Skip to content

Remove arith dependency from DynamicIotaOpToBroadcast #2918

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
brucechanglongxu wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −11
Open

Remove arith dependency from DynamicIotaOpToBroadcast #2918

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
9 changes: 3 additions & 6 deletions stablehlo/tests/transforms/stablehlo_aggressive_simplification.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,15 +545,12 @@ func.func @dynamic_iota_broadcast_dim0_i64(%arg0 : tensor<2xi64>) -> tensor<5x?x
func.return %0 : tensor<5x?xi32>
}

// Index-typed shapes are skipped (run shape-legalize-to-stablehlo first).
// CHECK-LABEL: @dynamic_iota_broadcast_dim1_index
func.func @dynamic_iota_broadcast_dim1_index(%arg0 : tensor<2xindex>) -> tensor<5x?xi32> {
// CHECK-NEXT: [[CAST:%.+]] = arith.index_cast %arg0 : tensor<2xindex> to tensor<2xi64>
// CHECK-NEXT: [[SLICE:%.+]] = stablehlo.slice [[CAST]] [1:2] : (tensor<2xi64>) -> tensor<1xi64>
// CHECK-NEXT: [[IOTA:%.+]] = stablehlo.dynamic_iota [[SLICE]], dim = 0 : (tensor<1xi64>) -> tensor<?xi32>
// CHECK-NEXT: [[BROADCAST:%.+]] = stablehlo.dynamic_broadcast_in_dim [[IOTA]], %arg0, dims = [1] : (tensor<?xi32>, tensor<2xindex>) -> tensor<5x?xi32>
// CHECK-NEXT: stablehlo.dynamic_iota %arg0
%0 = "stablehlo.dynamic_iota"(%arg0) <{iota_dimension = 1 : i64}> : (tensor<2xindex>) -> tensor<5x?xi32>

// CHECK: return [[BROADCAST]]
// CHECK-NEXT: return
func.return %0 : tensor<5x?xi32>
}

Expand Down
1 change: 0 additions & 1 deletion stablehlo/transforms/optimization/Passes.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ def StablehloAggressiveSimplificationPass
}];
let dependentDialects = [
"mlir::stablehlo::StablehloDialect",
"mlir::arith::ArithDialect",
];
let options = EnableStablehloOptimizationPassFlags<[
"fold-op-element-limit",
Expand Down
11 changes: 7 additions & 4 deletions stablehlo/transforms/optimization/StablehloAggressiveSimplification.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include "llvm/ADT/SmallVectorExtras.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/FormatVariadic.h"
#include "mlir/Dialect/Arith/IR/Arith.h"
#include "mlir/IR/Attributes.h"
#include "mlir/IR/Block.h"
#include "mlir/IR/Builders.h"
Expand Down Expand Up @@ -506,12 +505,16 @@ struct DynamicIotaOpToBroadcast

Value iotaShape = iota.getOutputShape();
auto iotaShapeType = cast<ShapedType>(iotaShape.getType());
if (iotaShapeType.getElementType().isIndex())
return rewriter.notifyMatchFailure(
iota, "index-typed shapes not supported; run "
"shape-legalize-to-stablehlo first");

auto iotaShapeI64Type =
RankedTensorType::get(iotaShapeType.getShape(), rewriter.getI64Type());
Value iotaShapeI64;
if (iotaShapeType.getElementType().isIndex()) {
iotaShapeI64 = arith::IndexCastOp::create(rewriter, iotaLoc,
iotaShapeI64Type, iotaShape);
if (iotaShapeType.getElementType().isInteger(64)) {
iotaShapeI64 = iotaShape;
} else {
iotaShapeI64 = stablehlo::ConvertOp::create(rewriter, iotaLoc,
iotaShapeI64Type, iotaShape);
Expand Down