Ignore:
Timestamp:
Dec 22, 2016, 2:35:46 PM (2 years ago)
Author:
nmedfort
Message:

Modified memory alignment mechanism for GetPropertyValueGrepString? + misc. changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/kernels/symboltablepipeline.cpp

    r5230 r5234  
    279279    startIndexPhi1->addIncoming(startIndex, groupBody);
    280280    PHINode * startIV = iBuilder->CreatePHI(iBuilder->getSizeTy(), 2);
    281     startIV->addIncoming(ConstantInt::get(iBuilder->getSizeTy(), 0), groupBody);
     281    startIV->addIncoming(iBuilder->getSize(0), groupBody);
    282282    Value * startOuterTest = iBuilder->CreateICmpNE(startIV, ConstantInt::get(iBuilder->getSizeTy(), fieldCount));
    283283    iBuilder->CreateCondBr(startOuterTest, startOuterBody, endOuterCond);
     
    286286    iBuilder->SetInsertPoint(startOuterBody);
    287287    Value * startField = iBuilder->CreateExtractElement(startStream, startIV);
    288     startIV->addIncoming(iBuilder->CreateAdd(startIV, ConstantInt::get(iBuilder->getSizeTy(), 1)), startInnerCond);
     288    startIV->addIncoming(iBuilder->CreateAdd(startIV, iBuilder->getSize(1)), startInnerCond);
    289289    startBlockOffset->addIncoming(iBuilder->CreateAdd(startBlockOffset, ConstantInt::get(iBuilder->getSizeTy(), scanWordBitWidth)), startInnerCond);
    290290    iBuilder->CreateBr(startInnerCond);
     
    318318    startIndexPhi3->addIncoming(startIndexPhi1, startOuterCond);
    319319    PHINode * endIV = iBuilder->CreatePHI(iBuilder->getSizeTy(), 2);
    320     endIV->addIncoming(ConstantInt::get(iBuilder->getSizeTy(), 0), startOuterCond);
     320    endIV->addIncoming(iBuilder->getSize(0), startOuterCond);
    321321    Value * endOuterTest = iBuilder->CreateICmpNE(endIV, ConstantInt::get(iBuilder->getSizeTy(), fieldCount));
    322322    iBuilder->CreateCondBr(endOuterTest, endOuterBody, nextGroup);
     
    325325    iBuilder->SetInsertPoint(endOuterBody);
    326326    Value * endField = iBuilder->CreateExtractElement(endStream, endIV);
    327     endIV->addIncoming(iBuilder->CreateAdd(endIV, ConstantInt::get(iBuilder->getSizeTy(), 1)), endInnerCond);
     327    endIV->addIncoming(iBuilder->CreateAdd(endIV, iBuilder->getSize(1)), endInnerCond);
    328328    endBlockOffset->addIncoming(iBuilder->CreateAdd(endBlockOffset, ConstantInt::get(iBuilder->getSizeTy(), scanWordBitWidth)), endInnerCond);
    329329    iBuilder->CreateBr(endInnerCond);
     
    729729    remainingBytes3->addIncoming(bufferSize, partialLeadingCond);
    730730    remainingBytes3->addIncoming(remainingBytes2, regularCondBlock);
    731     Value * partialBlockCond = iBuilder->CreateICmpSGT(remainingBytes3, ConstantInt::get(iBuilder->getSizeTy(), 0));
     731    Value * partialBlockCond = iBuilder->CreateICmpSGT(remainingBytes3, iBuilder->getSize(0);
    732732    iBuilder->CreateCondBr(partialBlockCond, partialBodyBlock, flushLengthGroupsBlock);
    733733
Note: See TracChangeset for help on using the changeset viewer.