Changeset 5815


Ignore:
Timestamp:
Dec 30, 2017, 4:46:54 PM (12 months ago)
Author:
cameron
Message:

Revert inadvertent change to wc.cpp

File:
1 edited

Legend:

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

    r5814 r5815  
    9292WordCountKernel::WordCountKernel (const std::unique_ptr<kernel::KernelBuilder> & b)
    9393: PabloKernel(b, "wc",
    94     {Binding{b->getStreamSetTy(8, 1), "u8bit"}, Binding{b->getStreamSetTy(1, 8), "u8byte"}},
    95     {Binding{b->getStreamSetTy(1, 8), "dblbyte"}},
     94    {Binding{b->getStreamSetTy(8, 1), "u8bit"}},
     95    {},
    9696    {},
    9797    {Binding{b->getSizeTy(), "lineCount"}, Binding{b->getSizeTy(), "wordCount"}, Binding{b->getSizeTy(), "charCount"}}) {
     
    103103    //  input: 8 basis bit streams
    104104    const auto u8bitSet = getInputStreamVar("u8bit");
    105     const auto u8byteSet = getInputStreamVar("u8byte");
    106     const auto dblbyteSet = getOutputStreamVar("dblbyte");
    107105    //  output: 3 counters
    108106
     
    111109    PabloBuilder & pb = ccc.getBuilder();
    112110
    113     PabloAST * bytes = pb.createExtract(u8byteSet, pb.getInteger(0));
    114     PabloAST * dbl = pb.createAdd(bytes, bytes);
    115     pb.createAssign(pb.createExtract(dblbyteSet, pb.getInteger(0)), dbl);
    116    
    117111    Var * lc = getOutputScalarVar("lineCount");
    118112    Var * wc = getOutputScalarVar("wordCount");
     
    170164
    171165    StreamSetBuffer * const ByteStream = pxDriver.addBuffer<SourceBuffer>(iBuilder, iBuilder->getStreamSetTy(1, 8));
    172     StreamSetBuffer * const ByteOut = pxDriver.addBuffer<CircularBuffer>(iBuilder, iBuilder->getStreamSetTy(1, 8), segmentSize * bufferSegments);
    173166
    174167    StreamSetBuffer * const BasisBits = pxDriver.addBuffer<CircularBuffer>(iBuilder, iBuilder->getStreamSetTy(8, 1), segmentSize * bufferSegments);
     
    182175   
    183176    Kernel * wck = pxDriver.addKernelInstance<WordCountKernel>(iBuilder);
    184     pxDriver.makeKernelCall(wck, {BasisBits,ByteStream}, {ByteOut});
     177    pxDriver.makeKernelCall(wck, {BasisBits}, {});
    185178
    186179    pxDriver.generatePipelineIR();
Note: See TracChangeset for help on using the changeset viewer.