This is an archive of the discontinued LLVM Phabricator instance.

Differential D14566

Add ompt_event_task_switch event into OMPT/OpenMP
ClosedPublic

Authored by harald.servat on Nov 11 2015, 2:57 AM.

Details

Reviewers
openmp-commits
llvm-commits
Commits
rGadee8c5a18bf: [OMPT] Add ompt_event_task_switch event into OMPT/OpenMP
rOMP252761: [OMPT] Add ompt_event_task_switch event into OMPT/OpenMP
rL252761: [OMPT] Add ompt_event_task_switch event into OMPT/OpenMP
Summary

The patch adds support for ompt_event_task_switch into LLVM/OpenMP. Note that the patch has also updated the signature of ompt_event_task_switch to ompt_task_pair_callback_t (rather than the previous ompt_task_switch_callback_t).

Diff Detail

Event Timeline

harald.servat updated this revision to Diff 39891.Nov 11 2015, 2:57 AM
harald.servat retitled this revision from to Add ompt_event_task_switch event into OMPT/OpenMP.
harald.servat updated this object.
harald.servat added reviewers: openmp-commits, llvm-commits.
jmellorcrummey added a subscriber: jmellorcrummey.Nov 11 2015, 6:24 AM

Please update your patch in differential to include full diffs with "git diff -U999999 master"

The patches in kmp_tasking.c should use ifdefs

#if OMPT_SUPPORT && OMPT_TRACE

harald.servat updated this revision to Diff 39918.Nov 11 2015, 7:00 AM

I've updated the patch according to John's request.

Hahnfeld added a subscriber: Hahnfeld.Nov 11 2015, 7:41 AM

Also should this only be part of the header for 4.1 (aka 4.5)?

harald.servat updated this revision to Diff 39929.Nov 11 2015, 8:05 AM

This patch now applies to version 3.0, 4.0 and 4.1 (aka 4.5). All these versions support #pragma omp task.

jmellorcrummey added a subscriber: jlpeyton.Nov 11 2015, 8:20 AM

Looks good to me.

This revision (1) implements the OMPT support for the task switch event, and (2) brings the interface for the event in line with the current OMPT specification.

jlpeyton added inline comments.Nov 11 2015, 9:35 AM
runtime/src/include/41/ompt.h.var
316–319

Should this be changed in 40/ompt.h.var and 30/ompt.h.var as well?

harald.servat updated this revision to Diff 39939.Nov 11 2015, 9:42 AM

Complete update for OpenMP 3.0, 4.0 and 4.1 (aka 4.5).

Closed by commit rL252761: [OMPT] Add ompt_event_task_switch event into OMPT/OpenMP (authored by jlpeyton). · Explain WhyNov 11 2015, 9:52 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
runtime/
src/
include/
30/
2 lines
40/
2 lines
41/
8 lines
24 lines
2 lines

Diff 39929

runtime/src/include/30/ompt.h.var

Show First 20 Lines • Show All 115 Lines • ▼ Show 20 Lines macro (ompt_event_release_ordered, ompt_wait_callback_t, 21) /* ordered release */ \
\ \
/*--- Optional Events (synchronous events, ompt_event_unimplemented) --- */ \ /*--- Optional Events (synchronous events, ompt_event_unimplemented) --- */ \
macro (ompt_event_implicit_task_begin, ompt_parallel_callback_t, 22) /* implicit task begin */ \ macro (ompt_event_implicit_task_begin, ompt_parallel_callback_t, 22) /* implicit task begin */ \
macro (ompt_event_implicit_task_end, ompt_parallel_callback_t, 23) /* implicit task end */ \ macro (ompt_event_implicit_task_end, ompt_parallel_callback_t, 23) /* implicit task end */ \
\ \
macro (ompt_event_initial_task_begin, ompt_parallel_callback_t, 24) /* initial task begin */ \ macro (ompt_event_initial_task_begin, ompt_parallel_callback_t, 24) /* initial task begin */ \
macro (ompt_event_initial_task_end, ompt_parallel_callback_t, 25) /* initial task end */ \ macro (ompt_event_initial_task_end, ompt_parallel_callback_t, 25) /* initial task end */ \
\ \
macro (ompt_event_task_switch, ompt_task_switch_callback_t, 26) /* task switch */ \ macro (ompt_event_task_switch, ompt_task_pair_callback_t, 26) /* task switch */ \
\ \
macro (ompt_event_loop_begin, ompt_new_workshare_callback_t, 27) /* task at loop begin */ \ macro (ompt_event_loop_begin, ompt_new_workshare_callback_t, 27) /* task at loop begin */ \
macro (ompt_event_loop_end, ompt_parallel_callback_t, 28) /* task at loop end */ \ macro (ompt_event_loop_end, ompt_parallel_callback_t, 28) /* task at loop end */ \
\ \
macro (ompt_event_sections_begin, ompt_new_workshare_callback_t, 29) /* task at sections begin */\ macro (ompt_event_sections_begin, ompt_new_workshare_callback_t, 29) /* task at sections begin */\
macro (ompt_event_sections_end, ompt_parallel_callback_t, 30) /* task at sections end */ \ macro (ompt_event_sections_end, ompt_parallel_callback_t, 30) /* task at sections end */ \
\ \
macro (ompt_event_single_in_block_begin, ompt_new_workshare_callback_t, 31) /* task at single begin*/ \ macro (ompt_event_single_in_block_begin, ompt_new_workshare_callback_t, 31) /* task at single begin*/ \
▲ Show 20 Lines • Show All 355 Lines • Show Last 20 Lines

