rename the pass

Author: Yu-Zhewen

compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEGenerateColumnControlOverlay.cpp renamed to compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEGenerateControlOverlay.cpp

@@ -10,7 +10,7 @@
 #include "iree-amd-aie/Transforms/Utils/AMDAIEUtils.h"
 #include "iree-amd-aie/aie_runtime/Utils/ChannelGenerator.h"
 
-#define DEBUG_TYPE "iree-amdaie-generate-column-control-overlay"
+#define DEBUG_TYPE "iree-amdaie-generate-control-overlay"
 
 namespace mlir::iree_compiler::AMDAIE {
 
@@ -49,9 +49,11 @@ LogicalResult initializeChannelsGenerators(
         if (direction == AMDAIE::DMAChannelDir::MM2S) {
           shimTileToGeneratorMap[tileOp.getResult()].assignProducerDMAChannel(
               channel);
-        } else {
+        } else if (direction == AMDAIE::DMAChannelDir::S2MM) {
           shimTileToGeneratorMap[tileOp.getResult()].assignConsumerDMAChannel(
               channel);
+        } else {
+          assert(false && "unexpected DMA channel direction");
         }
       }
     }
@@ -60,9 +62,9 @@ LogicalResult initializeChannelsGenerators(
   return success();
 }
 
