Bump iree, mlir-air (#478)

daveliddell · web-flow · commit edb7d6f990d2 · 2024-06-27T22:09:59.000-06:00
Bump iree to 4294a5b
Bump mlir-air to 4559217
mlir-aie remains unchanged, as mlir-air's pin of mlir-aie is unchanged.

Submodule changes that required adaptation in iree-amd-aie:

- AIR DmaToChannel pass moved from Conversion to Transform

Signed-off-by: daveliddell &lt;dave.liddell@amd.com&gt;
diff --git a/compiler/plugins/target/AMD-AIE/air/CMakeLists.txt b/compiler/plugins/target/AMD-AIE/air/CMakeLists.txt
@@ -246,6 +246,7 @@ iree_cc_library(
     "${IREE_MLIR_AIR_SOURCE_DIR}/lib/Transform/AIRDependency.cpp"
     "${IREE_MLIR_AIR_SOURCE_DIR}/lib/Transform/AIRDependencyScheduleOpt.cpp"
     "${IREE_MLIR_AIR_SOURCE_DIR}/lib/Transform/AIRDependencyCanonicalize.cpp"
+    "${IREE_MLIR_AIR_SOURCE_DIR}/lib/Transform/AIRDmaToChannel.cpp"
   DEPS
     ::defs
     iree::target::amd-aie::aie::AIEDialectIR
diff --git a/compiler/plugins/target/AMD-AIE/air/ConversionPasses.cpp b/compiler/plugins/target/AMD-AIE/air/ConversionPasses.cpp
@@ -17,7 +17,6 @@ void registerAIRConversionPasses() {
   registerAIRLoweringPass();
   registerAIRRtToNpuPass();
   registerCopyToDma();
-  registerDmaToChannel();
   registerParallelToHerd();
   registerParallelToLaunch();
 }
diff --git a/compiler/plugins/target/AMD-AIE/air/TransformPasses.cpp b/compiler/plugins/target/AMD-AIE/air/TransformPasses.cpp
@@ -30,5 +30,6 @@ void registerAIRTransformPasses() {
   registerAIRUnrollOuterPerfectlyNestedLoopsPass();
   registerAffineLoopOptPass();
   registerAIRSplitL2MemrefForBufferConstraintPass();
+  registerDmaToChannel();
 }
 }  // namespace mlir::iree_compiler::AMDAIE
diff --git a/sync_deps.py b/sync_deps.py
@@ -7,7 +7,7 @@
 ### Update with: shark-workspace pin
 
 PINNED_VERSIONS = {
-  "iree": "36aec8a79cc616d126fe50f213d8b93ef298d6ba",
+  "iree": "4294a5b0ebaec6dcca483bf16f5918108b09ea0a",
 }
 
 ORIGINS = {
diff --git a/third_party/mlir-air b/third_party/mlir-air
@@ -1 +1 @@
-Subproject commit 05284a2436293e10bba4eace47163b6d2f216a84
+Subproject commit 455921766b43e0099a58c60d1dedf786392eb96c

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ void registerAIRConversionPasses() {`
`17`	`17`	`registerAIRLoweringPass();`
`18`	`18`	`registerAIRRtToNpuPass();`
`19`	`19`	`registerCopyToDma();`
`20`		`- registerDmaToChannel();`
`21`	`20`	`registerParallelToHerd();`
`22`	`21`	`registerParallelToLaunch();`
`23`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,5 +30,6 @@ void registerAIRTransformPasses() {`
`30`	`30`	`registerAIRUnrollOuterPerfectlyNestedLoopsPass();`
`31`	`31`	`registerAffineLoopOptPass();`
`32`	`32`	`registerAIRSplitL2MemrefForBufferConstraintPass();`
	`33`	`+ registerDmaToChannel();`
`33`	`34`	`}`
`34`	`35`	`} // namespace mlir::iree_compiler::AMDAIE`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`### Update with: shark-workspace pin`
`8`	`8`
`9`	`9`	`PINNED_VERSIONS = {`
`10`		`- "iree": "36aec8a79cc616d126fe50f213d8b93ef298d6ba",`
	`10`	`+ "iree": "4294a5b0ebaec6dcca483bf16f5918108b09ea0a",`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`ORIGINS = {`