Ignore:
Timestamp:
Jul 7, 2018, 10:21:29 PM (10 months ago)
Author:
xwa163
Message:
  1. Improve RE_Compiler for multiplexing
  2. Use faster approach for LineBreakStream? generating in LZParabix_grep
File:
1 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/lzparabix/LZParabixGrepGenerator.cpp

    r6124 r6127  
    205205    mPxDriver.makeKernelCall(fakeStreamGeneratorK, {decompressedCharClasses}, {fakeMatchCopiedBits});
    206206
    207     kernel::Kernel * icgrepK = mGrepDriver->addKernelInstance<kernel::ICGrepKernel>(idb, mREs[0], externalStreamNames, std::vector<cc::Alphabet *>{mpx.get()}, cc::BitNumbering::BigEndian);
     207    kernel::Kernel * icgrepK = mGrepDriver->addKernelInstance<kernel::ICGrepKernel>(idb, mREs[0], externalStreamNames, std::vector<cc::Alphabet *>{mpx.get()}, cc::BitNumbering::BigEndian, true);
    208208    mGrepDriver->makeKernelCall(icgrepK, {fakeMatchCopiedBits, decompressedCharClasses}, {MatchResults});
    209209    MatchResultsBufs[0] = MatchResults;
     
    254254    this->generateBlockData(idb);
    255255    StreamSetBuffer * const LiteralBitStream = this->extractLiteralBitStream(idb);
    256     auto compressedLineBreakStream = this->linefeedStreamFromDecompressedBits(LiteralBitStream);
    257 
    258 
    259     auto ret = this->generateBitStreamDecompression(idb, {LiteralBitStream, compressedLineBreakStream});
     256//    auto compressedLineBreakStream = this->linefeedStreamFromDecompressedBits(LiteralBitStream);
     257
     258
     259    auto ret = this->generateBitStreamDecompression(idb, {LiteralBitStream/*, compressedLineBreakStream*/});
    260260    StreamSetBuffer * decompressedBasisBits = ret[0];
    261     StreamSetBuffer * LineBreakStream = ret[1];
     261//    StreamSetBuffer * LineBreakStream = ret[1];
    262262
    263263//    StreamSetBuffer * decompressedBasisBits = this->generateAioBitStreamDecompressoin(idb, {mCompressedBasisBits})[0];
    264 //    StreamSetBuffer * LineBreakStream = this->linefeedStreamFromDecompressedBits(decompressedBasisBits);
     264    StreamSetBuffer * LineBreakStream = this->linefeedStreamFromDecompressedBits(decompressedBasisBits);
    265265
    266266    std::map<std::string, StreamSetBuffer *> propertyStream;
Note: See TracChangeset for help on using the changeset viewer.