Commit f19981a9 authored by Rob Cameron's avatar Rob Cameron
Browse files

Attribute fixes to resolve stream-length mismatches

parent dfc6241f
#ifndef PIPELINE_KERNEL_COMPILER_CONFIG_H #ifndef PIPELINE_KERNEL_COMPILER_CONFIG_H
#define PIPELINE_KERNEL_COMPILER_CONFIG_H #define PIPELINE_KERNEL_COMPILER_CONFIG_H
#define PRINT_DEBUG_MESSAGES //#define PRINT_DEBUG_MESSAGES
// #define PRINT_DEBUG_MESSAGES_FOR_KERNEL_NUM 31,32,33,34,35,36 // #define PRINT_DEBUG_MESSAGES_FOR_KERNEL_NUM 31,32,33,34,35,36
......
...@@ -674,8 +674,8 @@ ScanBatchKernel::ScanBatchKernel(BuilderRef b, StreamSet * const Matches, Stream ...@@ -674,8 +674,8 @@ ScanBatchKernel::ScanBatchKernel(BuilderRef b, StreamSet * const Matches, Stream
: MultiBlockKernel(b, "scanBatch" + std::to_string(strideBlocks), : MultiBlockKernel(b, "scanBatch" + std::to_string(strideBlocks),
// inputs // inputs
{Binding{"matchResult", Matches} {Binding{"matchResult", Matches}
,Binding{"lineBreak", LineBreakStream} ,Binding{"lineBreak", LineBreakStream, FixedRate(), ZeroExtended()}
,Binding{"InputStream", ByteStream, FixedRate(), { Deferred() }}}, ,Binding{"InputStream", ByteStream, FixedRate(), { ZeroExtended(), Deferred() }}},
// outputs // outputs
{}, {},
// input scalars // input scalars
......
...@@ -216,7 +216,7 @@ FieldCompressKernel::FieldCompressKernel(BuilderRef b, ...@@ -216,7 +216,7 @@ FieldCompressKernel::FieldCompressKernel(BuilderRef b,
mMaskOp.operation = maskOp.operation; mMaskOp.operation = maskOp.operation;
mMaskOp.bindings.push_back(std::make_pair("extractionMask", maskOp.bindings[0].second)); mMaskOp.bindings.push_back(std::make_pair("extractionMask", maskOp.bindings[0].second));
// assert (streamutil::resultStreamCount(maskOp) == 1); // assert (streamutil::resultStreamCount(maskOp) == 1);
mInputStreamSets.push_back({"extractionMask", maskOp.bindings[0].first}); mInputStreamSets.push_back({"extractionMask", maskOp.bindings[0].first, FixedRate(), Principal()});
// assert (streamutil::resultStreamCount(inputOps) == outputStreamSet->getNumElements()); // assert (streamutil::resultStreamCount(inputOps) == outputStreamSet->getNumElements());
std::unordered_map<StreamSet *, std::string> inputBindings; std::unordered_map<StreamSet *, std::string> inputBindings;
std::tie(mInputOps, inputBindings) = streamutils::mapOperationsToStreamNames(inputOps); std::tie(mInputOps, inputBindings) = streamutils::mapOperationsToStreamNames(inputOps);
......
...@@ -47,8 +47,8 @@ StreamExpandKernel::StreamExpandKernel(BuilderRef b, ...@@ -47,8 +47,8 @@ StreamExpandKernel::StreamExpandKernel(BuilderRef b,
+ "_" + std::to_string(source->getNumElements()) + "_" + std::to_string(source->getNumElements())
+ ":" + std::to_string(expanded->getNumElements()), + ":" + std::to_string(expanded->getNumElements()),
// input stream sets // input stream sets
{Binding{"marker", mask, FixedRate()}, {Binding{"marker", mask, FixedRate(), Principal()},
Binding{"source", source, PopcountOf("marker"), BlockSize(b->getBitBlockWidth())}}, Binding{"source", source, PopcountOf("marker"), {ZeroExtended(), BlockSize(b->getBitBlockWidth())}}},
// output stream set // output stream set
{Binding{"output", expanded}}, {Binding{"output", expanded}},
// input scalar // input scalar
......
...@@ -345,7 +345,7 @@ void LineStartsKernel::generatePabloMethod() { ...@@ -345,7 +345,7 @@ void LineStartsKernel::generatePabloMethod() {
LineSpansKernel::LineSpansKernel(BuilderRef b, StreamSet * LineStarts, StreamSet * LineEnds, StreamSet * LineSpans) LineSpansKernel::LineSpansKernel(BuilderRef b, StreamSet * LineStarts, StreamSet * LineEnds, StreamSet * LineSpans)
: PabloKernel(b, "LineSpans", : PabloKernel(b, "LineSpans",
{Binding{"LineStarts", LineStarts}, Binding{"LineEnds", LineEnds}}, {Binding{"LineStarts", LineStarts}, Binding{"LineEnds", LineEnds, FixedRate(), Principal()}},
{Binding{"LineSpans", LineSpans}}) {} {Binding{"LineSpans", LineSpans}}) {}
void LineSpansKernel::generatePabloMethod() { void LineSpansKernel::generatePabloMethod() {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment