This is an archive of the discontinued LLVM Phabricator instance.

Differential D102430

[mlir][tosa] Add tosa.div integer lowering to linalg.generic.
ClosedPublic

Authored by NatashaKnk on May 13 2021, 11:53 AM.

Details

Reviewers
rsuderman
sjarus
Commits
rG0831793ed962: [mlir][tosa] Add tosa.div integer lowering to linalg.generic.
Summary

Lowering div elementwise op to the linalg dialect. Since tosa only supports integer division, that is the only version that is currently implemented.

Diff Detail

Event Timeline

NatashaKnk created this revision.May 13 2021, 11:53 AM
Herald added a reviewer: sjarus. · View Herald TranscriptMay 13 2021, 11:53 AM
Herald added subscribers: jsmolens, eric-k256, dcaballe and 19 others. · View Herald Transcript
NatashaKnk requested review of this revision.May 13 2021, 11:53 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 13 2021, 11:53 AM
Herald added subscribers: limo1996, stephenneuendorffer, nicolasvasilache. · View Herald Transcript
rsuderman accepted this revision.May 13 2021, 12:10 PM
rsuderman retitled this revision from [mlir][tosa] Add tosa.div lowering to linalg.generic. Currently only the integer version is implemented. to [mlir][tosa] Add tosa.div integer lowering to linalg.generic..
This revision is now accepted and ready to land.May 13 2021, 12:10 PM
This revision was landed with ongoing or failed builds.May 13 2021, 1:21 PM
Closed by commit rG0831793ed962: [mlir][tosa] Add tosa.div integer lowering to linalg.generic. (authored by NatashaKnk, committed by rsuderman). · Explain Why
This revision was automatically updated to reflect the committed changes.
rsuderman added a commit: rG0831793ed962: [mlir][tosa] Add tosa.div integer lowering to linalg.generic..
Harbormaster completed remote builds in B104352: Diff 345241.May 13 2021, 1:59 PM

Revision Contents

PathSize
mlir/
lib/
Conversion/
TosaToLinalg/
5 lines
test/
Conversion/
TosaToLinalg/
44 lines

Diff 345263

mlir/lib/Conversion/TosaToLinalg/TosaToLinalg.cpp

