Changeset 4422

Timestamp:

Jan 16, 2015, 10:51:09 AM (4 years ago)

Author:

cameron

Message:

Fix for very long shift

Location:

icGREP/icgrep-devel

Files:

• QA/greptest.xml (modified) (2 diffs)
• icgrep/pablo/pablo_compiler.cpp (modified) (2 diffs)

icGREP/icgrep-devel/QA/greptest.xml

@@ -41 +41 @@
 =01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789;
 =012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789;
-=0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789;
+=01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789;
+=012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789;
+=0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789;
 </datafile>
 
@@ -396 +398 @@
 <grepcase regexp="(?i)=S[A-T]S*;" datafile="bounded_charclass" grepcount="1"/>
 <grepcase regexp="=[0-9]{100};" datafile="bounded_charclass" grepcount="1"/>
-<grepcase regexp="=[0-9]{50,};" datafile="bounded_charclass" grepcount="7"/>
+<grepcase regexp="=[0-9]{50,};" datafile="bounded_charclass" grepcount="9"/>
 <grepcase regexp="=[0-9]{140};" datafile="bounded_charclass" grepcount="1"/>
 <grepcase regexp="=[0-9a-z]{12,200};" datafile="bounded_charclass" grepcount="22"/>
+<grepcase regexp="=[0-9a-z]{200,1000};" datafile="bounded_charclass" grepcount="3"/>
+<grepcase regexp="=[0-9]{500,1000};" datafile="bounded_charclass" grepcount="1"/>
 
 

icGREP/icgrep-devel/icgrep/pablo/pablo_compiler.cpp

@@ -1076 +1076 @@
 #elif (BLOCK_SIZE == 128)
     if (advEntries == 1) {
+        if (block_shift == 0) {  
+            result_value = genAdvanceInLoad(loadIdx);
+            //b.CreateCall(mFunc_print_register, result_value);
+        }
         if (block_shift == 1) {
             Value* advanceq_value = genShiftHighbitToLow(genAdvanceInLoad(loadIdx));
@@ -1110 +1114 @@
             result_value = b.CreateBitCast(adv_longint, mBitBlockType);
             //b.CreateCall(mFunc_print_register, genAdvanceInLoad(loadIdx));
-            //b.CreateCall(mFunc_print_register, strm_value);
+            //b.CreateCall(mFunc_print_register, genAdvanceInLoad(loadIdx-1));
             //b.CreateCall(mFunc_print_register, result_value);
         }
         // copy entries from previous blocks forward
-        for (int i = storeIdx; i < loadIdx; i++) {
-            genAdvanceOutStore(genAdvanceInLoad(i), i+1);
+        for (int i = loadIdx; i > storeIdx; i--) {
+            genAdvanceOutStore(genAdvanceInLoad(i-1), i);
         }
     }