Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
64 changes: 64 additions & 0 deletions mlir/lib/Dialect/Affine/IR/ValueBoundsOpInterfaceImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,66 @@ struct AffineMaxOpInterface
};
};

struct AffineDelinearizeIndexOpInterface
: public ValueBoundsOpInterface::ExternalModel<
AffineDelinearizeIndexOpInterface, AffineDelinearizeIndexOp> {
void populateBoundsForIndexValue(Operation *rawOp, Value value,
ValueBoundsConstraintSet &cstr) const {
auto op = cast<AffineDelinearizeIndexOp>(rawOp);
auto result = cast<OpResult>(value);
assert(result.getOwner() == rawOp &&
"bounded value isn't a result of this delinearize_index");
unsigned resIdx = result.getResultNumber();

AffineExpr linearIdx = cstr.getExpr(op.getLinearIndex());

SmallVector<OpFoldResult> basis = op.getPaddedBasis();
AffineExpr divisor = cstr.getExpr(1);
for (OpFoldResult basisElem :
ArrayRef<OpFoldResult>(basis).drop_front(resIdx + 1))
divisor = divisor * cstr.getExpr(basisElem);

auto resBound = cstr.bound(result);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Style of other value bounds impls just calls cstr.bound multiple times rather than creating a local instance of the builder.

(I wonder if that could be the cause for why the extra < bound in delinearize_index is failing below?)

if (resIdx == 0) {
resBound == linearIdx.floorDiv(divisor);
if (!basis.front().isNull())
resBound < cstr.getExpr(basis.front());
return;
}
AffineExpr thisBasis = cstr.getExpr(basis[resIdx]);
resBound == (linearIdx % (thisBasis * divisor)).floorDiv(divisor);
}
};

struct AffineLinearizeIndexOpInterface
: public ValueBoundsOpInterface::ExternalModel<
AffineLinearizeIndexOpInterface, AffineLinearizeIndexOp> {
void populateBoundsForIndexValue(Operation *rawOp, Value value,
ValueBoundsConstraintSet &cstr) const {
auto op = cast<AffineLinearizeIndexOp>(rawOp);
assert(value == op.getResult() &&
"value isn't the result of this linearize");

AffineExpr bound = cstr.getExpr(0);
AffineExpr stride = cstr.getExpr(1);
SmallVector<OpFoldResult> basis = op.getPaddedBasis();
OperandRange multiIndex = op.getMultiIndex();
for (auto [revArgNum, length] : llvm::enumerate(llvm::reverse(basis))) {
unsigned argNum = multiIndex.size() - (revArgNum + 1);
if (argNum == 0)
break;
OpFoldResult indexAsFoldRes = getAsOpFoldResult(multiIndex[argNum]);
bound = bound + cstr.getExpr(indexAsFoldRes) * stride;
stride = stride * cstr.getExpr(length);
}
bound = bound + cstr.getExpr(op.getMultiIndex().front()) * stride;
auto resBound = cstr.bound(value);
resBound == bound;
if (op.getDisjoint() && !basis.front().isNull()) {
resBound <= stride *cstr.getExpr(basis.front());
}
}
};
} // namespace
} // namespace mlir

Expand All @@ -100,6 +160,10 @@ void mlir::affine::registerValueBoundsOpInterfaceExternalModels(
AffineApplyOp::attachInterface<AffineApplyOpInterface>(*ctx);
AffineMaxOp::attachInterface<AffineMaxOpInterface>(*ctx);
AffineMinOp::attachInterface<AffineMinOpInterface>(*ctx);
AffineDelinearizeIndexOp::attachInterface<
AffineDelinearizeIndexOpInterface>(*ctx);
AffineLinearizeIndexOp::attachInterface<AffineLinearizeIndexOpInterface>(
*ctx);
});
}

Expand Down
38 changes: 38 additions & 0 deletions mlir/test/Dialect/Affine/value-bounds-op-interface-impl.mlir
Original file line number Diff line number Diff line change
Expand Up @@ -155,3 +155,41 @@ func.func @compare_maps(%a: index, %b: index) {
: (index, index, index, index) -> ()
return
}

// -----

// CHECK-DAG: #[[$map1:.+]] = affine_map<()[s0] -> (s0 floordiv 15)>
// CHECK-DAG: #[[$map2:.+]] = affine_map<()[s0] -> ((s0 mod 15) floordiv 5)>
// CHECK-DAG: #[[$map3:.+]] = affine_map<()[s0] -> (s0 mod 5)>
// CHECK-LABEL: func.func @delinearize_static
// CHECK-SAME: (%[[arg0:.+]]: index)
// CHECK-DAG: %[[v1:.+]] = affine.apply #[[$map1]](}[%[[arg0]]]
// CHECK-DAG: %[[v2:.+]] = affine.apply #[[$map2]](}[%[[arg0]]]
// CHECK-DAG: %[[v3:.+]] = affine.apply #[[$map3]]()[%[[arg0]]]
// CHECK: return %[[v1]], %[[v2]], %[[v3]]
func.func @delinearize_static(%arg0: index) -> (index, index, index) {
%c2 = arith.constant 2 : index
%c3 = arith.constant 3 : index
%0:3 = affine.delinearize_index %arg0 into (2, 3, 5) : index, index, index
%1 = "test.reify_bound"(%0#0) {type = "EQ"} : (index) -> (index)
%2 = "test.reify_bound"(%0#1) {type = "EQ"} : (index) -> (index)
%3 = "test.reify_bound"(%0#2) {type = "EQ"} : (index) -> (index)
// TODO: why doesn't this return true? I'm setting the bound.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it work if you comment out the other bounds of resBound, e.g., resBound == linearIdx.floorDiv(divisor);?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it return "false" or "unknown"?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just ran your code and this returns true.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... turns out there was a typo in the tests

"test.compaare"(%0#0, %c2) {cmp = "LT"} : (index, index) -> ()
// expected-remark @below{{true}}
"test.compare"(%0#1, %c3) {cmp = "LT"} : (index, index) -> ()
return %1, %2, %3 : index, index, index
}

// -----

// CHECK: #[[$map:.+]] = affine_map<()[s0, s1] -> (s0 + s1 * 3)>
// CHECK-LABEL: func.func @linearize_static
// CHECK-SAME: (%[[arg0:.+]]: index, %[[arg1:.+]]: index)
// CHECK: %[[v1:.+]] = affine.apply #[[$map]]()[%[[arg0]], %[[arg1]]]
// CHECK: return %[[v1]]
func.func @linearize_static(%arg0: index, %arg1: index) -> index {
%0 = affine.linearize_index disjoint [%arg0, %arg1] by (2, 3) : index
%1 = "test.reify_bound"(%0) {type = "EQ"} : (index) -> (index)
return %1 : index
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add tests for both without the leading basis elements? (getPaddedBasis = [null, ...])

Loading