[mlir][linalg] Edit the yieldOutputs method's builder #73900
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
llvmbot
added
mlir:core
|
@llvm/pr-subscribers-mlir-core @llvm/pr-subscribers-mlir-linalg Author: Amir Bishara (amirBish) ChangesPassing the Full diff: https://github.com/llvm/llvm-project/pull/73900.diff 3 Files Affected:
diff --git a/mlir/lib/Dialect/Linalg/IR/LinalgOps.cpp b/mlir/lib/Dialect/Linalg/IR/LinalgOps.cpp
index 58af9995548e939..11ebbabe9773787 100644
--- a/mlir/lib/Dialect/Linalg/IR/LinalgOps.cpp
+++ b/mlir/lib/Dialect/Linalg/IR/LinalgOps.cpp
@@ -480,8 +480,8 @@ class RegionBuilderHelper {
llvm_unreachable("unsupported type conversion function");
}
- void yieldOutputs(ValueRange values) {
- OpBuilder builder = getBuilder();
+ void yieldOutputs(OpBuilder builder, ValueRange values) {
+ builder.setInsertionPointToEnd(&block);
Location loc = builder.getUnknownLoc();
builder.create<YieldOp>(loc, values);
}
diff --git a/mlir/lib/Dialect/SparseTensor/Transforms/SparseTensorPasses.cpp b/mlir/lib/Dialect/SparseTensor/Transforms/SparseTensorPasses.cpp
index 375e10f9068e43b..e14efd8def0920d 100644
--- a/mlir/lib/Dialect/SparseTensor/Transforms/SparseTensorPasses.cpp
+++ b/mlir/lib/Dialect/SparseTensor/Transforms/SparseTensorPasses.cpp
@@ -260,6 +260,7 @@ struct SparseTensorCodegenPass
// The following operations and dialects may be introduced by the
// codegen rules, and are therefore marked as legal.
target.addLegalOp<linalg::FillOp>();
+ target.addLegalOp<linalg::YieldOp>();
target.addLegalDialect<
arith::ArithDialect, bufferization::BufferizationDialect,
complex::ComplexDialect, memref::MemRefDialect, scf::SCFDialect>();
diff --git a/mlir/tools/mlir-linalg-ods-gen/mlir-linalg-ods-yaml-gen.cpp b/mlir/tools/mlir-linalg-ods-gen/mlir-linalg-ods-yaml-gen.cpp
index fb3c9d48f9a9821..cd8398b973a5677 100644
--- a/mlir/tools/mlir-linalg-ods-gen/mlir-linalg-ods-yaml-gen.cpp
+++ b/mlir/tools/mlir-linalg-ods-gen/mlir-linalg-ods-yaml-gen.cpp
@@ -1012,7 +1012,7 @@ void {0}::regionBuilder(ImplicitLocOpBuilder &b,
SmallVector<Value> yields;
{2}
{3}
- helper.yieldOutputs(yields);
+ helper.yieldOutputs(b, yields);
}
)FMT";
auto &args = opConfig.structuredOp->args;
|
|
A reproduction for the stack trace that I've encountered |
joker-eph
reviewed
Nov 30, 2023
| void yieldOutputs(ValueRange values) { | ||
| OpBuilder builder = getBuilder(); | ||
| void yieldOutputs(OpBuilder builder, ValueRange values) { | ||
| builder.setInsertionPointToEnd(&block); |
There was a problem hiding this comment.
What's the difference here exactly with before? Looking at the implementation of getBuilder() I'm not spotting it immediately.
There was a problem hiding this comment.
In the previous one the builder is being constructed from the block's argument context block.getArgument(0).getContext() , here is not the case It is being passed as is.
when using the rewriter of the MatchAndRewrite pattern we should use the rewriter which has been passed and not creating a new builder. That what has made the memory leakage.
| @@ -260,6 +260,7 @@ struct SparseTensorCodegenPass | |||
| // The following operations and dialects may be introduced by the | |||
| // codegen rules, and are therefore marked as legal. | |||
| target.addLegalOp<linalg::FillOp>(); | |||
| target.addLegalOp<linalg::YieldOp>(); | |||
There was a problem hiding this comment.
Is a test failing if you don't add that?
There was a problem hiding this comment.
yep, without this legalizing YieldOp, the RewritePattern won't be applied (since YieldOp it's not legal).
|
@MaheshRavishankar are you familiar with these |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Passing the
RegionBuilder's builder to theyieldOutputsmethod, Instead of creating a new one within theyieldOutputsmethod. This change is being made since having memory leaks issues (when compiling with address sanitizer) when applyingRewritePatternonLinalgStructuredOp(creating and erasing op withinmatchAndRewritemethod would reproduce the issue).