runtime/src/include/40/ompt.h.var

Show First 20 Lines • Show All 115 Lines • ▼ Show 20 Lines macro (ompt_event_release_ordered, ompt_wait_callback_t, 21) /* ordered release */ \
\ \
/*--- Optional Events (synchronous events, ompt_event_unimplemented) --- */ \ /*--- Optional Events (synchronous events, ompt_event_unimplemented) --- */ \
macro (ompt_event_implicit_task_begin, ompt_parallel_callback_t, 22) /* implicit task begin */ \ macro (ompt_event_implicit_task_begin, ompt_parallel_callback_t, 22) /* implicit task begin */ \
macro (ompt_event_implicit_task_end, ompt_parallel_callback_t, 23) /* implicit task end */ \ macro (ompt_event_implicit_task_end, ompt_parallel_callback_t, 23) /* implicit task end */ \
\ \
macro (ompt_event_initial_task_begin, ompt_parallel_callback_t, 24) /* initial task begin */ \ macro (ompt_event_initial_task_begin, ompt_parallel_callback_t, 24) /* initial task begin */ \
macro (ompt_event_initial_task_end, ompt_parallel_callback_t, 25) /* initial task end */ \ macro (ompt_event_initial_task_end, ompt_parallel_callback_t, 25) /* initial task end */ \
\ \
macro (ompt_event_task_switch, ompt_task_switch_callback_t, 26) /* task switch */ \ macro (ompt_event_task_switch, ompt_task_pair_callback_t, 26) /* task switch */ \
\ \
macro (ompt_event_loop_begin, ompt_new_workshare_callback_t, 27) /* task at loop begin */ \ macro (ompt_event_loop_begin, ompt_new_workshare_callback_t, 27) /* task at loop begin */ \
macro (ompt_event_loop_end, ompt_parallel_callback_t, 28) /* task at loop end */ \ macro (ompt_event_loop_end, ompt_parallel_callback_t, 28) /* task at loop end */ \
\ \
macro (ompt_event_sections_begin, ompt_new_workshare_callback_t, 29) /* task at sections begin */\ macro (ompt_event_sections_begin, ompt_new_workshare_callback_t, 29) /* task at sections begin */\
macro (ompt_event_sections_end, ompt_parallel_callback_t, 30) /* task at sections end */ \ macro (ompt_event_sections_end, ompt_parallel_callback_t, 30) /* task at sections end */ \
\ \
macro (ompt_event_single_in_block_begin, ompt_new_workshare_callback_t, 31) /* task at single begin*/ \ macro (ompt_event_single_in_block_begin, ompt_new_workshare_callback_t, 31) /* task at single begin*/ \
▲ Show 20 Lines • Show All 355 Lines • Show Last 20 Lines

runtime/src/include/41/ompt.h.var

