This is an archive of the discontinued LLVM Phabricator instance.

Differential D128816

[OpenMP] Add loop tripcount argument to kernel launch and remove push function
ClosedPublic

Authored by jhuber6 on Jun 29 2022, 6:21 AM.

Details

Reviewers
jdoerfert
tianshilei1992
JonChesterfield
ABataev
Commits
rG5300263c70da: [OpenMP] Add loop tripcount argument to kernel launch and remove push function
Summary

Previously we added the push_target_tripcount function to send the
loop tripcount to the device runtime so we knew how to configure the
teams / threads for execute the loop for a teams distribute construct.
This was implemented as a separate function mostly to avoid changing the
interface for backwards compatbility. Now that we've changed it anyway
and the new interface can take an arbitrary number of arguments via the
struct without changing the ABI, we can move this to the new interface.
This will simplify the runtime by removing unnecessary state between
calls.

Depends on D128550

Diff Detail

Event Timeline

jhuber6 created this revision.Jun 29 2022, 6:21 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 29 2022, 6:21 AM
Herald added subscribers: mattd, asavonic, guansong, yaxunl. · View Herald Transcript
jhuber6 requested review of this revision.Jun 29 2022, 6:21 AM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptJun 29 2022, 6:21 AM
Herald added subscribers: llvm-commits, cfe-commits, sstefan1. · View Herald Transcript
jhuber6 added a child revision: D128817: [Libomptarget] Use new tripcount argument in the runtime..Jun 29 2022, 6:24 AM
Harbormaster completed remote builds in B172736: Diff 440981.Jun 29 2022, 7:54 AM
jhuber6 updated this revision to Diff 441049.Jun 29 2022, 9:27 AM

Update

Harbormaster completed remote builds in B172795: Diff 441049.Jun 29 2022, 11:10 AM
jhuber6 updated this revision to Diff 443013.Jul 7 2022, 11:51 AM

Rebasing

Harbormaster completed remote builds in B174224: Diff 443013.Jul 7 2022, 1:00 PM
jdoerfert accepted this revision.Jul 7 2022, 1:40 PM

LG, but rename the function.

clang/lib/CodeGen/CGOpenMPRuntime.h
890

Rename the function. It doesn't emit a call anymore.

This revision is now accepted and ready to land.Jul 7 2022, 1:40 PM
This revision was landed with ongoing or failed builds.Jul 8 2022, 11:45 AM
Closed by commit rG5300263c70da: [OpenMP] Add loop tripcount argument to kernel launch and remove push function (authored by jhuber6). · Explain Why
This revision was automatically updated to reflect the committed changes.
jhuber6 added a commit: rG5300263c70da: [OpenMP] Add loop tripcount argument to kernel launch and remove push function.

Large Diff

This large diff affects 116 files. Files without inline comments have been collapsed. Expand All Files

Revision Contents

PathSize
clang/
lib/
CodeGen/
10 lines
29 lines
test/
OpenMP/
90 lines
68 lines
68 lines
3364 lines
68 lines
250 lines
68 lines
672 lines
68 lines
49 lines
3364 lines
68 lines
1000 lines
68 lines
672 lines
68 lines
49 lines
130 lines
180 lines
68 lines
68 lines
190 lines
36 lines
396 lines
362 lines
112 lines
16 lines
423 lines
24 lines
692 lines
2148 lines
1480 lines
488 lines
532 lines
1000 lines
794 lines
86 lines
1034 lines
52 lines
68 lines
244 lines
86 lines
1086 lines
52 lines
210 lines
68 lines
9 lines
52 lines
49 lines
36 lines
4276 lines
244 lines
86 lines
1086 lines
52 lines
840 lines
68 lines
52 lines
49 lines
36 lines
4276 lines
52 lines
36 lines
1492 lines
86 lines
1034 lines
52 lines
68 lines
52 lines
36 lines
372 lines
532 lines
532 lines
1426 lines
328 lines
86 lines
986 lines
52 lines
68 lines
328 lines
86 lines
36 lines
1070 lines
52 lines
270 lines
68 lines
372 lines
52 lines
49 lines
36 lines
4212 lines
372 lines
86 lines
1070 lines
52 lines
1080 lines
68 lines
372 lines
52 lines
49 lines
36 lines
4212 lines
52 lines
36 lines
414 lines
86 lines
986 lines
52 lines
68 lines
52 lines
36 lines
336 lines
112 lines
llvm/
include/
llvm/
Frontend/
OpenMP/
2 lines

