Skip to content

[MLIR][Tensor] Perform shape inference via in-place modification (NFC) #111593

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

Merged
merged 5 commits into from
Oct 9, 2024
Merged

[MLIR][Tensor] Perform shape inference via in-place modification (NFC) #111593

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d927131
[MLIR][Tensor] Perform shape inference via in-place modification (NFC)
joker-eph Oct 8, 2024
8d8b16a
Update TensorOps.cpp
joker-eph Oct 8, 2024
3403ef5
Update TensorOps.cpp
joker-eph Oct 8, 2024
362f7e7
Update TensorOps.cpp
joker-eph Oct 8, 2024
26f1b3b
Update TensorOps.cpp
joker-eph Oct 9, 2024
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
26 changes: 15 additions & 11 deletions mlir/lib/Dialect/Tensor/IR/TensorOps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4332,21 +4332,25 @@ LogicalResult PackOp::canonicalize(PackOp packOp, PatternRewriter &rewriter) {
rewriter.create<tensor::CastOp>(loc, newSrcType, packOp.getSource());
}
Value dest = packOp.getDest();
if (destShape != packOp.getDestType().getShape()) {
Type originalResultType = packOp.getDestType();
bool needUpdateDestType = (destShape != originalResultType.getShape());
if (needUpdateDestType) {
auto newDestType = packOp.getDestType().clone(destShape);
dest =
rewriter.create<tensor::CastOp>(loc, newDestType, packOp.getDest());
}
auto clonedPackOp = cast<PackOp>(rewriter.clone(*packOp));
Value res = clonedPackOp.getResult();
rewriter.startOpModification(clonedPackOp);
clonedPackOp.getSourceMutable().assign(source);
clonedPackOp.getDestMutable().assign(dest);
res.setType(dest.getType());
rewriter.finalizeOpModification(clonedPackOp);

rewriter.replaceOpWithNewOp<tensor::CastOp>(
packOp, packOp.getResult().getType(), clonedPackOp);
rewriter.modifyOpInPlace(packOp, [&] {
packOp.getSourceMutable().assign(source);
packOp.getDestMutable().assign(dest);
packOp.getResult().setType(cast<RankedTensorType>(dest.getType()));
});
// Insert a cast if needed
if (needUpdateDestType) {
rewriter.setInsertionPointAfter(packOp);
auto castOp =
rewriter.create<tensor::CastOp>(loc, originalResultType, packOp);
rewriter.replaceAllUsesExcept(packOp, castOp, castOp);
}
return success();
}

Expand Down
Loading