Show First 20 Lines • Show All 115 Lines • ▼ Show 20 Lines macro (ompt_event_release_ordered, ompt_wait_callback_t, 21) /* ordered release */ \
\ \
/*--- Optional Events (synchronous events, ompt_event_unimplemented) --- */ \ /*--- Optional Events (synchronous events, ompt_event_unimplemented) --- */ \
macro (ompt_event_implicit_task_begin, ompt_parallel_callback_t, 22) /* implicit task begin */ \ macro (ompt_event_implicit_task_begin, ompt_parallel_callback_t, 22) /* implicit task begin */ \
macro (ompt_event_implicit_task_end, ompt_parallel_callback_t, 23) /* implicit task end */ \ macro (ompt_event_implicit_task_end, ompt_parallel_callback_t, 23) /* implicit task end */ \
\ \
macro (ompt_event_initial_task_begin, ompt_parallel_callback_t, 24) /* initial task begin */ \ macro (ompt_event_initial_task_begin, ompt_parallel_callback_t, 24) /* initial task begin */ \
macro (ompt_event_initial_task_end, ompt_parallel_callback_t, 25) /* initial task end */ \ macro (ompt_event_initial_task_end, ompt_parallel_callback_t, 25) /* initial task end */ \
\ \
macro (ompt_event_task_switch, ompt_task_switch_callback_t, 26) /* task switch */ \ macro (ompt_event_task_switch, ompt_task_pair_callback_t, 26) /* task switch */ \
\ \
macro (ompt_event_loop_begin, ompt_new_workshare_callback_t, 27) /* task at loop begin */ \ macro (ompt_event_loop_begin, ompt_new_workshare_callback_t, 27) /* task at loop begin */ \
macro (ompt_event_loop_end, ompt_parallel_callback_t, 28) /* task at loop end */ \ macro (ompt_event_loop_end, ompt_parallel_callback_t, 28) /* task at loop end */ \
\ \
macro (ompt_event_sections_begin, ompt_new_workshare_callback_t, 29) /* task at sections begin */\ macro (ompt_event_sections_begin, ompt_new_workshare_callback_t, 29) /* task at sections begin */\
macro (ompt_event_sections_end, ompt_parallel_callback_t, 30) /* task at sections end */ \ macro (ompt_event_sections_end, ompt_parallel_callback_t, 30) /* task at sections end */ \
\ \
macro (ompt_event_single_in_block_begin, ompt_new_workshare_callback_t, 31) /* task at single begin*/ \ macro (ompt_event_single_in_block_begin, ompt_new_workshare_callback_t, 31) /* task at single begin*/ \
▲ Show 20 Lines • Show All 175 Lines • ▼ Show 20 Linestypedef void (*ompt_end_parallel_callback_t) (
ompt_invoker_t invoker /* who invokes master task? */ ompt_invoker_t invoker /* who invokes master task? */
); );
/* tasks */ /* tasks */
typedef void (*ompt_task_callback_t) ( typedef void (*ompt_task_callback_t) (
ompt_task_id_t task_id /* id of task */ ompt_task_id_t task_id /* id of task */
); );
typedef void (*ompt_task_switch_callback_t) ( typedef void (*ompt_task_pair_callback_t) (
ompt_task_id_t suspended_task_id, /* tool data for suspended task */ ompt_task_id_t first_task_id,
ompt_task_id_t resumed_task_id /* tool data for resumed task */ ompt_task_id_t second_task_id
); );
jlpeytonUnsubmitted
Not Done
ReplyInline Actions

Should this be changed in 40/ompt.h.var and 30/ompt.h.var as well?

jlpeyton: Should this be changed in 40/ompt.h.var and 30/ompt.h.var as well?
typedef void (*ompt_new_task_callback_t) ( typedef void (*ompt_new_task_callback_t) (
ompt_task_id_t parent_task_id, /* id of parent task */ ompt_task_id_t parent_task_id, /* id of parent task */
ompt_frame_t *parent_task_frame, /* frame data for parent task */ ompt_frame_t *parent_task_frame, /* frame data for parent task */
ompt_task_id_t new_task_id, /* id of created task */ ompt_task_id_t new_task_id, /* id of created task */
void *task_function /* pointer to outlined function */ void *task_function /* pointer to outlined function */
); );
▲ Show 20 Lines • Show All 160 Lines • Show Last 20 Lines

runtime/src/kmp_tasking.c

