Changeset 5853


Ignore:
Timestamp:
Jan 30, 2018, 3:32:43 AM (15 months ago)
Author:
xwa163
Message:

Use delMaskSet as principal input stream in SwizzledDeleteByPEXTkernel

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

Legend:

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

    r5850 r5853  
    125125    StreamSetBuffer * u16Swizzle1 = pxDriver.addBuffer<SwizzledCopybackBuffer>(iBuilder, iBuilder->getStreamSetTy(4), inputBufferBlocks, 1);
    126126    Kernel * delK = pxDriver.addKernelInstance<SwizzledDeleteByPEXTkernel>(iBuilder, 64, 8);
    127     pxDriver.makeKernelCall(delK, {BasisBits, CharacterMarkerBuffer}, {u16Swizzle0, u16Swizzle1});
     127    pxDriver.makeKernelCall(delK, {CharacterMarkerBuffer, BasisBits}, {u16Swizzle0, u16Swizzle1});
    128128
    129129    // Produce unswizzled bit streams
  • icGREP/icgrep-devel/icgrep/kernels/deletion.cpp

    r5852 r5853  
    5050SwizzledDeleteByPEXTkernel::SwizzledDeleteByPEXTkernel(const std::unique_ptr<kernel::KernelBuilder> & iBuilder, unsigned fw, unsigned streamCount, unsigned PEXT_width)
    5151: BlockOrientedKernel("PEXTdel" + std::to_string(fw) + "_" + std::to_string(streamCount),
    52                   {Binding{iBuilder->getStreamSetTy(streamCount), "inputStreamSet"}, Binding{iBuilder->getStreamSetTy(), "delMaskSet"}},
     52                  {Binding{iBuilder->getStreamSetTy(), "delMaskSet"}, Binding{iBuilder->getStreamSetTy(streamCount), "inputStreamSet"}},
    5353                  {}, {}, {}, {})
    5454, mDelCountFieldWidth(fw)
  • icGREP/icgrep-devel/icgrep/u8u16.cpp

    r5847 r5853  
    310310    // sequences (bit streams) for each UTF-16 code unit. Also compresses and swizzles the result.
    311311    Kernel * delK = pxDriver.addKernelInstance<SwizzledDeleteByPEXTkernel>(iBuilder, 64, 16);
    312     pxDriver.makeKernelCall(delK, {U8u16Bits, DelMask}, {u16Swizzle0, u16Swizzle1, u16Swizzle2, u16Swizzle3});
     312    pxDriver.makeKernelCall(delK, {DelMask, U8u16Bits}, {u16Swizzle0, u16Swizzle1, u16Swizzle2, u16Swizzle3});
    313313
    314314    // Produce unswizzled UTF-16 bit streams
Note: See TracChangeset for help on using the changeset viewer.