Ignore:
Timestamp:
Oct 25, 2017, 4:57:58 PM (23 months ago)
Author:
nmedfort
Message:

First stage of MultiBlockKernel? and pipeline restructuring

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

Legend:

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

    r5630 r5706  
    163163    // must be a regex, not an input file.
    164164
    165     if (pattVector.size() == 0) {
     165    if (pattVector.size() == 0 && inputFiles.size() > 1) {
    166166        pattVector.push_back(inputFiles[0]);
    167167        inputFiles.erase(inputFiles.begin());
     
    575575    pxDriver.makeKernelCall(sourceK, {}, {CCStream});
    576576
    577     ExternalBuffer * ResultStream = pxDriver.addExternalBuffer(make_unique<ExternalBuffer>(iBuilder, iBuilder->getStreamSetTy(editDistance+1), resultStreamPtr, 1));   
     577    ExternalBuffer * ResultStream = pxDriver.addExternalBuffer(make_unique<ExternalBuffer>(iBuilder, iBuilder->getStreamSetTy(editDistance+1), resultStreamPtr, 1));
    578578    kernel::Kernel * editdk = pxDriver.addKernelInstance(make_unique<kernel::editdGPUKernel>(iBuilder, editDistance, patternLen, groupSize));
    579579     
  • icGREP/icgrep-devel/icgrep/editd/editd_cpu_kernel.cpp

    r5603 r5706  
    9191
    9292void editdCPUKernel::generateFinalBlockMethod(const std::unique_ptr<KernelBuilder> & idb, Value * remainingBytes) {
    93     idb->setScalarField("EOFmask", idb->bitblock_mask_from(remainingBytes));
     93    idb->setScalarField("EOFmask", idb->bitblock_mask_from(mAvailableItemCount[0]));
    9494    CreateDoBlockMethodCall(idb);
    9595}
  • icGREP/icgrep-devel/icgrep/editd/editd_gpu_kernel.cpp

    r5603 r5706  
    9393
    9494void editdGPUKernel::generateFinalBlockMethod(const std::unique_ptr<KernelBuilder> & idb, Value * remainingBytes) {
    95     idb->setScalarField("EOFmask", idb->bitblock_mask_from(remainingBytes));
     95    idb->setScalarField("EOFmask", idb->bitblock_mask_from(mAvailableItemCount[0]));
    9696    CreateDoBlockMethodCall(idb);
    9797}
Note: See TracChangeset for help on using the changeset viewer.