Show First 20 Lines • Show All 1,141 Lines • ▼ Show 20 Lines#if OMP_40_ENABLED
// //
// Invoke the task routine and pass in relevant data. // Invoke the task routine and pass in relevant data.
// Thunks generated by gcc take a different argument list. // Thunks generated by gcc take a different argument list.
// //
if (!discard) { if (!discard) {
KMP_COUNT_BLOCK(TASK_executed); KMP_COUNT_BLOCK(TASK_executed);
KMP_TIME_BLOCK (TASK_execution); KMP_TIME_BLOCK (TASK_execution);
#endif // OMP_40_ENABLED #endif // OMP_40_ENABLED
#if OMPT_SUPPORT && OMPT_TRACE
/* let OMPT know that we're about to run this task */
if (ompt_enabled &&
ompt_callbacks.ompt_callback(ompt_event_task_switch))
{
ompt_callbacks.ompt_callback(ompt_event_task_switch)(
current_task->ompt_task_info.task_id,
taskdata->ompt_task_info.task_id);
}
#endif
#ifdef KMP_GOMP_COMPAT #ifdef KMP_GOMP_COMPAT
if (taskdata->td_flags.native) { if (taskdata->td_flags.native) {
((void (*)(void *))(*(task->routine)))(task->shareds); ((void (*)(void *))(*(task->routine)))(task->shareds);
} }
else else
#endif /* KMP_GOMP_COMPAT */ #endif /* KMP_GOMP_COMPAT */
{ {
(*(task->routine))(gtid, task); (*(task->routine))(gtid, task);
} }
#if OMPT_SUPPORT && OMPT_TRACE
/* let OMPT know that we're returning to the callee task */
if (ompt_enabled &&
ompt_callbacks.ompt_callback(ompt_event_task_switch))
{
ompt_callbacks.ompt_callback(ompt_event_task_switch)(
taskdata->ompt_task_info.task_id,
current_task->ompt_task_info.task_id);
}
#endif
#if OMP_40_ENABLED #if OMP_40_ENABLED
} }
#endif // OMP_40_ENABLED #endif // OMP_40_ENABLED
#if OMPT_SUPPORT #if OMPT_SUPPORT
if (ompt_enabled) { if (ompt_enabled) {
thread->th.ompt_thread_info = oldInfo; thread->th.ompt_thread_info = oldInfo;
▲ Show 20 Lines • Show All 1,672 Lines • Show Last 20 Lines

runtime/src/ompt-event-specific.h

Show First 20 Lines • Show All 85 Lines • ▼ Show 20 Lines
+--------------------------------------------------------------------------*/ +--------------------------------------------------------------------------*/
#define ompt_event_implicit_task_begin_implemented ompt_event_MAY_ALWAYS_TRACE #define ompt_event_implicit_task_begin_implemented ompt_event_MAY_ALWAYS_TRACE
#define ompt_event_implicit_task_end_implemented ompt_event_MAY_ALWAYS_TRACE #define ompt_event_implicit_task_end_implemented ompt_event_MAY_ALWAYS_TRACE
#define ompt_event_initial_task_begin_implemented ompt_event_UNIMPLEMENTED #define ompt_event_initial_task_begin_implemented ompt_event_UNIMPLEMENTED
#define ompt_event_initial_task_end_implemented ompt_event_UNIMPLEMENTED #define ompt_event_initial_task_end_implemented ompt_event_UNIMPLEMENTED
#define ompt_event_task_switch_implemented ompt_event_UNIMPLEMENTED #define ompt_event_task_switch_implemented ompt_event_MAY_ALWAYS_TRACE
#define ompt_event_loop_begin_implemented ompt_event_MAY_ALWAYS_TRACE #define ompt_event_loop_begin_implemented ompt_event_MAY_ALWAYS_TRACE
#define ompt_event_loop_end_implemented ompt_event_MAY_ALWAYS_TRACE #define ompt_event_loop_end_implemented ompt_event_MAY_ALWAYS_TRACE
#define ompt_event_sections_begin_implemented ompt_event_UNIMPLEMENTED #define ompt_event_sections_begin_implemented ompt_event_UNIMPLEMENTED
#define ompt_event_sections_end_implemented ompt_event_UNIMPLEMENTED #define ompt_event_sections_end_implemented ompt_event_UNIMPLEMENTED
#define ompt_event_single_in_block_begin_implemented ompt_event_MAY_ALWAYS_TRACE #define ompt_event_single_in_block_begin_implemented ompt_event_MAY_ALWAYS_TRACE
▲ Show 20 Lines • Show All 42 Lines • Show Last 20 Lines