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

Release rai 1 2 #201

Merged
merged 9 commits into from
Jun 20, 2024
Merged

Release rai 1 2 #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f77637f
TosaToArith: Use type converter for tosa.const (#195)
mgehre-amd Jun 12, 2024
33b28f1
Merge pull request #199 from Xilinx/feature/fused-ops
mgehre-amd Jun 13, 2024
8229868
feat: Create a fused location for rsqrt canonicalization
ehsan-toosi Jun 14, 2024
16a9e06
Add lit tests
Jun 17, 2024
a325070
Revert formatting change
Jun 17, 2024
a5766f5
Fix TOSA cast constant op folding
cferry-AMD Jun 18, 2024
b36c81e
Add a test case
cferry-AMD Jun 19, 2024
de0d133
Merge pull request #200 from Xilinx/enadjara.change_loc_to_fused_loc_…
flemairen6 Jun 19, 2024
f951d24
Merge pull request #204 from Xilinx/corentin.fix_tosa_cast_cp_2
mgehre-amd Jun 19, 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
9 changes: 6 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 @@ -99,9 +99,12 @@ struct SqrtReciprocalOptimization : public OpRewritePattern<tosa::PowOp> {
// An improvement for the future would be to generate a tile operator here instead
if (inputType != outputType)
return rewriter.notifyMatchFailure(op, "input type and output type are different, tiling is not supported for this canonicalization");

rewriter.replaceOpWithNewOp<tosa::RsqrtOp>(user, outputType, op.getInput1());

auto rsqrtOp = rewriter.create<tosa::RsqrtOp>(
rewriter.getFusedLoc({op.getLoc(), user->getLoc()}), outputType,
op.getInput1());
rewriter.replaceOp(user, rsqrtOp);

return success();
}
};
Expand Down Expand Up @@ -888,7 +891,7 @@ OpFoldResult CastOp::fold(FoldAdaptor adaptor) {
llvm::cast<IntegerType>(outETy).getIntOrFloatBitWidth(), unsign);
auto floatVal = operand.getSplatValue<APFloat>();
bool exact;
floatVal.convertToInteger(intVal, llvm::RoundingMode::TowardZero, &exact);
floatVal.convertToInteger(intVal, llvm::RoundingMode::NearestTiesToEven, &exact);
return SplatElementsAttr::get(outTy, intVal);
}

Expand Down
36 changes: 34 additions & 2 deletions mlir/test/Dialect/Tosa/canonicalize_with_debuginfo.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: mlir-opt -mlir-print-debuginfo -canonicalize="test-convergence" %s | FileCheck %s
// RUN: mlir-opt -split-input-file -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> {
Expand All @@ -11,4 +11,36 @@ func.func @clamp_twice_is_single_clamp(%arg0: tensor<4xi8>) -> tensor<4xi8> {
return %1 : tensor<4xi8>
}
#loc0 = loc("Clamp_A")
#loc1 = loc("Clamp_B")
#loc1 = loc("Clamp_B")

// -----

// CHECK-LABEL: @canonicalize_optimize_sqrt_reciprocal
func.func @canonicalize_optimize_sqrt_reciprocal_with_debinfo(%arg0: tensor<1x5x1x1xf32>) -> tensor<1x5x1x1xf32> {
// CHECK: %[[RSQRT:.*]] = tosa.rsqrt %arg{{.*}} : (tensor<1x5x1x1xf32>) -> tensor<1x5x1x1xf32> loc([[LOC:.*]])
// CHECK-DAG: #[[A:.*]] = loc("Pow_A")
// CHECK-DAG: #[[B:.*]] = loc("Reciprocal_B")
// CHECK-DAG: [[LOC]] = loc(fused[#[[A]], #[[B]]])
%0 = "tosa.const"() <{value = dense<5.000000e-01> : tensor<1x1x1x1xf32>}> : () -> tensor<1x1x1x1xf32>
%1 = tosa.pow %arg0, %0 : (tensor<1x5x1x1xf32>, tensor<1x1x1x1xf32>) -> tensor<1x5x1x1xf32> loc(#loc0)
%2 = tosa.reciprocal %1 : (tensor<1x5x1x1xf32>) -> tensor<1x5x1x1xf32> loc(#loc1)
return %2 : tensor<1x5x1x1xf32>
}
#loc0 = loc("Pow_A")
#loc1 = loc("Reciprocal_B")

// -----

// CHECK-LABEL: @canonicalize_optimize_sqrt_reciprocal
func.func @canonicalize_optimize_sqrt_reciprocal_bf16(%arg0: tensor<1x5x1x1xbf16>) -> tensor<1x5x1x1xbf16> {
// CHECK: %[[RSQRT:.*]] = tosa.rsqrt %arg{{.*}} : (tensor<1x5x1x1xbf16>) -> tensor<1x5x1x1xbf16> loc([[LOC:.*]])
// CHECK-DAG: #[[A:.*]] = loc("Pow_B")
// CHECK-DAG: #[[B:.*]] = loc("Reciprocal_C")
// CHECK-DAG: [[LOC]] = loc(fused[#[[A]], #[[B]]])
%0 = "tosa.const"() <{value = dense<5.000000e-01> : tensor<1x1x1x1xbf16>}> : () -> tensor<1x1x1x1xbf16>
%1 = tosa.pow %arg0, %0 : (tensor<1x5x1x1xbf16>, tensor<1x1x1x1xbf16>) -> tensor<1x5x1x1xbf16> loc(#loc0)
%2 = tosa.reciprocal %1 : (tensor<1x5x1x1xbf16>) -> tensor<1x5x1x1xbf16> loc(#loc1)
return %2 : tensor<1x5x1x1xbf16>
}
#loc0 = loc("Pow_B")
#loc1 = loc("Reciprocal_C")
11 changes: 11 additions & 0 deletions mlir/test/Dialect/Tosa/constant-op-fold.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,6 +602,17 @@ func.func @cast_float_to_int() -> tensor<i16> {

// -----

// CHECK: func.func @cast_float_to_int_round
func.func @cast_float_to_int_round() -> tensor<i16> {
%splat = "tosa.const"() {value = dense<-3.5> : tensor<f32>} : () -> tensor<f32>
// CHECK: %[[SPLAT:.+]] = "tosa.const"() <{value = dense<-4> : tensor<i16>}
%cast = tosa.cast %splat : (tensor<f32>) -> tensor<i16>
// CHECK: return %[[SPLAT]]
return %cast : tensor<i16>
}

// -----

// CHECK: func.func @cast_int_to_int_trunc
func.func @cast_int_to_int_trunc() -> tensor<i16> {
%splat = "tosa.const"() {value = dense<-1> : tensor<i32>} : () -> tensor<i32>
Expand Down