Changeset 4422


Ignore:
Timestamp:
Jan 16, 2015, 10:51:09 AM (4 years ago)
Author:
cameron
Message:

Fix for very long shift

Location:
icGREP/icgrep-devel
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/QA/greptest.xml

    r4421 r4422  
    4141=01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789;
    4242=012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789;
    43 =0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789;
     43=01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789;
     44=012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789;
     45=0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789;
    4446</datafile>
    4547
     
    396398<grepcase regexp="(?i)=S[A-T]S*;" datafile="bounded_charclass" grepcount="1"/>
    397399<grepcase regexp="=[0-9]{100};" datafile="bounded_charclass" grepcount="1"/>
    398 <grepcase regexp="=[0-9]{50,};" datafile="bounded_charclass" grepcount="7"/>
     400<grepcase regexp="=[0-9]{50,};" datafile="bounded_charclass" grepcount="9"/>
    399401<grepcase regexp="=[0-9]{140};" datafile="bounded_charclass" grepcount="1"/>
    400402<grepcase regexp="=[0-9a-z]{12,200};" datafile="bounded_charclass" grepcount="22"/>
     403<grepcase regexp="=[0-9a-z]{200,1000};" datafile="bounded_charclass" grepcount="3"/>
     404<grepcase regexp="=[0-9]{500,1000};" datafile="bounded_charclass" grepcount="1"/>
    401405
    402406
  • icGREP/icgrep-devel/icgrep/pablo/pablo_compiler.cpp

    r4421 r4422  
    10761076#elif (BLOCK_SIZE == 128)
    10771077    if (advEntries == 1) {
     1078        if (block_shift == 0) { 
     1079            result_value = genAdvanceInLoad(loadIdx);
     1080            //b.CreateCall(mFunc_print_register, result_value);
     1081        }
    10781082        if (block_shift == 1) {
    10791083            Value* advanceq_value = genShiftHighbitToLow(genAdvanceInLoad(loadIdx));
     
    11101114            result_value = b.CreateBitCast(adv_longint, mBitBlockType);
    11111115            //b.CreateCall(mFunc_print_register, genAdvanceInLoad(loadIdx));
    1112             //b.CreateCall(mFunc_print_register, strm_value);
     1116            //b.CreateCall(mFunc_print_register, genAdvanceInLoad(loadIdx-1));
    11131117            //b.CreateCall(mFunc_print_register, result_value);
    11141118        }
    11151119        // copy entries from previous blocks forward
    1116         for (int i = storeIdx; i < loadIdx; i++) {
    1117             genAdvanceOutStore(genAdvanceInLoad(i), i+1);
     1120        for (int i = loadIdx; i > storeIdx; i--) {
     1121            genAdvanceOutStore(genAdvanceInLoad(i-1), i);
    11181122        }
    11191123    }
Note: See TracChangeset for help on using the changeset viewer.