Changeset 5626

Timestamp:

Sep 1, 2017, 1:00:48 AM (3 weeks ago)

Author:

xuedongx

Message:

small fix for expandstreams

Location:

icGREP/icgrep-devel/icgrep/kernels

Files:

• alignedprint.cpp (modified) (2 diffs)
• alignedprint.h (modified) (1 diff)

icGREP/icgrep-devel/icgrep/kernels/alignedprint.cpp

@@ -94 +94 @@
 }
 
-void ExpandStream::generateDoBlockMethod(const std::unique_ptr<KernelBuilder> &iBuilder) {
-    if (mSizeOutputStreamSet <= mSizeInputStreamSet)
-        llvm::report_fatal_error("Stream Expanding fails.\n");
+void ExpandOrSelectStreams::generateDoBlockMethod(const std::unique_ptr<KernelBuilder> &iBuilder) {
 
     for (unsigned i = 0; i < mSizeOutputStreamSet; i++) {
@@ -281 +279 @@
 }
 
-ExpandStream::ExpandStream(const std::unique_ptr<kernel::KernelBuilder> & builder, unsigned sizeInputStreamSet, unsigned sizeOutputStreamSet)
-: BlockOrientedKernel("ExpandStream", {Binding{builder->getStreamSetTy(sizeInputStreamSet), "bitStreams"}}, {Binding{builder->getStreamSetTy(sizeOutputStreamSet), "outputbitStreams"}}, {}, {}, {}), mSizeInputStreamSet(sizeInputStreamSet), mSizeOutputStreamSet(sizeOutputStreamSet) {
+ExpandOrSelectStreams::ExpandOrSelectStreams(const std::unique_ptr<kernel::KernelBuilder> & builder, unsigned sizeInputStreamSet, unsigned sizeOutputStreamSet)
+: BlockOrientedKernel("ExpandOrSelectStreams", {Binding{builder->getStreamSetTy(sizeInputStreamSet), "bitStreams"}}, {Binding{builder->getStreamSetTy(sizeOutputStreamSet), "outputbitStreams"}}, {}, {}, {}), mSizeInputStreamSet(sizeInputStreamSet), mSizeOutputStreamSet(sizeOutputStreamSet) {
     setNoTerminateAttribute(true);
 

icGREP/icgrep-devel/icgrep/kernels/alignedprint.h

@@ -28 +28 @@
 };
 
-class ExpandStream final : public BlockOrientedKernel {
+class ExpandOrSelectStreams final : public BlockOrientedKernel {
 public:
-    ExpandStream(const std::unique_ptr<kernel::KernelBuilder> & builder, unsigned sizeInputStreamSet, unsigned sizeOutputStreamSet);
+    ExpandOrSelectStreams(const std::unique_ptr<kernel::KernelBuilder> & builder, unsigned sizeInputStreamSet, unsigned sizeOutputStreamSet);
 private:
     void generateDoBlockMethod(const std::unique_ptr<kernel::KernelBuilder> & iBuilder) override;