[Openmp-commits] [PATCH] D41176: [OMPT] Fix ompt_task_data handling in implicit barriers

[Phabricator via Phabricator via Openmp-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rOMP322178: [OMPT] Fix ompt_task_data handling in implicit barriers (authored by jprotze, committed by ).

Changed prior to commit:
  https://reviews.llvm.org/D41176?vs=129235&id=129246#toc

Repository:
  rOMP OpenMP

https://reviews.llvm.org/D41176

Files:
  runtime/src/kmp_barrier.cpp
  runtime/src/kmp_runtime.cpp


Index: runtime/src/kmp_runtime.cpp
===================================================================
--- runtime/src/kmp_runtime.cpp
+++ runtime/src/kmp_runtime.cpp
@@ -5669,7 +5669,6 @@
         __ompt_get_task_info_object(0)->frame.exit_frame = NULL;
 
         this_thr->th.ompt_thread_info.state = omp_state_overhead;
-        this_thr->th.ompt_thread_info.task_data = *OMPT_CUR_TASK_DATA(this_thr);
       }
 #endif
       /* join barrier after parallel region */
Index: runtime/src/kmp_barrier.cpp
===================================================================
--- runtime/src/kmp_barrier.cpp
+++ runtime/src/kmp_barrier.cpp
@@ -1623,6 +1623,8 @@
           ompt_sync_region_barrier, ompt_scope_begin, my_parallel_data,
           my_task_data, codeptr);
     }
+    if (!KMP_MASTER_TID(ds_tid))
+      this_thr->th.ompt_thread_info.task_data = *OMPT_CUR_TASK_DATA(this_thr);
 #endif
     this_thr->th.ompt_thread_info.state = omp_state_wait_barrier_implicit;
   }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D41176.129246.patch
Type: text/x-patch
Size: 978 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/openmp-commits/attachments/20180110/fd45072a/attachment.bin>