From a123e3c48b5814dba4ec90262192068cd05f755e Mon Sep 17 00:00:00 2001 From: thomasraoux Date: Thu, 16 Sep 2021 07:37:30 -0700 Subject: [PATCH] [mlir] Fix potential crash in hoistRedundantVectorTransfers Differential Revision: https://reviews.llvm.org/D107856 --- mlir/lib/Dialect/Linalg/Transforms/Hoisting.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mlir/lib/Dialect/Linalg/Transforms/Hoisting.cpp b/mlir/lib/Dialect/Linalg/Transforms/Hoisting.cpp index bcc047baa949..2c487f010741 100644 --- a/mlir/lib/Dialect/Linalg/Transforms/Hoisting.cpp +++ b/mlir/lib/Dialect/Linalg/Transforms/Hoisting.cpp @@ -394,6 +394,13 @@ void mlir::linalg::hoistRedundantVectorTransfers(FuncOp func) { bool changed = true; while (changed) { changed = false; + // First move loop invariant ops outside of their loop. This needs to be + // done before as we cannot move ops without interputing the function walk. + func.walk([&](LoopLikeOpInterface loopLike) { + if (failed(moveLoopInvariantCode(loopLike))) + llvm_unreachable( + "Unexpected failure to move invariant code out of loop"); + }); func.walk([&](vector::TransferReadOp transferRead) { if (!transferRead.getShapedType().isa()) @@ -407,11 +414,6 @@ void mlir::linalg::hoistRedundantVectorTransfers(FuncOp func) { if (!loop) return WalkResult::advance(); - if (failed(moveLoopInvariantCode( - cast(loop.getOperation())))) - llvm_unreachable( - "Unexpected failure to move invariant code out of loop"); - LLVM_DEBUG(DBGS() << "Candidate read: " << *transferRead.getOperation() << "\n"); -- GitLab