-LogicalResult generateColumnControlOverlay(AMDAIE::WorkgroupOp workgroupOp,
-                                           bool routeShimToTileCtrl,
-                                           bool routeShimCtrlToTct) {
+LogicalResult generateControlOverlay(AMDAIE::WorkgroupOp workgroupOp,
+                                     bool routeShimToTileCtrl,
+                                     bool routeShimCtrlToTct) {
   // Get the device model.
   std::optional<AMDAIEDevice> device = getConfigAMDAIEDevice(workgroupOp);
   if (!device) {
@@ -78,8 +80,7 @@ LogicalResult generateColumnControlOverlay(AMDAIE::WorkgroupOp workgroupOp,
     uint32_t col = getConstantIndexOrAssert(tileOp.getCol());
     uint32_t row = getConstantIndexOrAssert(tileOp.getRow());
     occupiedCols.insert(col);
-    if (deviceModel.getTileType(col, row) == AMDAIETileType::SHIMNOC)
-      columnToShimTile[col] = tileOp;
+    if (deviceModel.isShimNOCTile(col, row)) columnToShimTile[col] = tileOp;
   });
 
   // If the column is occupied, but the shim tile op is not present, then create
@@ -153,13 +154,13 @@ LogicalResult generateColumnControlOverlay(AMDAIE::WorkgroupOp workgroupOp,
   return success();
 }
 
-class AMDAIEGenerateColumnControlOverlayPass
-    : public impl::AMDAIEGenerateColumnControlOverlayBase<
-          AMDAIEGenerateColumnControlOverlayPass> {
+class AMDAIEGenerateControlOverlayPass
+    : public impl::AMDAIEGenerateControlOverlayBase<
+          AMDAIEGenerateControlOverlayPass> {
  public:
-  AMDAIEGenerateColumnControlOverlayPass(
-      const AMDAIEGenerateColumnControlOverlayOptions &options)
-      : AMDAIEGenerateColumnControlOverlayBase(options) {}
+  AMDAIEGenerateControlOverlayPass(
+      const AMDAIEGenerateControlOverlayOptions &options)
+      : AMDAIEGenerateControlOverlayBase(options) {}
 
   void getDependentDialects(DialectRegistry &registry) const override {
     registry.insert<AMDAIEDialect>();
@@ -168,11 +169,11 @@ class AMDAIEGenerateColumnControlOverlayPass
   void runOnOperation() override;
 };
 
-void AMDAIEGenerateColumnControlOverlayPass::runOnOperation() {
+void AMDAIEGenerateControlOverlayPass::runOnOperation() {
   Operation *parentOp = getOperation();
   WalkResult res = parentOp->walk([&](AMDAIE::WorkgroupOp workgroupOp) {
-    if (failed(generateColumnControlOverlay(workgroupOp, routeShimToTileCtrl,
-                                            routeShimCtrlToTct))) {
+    if (failed(generateControlOverlay(workgroupOp, routeShimToTileCtrl,
+                                      routeShimCtrlToTct))) {
       return WalkResult::interrupt();
     }
     return WalkResult::advance();
@@ -183,9 +184,9 @@ void AMDAIEGenerateColumnControlOverlayPass::runOnOperation() {
 
 }  // namespace
 
-std::unique_ptr<Pass> createAMDAIEGenerateColumnControlOverlayPass(
-    AMDAIEGenerateColumnControlOverlayOptions options) {
-  return std::make_unique<AMDAIEGenerateColumnControlOverlayPass>(options);
+std::unique_ptr<Pass> createAMDAIEGenerateControlOverlayPass(
+    AMDAIEGenerateControlOverlayOptions options) {
+  return std::make_unique<AMDAIEGenerateControlOverlayPass>(options);
 }
 
 }  // namespace mlir::iree_compiler::AMDAIE

compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/CMakeLists.txt

@@ -75,7 +75,7 @@ iree_cc_library(
     "AMDAIEFuseConsumerIntoLoop.cpp"
     "AMDAIEFuseFillIntoForall.cpp"
     "AMDAIEFusePackIntoLoop.cpp"
-    "AMDAIEGenerateColumnControlOverlay.cpp"
+    "AMDAIEGenerateControlOverlay.cpp"
     "AMDAIEHoistForAffineApply.cpp"
     "AMDAIEHoistLogicalObjFifo.cpp"
     "AMDAIEInsertCores.cpp"

compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/PassDetail.h

@@ -56,7 +56,7 @@ namespace mlir::iree_compiler::AMDAIE {
 #define GEN_PASS_DEF_AMDAIEFUSECONSUMERINTOLOOP
 #define GEN_PASS_DEF_AMDAIEFUSEFILLINTOFORALL
 #define GEN_PASS_DEF_AMDAIEFUSEPACKINTOLOOP
-#define GEN_PASS_DEF_AMDAIEGENERATECOLUMNCONTROLOVERLAY
+#define GEN_PASS_DEF_AMDAIEGENERATECONTROLOVERLAY
 #define GEN_PASS_DEF_AMDAIEHOISTFORLOOPAFFINEAPPLY
 #define GEN_PASS_DEF_AMDAIEHOISTLOGICALOBJFIFO
 #define GEN_PASS_DEF_AMDAIEINSERTAIEWORKGROUP

compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/Passes.cpp

@@ -671,7 +671,7 @@ void addAMDAIEObjectFifoLoweringPasses(
   passManager.addPass(createAMDAIETemporaryAllocBufferizationPass());
   passManager.addPass(createAMDAIEConnectionToFlowPass());
 
-  passManager.addPass(createAMDAIEGenerateColumnControlOverlayPass());
+  passManager.addPass(createAMDAIEGenerateControlOverlayPass());
   passManager.addPass(createCSEPass());
   passManager.addPass(createCanonicalizerPass());
 

compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/Passes.h

@@ -197,8 +197,8 @@ std::unique_ptr<Pass> createAMDAIEFuseFillIntoForallPass();
 
 /// Create pass to generate packet-flow routings for control packets entering or
 /// leaving each tile.
-std::unique_ptr<Pass> createAMDAIEGenerateColumnControlOverlayPass(
-    AMDAIEGenerateColumnControlOverlayOptions options = {});
+std::unique_ptr<Pass> createAMDAIEGenerateControlOverlayPass(
+    AMDAIEGenerateControlOverlayOptions options = {});
 
 /// Hoist an affine.apply op on a scf.for op's induction variable.
 std::unique_ptr<Pass> createAMDAIEHoistForLoopAffineApplyPass();

compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/Passes.td

@@ -330,9 +330,9 @@ def AMDAIEFusePackIntoLoop :
   ];
 }
 
-def AMDAIEGenerateColumnControlOverlay : Pass<"iree-amdaie-generate-column-control-overlay"> {
-  let summary = "Spawn a streaming interconnect network for column control.";
-  let constructor = "mlir::iree_compiler::AMDAIE::createAMDAIEGenerateColumnControlOverlayPass()";
+def AMDAIEGenerateControlOverlay : Pass<"iree-amdaie-generate-control-overlay"> {
+  let summary = "Spawn a streaming interconnect network for CTRL ports.";
+  let constructor = "mlir::iree_compiler::AMDAIE::createAMDAIEGenerateControlOverlayPass()";
   let options = [
     Option<"routeShimCtrlToTct", "route-shim-to-tct", "bool", /*default=*/"true",
       "Flag to generate TCT routing between tile CTRL and shim SOUTH ports.">,

compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/CMakeLists.txt

@@ -48,7 +48,7 @@ iree_lit_test_suite(
     "fuse_consumer_into_loop.mlir"
     "fuse_fill_into_forall.mlir"
     "fuse_pack_into_loop.mlir"
-    "generate_column_control_overlay.mlir"
+    "generate_control_overlay.mlir"
     "hoist_for_affine_apply.mlir"
     "hoist_logical_obj_fifo.mlir"
     "insert_cores.mlir"

compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/generate_column_control_overlay.mlir renamed to compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/generate_control_overlay.mlir

@@ -1,4 +1,4 @@
-// RUN: iree-opt --pass-pipeline="builtin.module(func.func(iree-amdaie-generate-column-control-overlay{route-shim-to-tct=true route-shim-to-tile-ctrl=true},canonicalize,cse))" --split-input-file --verify-diagnostics %s | FileCheck %s
+// RUN: iree-opt --pass-pipeline="builtin.module(func.func(iree-amdaie-generate-control-overlay{route-shim-to-tct=true route-shim-to-tile-ctrl=true},canonicalize,cse))" --split-input-file --verify-diagnostics %s | FileCheck %s
 
 // Device attribute is required for route-shim-to-tile-ctrl.
 module {