Support to bufferize task op with new destination-style semantics

include/scalehls/Dialect/HLS/IR/HLSOps.td

@@ -379,15 +379,22 @@ def TaskOp : HLSOp<"task", [SingleBlockImplicitTerminator<"YieldOp">]> {
   let hasCanonicalizer = 1;
 
   let extraClassDeclaration = [{
-    /// Return true if this task op contains nested sub-tasks.
-    bool hasHierarchy() {
-      return walk([&](Operation *op) {
+    /// Return whether this task op is a leaf task.
+    bool isLeafTask() {
+      return !walk([&](Operation *op) {
           if (isa<TaskOp, func::CallOp>(op) && op != *this)
             return WalkResult::interrupt();
           return WalkResult::advance();
         }).wasInterrupted();
     }
 
+    /// Return whether this task is the single task in the parent block.
+    bool isSingleTask() {
+      return llvm::hasSingleElement(
+          llvm::make_filter_range((*this)->getBlock()->getOperations(),
+              [](Operation &op) { return isa<TaskOp, func::CallOp>(op); }));
+    }
+
     /// Return the yield op of this task op.
     YieldOp getYieldOp();
 

lib/Dialect/HLS/IR/HLSOps.cpp

@@ -435,7 +435,8 @@ struct FoldTaskIterArgs : public OpRewritePattern<hls::TaskOp> {
         task.getLoc(), TypeRange(newIterArgs), newIterArgs);
     newtask->setAttrs(task->getAttrs());
     Block *newBlock = rewriter.createBlock(
-        &newtask.getBody(), newtask.getBody().begin(), TypeRange(newIterArgs));
+        &newtask.getBody(), newtask.getBody().begin(), TypeRange(newIterArgs),
+        llvm::map_to_vector(newIterArgs, [&](Value v) { return v.getLoc(); }));
     rewriter.setInsertionPointToEnd(newBlock);
     rewriter.create<hls::YieldOp>(task.getLoc(), newYieldValues);
 
@@ -518,11 +519,8 @@ struct InlineTask : public OpRewritePattern<hls::TaskOp> {
 void TaskOp::getCanonicalizationPatterns(RewritePatternSet &results,
                                          MLIRContext *context) {
   results.add<FoldTaskIterArgs>(context);
-  results.add<InlineTask>(context, [](TaskOp task) {
-    return llvm::hasSingleElement(
-        llvm::make_filter_range(task->getBlock()->getOperations(),
-                                [](Operation &op) { return isa<TaskOp>(op); }));
-  });
+  results.add<InlineTask>(context,
+                          [](TaskOp task) { return task.isSingleTask(); });
 }
 
 LogicalResult TaskOp::verify() {