Skip to content

Commit 82e94a5

Browse files
jprotzejprotze
committed
Update implementation of OMPT to the specification OpenMP 5.0 Preview 1 (TR4).
The code is tested to work with latest clang, GNU and Intel compiler. The implementation is optimized for low overhead when no tool is attached shifting the cost to execution with tool attached. This patch does not implement OMPT for libomptarget. Patch by Simon Convent and Joachim Protze Differential Revision: https://reviews.llvm.org/D38185 llvm-svn: 317085
1 parent b93c063 commit 82e94a5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+7244
-1829
lines changed

‎openmp/runtime/CMakeLists.txt‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -321,12 +321,11 @@ endif()
321321
# OMPT-support
322322
set(LIBOMP_OMPT_DEBUG FALSE CACHE BOOL
323323
"Trace OMPT initialization?")
324+
#after testing: turn on ompt support by default for OpenMP 5.0 and higher
324325
set(LIBOMP_OMPT_SUPPORT FALSE CACHE BOOL
325326
"OMPT-support?")
326-
set(LIBOMP_OMPT_BLAME TRUE CACHE BOOL
327-
"OMPT-blame?")
328-
set(LIBOMP_OMPT_TRACE TRUE CACHE BOOL
329-
"OMPT-trace?")
327+
set(LIBOMP_OMPT_OPTIONAL TRUE CACHE BOOL
328+
"OMPT-optional?")
330329
if(LIBOMP_OMPT_SUPPORT AND (NOT LIBOMP_HAVE_OMPT_SUPPORT))
331330
libomp_error_say("OpenMP Tools Interface requested but not available in this implementation")
332331
endif()
@@ -396,8 +395,7 @@ if(${LIBOMP_STANDALONE_BUILD})
396395
libomp_say("Use ITT notify -- ${LIBOMP_USE_ITT_NOTIFY}")
397396
libomp_say("Use OMPT-support -- ${LIBOMP_OMPT_SUPPORT}")
398397
if(${LIBOMP_OMPT_SUPPORT})
399-
libomp_say("Use OMPT-blame -- ${LIBOMP_OMPT_BLAME}")
400-
libomp_say("Use OMPT-trace -- ${LIBOMP_OMPT_TRACE}")
398+
libomp_say("Use OMPT-optional -- ${LIBOMP_OMPT_OPTIONAL}")
401399
endif()
402400
libomp_say("Use Adaptive locks -- ${LIBOMP_USE_ADAPTIVE_LOCKS}")
403401
libomp_say("Use quad precision -- ${LIBOMP_USE_QUAD_PRECISION}")

