Skip to content

[OpenMP][OMPIRBuilder] Collect users of a value before replacing them in target outlined function #139064

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
ergawy merged 1 commit into from
May 28, 2025
Merged

[OpenMP][OMPIRBuilder] Collect users of a value before replacing them in target outlined function #139064

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
6 changes: 5 additions & 1 deletion llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7089,8 +7089,12 @@ static Expected<Function *> createOutlinedFunction(
if (auto *Const = dyn_cast<Constant>(Input))
convertUsersOfConstantsToInstructions(Const, Func, false);

// Collect users before iterating over them to avoid invalidating the
// iteration in case a user uses Input more than once (e.g. a call
// instruction).
SetVector<User *> Users(Input->users().begin(), Input->users().end());
// Collect all the instructions
for (User *User : make_early_inc_range(Input->users()))
for (User *User : make_early_inc_range(Users))
if (auto *Instr = dyn_cast<Instruction>(User))
if (Instr->getFunction() == Func)
Instr->replaceUsesOfWith(Input, InputCopy);
Expand Down
37 changes: 37 additions & 0 deletions mlir/test/Target/LLVMIR/omp-target-call-with-repeated-parameter.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
// RUN: mlir-translate -mlir-to-llvmir %s | FileCheck %s

llvm.func @caller_() {
%c1 = llvm.mlir.constant(1 : i64) : i64
%x_host = llvm.alloca %c1 x f32 {bindc_name = "x"} : (i64) -> !llvm.ptr
%i_host = llvm.alloca %c1 x i32 {bindc_name = "i"} : (i64) -> !llvm.ptr
%x_map = omp.map.info var_ptr(%x_host : !llvm.ptr, f32) map_clauses(implicit, exit_release_or_enter_alloc) capture(ByCopy) -> !llvm.ptr {name = "x"}
%i_map = omp.map.info var_ptr(%i_host : !llvm.ptr, i32) map_clauses(implicit, exit_release_or_enter_alloc) capture(ByCopy) -> !llvm.ptr {name = "i"}
omp.target map_entries(%x_map -> %x_arg, %i_map -> %i_arg : !llvm.ptr, !llvm.ptr) {
%1 = llvm.load %i_arg : !llvm.ptr -> i32
%2 = llvm.sitofp %1 : i32 to f32
llvm.store %2, %x_arg : f32, !llvm.ptr
// The call instruction uses %x_arg more than once. Hence modifying users
// while iterating them invalidates the iteration. Which is what is tested
// by this test.
llvm.call @callee_(%x_arg, %x_arg) : (!llvm.ptr, !llvm.ptr) -> ()
omp.terminator
}
llvm.return
}

llvm.func @callee_(%arg0: !llvm.ptr, %arg1: !llvm.ptr) {
llvm.return
}


// CHECK: define internal void @__omp_offloading_{{.*}}_caller__{{.*}}(ptr %[[X_PARAM:.*]], ptr %[[I_PARAM:.*]]) {

// CHECK: %[[I_VAL:.*]] = load i32, ptr %[[I_PARAM]], align 4
// CHECK: %[[I_VAL_FL:.*]] = sitofp i32 %[[I_VAL]] to float
// CHECK: store float %[[I_VAL_FL]], ptr %[[X_PARAM]], align 4
// CHECK: call void @callee_(ptr %[[X_PARAM]], ptr %[[X_PARAM]])
// CHECK: br label %[[REGION_CONT:.*]]

// CHECK: [[REGION_CONT]]:
// CHECK: ret void
// CHECK: }