[mlir][Transforms] Detect mapping overwrites during block signature conversion #121646
+9
−5
Conversation
This file contains 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
Fixes two minor issues in `findOrBuildReplacementValue`: * Remove a redundant `mapping.map`. * Map `repl` instead of `value`. We used to overwrite an existing mapping, which may introduce extra materializations. Note: We generally do not want to overwrite mappings, but create a chain of mappings. There are still a few more places, where a mapping is overwritten. Once those are fixed, I will put an assertion into `ConversionValueMapping::map`.
|
@llvm/pr-subscribers-mlir @llvm/pr-subscribers-mlir-core Author: Matthias Springer (matthias-springer) ChangesAdd extra assertions to make sure that a value in the conversion value mapping is not overwritten during Depends on #121644. Full diff: https://github.com/llvm/llvm-project/pull/121646.diff 1 Files Affected:
diff --git a/mlir/lib/Transforms/Utils/DialectConversion.cpp b/mlir/lib/Transforms/Utils/DialectConversion.cpp
index 4904d3ce3f8635..3201fad613d294 100644
--- a/mlir/lib/Transforms/Utils/DialectConversion.cpp
+++ b/mlir/lib/Transforms/Utils/DialectConversion.cpp
@@ -1364,6 +1364,14 @@ Block *ConversionPatternRewriterImpl::applySignatureConversion(
if (hasRewrite<BlockTypeConversionRewrite>(rewrites, block))
llvm::report_fatal_error("block was already converted");
#endif // MLIR_ENABLE_EXPENSIVE_PATTERN_API_CHECKS
+#ifndef NDEBUG
+ // This check detects the following cases:
+ // * Attempting to convert the same block multiple times.
+ // * Block argument replaced, then attempting to convert the block.
+ for (BlockArgument arg : block->getArguments())
+ assert(mapping.lookupOrNull(arg).empty() &&
+ "cannot convert block whose arguments have been replaced");
+#endif // NDEBUG
OpBuilder::InsertionGuard g(rewriter);
|
…onversion Add extra assertions to make sure that a value in the conversion value mapping is not overwritten during `applySignatureConversion`.
matthias-springer
force-pushed
the
users/matthias-springer/fix_mapping_2
branch
from
f0edd03 to
bf57b8d
Compare
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.
Add extra assertions to make sure that a value in the conversion value mapping is not overwritten during
applySignatureConversion.Depends on #121644.