‎openmp/runtime/src/exports_so.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ VERSION {
2525
#
2626
# OMPT API
2727
#
28-
ompt_tool; # OMPT initialization interface
29-
ompt_control; # OMPT control interface
28+
ompt_start_tool; # OMPT start interface
3029

3130
# icc drops weak attribute at linking step without the following line:
3231
Annotate*; # TSAN annotation

‎openmp/runtime/src/include/50/omp.h.var‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,23 @@
182182
extern void __KAI_KMPC_CONVENTION kmp_set_warnings_on(void);
183183
extern void __KAI_KMPC_CONVENTION kmp_set_warnings_off(void);
184184

185+
/* OpenMP 5.0 Tool Control */
186+
typedef enum omp_control_tool_result_t {
187+
omp_control_tool_notool = -2,
188+
omp_control_tool_nocallback = -1,
189+
omp_control_tool_success = 0,
190+
omp_control_tool_ignored = 1
191+
} omp_control_tool_result_t;
192+
193+
typedef enum omp_control_tool_t {
194+
omp_control_tool_start = 1,
195+
omp_control_tool_pause = 2,
196+
omp_control_tool_flush = 3,
197+
omp_control_tool_end = 4
198+
} omp_control_tool_t;
199+
200+
extern int __KAI_KMPC_CONVENTION omp_control_tool(int, int, void*);
201+
185202
# undef __KAI_KMPC_CONVENTION
186203

187204
/* Warning:

‎openmp/runtime/src/include/50/omp_lib.f.var‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
integer, parameter :: kmp_affinity_mask_kind = int_ptr_kind()
3333
integer, parameter :: kmp_cancel_kind = omp_integer_kind
3434
integer, parameter :: omp_lock_hint_kind = omp_integer_kind
35+
integer, parameter :: omp_control_tool_kind = omp_integer_kind
36+
integer, parameter :: omp_control_tool_result_kind = omp_integer_kind
3537

3638
end module omp_lib_kinds
3739

@@ -518,6 +520,13 @@
518520
integer (kind=omp_lock_hint_kind) hint
519521
end subroutine omp_init_nest_lock_with_hint
520522

523+
function omp_control_tool(command, modifier)
524+
use omp_lib_kinds
525+
integer (kind=omp_integer_kind) omp_control_tool
526+
integer (kind=omp_control_tool_kind) command
527+
integer (kind=omp_control_tool_kind) modifier
528+
end function omp_control_tool
529+
521530
end interface
522531

523532
!dec$ if defined(_WIN32)
@@ -563,6 +572,7 @@
563572
!dec$ attributes alias:'OMP_GET_CANCELLATION' :: omp_get_cancellation
564573
!dec$ attributes alias:'OMP_IS_INITIAL_DEVICE' :: omp_is_initial_device
565574
!dec$ attributes alias:'OMP_GET_MAX_TASK_PRIORITY' :: omp_get_max_task_priority
575+
!dec$ attributes alias:'OMP_CONTROL_TOOL' :: omp_control_tool
566576

567577
!dec$ attributes alias:'omp_init_lock' :: omp_init_lock
568578
!dec$ attributes alias:'omp_init_lock_with_hint' :: omp_init_lock_with_hint
@@ -643,6 +653,7 @@
643653
!dec$ attributes alias:'_OMP_GET_CANCELLATION' :: omp_get_cancellation
644654
!dec$ attributes alias:'_OMP_IS_INITIAL_DEVICE' :: omp_is_initial_device
645655
!dec$ attributes alias:'_OMP_GET_MAX_TASK_PRIORTY' :: omp_get_max_task_priority
656+
!dec$ attributes alias:'_OMP_CONTROL_TOOL' :: omp_control_tool
646657

647658
!dec$ attributes alias:'_omp_init_lock' :: omp_init_lock
648659
!dec$ attributes alias:'_omp_init_lock_with_hint' :: omp_init_lock_with_hint
@@ -739,6 +750,7 @@
739750
!dec$ attributes alias:'omp_set_nest_lock_'::omp_set_nest_lock
740751
!dec$ attributes alias:'omp_unset_nest_lock_'::omp_unset_nest_lock
741752
!dec$ attributes alias:'omp_test_nest_lock_'::omp_test_nest_lock
753+
!dec$ attributes alias:'omp_control_tool_'::omp_control_tool
742754

743755
!dec$ attributes alias:'kmp_set_stacksize_'::kmp_set_stacksize
744756
!dec$ attributes alias:'kmp_set_stacksize_s_'::kmp_set_stacksize_s
@@ -818,6 +830,7 @@
818830
!dec$ attributes alias:'_omp_set_nest_lock_'::omp_set_nest_lock
819831
!dec$ attributes alias:'_omp_unset_nest_lock_'::omp_unset_nest_lock
820832
!dec$ attributes alias:'_omp_test_nest_lock_'::omp_test_nest_lock
833+
!dec$ attributes alias:'_omp_control_tool_'::omp_control_tool
821834

822835
!dec$ attributes alias:'_kmp_set_stacksize_'::kmp_set_stacksize
823836
!dec$ attributes alias:'_kmp_set_stacksize_s_'::kmp_set_stacksize_s

‎openmp/runtime/src/include/50/omp_lib.f90.var‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
integer, parameter :: kmp_affinity_mask_kind = c_intptr_t
2929
integer, parameter :: kmp_cancel_kind = omp_integer_kind
3030
integer, parameter :: omp_lock_hint_kind = omp_integer_kind
31+
integer, parameter :: omp_control_tool_kind = omp_integer_kind
32+
integer, parameter :: omp_control_tool_result_kind = omp_integer_kind
3133

3234
end module omp_lib_kinds
3335

@@ -68,6 +70,16 @@
6870
integer (kind=omp_lock_hint_kind), parameter :: kmp_lock_hint_rtm = 131072
6971
integer (kind=omp_lock_hint_kind), parameter :: kmp_lock_hint_adaptive = 262144
7072

73+
integer (kind=omp_control_tool_kind), parameter :: omp_control_tool_start = 1
74+
integer (kind=omp_control_tool_kind), parameter :: omp_control_tool_pause = 2
75+
integer (kind=omp_control_tool_kind), parameter :: omp_control_tool_flush = 3
76+
integer (kind=omp_control_tool_kind), parameter :: omp_control_tool_end = 4
77+
78+
integer (kind=omp_control_tool_result_kind), parameter :: omp_control_tool_notool = -2
79+
integer (kind=omp_control_tool_result_kind), parameter :: omp_control_tool_nocallback = -1
80+
integer (kind=omp_control_tool_result_kind), parameter :: omp_control_tool_success = 0
81+
integer (kind=omp_control_tool_result_kind), parameter :: omp_control_tool_ignored = 1
82+
7183
interface
7284

7385
! ***
@@ -519,6 +531,13 @@
519531
integer (kind=omp_lock_hint_kind), value :: hint
520532
end subroutine omp_init_nest_lock_with_hint
521533

534+
function omp_control_tool(command, modifier) bind(c)
535+
use omp_lib_kinds
536+
integer (kind=omp_integer_kind) omp_control_tool
537+
integer (kind=omp_control_tool_kind), value :: command
538+
integer (kind=omp_control_tool_kind), value :: modifier
539+
end function omp_control_tool
540+
522541
end interface
523542

524543
end module omp_lib

‎openmp/runtime/src/include/50/omp_lib.h.var‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
integer, parameter :: kmp_size_t_kind = int_ptr_kind()
3030
integer, parameter :: kmp_affinity_mask_kind = int_ptr_kind()
3131
integer, parameter :: omp_lock_hint_kind = omp_integer_kind
32+
integer, parameter :: omp_control_tool_kind = omp_integer_kind
33+
integer, parameter :: omp_control_tool_result_kind = omp_integer_kind
3234

3335
integer (kind=omp_integer_kind), parameter :: openmp_version = @LIBOMP_OMP_YEAR_MONTH@
3436
integer (kind=omp_integer_kind), parameter :: kmp_version_major = @LIBOMP_VERSION_MAJOR@
@@ -57,6 +59,16 @@
5759
integer (kind=omp_lock_hint_kind), parameter :: kmp_lock_hint_rtm = 131072
5860
integer (kind=omp_lock_hint_kind), parameter :: kmp_lock_hint_adaptive = 262144
5961

62+
integer (kind=omp_control_tool_kind), parameter :: omp_control_tool_start = 1
63+
integer (kind=omp_control_tool_kind), parameter :: omp_control_tool_pause = 2
64+
integer (kind=omp_control_tool_kind), parameter :: omp_control_tool_flush = 3
65+
integer (kind=omp_control_tool_kind), parameter :: omp_control_tool_end = 4
66+
67+
integer (kind=omp_control_tool_result_kind), parameter :: omp_control_tool_notool = -2
68+
integer (kind=omp_control_tool_result_kind), parameter :: omp_control_tool_nocallback = -1
69+
integer (kind=omp_control_tool_result_kind), parameter :: omp_control_tool_success = 0
70+
integer (kind=omp_control_tool_result_kind), parameter :: omp_control_tool_ignored = 1
71+
6072
interface
6173

6274
! ***
@@ -494,6 +506,13 @@
494506
integer (kind=omp_lock_hint_kind), value :: hint
495507
end subroutine omp_init_nest_lock_with_hint
496508

509+
function omp_control_tool(command, modifier) bind(c)
510+
import
511+
integer (kind=omp_integer_kind) omp_control_tool
512+
integer (kind=omp_control_tool_kind), value :: command
513+
integer (kind=omp_control_tool_kind), value :: modifier
514+
end function omp_control_tool
515+
497516
end interface
498517

499518
!DIR$ IF DEFINED (__INTEL_OFFLOAD)

0 commit comments

Comments
 (0)