Diff 441049

clang/lib/CodeGen/CGOpenMPRuntime.h

Show First 20 Lines • Show All 878 Lines • ▼ Show 20 Linesprivate:
/// TaskFunction. /// TaskFunction.
/// \param Data Additional data for task generation like tiednsee, final /// \param Data Additional data for task generation like tiednsee, final
/// state, list of privates etc. /// state, list of privates etc.
TaskResultTy emitTaskInit(CodeGenFunction &CGF, SourceLocation Loc, TaskResultTy emitTaskInit(CodeGenFunction &CGF, SourceLocation Loc,
const OMPExecutableDirective &D, const OMPExecutableDirective &D,
llvm::Function *TaskFunction, QualType SharedsTy, llvm::Function *TaskFunction, QualType SharedsTy,
Address Shareds, const OMPTaskDataTy &Data); Address Shareds, const OMPTaskDataTy &Data);
/// Emit code that pushes the trip count of loops associated with constructs /// Return the trip count of loops associated with constructs / 'target teams
/// 'target teams distribute' and 'teams distribute parallel for'. /// distribute' and 'teams distribute parallel for'. \param SizeEmitter Emits
/// \param SizeEmitter Emits the int64 value for the number of iterations of /// the int64 value for the number of iterations of the associated loop.
/// the associated loop. llvm::Value *emitTargetNumIterationsCall(
jdoerfertUnsubmitted
Not Done
ReplyInline Actions

Rename the function. It doesn't emit a call anymore.

jdoerfert: Rename the function. It doesn't emit a call anymore.
void emitTargetNumIterationsCall(
CodeGenFunction &CGF, const OMPExecutableDirective &D, CodeGenFunction &CGF, const OMPExecutableDirective &D,
llvm::Value *DeviceID,
llvm::function_ref<llvm::Value *(CodeGenFunction &CGF, llvm::function_ref<llvm::Value *(CodeGenFunction &CGF,
const OMPLoopDirective &D)> const OMPLoopDirective &D)>
SizeEmitter); SizeEmitter);
/// Emit update for lastprivate conditional data. /// Emit update for lastprivate conditional data.
void emitLastprivateConditionalUpdate(CodeGenFunction &CGF, LValue IVLVal, void emitLastprivateConditionalUpdate(CodeGenFunction &CGF, LValue IVLVal,
StringRef UniqueDeclName, LValue LVal, StringRef UniqueDeclName, LValue LVal,
SourceLocation Loc); SourceLocation Loc);
▲ Show 20 Lines • Show All 1,639 Lines • Show Last 20 Lines

clang/lib/CodeGen/CGOpenMPRuntime.cpp

clang/test/OpenMP/distribute_codegen.cpp

clang/test/OpenMP/distribute_firstprivate_codegen.cpp

clang/test/OpenMP/distribute_lastprivate_codegen.cpp

clang/test/OpenMP/distribute_parallel_for_codegen.cpp

clang/test/OpenMP/distribute_parallel_for_firstprivate_codegen.cpp

clang/test/OpenMP/distribute_parallel_for_if_codegen.cpp

clang/test/OpenMP/distribute_parallel_for_lastprivate_codegen.cpp

clang/test/OpenMP/distribute_parallel_for_num_threads_codegen.cpp

clang/test/OpenMP/distribute_parallel_for_private_codegen.cpp

clang/test/OpenMP/distribute_parallel_for_proc_bind_codegen.cpp

clang/test/OpenMP/distribute_parallel_for_simd_codegen.cpp

clang/test/OpenMP/distribute_parallel_for_simd_firstprivate_codegen.cpp

clang/test/OpenMP/distribute_parallel_for_simd_if_codegen.cpp

clang/test/OpenMP/distribute_parallel_for_simd_lastprivate_codegen.cpp

clang/test/OpenMP/distribute_parallel_for_simd_num_threads_codegen.cpp

clang/test/OpenMP/distribute_parallel_for_simd_private_codegen.cpp

