[mlir][bufferization] Fix invalid IR in SimplifyClones canonicalization
#74417
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…tion `SimplifyClones` used to generate an invalid op: ``` error: 'memref.cast' op operand type 'memref<*xf32>' and result type 'memref<*xf32>' are cast incompatible %2 = bufferization.clone %1 : memref<*xf32> to memref<*xf32 ``` This commit fixes tests such as `mlir/test/Dialect/Bufferization/canonicalize.mlir` when verifying the IR after each pattern (llvm#74270).
Member
|
@llvm/pr-subscribers-mlir-bufferization Author: Matthias Springer (matthias-springer) Changes
This commit fixes tests such as 1 Files Affected:
diff --git a/mlir/lib/Dialect/Bufferization/IR/BufferizationOps.cpp b/mlir/lib/Dialect/Bufferization/IR/BufferizationOps.cpp
index ec5feab1ed0d8..ca0d2f407c2d8 100644
--- a/mlir/lib/Dialect/Bufferization/IR/BufferizationOps.cpp
+++ b/mlir/lib/Dialect/Bufferization/IR/BufferizationOps.cpp
@@ -507,8 +507,10 @@ struct SimplifyClones : public OpRewritePattern<CloneOp> {
return failure();
}
- rewriter.replaceOpWithNewOp<memref::CastOp>(cloneOp, cloneOp.getType(),
- source);
+ if (source.getType() != cloneOp.getType())
+ source = rewriter.create<memref::CastOp>(cloneOp.getLoc(),
+ cloneOp.getType(), source);
+ rewriter.replaceOp(cloneOp, source);
rewriter.eraseOp(redundantDealloc);
return success();
}
|
Member
|
@llvm/pr-subscribers-mlir Author: Matthias Springer (matthias-springer) Changes
This commit fixes tests such as 1 Files Affected:
diff --git a/mlir/lib/Dialect/Bufferization/IR/BufferizationOps.cpp b/mlir/lib/Dialect/Bufferization/IR/BufferizationOps.cpp
index ec5feab1ed0d8..ca0d2f407c2d8 100644
--- a/mlir/lib/Dialect/Bufferization/IR/BufferizationOps.cpp
+++ b/mlir/lib/Dialect/Bufferization/IR/BufferizationOps.cpp
@@ -507,8 +507,10 @@ struct SimplifyClones : public OpRewritePattern<CloneOp> {
return failure();
}
- rewriter.replaceOpWithNewOp<memref::CastOp>(cloneOp, cloneOp.getType(),
- source);
+ if (source.getType() != cloneOp.getType())
+ source = rewriter.create<memref::CastOp>(cloneOp.getLoc(),
+ cloneOp.getType(), source);
+ rewriter.replaceOp(cloneOp, source);
rewriter.eraseOp(redundantDealloc);
return success();
}
|
pifon2a
approved these changes
Dec 5, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
SimplifyClonesused to generate an invalid op:This commit fixes tests such as
mlir/test/Dialect/Bufferization/canonicalize.mlirwhen verifying the IR after each pattern (#74270).