Skip to content
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

fix(TosaCanonicalize): create FusedLoc when folding clamp #189

Merged
merged 1 commit into from
May 21, 2024
Merged

fix(TosaCanonicalize): create FusedLoc when folding clamp #189

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
14 changes: 12 additions & 2 deletions mlir/include/mlir/IR/PatternMatch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,14 +532,24 @@ class RewriterBase : public OpBuilder {
virtual void replaceOp(Operation *op, Operation *newOp);

/// Replaces the result op with a new op that is created without verification.
/// Use a given list of locations to generate a FusedLoc for the new op.
/// The result values of the two ops must be the same types.
template <typename OpTy, typename... Args>
OpTy replaceOpWithNewOp(Operation *op, Args &&...args) {
auto newOp = create<OpTy>(op->getLoc(), std::forward<Args>(args)...);
OpTy replaceOpWithNewOp(Operation *op, ArrayRef<Location> locs,
Args &&...args) {
auto newOp = create<OpTy>(getFusedLoc(locs), std::forward<Args>(args)...);
replaceOp(op, newOp.getOperation());
return newOp;
}

/// Replaces the result op with a new op that is created without verification.
/// The result values of the two ops must be the same types.
template <typename OpTy, typename... Args>
OpTy replaceOpWithNewOp(Operation *op, Args &&...args) {
return replaceOpWithNewOp<OpTy, Args...>(op, {op->getLoc()},
std::forward<Args>(args)...);
}

/// This method erases an operation that is known to have no uses.
virtual void eraseOp(Operation *op);

Expand Down
6 changes: 3 additions & 3 deletions mlir/lib/Dialect/Tosa/IR/TosaCanonicalizations.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,9 +404,9 @@ struct ClampClampOptimization : public OpRewritePattern<tosa::ClampOp> {
auto minInt = std::max(op.getMinInt(), clampOp.getMinInt());
auto maxInt = std::min(op.getMaxInt(), clampOp.getMaxInt());

rewriter.replaceOpWithNewOp<tosa::ClampOp>(
op, op.getType(), clampOp.getInput(),
rewriter.getI64IntegerAttr(minInt),
rewriter.replaceOpWithNewOp<ClampOp>(
op, {op->getLoc(), clampOp->getLoc()}, op.getType(),
clampOp.getInput(), rewriter.getI64IntegerAttr(minInt),
rewriter.getI64IntegerAttr(maxInt), rewriter.getF32FloatAttr(minFp),
rewriter.getF32FloatAttr(maxFp));
return success();
Expand Down
14 changes: 14 additions & 0 deletions mlir/test/Dialect/Tosa/canonicalize_with_debuginfo.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// RUN: mlir-opt -mlir-print-debuginfo -canonicalize="test-convergence" %s | FileCheck %s

// CHECK-LABEL: @clamp_twice_is_single_clamp
func.func @clamp_twice_is_single_clamp(%arg0: tensor<4xi8>) -> tensor<4xi8> {
// CHECK: tosa.clamp %arg0 {max_fp = 3.000000e+00 : f32, max_int = 2 : i64, min_fp = -3.000000e+00 : f32, min_int = -2 : i64} {{.*}} loc(#[[FUSED:.*]])
// CHECK-DAG: #[[A:.*]] = loc("Clamp_A")
// CHECK-DAG: #[[B:.*]] = loc("Clamp_B")
// CHECK: #[[FUSED]] = loc(fused[#[[B]], #[[A]]])
%0 = tosa.clamp %arg0 {max_fp = 3.0 : f32, max_int = 4 : i64, min_fp = -5.0 : f32, min_int = -2 : i64} : (tensor<4xi8>) -> tensor<4xi8> loc(#loc0)
%1 = tosa.clamp %0 {max_fp = 5.0 : f32, max_int = 2 : i64, min_fp = -3.0 : f32, min_int = -4 : i64} : (tensor<4xi8>) -> tensor<4xi8> loc(#loc1)
return %1 : tensor<4xi8>
}
#loc0 = loc("Clamp_A")
#loc1 = loc("Clamp_B")