Ignore:
Timestamp:
Mar 13, 2017, 3:02:13 PM (2 years ago)
Author:
nmedfort
Message:

Work on non-carry collapsing mode.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/array-test.cpp

    r5353 r5361  
    8383        PabloAST * pscan = body.createAdvanceThenScanTo(pending_lparen, in_play, "pscan");
    8484
    85         PabloAST * closed = body.createAnd(pscan, rparen, "closed");
     85        PabloAST * closed = body.createAnd(pscan, rparen, "closed_rparen");
    8686        body.createAssign(all_closed, body.createOr(all_closed, closed));
    8787
     
    9393        body.createAssign(body.createExtract(matches, index), closed);
    9494
    95         PabloAST * pending_rparen = body.createAnd(rparen, body.createNot(all_closed), "pending_rparen");
     95        PabloAST * pending_rparen = body.createAnd(rparen, body.createNot(all_closed, "open_rparen"), "pending_rparen");
    9696        body.createAssign(in_play, body.createOr(pending_lparen, pending_rparen));
    9797        body.createAssign(index, body.createAdd(index, body.getInteger(1)));
     
    123123    ExternalFileBuffer ByteStream(iBuilder, iBuilder->getStreamSetTy(1, 8));
    124124
    125     kernel::MMapSourceKernel mmapK(iBuilder, segmentSize);
     125    MMapSourceKernel mmapK(iBuilder, segmentSize);
    126126    mmapK.generateKernel({}, {&ByteStream});
    127127    mmapK.setInitialArguments({fileSize});
     
    129129    CircularBuffer BasisBits(iBuilder, iBuilder->getStreamSetTy(8), segmentSize * bufferSegments);
    130130
    131     kernel::S2PKernel  s2pk(iBuilder);
     131    S2PKernel  s2pk(iBuilder);
    132132    s2pk.generateKernel({&ByteStream}, {&BasisBits});
    133133
     
    218218}
    219219
    220 
    221220void run(MatchParens match, const std::string & fileName) {
    222221    const boost::filesystem::path file(fileName);
Note: See TracChangeset for help on using the changeset viewer.