Skip to content

[mlir] [DataFlow] Fix bug in int-range-analysis #126708

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

Merged
merged 1 commit into from
Feb 12, 2025
Merged

[mlir] [DataFlow] Fix bug in int-range-analysis #126708

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
11 changes: 6 additions & 5 deletions mlir/lib/Analysis/DataFlow/IntegerRangeAnalysis.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,15 +152,15 @@ void IntegerRangeAnalysis::visitNonControlFlowArguments(
/// on a LoopLikeInterface return the lower/upper bound for that result if
/// possible.
auto getLoopBoundFromFold = [&](std::optional<OpFoldResult> loopBound,
Type boundType, bool getUpper) {
Type boundType, Block *block, bool getUpper) {
unsigned int width = ConstantIntRanges::getStorageBitwidth(boundType);
if (loopBound.has_value()) {
if (auto attr = dyn_cast<Attribute>(*loopBound)) {
if (auto bound = dyn_cast_or_null<IntegerAttr>(attr))
return bound.getValue();
} else if (auto value = llvm::dyn_cast_if_present<Value>(*loopBound)) {
const IntegerValueRangeLattice *lattice =
getLatticeElementFor(getProgramPointAfter(op), value);
getLatticeElementFor(getProgramPointBefore(block), value);
if (lattice != nullptr && !lattice->getValue().isUninitialized())
return getUpper ? lattice->getValue().getValue().smax()
: lattice->getValue().getValue().smin();
Expand All @@ -180,16 +180,17 @@ void IntegerRangeAnalysis::visitNonControlFlowArguments(
return SparseForwardDataFlowAnalysis ::visitNonControlFlowArguments(
op, successor, argLattices, firstIndex);
}
Block *block = iv->getParentBlock();
std::optional<OpFoldResult> lowerBound = loop.getSingleLowerBound();
std::optional<OpFoldResult> upperBound = loop.getSingleUpperBound();
std::optional<OpFoldResult> step = loop.getSingleStep();
APInt min = getLoopBoundFromFold(lowerBound, iv->getType(),
APInt min = getLoopBoundFromFold(lowerBound, iv->getType(), block,
/*getUpper=*/false);
APInt max = getLoopBoundFromFold(upperBound, iv->getType(),
APInt max = getLoopBoundFromFold(upperBound, iv->getType(), block,
/*getUpper=*/true);
// Assume positivity for uniscoverable steps by way of getUpper = true.
APInt stepVal =
getLoopBoundFromFold(step, iv->getType(), /*getUpper=*/true);
getLoopBoundFromFold(step, iv->getType(), block, /*getUpper=*/true);

if (stepVal.isNegative()) {
std::swap(min, max);
Expand Down
30 changes: 30 additions & 0 deletions mlir/test/Interfaces/InferIntRangeInterface/infer-int-range-test-ops.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,3 +154,33 @@ func.func @dont_propagate_across_infinite_loop() -> index {
return %2 : index
}

// CHECK-LABEL: @propagate_from_block_to_iterarg
func.func @propagate_from_block_to_iterarg(%arg0: index, %arg1: i1) {
%c0 = arith.constant 0 : index
%c1 = arith.constant 1 : index
%0 = scf.if %arg1 -> (index) {
%1 = scf.if %arg1 -> (index) {
scf.yield %arg0 : index
} else {
scf.yield %arg0 : index
}
scf.yield %1 : index
} else {
scf.yield %c1 : index
}
scf.for %arg2 = %c0 to %arg0 step %c1 {
scf.if %arg1 {
%1 = arith.subi %0, %c1 : index
%2 = arith.muli %0, %1 : index
%3 = arith.addi %2, %c1 : index
scf.for %arg3 = %c0 to %3 step %c1 {
%4 = arith.cmpi uge, %arg3, %c1 : index
// CHECK-NOT: scf.if %false
scf.if %4 {
"test.foo"() : () -> ()
}
}
}
}
return
}