Skip to content

[mlir][Transforms] Detect mapping overwrites during block signature conversion #121646

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

[mlir][Transforms] Detect mapping overwrites during block signature conversion #121646

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1102603
[mlir][Transforms] Fix mapping in `findOrBuildReplacementValue`
matthias-springer Jan 4, 2025
bf57b8d
[mlir][Transforms] Detect mapping overwrites during block signature c…
matthias-springer Jan 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions mlir/lib/Transforms/Utils/DialectConversion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,8 @@ struct ConversionValueMapping {
template <typename OldVal, typename NewVal>
std::enable_if_t<IsValueVector<OldVal>::value && IsValueVector<NewVal>::value>
map(OldVal &&oldVal, NewVal &&newVal) {
assert(!mapping.contains(oldVal) &&
"attempting to overwrite existing mapping");
LLVM_DEBUG({
ValueVector next(newVal);
while (true) {
Expand Down Expand Up @@ -1412,6 +1414,7 @@ Block *ConversionPatternRewriterImpl::applySignatureConversion(
for (unsigned i = 0; i != origArgCount; ++i) {
BlockArgument origArg = block->getArgument(i);
Type origArgType = origArg.getType();
ValueVector currentMapping = mapping.lookupOrDefault(origArg);

std::optional<TypeConverter::SignatureConversion::InputMapping> inputMap =
signatureConversion.getInputMapping(i);
Expand All @@ -1421,7 +1424,7 @@ Block *ConversionPatternRewriterImpl::applySignatureConversion(
buildUnresolvedMaterialization(
MaterializationKind::Source,
OpBuilder::InsertPoint(newBlock, newBlock->begin()), origArg.getLoc(),
/*valuesToMap=*/{origArg}, /*inputs=*/ValueRange(),
/*valuesToMap=*/currentMapping, /*inputs=*/ValueRange(),
/*outputType=*/origArgType, /*originalType=*/Type(), converter);
appendRewrite<ReplaceBlockArgRewrite>(block, origArg, converter);
continue;
Expand All @@ -1432,7 +1435,7 @@ Block *ConversionPatternRewriterImpl::applySignatureConversion(
assert(inputMap->size == 0 &&
"invalid to provide a replacement value when the argument isn't "
"dropped");
mapping.map(origArg, repl);
mapping.map(currentMapping, repl);
appendRewrite<ReplaceBlockArgRewrite>(block, origArg, converter);
continue;
}
Expand All @@ -1441,7 +1444,7 @@ Block *ConversionPatternRewriterImpl::applySignatureConversion(
auto replArgs =
newBlock->getArguments().slice(inputMap->inputNo, inputMap->size);
ValueVector replArgVals = llvm::to_vector_of<Value, 1>(replArgs);
mapping.map(origArg, std::move(replArgVals));
mapping.map(currentMapping, std::move(replArgVals));
appendRewrite<ReplaceBlockArgRewrite>(block, origArg, converter);
}

Expand Down Expand Up @@ -1533,11 +1536,10 @@ Value ConversionPatternRewriterImpl::findOrBuildReplacementValue(
Value castValue =
buildUnresolvedMaterialization(MaterializationKind::Source,
computeInsertPoint(repl), value.getLoc(),
/*valuesToMap=*/{value}, /*inputs=*/repl,
/*valuesToMap=*/repl, /*inputs=*/repl,
/*outputType=*/value.getType(),
/*originalType=*/Type(), converter)
.front();
mapping.map(value, castValue);
return castValue;
}

Expand Down Expand Up @@ -1758,6 +1760,8 @@ void ConversionPatternRewriter::replaceUsesOfBlockArgument(BlockArgument from,
<< "'(in region of '" << parentOp->getName()
<< "'(" << from.getOwner()->getParentOp() << ")\n";
});
llvm::errs() << "replaceUsesOfBlockArgument: " << from.getOwner() << "\n";

impl->appendRewrite<ReplaceBlockArgRewrite>(from.getOwner(), from,
impl->currentTypeConverter);
impl->mapping.map(impl->mapping.lookupOrDefault(from), to);
Expand Down
Loading