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
index 947d206af..125243e0f 100644
--- 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
index a4832dd40..b0ca1cc62 100644
--- 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
index bbe7f5c17..e14d6cd36 160000
--- a/third_party/iree
+++ b/third_party/iree
@@ -1 +1 @@
-Subproject commit bbe7f5c17a041bed5b4f652c49475ae8789eba86
+Subproject commit e14d6cd36c5cd7dfa51c07da3600a7226b4431bd
diff --git a/third_party/mlir-air b/third_party/mlir-air
index d411747bc..68691923a 160000
--- a/third_party/mlir-air
+++ b/third_party/mlir-air
@@ -1 +1 @@
-Subproject commit d411747bcd7e7be8cbb926aa1d583d8b8f574019
+Subproject commit 68691923a50632a116c8eb257592bac7e7aa6d31