Skip to content

[mlir][Linalg] Avoid doing op replacement in linalg::dropUnitDims. #105749

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 1 commit into from
Aug 23, 2024
Merged

[mlir][Linalg] Avoid doing op replacement in linalg::dropUnitDims. #105749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions mlir/include/mlir/Dialect/Linalg/Transforms/Transforms.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,8 +488,13 @@ struct ControlDropUnitDims {
return SmallVector<unsigned>{};
};
};
LogicalResult dropUnitDims(RewriterBase &rewriter, GenericOp genericOp,
const ControlDropUnitDims &options);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a short documentation comment on this struct + function?

struct DropUnitDimsResult {
linalg::GenericOp resultOp;
SmallVector<Value> replacements;
};
FailureOr<DropUnitDimsResult> dropUnitDims(RewriterBase &rewriter,
GenericOp genericOp,
const ControlDropUnitDims &options);

/// Fuse two `linalg.generic` operations that have a producer-consumer
/// relationship captured through `fusedOperand`. The method expects
Expand Down
16 changes: 11 additions & 5 deletions mlir/lib/Dialect/Linalg/Transforms/DropUnitDims.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,8 +386,9 @@ static UnitExtentReplacementInfo dropUnitExtentFromOperandMetadata(
return info;
}

LogicalResult linalg::dropUnitDims(RewriterBase &rewriter, GenericOp genericOp,
const ControlDropUnitDims &options) {
FailureOr<DropUnitDimsResult>
linalg::dropUnitDims(RewriterBase &rewriter, GenericOp genericOp,
const ControlDropUnitDims &options) {
SmallVector<AffineMap> indexingMaps = genericOp.getIndexingMapsArray();
if (indexingMaps.empty())
return failure();
Expand Down Expand Up @@ -545,8 +546,7 @@ LogicalResult linalg::dropUnitDims(RewriterBase &rewriter, GenericOp genericOp,
resultReplacements.push_back(expandedValue);
}

rewriter.replaceOp(genericOp, resultReplacements);
return success();
return DropUnitDimsResult{replacementOp, resultReplacements};
}

namespace {
Expand All @@ -557,7 +557,13 @@ struct DropUnitDims : public OpRewritePattern<GenericOp> {

LogicalResult matchAndRewrite(GenericOp genericOp,
PatternRewriter &rewriter) const override {
return dropUnitDims(rewriter, genericOp, options);
FailureOr<DropUnitDimsResult> result =
dropUnitDims(rewriter, genericOp, options);
if (failed(result)) {
return failure();
}
rewriter.replaceOp(genericOp, result->replacements);
return success();
}

private:
Expand Down
8 changes: 7 additions & 1 deletion mlir/test/lib/Dialect/Linalg/TestLinalgDropUnitDims.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,13 @@ LogicalResult dropOutermostUnitDims(RewriterBase &rewriter,
linalg::GenericOp genericOp) {
linalg::ControlDropUnitDims options;
options.controlFn = [](Operation *op) { return SmallVector<unsigned>{0}; };
return linalg::dropUnitDims(rewriter, genericOp, options);
FailureOr<linalg::DropUnitDimsResult> result =
linalg::dropUnitDims(rewriter, genericOp, options);
if (failed(result)) {
return failure();
}
rewriter.replaceOp(genericOp, result->replacements);
return success();
}

struct TestLinalgDropUnitDims
Expand Down
Loading