Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 23 additions & 0 deletions mlir/lib/Dialect/MemRef/IR/ValueBoundsOpInterfaceImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,27 @@ struct RankOpInterface
}
};

struct CollapseShapeOpInterface
: public ValueBoundsOpInterface::ExternalModel<CollapseShapeOpInterface,
memref::CollapseShapeOp> {
void populateBoundsForShapedValueDim(Operation *op, Value value, int64_t dim,
ValueBoundsConstraintSet &cstr) const {
auto collapseOp = cast<memref::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 SubViewOpInterface
: public ValueBoundsOpInterface::ExternalModel<SubViewOpInterface,
SubViewOp> {
Expand Down Expand Up @@ -134,6 +155,8 @@ void mlir::memref::registerValueBoundsOpInterfaceExternalModels(
memref::AllocOpInterface<memref::AllocaOp>>(*ctx);
memref::CastOp::attachInterface<memref::CastOpInterface>(*ctx);
memref::DimOp::attachInterface<memref::DimOpInterface>(*ctx);
memref::CollapseShapeOp::attachInterface<memref::CollapseShapeOpInterface>(
*ctx);
memref::ExpandShapeOp::attachInterface<memref::ExpandShapeOpInterface>(
*ctx);
memref::GetGlobalOp::attachInterface<memref::GetGlobalOpInterface>(*ctx);
Expand Down
18 changes: 18 additions & 0 deletions mlir/test/Dialect/MemRef/value-bounds-op-interface-impl.mlir
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,24 @@ func.func @memref_expand(%m: memref<?xf32>, %sz: index) -> (index, index) {

// -----

// CHECK: #[[$MAP:.+]] = affine_map<()[s0] -> (s0 * 2)>
// CHECK-LABEL: func @memref_collapse(
// CHECK-SAME: %[[sz0:.*]]: index
// CHECK-DAG: %[[c2:.*]] = arith.constant 2 : index
// CHECK-DAG: %[[c12:.*]] = arith.constant 12 : index
// CHECK: %[[dim:.*]] = memref.dim %{{.*}}, %[[c2]] : memref<3x4x?x2xf32>
// CHECK: %[[mul:.*]] = affine.apply #[[$MAP]]()[%[[dim]]]
// CHECK: return %[[c12]], %[[mul]]
func.func @memref_collapse(%sz0: index) -> (index, index) {
%0 = memref.alloc(%sz0) : memref<3x4x?x2xf32>
%1 = memref.collapse_shape %0 [[0, 1], [2, 3]] : memref<3x4x?x2xf32> into memref<12x?xf32>
%2 = "test.reify_bound"(%1) {dim = 0} : (memref<12x?xf32>) -> (index)
%3 = "test.reify_bound"(%1) {dim = 1} : (memref<12x?xf32>) -> (index)
return %2, %3 : index, index
}

// -----

// CHECK-LABEL: func @memref_get_global(
// CHECK: %[[c4:.*]] = arith.constant 4 : index
// CHECK: return %[[c4]]
Expand Down