From c19853606b8fe4338f483ba0397ad83d57f4d7c8 Mon Sep 17 00:00:00 2001 From: erwei-xilinx Date: Thu, 24 Oct 2024 07:21:12 +0800 Subject: [PATCH] Bump mlir-air; more generic air compiler pipeline (#855) --- .../AMD-AIE/iree-amd-aie/Transforms/Passes.cpp | 13 +++++++------ third_party/mlir-air | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/Passes.cpp b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/Passes.cpp index ce858a7b4..5e4ea1d3e 100644 --- a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/Passes.cpp +++ b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/Passes.cpp @@ -539,7 +539,6 @@ void buildAMDAIETransformPassPipeline( }); } - void addAMDAIEObjectFifoLoweringPasses(OpPassManager &passManager, bool enablePacketFlow, TilePassPipeline useTilePipeline) { @@ -728,11 +727,6 @@ void addMLIRAIRLoweringPasses(OpPassManager &passManager, AMDAIEDevice device, passManager.addPass(xilinx::air::createAIRDependencyCanonicalizePass()); passManager.addPass(createCanonicalizerPass()); passManager.addPass(createCSEPass()); - // TODO (Erwei): This pass currently doesn't support pack-peel pipeline. This - // pass needs to work in order to get multiple AIE columns to work. - if (useTilePipeline != TilePassPipeline::PackPeelPipeline) - passManager.addNestedPass( - xilinx::air::createAIRSplitL2MemrefForBufferConstraintPass()); passManager.addPass(xilinx::air::createAIRIsolateAsyncDmaLoopNests()); passManager.addPass(createCanonicalizerPass()); passManager.addPass(createCSEPass()); @@ -747,6 +741,13 @@ void addMLIRAIRLoweringPasses(OpPassManager &passManager, AMDAIEDevice device, } passManager.addPass(createCanonicalizerPass()); passManager.addPass(createCSEPass()); + passManager.addNestedPass( + xilinx::air::createAIRSplitL2MemrefForBufferConstraintPass()); + passManager.addPass(xilinx::air::createAIRIsolateAsyncDmaLoopNests()); + passManager.addPass(createCanonicalizerPass()); + passManager.addPass(createCSEPass()); + passManager.addPass(createCanonicalizerPass()); + passManager.addPass(createCSEPass()); passManager.addNestedPass( xilinx::air::createAIRSegmentLoopFusion()); diff --git a/third_party/mlir-air b/third_party/mlir-air index 24cb14e6d..9160ca782 160000 --- a/third_party/mlir-air +++ b/third_party/mlir-air @@ -1 +1 @@ -Subproject commit 24cb14e6d2233e819a5455928e4237ef319e6fc8 +Subproject commit 9160ca7826c57a2a6f4f81cde6aed441ad772b74