Hahnfeld updated this revision to Diff 47002.
Hahnfeld added a comment.
Move callback up to execute in correct context.
This way, there will only be wrong ids reported between `__kmp_serialized_parallel` and the creation of the lightweight task.
I don't know if this can be fixed because the task is already brought to execution in `__kmp_serialized_parallel` so we would have to assign the correct id somewehere in there...
http://reviews.llvm.org/D16714
Files:
runtime/src/kmp_gsupport.c
Index: runtime/src/kmp_gsupport.c
===================================================================
--- runtime/src/kmp_gsupport.c
+++ runtime/src/kmp_gsupport.c
@@ -384,27 +384,32 @@
static void
__kmp_GOMP_serialized_parallel(ident_t *loc, kmp_int32 gtid, void (*task)(void *))
{
- __kmp_serialized_parallel(loc, gtid);
-
#if OMPT_SUPPORT
+ ompt_parallel_id_t ompt_parallel_id;
if (ompt_enabled) {
- ompt_task_id_t ompt_task_id = __ompt_get_task_id_internal(0);
- ompt_frame_t *ompt_frame = __ompt_get_task_frame_internal(0);
- kmp_info_t *thr = __kmp_threads[gtid];
-
- ompt_parallel_id_t ompt_parallel_id = __ompt_parallel_id_new(gtid);
- ompt_task_id_t my_ompt_task_id = __ompt_task_id_new(gtid);
+ ompt_task_info_t *task_info = __ompt_get_taskinfo(0);
+ task_info->frame.exit_runtime_frame = NULL;
- ompt_frame->exit_runtime_frame = NULL;
+ ompt_parallel_id = __ompt_parallel_id_new(gtid);
// parallel region callback
if (ompt_callbacks.ompt_callback(ompt_event_parallel_begin)) {
int team_size = 1;
ompt_callbacks.ompt_callback(ompt_event_parallel_begin)(
- ompt_task_id, ompt_frame, ompt_parallel_id,
+ task_info->task_id, &task_info->frame, ompt_parallel_id,
team_size, (void *) task,
OMPT_INVOKER(fork_context_gnu));
}
+ }
+#endif
+
+ __kmp_serialized_parallel(loc, gtid);
+
+#if OMPT_SUPPORT
+ if (ompt_enabled) {
+ kmp_info_t *thr = __kmp_threads[gtid];
+
+ ompt_task_id_t my_ompt_task_id = __ompt_task_id_new(gtid);
// set up lightweight task
ompt_lw_taskteam_t *lwt = (ompt_lw_taskteam_t *)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D16714.47002.patch
Type: text/x-patch
Size: 1749 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/openmp-commits/attachments/20160205/8f464e5e/attachment.bin>