Skip to content

[TOSA] Fix negate maxValue computation #126295

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 2 commits into from
Feb 8, 2025
Merged

[TOSA] Fix negate maxValue computation #126295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58e7545
[TOSA] Fix negate maxValue computation
RoboTux Feb 7, 2025
6cba9c1
Fix code formatting.
RoboTux Feb 7, 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
10 changes: 6 additions & 4 deletions mlir/lib/Conversion/TosaToLinalg/TosaToLinalg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,13 @@ static Value createLinalgBodyCalculationForElementwiseOp(
return rewriter.create<arith::NegFOp>(loc, resultTypes, args);

if (isa<IntegerType>(elementTy)) {
auto inputZpAttr = cast<tosa::NegateOp>(op).getInput1Zp();
auto outputZpAttr = cast<tosa::NegateOp>(op).getOutputZp();
auto inputZpAttr = cast<tosa::NegateOp>(op).getInput1ZpAttr();
auto outputZpAttr = cast<tosa::NegateOp>(op).getOutputZpAttr();

const int64_t inZp = inputZpAttr ? *inputZpAttr : 0;
const int64_t outZp = outputZpAttr ? *outputZpAttr : 0;
const int64_t inZp =
inputZpAttr ? inputZpAttr.getValue().getSExtValue() : 0;
const int64_t outZp =
outputZpAttr ? outputZpAttr.getValue().getSExtValue() : 0;

if (!inZp && !outZp) {
auto constant = rewriter.create<arith::ConstantOp>(
Expand Down
15 changes: 14 additions & 1 deletion mlir/test/Conversion/TosaToLinalg/tosa-to-linalg.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -911,12 +911,25 @@ func.func @test_negate_quantized(%arg0: tensor<1xi8>) -> () {
// CHECK: linalg.yield [[TRUNC]]
%2 = tosa.negate %arg0 {input1_zp = 32640 : i32, output_zp = 0 : i32} : (tensor<1xi8>) -> tensor<1xi8>

// CHECK: linalg.generic
// CHECK: ^bb0(%[[BBARG0:.+]]: i8,
// CHECK: [[C_128:%.+]] = arith.constant -128
// CHECK: [[EXT:%.+]] = arith.extsi %[[BBARG0]] : i8 to i16
// CHECK: [[SUB:%.+]] = arith.subi [[C_128]], [[EXT]]
// CHECK: [[MIN:%.+]] = arith.constant -128
// CHECK: [[MAX:%.+]] = arith.constant 127
// CHECK: [[LBOUND:%.+]] = arith.maxsi [[MIN]], [[SUB]]
// CHECK: [[UBOUND:%.+]] = arith.minsi [[MAX]], [[LBOUND]]
// CHECK: [[TRUNC:%.+]] = arith.trunci [[UBOUND]]
// CHECK: linalg.yield [[TRUNC]]
%3 = tosa.negate %arg0 {input1_zp = -128 : i32, output_zp = 0 : i32} : (tensor<1xi8>) -> tensor<1xi8>

// CHECK: linalg.generic
// CHECK: ^bb0(%[[BBARG0:.+]]: i8,
// CHECK: [[ZERO:%.+]] = arith.constant 0
// CHECK: [[SUB:%.+]] = arith.subi [[ZERO]],
// CHECK: linalg.yield [[SUB]]
%3 = tosa.negate %arg0 {quantization_info = #tosa.unary_quant<input_zp = 0, output_zp = 0>} : (tensor<1xi8>) -> tensor<1xi8>
%4 = tosa.negate %arg0 {quantization_info = #tosa.unary_quant<input_zp = 0, output_zp = 0>} : (tensor<1xi8>) -> tensor<1xi8>

return
}
Expand Down