clang/test/OpenMP/distribute_parallel_for_simd_proc_bind_codegen.cpp

clang/test/OpenMP/distribute_private_codegen.cpp

clang/test/OpenMP/distribute_simd_codegen.cpp

clang/test/OpenMP/distribute_simd_firstprivate_codegen.cpp

clang/test/OpenMP/distribute_simd_lastprivate_codegen.cpp

clang/test/OpenMP/distribute_simd_private_codegen.cpp

clang/test/OpenMP/distribute_simd_reduction_codegen.cpp

clang/test/OpenMP/nvptx_lambda_capturing.cpp

clang/test/OpenMP/reduction_implicit_map.cpp

clang/test/OpenMP/target_codegen_global_capture.cpp

clang/test/OpenMP/target_map_codegen_03.cpp

clang/test/OpenMP/target_map_codegen_hold.cpp

clang/test/OpenMP/target_offload_mandatory_codegen.cpp

clang/test/OpenMP/target_parallel_codegen.cpp

clang/test/OpenMP/target_parallel_for_codegen.cpp

clang/test/OpenMP/target_parallel_for_simd_codegen.cpp

clang/test/OpenMP/target_parallel_if_codegen.cpp

clang/test/OpenMP/target_parallel_num_threads_codegen.cpp

clang/test/OpenMP/target_teams_codegen.cpp

clang/test/OpenMP/target_teams_distribute_codegen.cpp

clang/test/OpenMP/target_teams_distribute_collapse_codegen.cpp

clang/test/OpenMP/target_teams_distribute_dist_schedule_codegen.cpp

clang/test/OpenMP/target_teams_distribute_firstprivate_codegen.cpp

clang/test/OpenMP/target_teams_distribute_lastprivate_codegen.cpp

clang/test/OpenMP/target_teams_distribute_parallel_for_codegen.cpp

clang/test/OpenMP/target_teams_distribute_parallel_for_collapse_codegen.cpp

clang/test/OpenMP/target_teams_distribute_parallel_for_dist_schedule_codegen.cpp

clang/test/OpenMP/target_teams_distribute_parallel_for_firstprivate_codegen.cpp

clang/test/OpenMP/target_teams_distribute_parallel_for_if_codegen.cpp

clang/test/OpenMP/target_teams_distribute_parallel_for_lastprivate_codegen.cpp

clang/test/OpenMP/target_teams_distribute_parallel_for_order_codegen.cpp

clang/test/OpenMP/target_teams_distribute_parallel_for_private_codegen.cpp

clang/test/OpenMP/target_teams_distribute_parallel_for_proc_bind_codegen.cpp

clang/test/OpenMP/target_teams_distribute_parallel_for_reduction_codegen.cpp

clang/test/OpenMP/target_teams_distribute_parallel_for_schedule_codegen.cpp

clang/test/OpenMP/target_teams_distribute_parallel_for_simd_codegen.cpp

clang/test/OpenMP/target_teams_distribute_parallel_for_simd_collapse_codegen.cpp

clang/test/OpenMP/target_teams_distribute_parallel_for_simd_dist_schedule_codegen.cpp

clang/test/OpenMP/target_teams_distribute_parallel_for_simd_firstprivate_codegen.cpp

clang/test/OpenMP/target_teams_distribute_parallel_for_simd_if_codegen.cpp

clang/test/OpenMP/target_teams_distribute_parallel_for_simd_lastprivate_codegen.cpp

clang/test/OpenMP/target_teams_distribute_parallel_for_simd_private_codegen.cpp

clang/test/OpenMP/target_teams_distribute_parallel_for_simd_proc_bind_codegen.cpp

clang/test/OpenMP/target_teams_distribute_parallel_for_simd_reduction_codegen.cpp

clang/test/OpenMP/target_teams_distribute_parallel_for_simd_schedule_codegen.cpp

clang/test/OpenMP/target_teams_distribute_private_codegen.cpp

clang/test/OpenMP/target_teams_distribute_reduction_codegen.cpp

clang/test/OpenMP/target_teams_distribute_simd_codegen.cpp

clang/test/OpenMP/target_teams_distribute_simd_collapse_codegen.cpp

