Skip to content

[mlir][scf] scf.while uplifting: optimize op matching #88813

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 2 commits into from
Apr 16, 2024
Merged

[mlir][scf] scf.while uplifting: optimize op matching #88813

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec26dae
[mlir][scf] `scf.while` uplifting: optimize op matching
Hardcode84 Apr 15, 2024
a778bbb
fix
Hardcode84 Apr 15, 2024
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
36 changes: 14 additions & 22 deletions mlir/lib/Dialect/SCF/Transforms/UpliftWhileToFor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,38 +101,30 @@ FailureOr<scf::ForOp> mlir::scf::upliftWhileToForLoop(RewriterBase &rewriter,

Block *afterBody = loop.getAfterBody();
scf::YieldOp afterTerm = loop.getYieldOp();
auto argNumber = inductionVar.getArgNumber();
auto afterTermIndArg = afterTerm.getResults()[argNumber];
unsigned argNumber = inductionVar.getArgNumber();
Value afterTermIndArg = afterTerm.getResults()[argNumber];

auto inductionVarAfter = afterBody->getArgument(argNumber);

Value step;
Value inductionVarAfter = afterBody->getArgument(argNumber);

// Find suitable `addi` op inside `after` block, one of the args must be an
// Induction var passed from `before` block and second arg must be defined
// outside of the loop and will be considered step value.
// TODO: Add `subi` support?
for (auto &use : inductionVarAfter.getUses()) {
auto owner = dyn_cast<arith::AddIOp>(use.getOwner());
if (!owner)
continue;

auto other =
(inductionVarAfter == owner.getLhs() ? owner.getRhs() : owner.getLhs());
if (!dom.properlyDominates(other, loop))
continue;

if (afterTermIndArg != owner.getResult())
continue;
auto addOp = afterTermIndArg.getDefiningOp<arith::AddIOp>();
if (!addOp)
return rewriter.notifyMatchFailure(loop, "Didn't found suitable 'addi' op");

step = other;
break;
Value step;
if (addOp.getLhs() == inductionVarAfter) {
step = addOp.getRhs();
} else if (addOp.getRhs() == inductionVarAfter) {
step = addOp.getLhs();
}

if (!step)
return rewriter.notifyMatchFailure(loop, "Didn't found suitable 'addi' op");
if (!step || !dom.properlyDominates(step, loop))
return rewriter.notifyMatchFailure(loop, "Invalid 'addi' form");

auto lb = loop.getInits()[argNumber];
Value lb = loop.getInits()[argNumber];

assert(lb.getType().isIntOrIndex());
assert(lb.getType() == ub.getType());
Expand Down