Skip to content
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

Canonicalize air.execute returned value if its yielded value isn't defined within its body #871

Merged
merged 2 commits into from
Jan 21, 2025
Merged

Canonicalize air.execute returned value if its yielded value isn't defined within its body #871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4e03d0
Canonicalize air.execute returned value if its yielded value isn't de…
erwei-xilinx Jan 21, 2025
e34e837
Merge branch 'main' into air_exec_cano_yielded_v_defed_above
erwei-xilinx Jan 21, 2025
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
16 changes: 10 additions & 6 deletions mlir/lib/Dialect/AIR/IR/AIRDialect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1181,17 +1181,21 @@ static LogicalResult FoldExecute(ExecuteOp op, PatternRewriter &rewriter) {
return success();
}

// replace returns of constants with the constant
// replace returns of (1) constants with the constant, and (2) values not
// defined within the execute with its original value
int idx = 0;
for (auto v : et->getOperands()) {
idx++;
if (op.getResult(idx).use_empty())
continue;
auto o = v.getDefiningOp();
if (!o)
continue;
if (isa<arith::ConstantOp>(o)) {
op.getResult(idx).replaceAllUsesWith(rewriter.clone(*o)->getResult(0));
if (!op.getRegion().isAncestor(v.getParentRegion())) {
rewriter.replaceAllUsesWith(op.getResult(idx), v);
return success();
}
if (auto constOp =
dyn_cast_if_present<arith::ConstantOp>(v.getDefiningOp())) {
rewriter.replaceAllUsesWith(op.getResult(idx),
rewriter.clone(*constOp)->getResult(0));
return success();
}
}
Expand Down
25 changes: 25 additions & 0 deletions mlir/test/Dialect/AIR/air_canonicalize.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,31 @@ func.func @execute_4() -> (memref<1xi32>, !air.async.token) {
return %results, %t : memref<1xi32>, !air.async.token
}

// CHECK-LABEL: execute_5
// CHECK: scf.for {{.*}} {
// CHECK: air.execute {{.*}} {
// CHECK-NEXT: memref.store
// CHECK-NEXT: }
// CHECK: scf.yield
// CHECK-NEXT: }
func.func @execute_5(%alloc : memref<4xi32>) -> (!air.async.token) {
%c0 = arith.constant 0 : index
%c1 = arith.constant 1 : index
%c4 = arith.constant 4 : index
%cst = arith.constant 2 : i32
%t = air.wait_all async
%0 = scf.for %arg0 = %c0 to %c4 step %c1 iter_args(%arg1 = %t) -> (!air.async.token) {
%async_token_0, %results_1 = air.execute [%arg1] -> (index) {
air.execute_terminator %arg0 : index
}
%async_token_1 = air.execute [%async_token_0] {
memref.store %cst, %alloc[%results_1] : memref<4xi32>
}
scf.yield %async_token_1 : !air.async.token
}
return %0 :!air.async.token
}

// CHECK: func.func @chan_0
// CHECK: %[[TOKEN0:.*]] = air.channel.get async @channel_0
// CHECK: %[[TOKEN1:.*]] = air.channel.get async @channel_1
Expand Down
Loading