clang/test/OpenMP/target_teams_distribute_simd_dist_schedule_codegen.cpp

clang/test/OpenMP/target_teams_distribute_simd_firstprivate_codegen.cpp

clang/test/OpenMP/target_teams_distribute_simd_lastprivate_codegen.cpp

clang/test/OpenMP/target_teams_distribute_simd_private_codegen.cpp

clang/test/OpenMP/target_teams_distribute_simd_reduction_codegen.cpp

clang/test/OpenMP/target_teams_map_codegen.cpp

clang/test/OpenMP/target_teams_num_teams_codegen.cpp

clang/test/OpenMP/target_teams_thread_limit_codegen.cpp

clang/test/OpenMP/teams_codegen.cpp

clang/test/OpenMP/teams_distribute_codegen.cpp

clang/test/OpenMP/teams_distribute_collapse_codegen.cpp

clang/test/OpenMP/teams_distribute_dist_schedule_codegen.cpp

clang/test/OpenMP/teams_distribute_firstprivate_codegen.cpp

clang/test/OpenMP/teams_distribute_lastprivate_codegen.cpp

clang/test/OpenMP/teams_distribute_parallel_for_codegen.cpp

clang/test/OpenMP/teams_distribute_parallel_for_collapse_codegen.cpp

clang/test/OpenMP/teams_distribute_parallel_for_copyin_codegen.cpp

clang/test/OpenMP/teams_distribute_parallel_for_dist_schedule_codegen.cpp

clang/test/OpenMP/teams_distribute_parallel_for_firstprivate_codegen.cpp

clang/test/OpenMP/teams_distribute_parallel_for_if_codegen.cpp

clang/test/OpenMP/teams_distribute_parallel_for_lastprivate_codegen.cpp

clang/test/OpenMP/teams_distribute_parallel_for_num_threads_codegen.cpp

clang/test/OpenMP/teams_distribute_parallel_for_private_codegen.cpp

clang/test/OpenMP/teams_distribute_parallel_for_proc_bind_codegen.cpp

clang/test/OpenMP/teams_distribute_parallel_for_reduction_codegen.cpp

clang/test/OpenMP/teams_distribute_parallel_for_schedule_codegen.cpp

clang/test/OpenMP/teams_distribute_parallel_for_simd_codegen.cpp

clang/test/OpenMP/teams_distribute_parallel_for_simd_collapse_codegen.cpp

clang/test/OpenMP/teams_distribute_parallel_for_simd_dist_schedule_codegen.cpp

clang/test/OpenMP/teams_distribute_parallel_for_simd_firstprivate_codegen.cpp

clang/test/OpenMP/teams_distribute_parallel_for_simd_if_codegen.cpp

clang/test/OpenMP/teams_distribute_parallel_for_simd_lastprivate_codegen.cpp

clang/test/OpenMP/teams_distribute_parallel_for_simd_num_threads_codegen.cpp

clang/test/OpenMP/teams_distribute_parallel_for_simd_private_codegen.cpp

clang/test/OpenMP/teams_distribute_parallel_for_simd_proc_bind_codegen.cpp

clang/test/OpenMP/teams_distribute_parallel_for_simd_reduction_codegen.cpp

clang/test/OpenMP/teams_distribute_parallel_for_simd_schedule_codegen.cpp

clang/test/OpenMP/teams_distribute_private_codegen.cpp

clang/test/OpenMP/teams_distribute_reduction_codegen.cpp

clang/test/OpenMP/teams_distribute_simd_codegen.cpp

clang/test/OpenMP/teams_distribute_simd_collapse_codegen.cpp

clang/test/OpenMP/teams_distribute_simd_dist_schedule_codegen.cpp

clang/test/OpenMP/teams_distribute_simd_firstprivate_codegen.cpp

clang/test/OpenMP/teams_distribute_simd_lastprivate_codegen.cpp

clang/test/OpenMP/teams_distribute_simd_private_codegen.cpp

clang/test/OpenMP/teams_distribute_simd_reduction_codegen.cpp

clang/test/OpenMP/teams_firstprivate_codegen.cpp

clang/test/OpenMP/teams_private_codegen.cpp

llvm/include/llvm/Frontend/OpenMP/OMPKinds.def