Cold-Air-Networks/mirror-llvm-project
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 7

Revert "[mlir][tensor] Add ValueBoundsOpInterface for ExpandShapeOp and CollapseShapeOp (#173356)"

Browse source 
This reverts commit 5154a05ef2.
It broke sanitizer build bots -- see
https://lab.llvm.org/buildbot/#/builders/52/builds/13831
This commit is contained in:
Emilio Cota 2025-12-24 22:45:31 -05:00
parent ba08fb7f7c
commit 5d6c40b44f
2 changed files with 0 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
mlir/lib/Dialect/Tensor/IR/ValueBoundsOpInterfaceImpl.cpp
View file

@ -31,27 +31,6 @@ struct CastOpInterface
}
};
struct CollapseShapeOpInterface
: public ValueBoundsOpInterface::ExternalModel<CollapseShapeOpInterface,
CollapseShapeOp> {
void populateBoundsForShapedValueDim(Operation *op, Value value, int64_t dim,
ValueBoundsConstraintSet &cstr) const {
auto collapseOp = cast<CollapseShapeOp>(op);
assert(value == collapseOp.getResult() && "invalid value");
// Multiply the expressions for the dimensions in the reassociation group.
const ReassociationIndices &reassocIndices =
collapseOp.getReassociationIndices()[dim];
AffineExpr productExpr =
cstr.getExpr(collapseOp.getSrc(), reassocIndices[0]);
for (size_t i = 1; i < reassocIndices.size(); ++i) {
productExpr =
productExpr * cstr.getExpr(collapseOp.getSrc(), reassocIndices[i]);
}
cstr.bound(value)[dim] == productExpr;
}
};
struct DimOpInterface
: public ValueBoundsOpInterface::ExternalModel<DimOpInterface, DimOp> {
void populateBoundsForIndexValue(Operation *op, Value value,
@ -78,17 +57,6 @@ struct EmptyOpInterface
}
};
struct ExpandShapeOpInterface
: public ValueBoundsOpInterface::ExternalModel<ExpandShapeOpInterface,
ExpandShapeOp> {
void populateBoundsForShapedValueDim(Operation *op, Value value, int64_t dim,
ValueBoundsConstraintSet &cstr) const {
auto expandOp = cast<ExpandShapeOp>(op);
assert(value == expandOp.getResult() && "invalid value");
cstr.bound(value)[dim] == expandOp.getMixedOutputShape()[dim];
}
};
struct ExtractSliceOpInterface
: public ValueBoundsOpInterface::ExternalModel<ExtractSliceOpInterface,
ExtractSliceOp> {
@ -149,12 +117,8 @@ void mlir::tensor::registerValueBoundsOpInterfaceExternalModels(
DialectRegistry &registry) {
registry.addExtension(+[](MLIRContext *ctx, tensor::TensorDialect *dialect) {
tensor::CastOp::attachInterface<tensor::CastOpInterface>(*ctx);
tensor::CollapseShapeOp::attachInterface<tensor::CollapseShapeOpInterface>(
*ctx);
tensor::DimOp::attachInterface<tensor::DimOpInterface>(*ctx);
tensor::EmptyOp::attachInterface<tensor::EmptyOpInterface>(*ctx);
tensor::ExpandShapeOp::attachInterface<tensor::ExpandShapeOpInterface>(
*ctx);
tensor::ExtractSliceOp::attachInterface<tensor::ExtractSliceOpInterface>(
*ctx);
tensor::PadOp::attachInterface<tensor::PadOpInterface>(*ctx);

32
mlir/test/Dialect/Tensor/value-bounds-op-interface-impl.mlir
View file

@ -230,35 +230,3 @@ func.func @pad_reification(%cst : f32, %idx : index, %t: tensor<64x?x64xf32>) {
%1 = "test.reify_bound"(%padded) {dim = 1, constant} : (tensor<1x?x64xf32>) -> (index)
return
}
// -----
// CHECK: #[[$MAP:.+]] = affine_map<()[s0] -> (s0 * 2)>
// CHECK-LABEL: func @tensor_collapse(
// CHECK-SAME: %[[sz0:.*]]: index
// CHECK-DAG: %[[c2:.*]] = arith.constant 2 : index
// CHECK-DAG: %[[c12:.*]] = arith.constant 12 : index
// CHECK: %[[dim:.*]] = tensor.dim %{{.*}}, %[[c2]] : tensor<3x4x?x2xf32>
// CHECK: %[[mul:.*]] = affine.apply #[[$MAP]]()[%[[dim]]]
// CHECK: return %[[c12]], %[[mul]]
func.func @tensor_collapse(%sz0: index) -> (index, index) {
%0 = tensor.empty(%sz0) : tensor<3x4x?x2xf32>
%1 = tensor.collapse_shape %0 [[0, 1], [2, 3]] : tensor<3x4x?x2xf32> into tensor<12x?xf32>
%2 = "test.reify_bound"(%1) {dim = 0} : (tensor<12x?xf32>) -> (index)
%3 = "test.reify_bound"(%1) {dim = 1} : (tensor<12x?xf32>) -> (index)
return %2, %3 : index, index
}
// -----
// CHECK-LABEL: func @tensor_expand(
// CHECK-SAME: %[[t:[a-zA-Z0-9]+]]: tensor<?xf32>
// CHECK-SAME: %[[sz:[a-zA-Z0-9]+]]: index
// CHECK: %[[c4:.*]] = arith.constant 4 : index
// CHECK: return %[[c4]], %[[sz]]
func.func @tensor_expand(%t: tensor<?xf32>, %sz: index) -> (index, index) {
%0 = tensor.expand_shape %t [[0, 1]] output_shape [4, %sz] : tensor<?xf32> into tensor<4x?xf32>
%1 = "test.reify_bound"(%0) {dim = 0} : (tensor<4x?xf32>) -> (index)
%2 = "test.reify_bound"(%0) {dim = 1} : (tensor<4x?xf32>) -> (index)
return %1, %2 : index, index
}