Ignore:
Timestamp:
Jan 12, 2016, 1:43:27 PM (4 years ago)
Author:
cameron
Message:

Fix conversion from carry out bit to bitblock

Location:
icGREP/icgrep-devel/icgrep
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/pablo/carry_manager.cpp

    r4898 r4909  
    410410        Value * increments = iBuilder->esimd_bitspread(64,incrementMask);
    411411        Value * sum = iBuilder->simd_add(64, digitsum, increments);
    412         Value * carry_out_strm = iBuilder->mvmd_insert(32, iBuilder->allZeroes(), iBuilder->CreateLShr(incrementMask, iBuilder->getBitBlockWidth()/64), 0);
    413         setCarryOpCarryOut(localIndex, carry_out_strm);
     412        //Value * carry_out_strm = iBuilder->mvmd_insert(32, iBuilder->allZeroes(), iBuilder->CreateLShr(incrementMask, iBuilder->getBitBlockWidth()/64), 0);
     413        Value * carry_out_strm = iBuilder->CreateZExt(iBuilder->CreateLShr(incrementMask, iBuilder->getBitBlockWidth()/64), iBuilder->getIntNTy(mBITBLOCK_WIDTH));
     414        setCarryOpCarryOut(localIndex, iBuilder->bitCast(carry_out_strm));
    414415        return sum;
    415416#endif
  • icGREP/icgrep-devel/icgrep/toolchain.cpp

    r4907 r4909  
    253253extern "C" {
    254254    void wrapped_report_match(uint64_t recordNum, uint64_t recordStart, uint64_t recordEnd) {
    255         printf("line %llu: (%llu, %llu)\n", recordNum, recordStart, recordEnd);
     255        printf("line %lu: (%lu, %lu)\n", recordNum, recordStart, recordEnd);
    256256    }
    257257}
Note: See TracChangeset for help on using the changeset viewer.