address reviwers comments and put passesin a seperate functions so other pipelines can use it

Author: nirvedhmeshram

compiler/plugins/target/AMD-AIE/aie/CMakeLists.txt

@@ -328,6 +328,7 @@ iree_cc_library(
     "${IREE_MLIR_AIE_SOURCE_DIR}/lib/Dialect/AIE/Transforms/AIECanonicalizeDevice.cpp"
     "${IREE_MLIR_AIE_SOURCE_DIR}/lib/Dialect/AIEX/Transforms/AIELowerMulticast.cpp"
     "${IREE_MLIR_AIE_SOURCE_DIR}/lib/Dialect/AIE/Transforms/AIEAssignBuffers.cpp"
+    "${IREE_MLIR_AIE_SOURCE_DIR}/lib/Dialect/AIE/Transforms/AIELocalizeLocks.cpp"
   DEPS
     ::defs
     ::AIEDialectIR

compiler/plugins/target/AMD-AIE/iree-amd-aie/Target/AIETarget.cpp

@@ -45,6 +45,8 @@
 #include "mlir/Target/LLVMIR/Dialect/All.h"
 #include "mlir/Target/LLVMIR/Export.h"
 #include "runtime/plugins/AMD-AIE/iree-amd-aie/schemas/xrt_executable_def_builder.h"
+#include "aie/Dialect/AIE/Transforms/AIEPasses.h"
+#include "aie/Dialect/AIEX/Transforms/AIEXPasses.h"
 
 #define DEBUG_TYPE "aie-target"
 

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

@@ -24,7 +24,6 @@ iree_cc_library(
     iree::target::amd-aie::aie::AIEDialectIR
     iree::target::amd-aie::aie::AIEXDialectIR
     iree::target::amd-aie::aie::AIEPasses
-    iree::target::amd-aie::aie::AIEPassesFromMLIRAIE
     iree::target::amd-aie::aie::AIEVecDialectIR
     iree::target::amd-aie::aie::AIEVecConvertToLLVM
     MLIRToLLVMIRTranslationRegistration

compiler/plugins/target/AMD-AIE/iree-amd-aie/Target/XCLBinGen.cpp

@@ -683,10 +683,10 @@ static LogicalResult generateUnifiedObject(MLIRContext *context,
   PassManager pm(context, moduleOp.getOperationName());
   applyConfigToPassManager(TK, pm);
 
-  pm.addNestedPass<AIE::DeviceOp>(
+  /*pm.addNestedPass<AIE::DeviceOp>(
       mlir::iree_compiler::AMDAIE::createAIELocalizeLocksPass());
   pm.addNestedPass<AIE::DeviceOp>(
-      xilinx::AIE::createAIENormalizeAddressSpacesPass());
+      xilinx::AIE::createAIENormalizeAddressSpacesPass());*/
   pm.addPass(mlir::iree_compiler::AMDAIE::createAIECoreToStandardPass());
   pm.addPass(mlir::iree_compiler::AMDAIE::createAIEXToStandardPass());
 

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

@@ -428,9 +428,9 @@ void buildAMDAIETransformPassPipeline(OpPassManager &variantPassManager) {
   }
   modulePassManager.addPass(createLowerUKernelOpsToCallsPass());
   if (clUsePipeline == AIEPassPipeline::PadPackPipeline) {
-    addMLIRAIRAIELoweringPasses(modulePassManager, false);
+    addMLIRAIRLoweringPasses(modulePassManager, false);
   } else if (clUsePipeline == AIEPassPipeline::PackPeelPipeline) {
-    addMLIRAIRAIELoweringPasses(modulePassManager, true);
+    addMLIRAIRLoweringPasses(modulePassManager, true);
   }
   variantPassManager.addPass(createReconcileTranslationInfoPass());
   variantPassManager.addPass(createAMDAIELowerWorkgroupCountPass());
@@ -445,7 +445,7 @@ void buildAMDAIETransformPassPipeline(OpPassManager &variantPassManager) {
 // TODO (Erwei): The "packPeel" temporary argument should be removed once
 // pack-peel and pack-pad share the same pass pipeline. See TODOs inlined below
 // for details.
-void addMLIRAIRAIELoweringPasses(OpPassManager &passManager, bool packPeel) {
+void addMLIRAIRLoweringPasses(OpPassManager &passManager, bool packPeel) {
   // Add passes for preparing for lowering to MLIR-AIR
   passManager.addPass(createEraseHALDescriptorTypeFromMemRefPass());
   passManager.addPass(memref::createFoldMemRefAliasOpsPass());
@@ -587,7 +587,11 @@ void addMLIRAIRAIELoweringPasses(OpPassManager &passManager, bool packPeel) {
   passManager.addPass(xilinx::airrt::createAIRRtToNpuPass());
   passManager.addPass(createCanonicalizerPass());
 
-  // Now lower using the AIE passes used by the mlir-air/mlir-aie flow.
+  // Now lower using the AIE passes from MLIR-AIE.
+  addMLIRAIELoweringPasses(passManager);
+}
+
+void addMLIRAIELoweringPasses(OpPassManager &passManager) {
   passManager.addPass(createLowerAffinePass());
   OpPassManager &devicePM = passManager.nest<xilinx::AIE::DeviceOp>();
   devicePM.addPass(xilinx::AIE::createAIEAssignLockIDsPass());
@@ -598,6 +602,8 @@ void addMLIRAIRAIELoweringPasses(OpPassManager &passManager, bool packPeel) {
   devicePM.addPass(xilinx::AIE::createAIERoutePacketFlowsPass());
   devicePM.addPass(xilinx::AIEX::createAIELowerMulticastPass());
   devicePM.addPass(xilinx::AIE::createAIEAssignBufferAddressesPass());
+  devicePM.addPass(xilinx::AIE::createAIELocalizeLocksPass());
+  devicePM.addPass(xilinx::AIE::createAIENormalizeAddressSpacesPass());
   passManager.addPass(createConvertSCFToCFPass());
 }
 

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

@@ -13,9 +13,13 @@
 
 namespace mlir::iree_compiler::AMDAIE {
 
-/// Add passes to lower from MLIR-AIR through AIE. This is
+/// Add lowering passes from MLIR-AIR. This is
 /// currently the default passes used for lowering after IREEs tiling.
-void addMLIRAIRAIELoweringPasses(OpPassManager &passManager, bool packPeel);
+void addMLIRAIRLoweringPasses(OpPassManager &passManager, bool packPeel);
+
+/// Add lowering passes from MLIR-AIE. This is
+/// currently the default passes used for lowering from AIE dialect.
+void addMLIRAIELoweringPasses(OpPassManager &passManager);
 
 /// Populates passes needed to lower linalg/arith/math ops to LLVM dialect via
 /// the structured ops path. The pass manager `pm` here operate on the module