Bump IREE to e14d6cd and mlir-air to 6869192 (nod-ai#1076)

erwei-xilinx · Feb 3, 2025 · 31ec62b · 31ec62b
1 parent c3c05fa
commit 31ec62b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEConvertToDma.cpp b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEConvertToDma.cpp
@@ -163,7 +163,7 @@ LogicalResult setDmaInputs(Operation *&operandOp,
   if (isa<memref::AllocOp>(operandOp) ||
       isa<IREE::HAL::InterfaceBindingSubspanOp>(operandOp)) {
     MemRefType memRefType = cast<MemRefType>(operandOp->getResult(0).getType());
-    auto [stridesI64, baseOffset] = getStridesAndOffset(memRefType);
+    auto [stridesI64, baseOffset] = memRefType.getStridesAndOffset();
     if (baseOffset != 0) {
       auto message = llvm::formatv(
           "with non-zero base offset {0} is not supported by the "
@@ -197,8 +197,8 @@ LogicalResult setDmaInputs(Operation *&operandOp,
       return subviewOp->emitOpError(message);
     }
     offsets = subviewOp.getMixedOffsets();
-    auto [stridesI64, baseOffset] =
-        getStridesAndOffset(subviewOp.getSource().getType());
+    MemRefType subviewType = subviewOp.getSource().getType();
+    auto [stridesI64, baseOffset] = subviewType.getStridesAndOffset();
     if (baseOffset != 0) {
       auto message = llvm::formatv(
           "has non-zero base offset {0} that is not supported by the "

diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEFlattenLogicalObjectFifo.cpp b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEFlattenLogicalObjectFifo.cpp
@@ -60,7 +60,7 @@ void AMDAIEFlattenLogicalObjectFifoPass::runOnOperation() {
             rewriter.getUnknownLoc(), newLogicalObjectFifo.getOutput(),
             accessOp.getAccessType());
 
-        auto [strides, baseOffset] = getStridesAndOffset(oldType);
+        auto [strides, baseOffset] = oldType.getStridesAndOffset();
         auto reinterpretOp = rewriter.create<memref::ReinterpretCastOp>(
             rewriter.getUnknownLoc(), oldType, newAccessOp.getOutput(),
             baseOffset, oldType.getShape(), strides);

diff --git a/third_party/iree b/third_party/iree
diff --git a/third_party/mlir-air b/third_party/mlir-air
+11 −0		mlir/include/air/Util/Util.h
+2 −2		mlir/lib/Conversion/ConvertToAIRPass.cpp
+17 −6		mlir/lib/Dialect/AIR/IR/AIRDialect.cpp
+9 −1		mlir/lib/Transform/AIRDependencyScheduleOpt.cpp
+31 −10		mlir/lib/Transform/AIRDmaToChannel.cpp
+4 −29		mlir/lib/Util/Runner/RunnerNode.cpp
+56 −0		mlir/lib/Util/Util.cpp
+1 −1		mlir/test/Conversion/AIRToAIE/insert_trace_packet_flow.mlir
+81 −0		mlir/test/Conversion/ConvertToAIR/dma_to_channel_async.mlir
+42 −0		mlir/test/Dialect/AIR/air_canonicalize.mlir
+9 −6		mlir/test/Transform/AIRDependencyScheduleOpt/fuse_channels.mlir
+1 −1		programming_examples/matrix_scalar_add/single_core_dma/single_core_dma.py
+1 −1		tools/air-runner/CMakeLists.txt
+1 −1		utils/build-llvm-local.sh
+1 −1		utils/clone-llvm.sh
+1 −1		utils/clone-mlir-aie.sh