Skip to content

[mlir][tosa] Fix select folder when operands are broadcast #165481

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[mlir][tosa] Fix select folder when operands are broadcast #165481

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
17 changes: 17 additions & 0 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 @@ -1484,7 +1484,24 @@ OpFoldResult SliceOp::fold(FoldAdaptor adaptor) {
return {};
}

static bool
mayRequireBroadcast(ValueTypeRange<mlir::OperandRange> operandTypes) {
const auto isDynamic = [](Type ty) {
const auto shapedTy = llvm::dyn_cast<ShapedType>(ty);
return !shapedTy || !shapedTy.hasStaticShape();
};

return llvm::any_of(operandTypes, isDynamic) ||
failed(verifyCompatibleShapes(operandTypes));
}

OpFoldResult tosa::SelectOp::fold(FoldAdaptor adaptor) {
// Select allows operand shapes to be broadcast to the output shape. For
// now, don't support folding when we cannot prove no broadcasting is
// involved.
if (mayRequireBroadcast(getOperandTypes()))
return {};

if (getOnTrue() == getOnFalse())
return getOnTrue();

Expand Down
42 changes: 42 additions & 0 deletions mlir/test/Dialect/Tosa/canonicalize.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,48 @@ func.func @select_not_pred(%arg0: tensor<2x3xi1>, %arg1: tensor<2x3xi32>, %arg2:

// -----

// CHECK-LABEL: @select_broadcast_same_value_no_fold
func.func @select_broadcast_same_value_no_fold(%arg0: tensor<2x2xi1>, %arg1: tensor<1x1xf32>) -> tensor<2x2xf32> {
// CHECK: tosa.select %arg0, %arg1, %arg1
%0 = tosa.select %arg0, %arg1, %arg1 : (tensor<2x2xi1>, tensor<1x1xf32>, tensor<1x1xf32>) -> tensor<2x2xf32>
return %0 : tensor<2x2xf32>
}

// -----

// CHECK-LABEL: @select_broadcast_true_value_no_fold
func.func @select_broadcast_true_value_no_fold(%arg0: tensor<1x1xf32>, %arg1: tensor<2x2xf32>) -> tensor<?x?xf32> {
// CHECK: %[[CONST:.*]] = "tosa.const"
%0 = "tosa.const"() {values = dense<1> : tensor<2x2xi1>} : () -> tensor<2x2xi1>
// CHECK: tosa.select %[[CONST]], %arg0, %arg1
%1 = tosa.select %0, %arg0, %arg1 : (tensor<2x2xi1>, tensor<1x1xf32>, tensor<2x2xf32>) -> tensor<?x?xf32>
return %1 : tensor<?x?xf32>
}

// -----

// CHECK-LABEL: @select_broadcast_false_value_no_fold
func.func @select_broadcast_false_value_no_fold(%arg0: tensor<2x2xf32>, %arg1: tensor<1x1xf32>) -> tensor<2x2xf32> {
// CHECK: %[[CONST:.*]] = "tosa.const"
%0 = "tosa.const"() {values = dense<0> : tensor<2x2xi1>} : () -> tensor<2x2xi1>
// CHECK: tosa.select %[[CONST]], %arg0, %arg1
%1 = tosa.select %0, %arg0, %arg1 : (tensor<2x2xi1>, tensor<2x2xf32>, tensor<1x1xf32>) -> tensor<2x2xf32>
return %1 : tensor<2x2xf32>
}

// -----

// CHECK-LABEL: @select_broadcast_false_value_dynamic_operand_no_fold
func.func @select_broadcast_false_value_dynamic_operand_no_fold(%arg0: tensor<2x?xf32>, %arg1: tensor<2x2xf32>) -> tensor<2x2xf32> {
// CHECK: %[[CONST:.*]] = "tosa.const"
%0 = "tosa.const"() {values = dense<0> : tensor<2x2xi1>} : () -> tensor<2x2xi1>
// CHECK: tosa.select %[[CONST]], %arg0, %arg1
%1 = tosa.select %0, %arg0, %arg1 : (tensor<2x2xi1>, tensor<2x?xf32>, tensor<2x2xf32>) -> tensor<2x2xf32>
return %1 : tensor<2x2xf32>
}

// -----

// CHECK-LABEL: @reduce_all_fold
func.func @reduce_all_fold(%arg0: tensor<?x1xf32>) -> tensor<?x1xf32> {
// CHECK: return %arg0
Expand Down