Ignore:
Timestamp:
Apr 9, 2018, 5:01:04 PM (15 months ago)
Author:
nmedfort
Message:

fixes for minor compilation issues

Location:
icGREP/icgrep-devel/icgrep/lz4
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/lz4/LZ4Generator.cpp

    r5955 r5957  
    9090
    9191    StreamSetBuffer * const DecompressedByteStream = pxDriver.addBuffer<CircularBuffer>(iBuilder, iBuilder->getStreamSetTy(1, 8), this->getDecompressedBufferBlocks());
    92     StreamSetBuffer * const FinalDecompressedByteStream = pxDriver.addBuffer<CircularBuffer>(iBuilder, iBuilder->getStreamSetTy(1, 8), this->getDecompressedBufferBlocks());
    9392
    9493    // GeneratePipeline
     
    223222    //// Generate Helper Markers Extenders, FX, XF
    224223    StreamSetBuffer * const Extenders = pxDriver.addBuffer<CircularBuffer>(iBuilder, iBuilder->getStreamSetTy(1, 1), this->getInputBufferBlocks());
    225     StreamSetBuffer * const CC_0xFX = pxDriver.addBuffer<CircularBuffer>(iBuilder, iBuilder->getStreamSetTy(1, 1), this->getInputBufferBlocks());
    226     StreamSetBuffer * const CC_0xXF = pxDriver.addBuffer<CircularBuffer>(iBuilder, iBuilder->getStreamSetTy(1, 1), this->getInputBufferBlocks());
    227 
    228224
    229225    Kernel * extenderK = pxDriver.addKernelInstance<ParabixCharacterClassKernelBuilder>(iBuilder, "extenders", std::vector<re::CC *>{re::makeCC(0xFF)}, 8);
     
    235231    blockDecoderK->setInitialArguments({iBuilder->CreateTrunc(hasBlockChecksum, iBuilder->getInt1Ty()), headerSize, fileSize});
    236232    pxDriver.makeKernelCall(blockDecoderK, {ByteStream}, {BlockData_IsCompressed, BlockData_BlockStart, BlockData_BlockEnd});
    237 
    238 //    re::CC* xfCC = re::makeCC(0x0f);
    239 //    re::CC* fxCC = re::makeCC(0xf0);
    240 //    for (re::codepoint_t i = 1; i <= 0xf; i++) {
    241 //        xfCC = re::makeCC(xfCC, re::makeCC(i * 0x10 + 0x0f));
    242 //        fxCC = re::makeCC(fxCC, re::makeCC(0xf0 + i));
    243 //    }
    244 
    245 //    Kernel * CC_0xFXKernel = pxDriver.addKernelInstance<ParabixCharacterClassKernelBuilder>(iBuilder, "CC_0xFX", std::vector<re::CC *>{fxCC}, 8);
    246 //    pxDriver.makeKernelCall(CC_0xFXKernel, {BasisBits}, {CC_0xFX});
    247 
    248 //    Kernel * CC_0xXFKernel = pxDriver.addKernelInstance<ParabixCharacterClassKernelBuilder>(iBuilder, "CC_0xXF", std::vector<re::CC *>{xfCC}, 8);
    249 //    pxDriver.makeKernelCall(CC_0xXFKernel, {BasisBits}, {CC_0xXF});
    250233
    251234    //// Generate Extract/Deposit Markers, M0_Start, M0_End, MatchOffset
     
    263246    DepositMarker = pxDriver.addBuffer<CircularBuffer>(iBuilder, iBuilder->getStreamSetTy(1, 1), this->getDecompressedBufferBlocks());
    264247    Match_Offset = pxDriver.addBuffer<CircularBuffer>(iBuilder, iBuilder->getStreamSetTy(1, 64), this->getInputBufferBlocks());
    265 
    266 
    267 
    268248
    269249    Kernel* Lz4IndexBuilderK = pxDriver.addKernelInstance<LZ4IndexBuilderKernel>(iBuilder);
     
    274254                    ByteStream,
    275255                    Extenders,
    276 //                    CC_0xFX,
    277 //                    CC_0xXF,
    278256
    279257                    // Block Data
  • icGREP/icgrep-devel/icgrep/lz4/LZ4Generator.h

    r5948 r5957  
    3232protected:
    3333    //// Protected Method
    34     inline void generateMainFunc(const std::unique_ptr<kernel::KernelBuilder> & iBuilder);
     34    void generateMainFunc(const std::unique_ptr<kernel::KernelBuilder> & iBuilder);
    3535    // Pipeline
    3636    virtual void generateLoadByteStreamAndBitStream(const std::unique_ptr<kernel::KernelBuilder> & iBuilder);
  • icGREP/icgrep-devel/icgrep/lz4/LZ4GrepGenerator.cpp

    r5955 r5957  
    141141    // TODO: until we automate stream buffer sizing, use this calculation to determine how large our matches buffer needs to be.
    142142    const unsigned baseBufferSize = this->getInputBufferBlocks();
    143     const unsigned encodingBits = 8;
    144143    bool MultithreadedSimpleRE = false;
    145     bool PabloTransposition = false;
    146144    bool PropertyKernels = false;
    147145    bool CC_Multiplexing = false;
     
    338336    return std::pair<StreamSetBuffer *, StreamSetBuffer *>(LineBreakStream, Matches);
    339337
    340 };
     338}
    341339
    342340
     
    350348    main(fileBuffer, blockStart, blockEnd, hasBlockChecksum, reinterpret_cast<intptr_t>(&accum));
    351349    llvm::outs() << s.str();
    352 };
     350}
    353351
    354352void LZ4GrepGenerator::generateScanMatchGrepPipeline(re::RE* regex) {
     
    425423    auto & iBuilder = pxDriver.getBuilder();
    426424    this->generateMainFunc(iBuilder);
    427 
    428     StreamSetBuffer * const DecompressedByteStream = pxDriver.addBuffer<CircularBuffer>(iBuilder, iBuilder->getStreamSetTy(1, 8), this->getDecompressedBufferBlocks());
    429425
    430426    // GeneratePipeline
  • icGREP/icgrep-devel/icgrep/lz4/LZ4GrepGenerator.h

    r5955 r5957  
    1414#include <sstream>
    1515#include <atomic>
    16 #import <grep/grep_engine.h>
     16#include <grep/grep_engine.h>
    1717
    1818typedef void (*ScanMatchGrepMainFunctionType)(char * byte_data, size_t headerSize, size_t filesize, bool hasBlockChecksum, intptr_t match_accumulator);
Note: See TracChangeset for help on using the changeset viewer.