Rename in-tree AIE passes to AMDAIE

Author: makslevental

compiler/plugins/target/AMD-AIE/aie/AIEAssignBufferAddressesBasic.cpp renamed to compiler/plugins/target/AMD-AIE/aie/AMDAIEAssignBufferAddressesBasic.cpp

@@ -10,39 +10,30 @@
 #include "mlir/IR/Attributes.h"
 #include "mlir/Pass/Pass.h"
 
-#define DEBUG_TYPE "aie-assign-buffers-basic"
+#define DEBUG_TYPE "amdaie-assign-buffers-basic"
 
 using namespace mlir;
-using namespace xilinx;
 using namespace xilinx::AIE;
 
 namespace mlir::iree_compiler::AMDAIE {
-struct AIEAssignBufferAddressesPassBasic : mlir::OperationPass<DeviceOp> {
+struct AMDAIEAssignBufferAddressesPassBasic : mlir::OperationPass<DeviceOp> {
   MLIR_DEFINE_EXPLICIT_INTERNAL_INLINE_TYPE_ID(
-      AIEAssignBufferAddressesPassBasic)
+      AMDAIEAssignBufferAddressesPassBasic)
 
-  AIEAssignBufferAddressesPassBasic()
+  AMDAIEAssignBufferAddressesPassBasic()
       : mlir::OperationPass<DeviceOp>(resolveTypeID()) {}
-  AIEAssignBufferAddressesPassBasic(
-      const AIEAssignBufferAddressesPassBasic &other)
-      : mlir::OperationPass<DeviceOp>(other) {}
 
   llvm::StringRef getArgument() const override {
-    return "aie-assign-buffer-addresses-basic";
+    return "amdaie-assign-buffer-addresses-basic";
   }
 
   llvm::StringRef getName() const override {
-    return "AIEAssignBufferAddressesBasic";
+    return "AMDAIEAssignBufferAddressesBasic";
   }
 
   std::unique_ptr<mlir::Pass> clonePass() const override {
-    return std::make_unique<AIEAssignBufferAddressesPassBasic>(
-        *static_cast<const AIEAssignBufferAddressesPassBasic *>(this));
-  }
-
-  void getDependentDialects(DialectRegistry &registry) const override {
-    registry.insert<func::FuncDialect>();
-    registry.insert<AIEDialect>();
+    return std::make_unique<AMDAIEAssignBufferAddressesPassBasic>(
+        *static_cast<const AMDAIEAssignBufferAddressesPassBasic *>(this));
   }
 
   void runOnOperation() override {
@@ -85,13 +76,13 @@ struct AIEAssignBufferAddressesPassBasic : mlir::OperationPass<DeviceOp> {
 };
 
 std::unique_ptr<OperationPass<DeviceOp>>
-createAIEAssignBufferAddressesBasicPass() {
-  return std::make_unique<AIEAssignBufferAddressesPassBasic>();
+createAMDAIEAssignBufferAddressesBasicPass() {
+  return std::make_unique<AMDAIEAssignBufferAddressesPassBasic>();
 }
 
-void registerAIEAssignBufferAddressesBasic() {
+void registerAMDAIEAssignBufferAddressesBasic() {
   mlir::registerPass([]() -> std::unique_ptr<mlir::Pass> {
-    return createAIEAssignBufferAddressesBasicPass();
+    return createAMDAIEAssignBufferAddressesBasicPass();
   });
 }
 }  // namespace mlir::iree_compiler::AMDAIE

compiler/plugins/target/AMD-AIE/aie/AIEAssignBufferDescriptorIDs.cpp renamed to compiler/plugins/target/AMD-AIE/aie/AMDAIEAssignBufferDescriptorIDs.cpp

@@ -10,22 +10,14 @@
 #include "aie/Dialect/AIE/IR/AIEDialect.h"
 #include "mlir/Pass/Pass.h"
 
-#define DEBUG_TYPE "aie-assign-bd-ids"
+#define DEBUG_TYPE "amdaie-assign-bd-ids"
 #define EVEN_BD_ID_START 0
 #define ODD_BD_ID_START 24
 
 using namespace mlir;
 using namespace xilinx;
 using namespace xilinx::AIE;
 
-#define GEN_PASS_DECL_AIEASSIGNBUFFERDESCRIPTORIDS
-#include "aie/Dialect/AIE/Transforms/AIEPasses.h.inc"
-#undef GEN_PASS_DECL_AIEASSIGNBUFFERDESCRIPTORIDS
-
-#define GEN_PASS_DEF_AIEASSIGNBUFFERDESCRIPTORIDS
-#include "aie/Dialect/AIE/Transforms/AIEPasses.h.inc"
-#undef GEN_PASS_DEF_AIEASSIGNBUFFERDESCRIPTORIDS
-
 struct BdIdGenerator {
   BdIdGenerator(int col, int row, const AIETargetModel &targetModel)
       : col(col), row(row), isMemTile(targetModel.isMemTile(col, row)) {}
@@ -55,9 +47,26 @@ struct BdIdGenerator {
 
 namespace mlir::iree_compiler::AMDAIE {
 
-struct AIEAssignBufferDescriptorIDsPass
-    : ::impl::AIEAssignBufferDescriptorIDsBase<
-          AIEAssignBufferDescriptorIDsPass> {
+struct AMDAIEAssignBufferDescriptorIDsPass : mlir::OperationPass<DeviceOp> {
+  MLIR_DEFINE_EXPLICIT_INTERNAL_INLINE_TYPE_ID(
+      AMDAIEAssignBufferDescriptorIDsPass)
+
+  AMDAIEAssignBufferDescriptorIDsPass()
+      : mlir::OperationPass<DeviceOp>(resolveTypeID()) {}
+
+  llvm::StringRef getArgument() const override {
+    return "amdaie-assign-bd-ids";
+  }
+
+  llvm::StringRef getName() const override {
+    return "AMDAIEAssignBufferDescriptorIDsPass";
+  }
+
+  std::unique_ptr<mlir::Pass> clonePass() const override {
+    return std::make_unique<AMDAIEAssignBufferDescriptorIDsPass>(
+        *static_cast<const AMDAIEAssignBufferDescriptorIDsPass *>(this));
+  }
+
   void runOnOperation() override {
     DeviceOp targetOp = getOperation();
     const AIETargetModel &targetModel = targetOp.getTargetModel();
@@ -133,13 +142,13 @@ struct AIEAssignBufferDescriptorIDsPass
 };
 
 std::unique_ptr<OperationPass<DeviceOp>>
-createAIEAssignBufferDescriptorIDsPass() {
-  return std::make_unique<AIEAssignBufferDescriptorIDsPass>();
+createAMDAIEAssignBufferDescriptorIDsPass() {
+  return std::make_unique<AMDAIEAssignBufferDescriptorIDsPass>();
 }
 
-void registerAIEAssignBufferDescriptorIDs() {
+void registerAMDAIEAssignBufferDescriptorIDs() {
   mlir::registerPass([]() -> std::unique_ptr<mlir::Pass> {
-    return createAIEAssignBufferDescriptorIDsPass();
+    return createAMDAIEAssignBufferDescriptorIDsPass();
   });
 }
 }  // namespace mlir::iree_compiler::AMDAIE

compiler/plugins/target/AMD-AIE/aie/AIEAssignLockIDs.cpp renamed to compiler/plugins/target/AMD-AIE/aie/AMDAIEAssignLockIDs.cpp

@@ -16,26 +16,27 @@
 #include "llvm/ADT/DenseMap.h"
 #include "mlir/Pass/Pass.h"
 
-#define DEBUG_TYPE "aie-assign-lock-ids"
+#define DEBUG_TYPE "amdaie-assign-lock-ids"
 
 using namespace mlir;
 using namespace xilinx;
 using namespace xilinx::AIE;
 
-#define GEN_PASS_DECL_AIEASSIGNLOCKIDS
-#include "aie/Dialect/AIE/Transforms/AIEPasses.h.inc"
-#undef GEN_PASS_DECL_AIEASSIGNLOCKIDS
+namespace mlir::iree_compiler::AMDAIE {
+struct AMDAIEAssignLockIDsPass : mlir::OperationPass<DeviceOp> {
+  MLIR_DEFINE_EXPLICIT_INTERNAL_INLINE_TYPE_ID(AMDAIEAssignLockIDsPass)
 
-#define GEN_PASS_DEF_AIEASSIGNLOCKIDS
-#include "aie/Dialect/AIE/Transforms/AIEPasses.h.inc"
-#undef GEN_PASS_DEF_AIEASSIGNLOCKIDS
+  AMDAIEAssignLockIDsPass() : mlir::OperationPass<DeviceOp>(resolveTypeID()) {}
 
-namespace mlir::iree_compiler::AMDAIE {
-struct AIEAssignLockIDsPass
-    : ::impl::AIEAssignLockIDsBase<AIEAssignLockIDsPass> {
-  void getDependentDialects(DialectRegistry &registry) const override {
-    registry.insert<func::FuncDialect>();
-    registry.insert<AIEDialect>();
+  llvm::StringRef getArgument() const override {
+    return "amdaie-assign-lock-ids";
+  }
+
+  llvm::StringRef getName() const override { return "AMDAIEAssignLockIDsPass"; }
+
+  std::unique_ptr<mlir::Pass> clonePass() const override {
+    return std::make_unique<AMDAIEAssignLockIDsPass>(
+        *static_cast<const AMDAIEAssignLockIDsPass *>(this));
   }
 
   void runOnOperation() override {
@@ -102,13 +103,13 @@ struct AIEAssignLockIDsPass
     }
   }
 };
-std::unique_ptr<OperationPass<DeviceOp>> createAIEAssignLockIDsPass() {
-  return std::make_unique<AIEAssignLockIDsPass>();
+std::unique_ptr<OperationPass<DeviceOp>> createAMDAIEAssignLockIDsPass() {
+  return std::make_unique<AMDAIEAssignLockIDsPass>();
 }
 
-void registerAIEAssignLockIDs() {
+void registerAMDAIEAssignLockIDs() {
   mlir::registerPass([]() -> std::unique_ptr<mlir::Pass> {
-    return createAIEAssignLockIDsPass();
+    return createAMDAIEAssignLockIDsPass();
   });
 }
 }  // namespace mlir::iree_compiler::AMDAIE

compiler/plugins/target/AMD-AIE/aie/AIECoreToStandard.cpp renamed to compiler/plugins/target/AMD-AIE/aie/AMDAIECoreToStandard.cpp

@@ -20,19 +20,13 @@
 #include "mlir/Tools/mlir-translate/MlirTranslateMain.h"
 #include "mlir/Transforms/DialectConversion.h"
 
+#define DEBUG_TYPE "amdaie-standard-lowering"
+
 using namespace mlir;
 using namespace mlir::vector;
 using namespace xilinx;
 using namespace xilinx::AIE;
 
-#define GEN_PASS_DECL_AIECORETOSTANDARD
-#include "aie/Dialect/AIE/Transforms/AIEPasses.h.inc"
-#undef GEN_PASS_DECL_AIECORETOSTANDARD
-
-#define GEN_PASS_DEF_AIECORETOSTANDARD
-#include "aie/Dialect/AIE/Transforms/AIEPasses.h.inc"
-#undef GEN_PASS_DEF_AIECORETOSTANDARD
-
 struct AIEUseLockToStdLowering : OpConversionPattern<UseLockOp> {
   using OpConversionPattern::OpConversionPattern;
   LogicalResult matchAndRewrite(
@@ -181,8 +175,41 @@ void outlineOps(DeviceOp device) {
 }
 
 namespace mlir::iree_compiler::AMDAIE {
-struct AIECoreToStandardPass
-    : ::impl::AIECoreToStandardBase<AIECoreToStandardPass> {
+struct AMDAIECoreToStandardPass : mlir::OperationPass<ModuleOp> {
+  MLIR_DEFINE_EXPLICIT_INTERNAL_INLINE_TYPE_ID(AMDAIECoreToStandardPass)
+
+  AMDAIECoreToStandardPass() : mlir::OperationPass<ModuleOp>(resolveTypeID()) {}
+  AMDAIECoreToStandardPass(const AMDAIECoreToStandardPass &other)
+      : mlir::OperationPass<mlir::ModuleOp>(other) {}
+
+  llvm::StringRef getArgument() const override {
+    return "amdaie-standard-lowering";
+  }
+
+  llvm::StringRef getName() const override {
+    return "AMDAIECoreToStandardPass";
+  }
+
+  std::unique_ptr<mlir::Pass> clonePass() const override {
+    return std::make_unique<AMDAIECoreToStandardPass>(
+        *static_cast<const AMDAIECoreToStandardPass *>(this));
+  }
+
+  void getDependentDialects(mlir::DialectRegistry &registry) const override {
+    registry.insert<mlir::func::FuncDialect>();
+    registry.insert<mlir::memref::MemRefDialect>();
+    registry.insert<xilinx::AIE::AIEDialect>();
+  }
+
+  mlir::Pass::Option<unsigned> tileCol{
+      *this, "tilecol",
+      llvm::cl::desc("X coordinate of tile to generate code for"),
+      llvm::cl::init(-1)};
+  mlir::Pass::Option<unsigned> tileRow{
+      *this, "tilerow",
+      llvm::cl::desc("Y coordinate of tile to generate code for"),
+      llvm::cl::init(-1)};
+
   void runOnOperation() override {
     ModuleOp m = getOperation();
     OpBuilder builder = OpBuilder::atBlockEnd(m.getBody());
@@ -243,13 +270,13 @@ struct AIECoreToStandardPass
   }
 };
 
-std::unique_ptr<OperationPass<ModuleOp>> createAIECoreToStandardPass() {
-  return std::make_unique<AIECoreToStandardPass>();
+std::unique_ptr<OperationPass<ModuleOp>> createAMDAIECoreToStandardPass() {
+  return std::make_unique<AMDAIECoreToStandardPass>();
 }
 
-void registerAIECoreToStandard() {
+void registerAMDAIECoreToStandard() {
   mlir::registerPass([]() -> std::unique_ptr<mlir::Pass> {
-    return createAIECoreToStandardPass();
+    return createAMDAIECoreToStandardPass();
   });
 }
 }  // namespace mlir::iree_compiler::AMDAIE