Ignore:
Timestamp:
Apr 24, 2018, 2:57:34 PM (16 months ago)
Author:
nmedfort
Message:

Restructured MultiBlock? kernel. Removal of Swizzled buffers. Inclusion of PopCount? rates / non-linear access. Modifications to several kernels to better align them with the kernel and pipeline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/character_deletion.cpp

    r5939 r5985  
    6262    codegen::ParseCommandLineOptions(argc, argv, {&lz4dFlags, codegen::codegen_flags()});
    6363
    64 
    65     std::string fileName = inputFile;
     64    const std::string fileName = inputFile;
    6665
    6766    std::ifstream f(fileName, std::ios::binary | std::ios::ate);
     
    118117
    119118
    120 //    StreamSetBuffer * u16Swizzle0 = pxDriver.addBuffer<CircularBuffer>(iBuilder, iBuilder->getStreamSetTy(4), inputBufferBlocks);
    121 //    StreamSetBuffer * u16Swizzle1 = pxDriver.addBuffer<CircularBuffer>(iBuilder, iBuilder->getStreamSetTy(4), inputBufferBlocks);
    122     StreamSetBuffer * u16Swizzle0 = pxDriver.addBuffer<SwizzledCopybackBuffer>(iBuilder, iBuilder->getStreamSetTy(4), inputBufferBlocks, 1);
    123     StreamSetBuffer * u16Swizzle1 = pxDriver.addBuffer<SwizzledCopybackBuffer>(iBuilder, iBuilder->getStreamSetTy(4), inputBufferBlocks, 1);
    124     Kernel * delK = pxDriver.addKernelInstance<SwizzledDeleteByPEXTkernel>(iBuilder, 64, 8);
     119    StreamSetBuffer * u16Swizzle0 = pxDriver.addBuffer<CircularBuffer>(iBuilder, iBuilder->getStreamSetTy(4), inputBufferBlocks, 1);
     120    StreamSetBuffer * u16Swizzle1 = pxDriver.addBuffer<CircularBuffer>(iBuilder, iBuilder->getStreamSetTy(4), inputBufferBlocks, 1);
     121    Kernel * delK = pxDriver.addKernelInstance<SwizzledDeleteByPEXTkernel>(iBuilder, 8);
    125122    pxDriver.makeKernelCall(delK, {CharacterMarkerBuffer, BasisBits}, {u16Swizzle0, u16Swizzle1});
    126123
     
    141138    pxDriver.makeKernelCall(outK, {DecompressedByteStream}, {});
    142139
    143     /*
    144     Kernel * outK = pxDriver.addKernelInstance<FileSink>(iBuilder, 8);
    145     outK->setInitialArguments({iBuilder->GetString(outputFile)});
    146     pxDriver.makeKernelCall(outK, {DecompressedByteStream}, {});
    147     */
    148 
    149 
    150140    pxDriver.generatePipelineIR();
    151141
     
    159149    auto mainFunc = reinterpret_cast<MainFunctionType>(pxDriver.getMain());
    160150
    161 
    162151    mainFunc(fileBuffer, mFilesize);
    163152
Note: See TracChangeset for help on using the changeset viewer.