diff options
author | Jonas Hahnfeld <Hahnfeld@itc.rwth-aachen.de> | 2016-01-28 10:39:52 +0000 |
---|---|---|
committer | Jonas Hahnfeld <Hahnfeld@itc.rwth-aachen.de> | 2016-01-28 10:39:52 +0000 |
commit | 39b686248264e7700c48d54a6e01c02563befa68 (patch) | |
tree | d5223f58665a1bffb646a1728a148831d83830b9 /openmp/runtime/src/ompt-internal.h | |
parent | dbf627dbd49bf58c94b45f5f98605b2a951f5fef (diff) | |
download | bcm5719-llvm-39b686248264e7700c48d54a6e01c02563befa68.tar.gz bcm5719-llvm-39b686248264e7700c48d54a6e01c02563befa68.zip |
[OMPT] Add support for ompt_event_task_dependences and ompt_event_task_dependence_pair
The attached patch adds support for ompt_event_task_dependences and
ompt_event_task_dependence_pair events from the OMPT specification [1]. These
events only apply to OpenMP 4.0 and 4.1 (aka 4.5) because task dependencies
were introduced in 4.0.
With respect to the changes:
ompt_event_task_dependences
According to the specification, this event is raised after the task has been
created, thefore this event needs to be raised after ompt_event_task_begin
(in __kmp_task_start). However, the dependencies are known at
__kmpc_omp_task_with_deps which occurs before __kmp_task_start. My modifications
extend the ompt_task_info_t struct in order to store the dependencies of the
task when _kmpc_omp_task_with_deps occurs and then they are emitted in
__kmp_task_start just after raising the ompt_event_task_begin. The deps field
is allocated and valid until the event is raised and it is freed and set
to null afterwards.
ompt_event_task_dependence_pair
The processing of the dependences (i.e. checking whenever a dependence is
already satisfied) is done within __kmp_process_deps. That function checks
every dependence and calls the __kmp_track_dependence routine which gives some
support for graphical output. I used that routine to emit the dependence pair
but I also needed to know the sink_task. Despite the fact that the code within
KMP_SUPPORT_GRAPH_OUTPUT refers to task_sink it may be null because
sink->dn.task (there's a comment regarding this) and in fact it does not point
to a proper pointer value because the value is set in node->dn.task = task;
after the __kmp_process_deps calls in __kmp_check_deps. I have extended the
__kmp_process_deps and __kmp_track_dependence parameter list to receive the
sink_task.
[1] https://github.com/OpenMPToolsInterface/OMPT-Technical-Report/blob/target/ompt-tr.pdf
Patch by Harald Servat
Differential Revision: http://reviews.llvm.org/D14746
llvm-svn: 259038
Diffstat (limited to 'openmp/runtime/src/ompt-internal.h')
-rw-r--r-- | openmp/runtime/src/ompt-internal.h | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/openmp/runtime/src/ompt-internal.h b/openmp/runtime/src/ompt-internal.h index 64e8d2e8fd6..42da9d86793 100644 --- a/openmp/runtime/src/ompt-internal.h +++ b/openmp/runtime/src/ompt-internal.h @@ -26,9 +26,13 @@ typedef struct ompt_callbacks_s { typedef struct { - ompt_frame_t frame; - void* function; - ompt_task_id_t task_id; + ompt_frame_t frame; + void* function; + ompt_task_id_t task_id; +#if OMP_40_ENABLED + int ndeps; + ompt_task_dependence_t *deps; +#endif /* OMP_40_ENABLED */ } ompt_task_info_t; @@ -62,6 +66,16 @@ typedef struct { extern ompt_callbacks_t ompt_callbacks; +#if OMP_40_ENABLED && OMPT_SUPPORT && OMPT_TRACE +#if USE_FAST_MEMORY +# define KMP_OMPT_DEPS_ALLOC __kmp_fast_allocate +# define KMP_OMPT_DEPS_FREE __kmp_fast_free +# else +# define KMP_OMPT_DEPS_ALLOC __kmp_thread_malloc +# define KMP_OMPT_DEPS_FREE __kmp_thread_free +# endif +#endif /* OMP_40_ENABLED && OMPT_SUPPORT && OMPT_TRACE */ + #ifdef __cplusplus extern "C" { #endif |