Show First 20 Lines • Show All 120 Lines • ▼ Show 20 Lines if (isa<tosa::MulOp>(op) && elementTy.isa<FloatType>()) {
if (dyn_cast<tosa::MulOp>(op).shift() != 0) { if (dyn_cast<tosa::MulOp>(op).shift() != 0) {
(void)rewriter.notifyMatchFailure(op, (void)rewriter.notifyMatchFailure(op,
"Cannot have shift value for float"); "Cannot have shift value for float");
return nullptr; return nullptr;
} }
return rewriter.create<mlir::MulFOp>(loc, resultTypes, args); return rewriter.create<mlir::MulFOp>(loc, resultTypes, args);
} }
// tosa::DivOp
if (isa<tosa::DivOp>(op) && elementTy.isa<IntegerType>())
return rewriter.create<mlir::SignedDivIOp>(loc, resultTypes, args);
// tosa::ReciprocalOp // tosa::ReciprocalOp
if (isa<tosa::ReciprocalOp>(op) && elementTy.isa<FloatType>()) { if (isa<tosa::ReciprocalOp>(op) && elementTy.isa<FloatType>()) {
auto one = auto one =
rewriter.create<mlir::ConstantOp>(loc, FloatAttr::get(elementTy, 1)); rewriter.create<mlir::ConstantOp>(loc, FloatAttr::get(elementTy, 1));
return rewriter.create<mlir::DivFOp>(loc, resultTypes, one, args[0]); return rewriter.create<mlir::DivFOp>(loc, resultTypes, one, args[0]);
} }
if (isa<tosa::MulOp>(op) && elementTy.isa<IntegerType>()) { if (isa<tosa::MulOp>(op) && elementTy.isa<IntegerType>()) {
▲ Show 20 Lines • Show All 2,193 Lines • ▼ Show 20 Lines
void mlir::tosa::populateTosaToLinalgOnTensorsConversionPatterns( void mlir::tosa::populateTosaToLinalgOnTensorsConversionPatterns(
RewritePatternSet *patterns) { RewritePatternSet *patterns) {
patterns->add< patterns->add<
// clang-format off // clang-format off
PointwiseConverter<tosa::AddOp>, PointwiseConverter<tosa::AddOp>,
PointwiseConverter<tosa::SubOp>, PointwiseConverter<tosa::SubOp>,
PointwiseConverter<tosa::MulOp>, PointwiseConverter<tosa::MulOp>,
PointwiseConverter<tosa::DivOp>,
PointwiseConverter<tosa::NegateOp>, PointwiseConverter<tosa::NegateOp>,
PointwiseConverter<tosa::PowOp>, PointwiseConverter<tosa::PowOp>,
PointwiseConverter<tosa::ReciprocalOp>, PointwiseConverter<tosa::ReciprocalOp>,
PointwiseConverter<tosa::RsqrtOp>, PointwiseConverter<tosa::RsqrtOp>,
PointwiseConverter<tosa::LogOp>, PointwiseConverter<tosa::LogOp>,
PointwiseConverter<tosa::ExpOp>, PointwiseConverter<tosa::ExpOp>,
PointwiseConverter<tosa::AbsOp>, PointwiseConverter<tosa::AbsOp>,
PointwiseConverter<tosa::TanhOp>, PointwiseConverter<tosa::TanhOp>,
▲ Show 20 Lines • Show All 49 Lines • Show Last 20 Lines

mlir/test/Conversion/TosaToLinalg/tosa-to-linalg.mlir

Show First 20 Lines • Show All 289 Lines • ▼ Show 20 Linesfunc @test_simple_i32(%arg0: tensor<1xi32>) -> () {
%2 = "tosa.mul"(%arg0, %arg0) {shift = 0 : i32} : (tensor<1xi32>, tensor<1xi32>) -> tensor<1xi32> %2 = "tosa.mul"(%arg0, %arg0) {shift = 0 : i32} : (tensor<1xi32>, tensor<1xi32>) -> tensor<1xi32>
// CHECK: linalg.generic // CHECK: linalg.generic
// CHECK: constant 2 // CHECK: constant 2
// CHECK: apply_scale // CHECK: apply_scale
%3 = "tosa.mul"(%arg0, %arg0) {shift = 2 : i32} : (tensor<1xi32>, tensor<1xi32>) -> tensor<1xi32> %3 = "tosa.mul"(%arg0, %arg0) {shift = 2 : i32} : (tensor<1xi32>, tensor<1xi32>) -> tensor<1xi32>
// CHECK: linalg.generic // CHECK: linalg.generic
// CHECK: divi
%4 = "tosa.div"(%arg0, %arg0) : (tensor<1xi32>, tensor<1xi32>) -> tensor<1xi32>
// CHECK: linalg.generic
// CHECK: [[ZERO:%.+]] = constant 0 // CHECK: [[ZERO:%.+]] = constant 0
// CHECK: subi [[ZERO]], %arg1 // CHECK: subi [[ZERO]], %arg1
%4 = "tosa.negate"(%arg0) : (tensor<1xi32>) -> tensor<1xi32> %5 = "tosa.negate"(%arg0) : (tensor<1xi32>) -> tensor<1xi32>
// CHECK: linalg.generic // CHECK: linalg.generic
// CHECK: and // CHECK: and
%5 = "tosa.bitwise_and"(%arg0, %arg0) : (tensor<1xi32>, tensor<1xi32>) -> tensor<1xi32> %6 = "tosa.bitwise_and"(%arg0, %arg0) : (tensor<1xi32>, tensor<1xi32>) -> tensor<1xi32>
// CHECK: linalg.generic // CHECK: linalg.generic
// CHECK: or // CHECK: or
%6 = "tosa.bitwise_or"(%arg0, %arg0) : (tensor<1xi32>, tensor<1xi32>) -> tensor<1xi32> %7 = "tosa.bitwise_or"(%arg0, %arg0) : (tensor<1xi32>, tensor<1xi32>) -> tensor<1xi32>
// CHECK: linalg.generic // CHECK: linalg.generic
// CHECK: xor // CHECK: xor
%7 = "tosa.bitwise_xor"(%arg0, %arg0) : (tensor<1xi32>, tensor<1xi32>) -> tensor<1xi32> %8 = "tosa.bitwise_xor"(%arg0, %arg0) : (tensor<1xi32>, tensor<1xi32>) -> tensor<1xi32>
// CHECK: linalg.generic // CHECK: linalg.generic
// CHECK: shift_left // CHECK: shift_left
%8 = "tosa.logical_left_shift"(%arg0, %arg0) : (tensor<1xi32>, tensor<1xi32>) -> tensor<1xi32> %9 = "tosa.logical_left_shift"(%arg0, %arg0) : (tensor<1xi32>, tensor<1xi32>) -> tensor<1xi32>
// CHECK: linalg.generic // CHECK: linalg.generic
// CHECK: shift_right_unsigned // CHECK: shift_right_unsigned
%9 = "tosa.logical_right_shift"(%arg0, %arg0) : (tensor<1xi32>, tensor<1xi32>) -> tensor<1xi32> %10 = "tosa.logical_right_shift"(%arg0, %arg0) : (tensor<1xi32>, tensor<1xi32>) -> tensor<1xi32>
// CHECK: linalg.generic // CHECK: linalg.generic
// CHECK: shift_right_signed // CHECK: shift_right_signed
%10 = "tosa.arithmetic_right_shift"(%arg0, %arg0) {round = 0 : i1} : (tensor<1xi32>, tensor<1xi32>) -> tensor<1xi32> %11 = "tosa.arithmetic_right_shift"(%arg0, %arg0) {round = 0 : i1} : (tensor<1xi32>, tensor<1xi32>) -> tensor<1xi32>
// CHECK: linalg.generic // CHECK: linalg.generic
// CHECK: constant 1 // CHECK: constant 1
// CHECK: constant 0 // CHECK: constant 0
// CHECK: constant true // CHECK: constant true
// CHECK: cmpi // CHECK: cmpi
// CHECK: subi // CHECK: subi
// CHECK: shift_right_signed // CHECK: shift_right_signed
// CHECK: trunci // CHECK: trunci
// CHECK: and // CHECK: and
// CHECK: and // CHECK: and
// CHECK: zexti // CHECK: zexti
// CHECK: addi // CHECK: addi
%11 = "tosa.arithmetic_right_shift"(%arg0, %arg0) {round = 1 : i1} : (tensor<1xi32>, tensor<1xi32>) -> tensor<1xi32> %12 = "tosa.arithmetic_right_shift"(%arg0, %arg0) {round = 1 : i1} : (tensor<1xi32>, tensor<1xi32>) -> tensor<1xi32>
// CHECK: linalg.generic // CHECK: linalg.generic
// CHECK: cmpi // CHECK: cmpi
%12 = "tosa.greater"(%0, %1) : (tensor<1xi32>, tensor<1xi32>) -> tensor<1xi1> %13 = "tosa.greater"(%0, %1) : (tensor<1xi32>, tensor<1xi32>) -> tensor<1xi1>
// CHECK: linalg.generic // CHECK: linalg.generic
// CHECK: cmpi // CHECK: cmpi
%13 = "tosa.greater_equal"(%0, %1) : (tensor<1xi32>, tensor<1xi32>) -> tensor<1xi1> %14 = "tosa.greater_equal"(%0, %1) : (tensor<1xi32>, tensor<1xi32>) -> tensor<1xi1>
// CHECK: linalg.generic // CHECK: linalg.generic
// CHECK: select // CHECK: select
%14 = "tosa.select"(%12, %0, %1) : (tensor<1xi1>, tensor<1xi32>, tensor<1xi32>) -> tensor<1xi32> %15 = "tosa.select"(%13, %0, %1) : (tensor<1xi1>, tensor<1xi32>, tensor<1xi32>) -> tensor<1xi32>
// CHECK: linalg.generic // CHECK: linalg.generic
// CHECK: cmpi // CHECK: cmpi
// CHECK: select // CHECK: select
%15 = "tosa.maximum"(%0, %1) : (tensor<1xi32>, tensor<1xi32>) -> tensor<1xi32> %16 = "tosa.maximum"(%0, %1) : (tensor<1xi32>, tensor<1xi32>) -> tensor<1xi32>
// CHECK: linalg.generic // CHECK: linalg.generic
// CHECK: cmpi // CHECK: cmpi
// CHECK: select // CHECK: select
%16 = "tosa.minimum"(%0, %1) : (tensor<1xi32>, tensor<1xi32>) -> tensor<1xi32> %17 = "tosa.minimum"(%0, %1) : (tensor<1xi32>, tensor<1xi32>) -> tensor<1xi32>
// CHECK: linalg.generic // CHECK: linalg.generic
// CHECK: cmpi // CHECK: cmpi
// CHECK: select // CHECK: select
%17 = "tosa.clamp"(%0) {min_int = 1 : i64, max_int = 5 : i64, min_fp = 1.0 : f32, max_fp = 5.0 : f32} : (tensor<1xi32>) -> tensor<1xi32> %18 = "tosa.clamp"(%0) {min_int = 1 : i64, max_int = 5 : i64, min_fp = 1.0 : f32, max_fp = 5.0 : f32} : (tensor<1xi32>) -> tensor<1xi32>
// CHECK: linalg.generic // CHECK: linalg.generic
// CHECK: cmpi // CHECK: cmpi
// CHECK: select // CHECK: select
%18 = "tosa.reluN"(%0) {max_int = 5 : i64, max_fp = 5.0 : f32} : (tensor<1xi32>) -> tensor<1xi32> %19 = "tosa.reluN"(%0) {max_int = 5 : i64, max_fp = 5.0 : f32} : (tensor<1xi32>) -> tensor<1xi32>
// CHECK: linalg.generic // CHECK: linalg.generic
// CHECK: constant -32768 // CHECK: constant -32768
// CHECK: constant 32767 // CHECK: constant 32767
// CHECK: cmpi slt // CHECK: cmpi slt
// CHECK: select // CHECK: select
// CHECK: cmpi slt // CHECK: cmpi slt
// CHECK: select // CHECK: select
// CHECK: trunci // CHECK: trunci
%19 = "tosa.cast"(%0) : (tensor<1xi32>) -> tensor<1xi16> %20 = "tosa.cast"(%0) : (tensor<1xi32>) -> tensor<1xi16>
// CHECK: linalg.generic // CHECK: linalg.generic
// CHECK: yield // CHECK: yield
%20 = "tosa.cast"(%0) : (tensor<1xi32>) -> tensor<1xi32> %21 = "tosa.cast"(%0) : (tensor<1xi32>) -> tensor<1xi32>
// CHECK: linalg.generic // CHECK: linalg.generic
// CHECK: sexti // CHECK: sexti
%21 = "tosa.cast"(%0) : (tensor<1xi32>) -> tensor<1xi64> %22 = "tosa.cast"(%0) : (tensor<1xi32>) -> tensor<1xi64>
// CHECK: linalg.generic // CHECK: linalg.generic
// CHECK: constant 0 // CHECK: constant 0
// CHECK: cmpi // CHECK: cmpi
%22 = "tosa.cast"(%0) : (tensor<1xi32>) -> tensor<1xi1> %23 = "tosa.cast"(%0) : (tensor<1xi32>) -> tensor<1xi1>
// CHECK: linalg.generic // CHECK: linalg.generic
// CHECK: sitofp // CHECK: sitofp
%23 = "tosa.cast"(%0) : (tensor<1xi32>) -> tensor<1xf32> %24 = "tosa.cast"(%0) : (tensor<1xi32>) -> tensor<1xf32>
return return
} }
// ----- // -----
// CHECK-LABEL: @test_bool // CHECK-LABEL: @test_bool
func @test_bool(%arg0: tensor<1xi1>, %arg1: tensor<1xi1>) -> () { func @test_bool(%arg0: tensor<1xi1>, %arg1: tensor<1xi1>) -> () {
▲ Show 20 Lines • Show All 1,019 Lines • Show Last 20 Lines