Fix issue in the verifier of StreamReadOp

UIUC-ChenLab · Feb 23, 2024 · 84f820d · 84f820d
1 parent b1922b8
commit 84f820d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/lib/Dialect/HLS/IR/HLSOps.cpp b/lib/Dialect/HLS/IR/HLSOps.cpp
@@ -98,7 +98,9 @@ static LogicalResult verifyTripCountsAndSteps(Operation *op, Value channel) {
       llvm::zip(channelType.getIterTripCounts(), channelType.getIterSteps()),
       [](auto tuple) { return std::get<0>(tuple) != 1; });
 
-  if (llvm::any_of(llvm::zip(stripedLoopInfo, stripedIterInfo), [](auto tuple) {
+  if (std::distance(stripedLoopInfo.begin(), stripedLoopInfo.end()) !=
+          std::distance(stripedIterInfo.begin(), stripedIterInfo.end()) ||
+      llvm::any_of(llvm::zip(stripedLoopInfo, stripedIterInfo), [](auto tuple) {
         return std::get<0>(tuple) != std::get<1>(tuple);
       })) {
     auto diag = op->emitOpError("loop trip counts or steps doesn't align with "

diff --git a/lib/Dialect/HLS/Transforms/LowerDataflow.cpp b/lib/Dialect/HLS/Transforms/LowerDataflow.cpp
@@ -101,6 +101,7 @@ struct ConvertTaskToNode : public OpRewritePattern<TaskOp> {
     rewriter.setInsertionPoint(task);
     auto node = rewriter.create<NodeOp>(rewriter.getUnknownLoc(), inputs,
                                         outputs, params);
+    node->setAttrs(task->getAttrs());
     auto nodeBlock = rewriter.createBlock(&node.getBody());
 
     auto inputArgs = nodeBlock->addArguments(ValueRange(inputs), inputLocs);
@@ -165,14 +166,13 @@ struct LowerDataflow : public LowerDataflowBase<LowerDataflow> {
 
     // Convert dispatch, task, and to_memref operations.
     ConversionTarget target(*context);
-    target
-        .addIllegalOp<DispatchOp, TaskOp, YieldOp, bufferization::ToMemrefOp>();
-    target.addLegalOp<ScheduleOp, NodeOp, ConstBufferOp>();
+    target.addIllegalOp<DispatchOp, TaskOp, YieldOp>();
+    target.addLegalOp<ScheduleOp, NodeOp>();
 
     mlir::RewritePatternSet patterns(context);
     patterns.add<ConvertDispatchToSchedule>(context);
     patterns.add<ConvertTaskToNode>(context);
-    patterns.add<ConvertConstantToConstBuffer>(context);
+    // patterns.add<ConvertConstantToConstBuffer>(context);
     if (failed(applyPartialConversion(func, target, std::move(patterns))))
       return signalPassFailure();
   }

diff --git a/lib/Pipelines/Pipelines.cpp b/lib/Pipelines/Pipelines.cpp
@@ -44,9 +44,9 @@ void scalehls::addComprehensiveBufferizePasses(OpPassManager &pm) {
   // can be deleted by canonicalizer. We have to run it again because the
   // memrefs are unified in CSE pass, so we can truely remove redundant memcpy.
   pm.addPass(mlir::createCanonicalizerPass());
-  pm.addPass(memref::createFoldMemRefAliasOpsPass());
-  pm.addPass(hls::createRaiseSCFToAffinePass());
-  pm.addPass(mlir::createCanonicalizerPass());
+  // pm.addPass(memref::createFoldMemRefAliasOpsPass());
+  // pm.addPass(hls::createRaiseSCFToAffinePass());
+  // pm.addPass(mlir::createCanonicalizerPass());
 }
 
 void scalehls::addConvertDataflowToFuncPasses(OpPassManager &pm) {

diff --git a/lib/Utils/Utils.cpp b/lib/Utils/Utils.cpp
@@ -65,10 +65,11 @@ scalehls::constructLoops(ArrayRef<int64_t> tripCounts, ArrayRef<int64_t> steps,
 SmallVector<scf::ForOp> scalehls::getSurroundingLoops(Operation *target,
                                                       Block *sourceBlock) {
   SmallVector<scf::ForOp> reversedLoops;
-  while (auto loop = target->getParentOfType<scf::ForOp>()) {
-    reversedLoops.push_back(loop);
-    target = loop;
-    if (sourceBlock == loop->getBlock())
+  while (auto parent = target->getParentOp()) {
+    if (auto loop = dyn_cast<scf::ForOp>(parent))
+      reversedLoops.push_back(loop);
+    target = parent;
+    if (sourceBlock == parent->getBlock())
       break;
   }
   return {reversedLoops.rbegin(), reversedLoops.rend()};