[Openmp-commits] [PATCH] D17145: [OMPT] Frame information for openmp taskwait

[Joachim Protze via Openmp-commits]

protze.joachim created this revision.
protze.joachim added reviewers: Hahnfeld, jmellorcrummey.
protze.joachim added a subscriber: openmp-commits.

For pragma openmp taskwait the runtime is called from the task context. Therefore, the reentry frame information should be updated.
The information should be available for both taskwait event calls; therefore, set before the first event and reset after the last event.

http://reviews.llvm.org/D17145

Files:
  runtime/src/kmp_tasking.c

Index: runtime/src/kmp_tasking.c
===================================================================
--- runtime/src/kmp_tasking.c
+++ runtime/src/kmp_tasking.c
@@ -1357,6 +1357,7 @@
             my_task_id = taskdata->ompt_task_info.task_id;
             my_parallel_id = team->t.ompt_team_info.parallel_id;
             
+            taskdata->ompt_task_info.frame.reenter_runtime_frame = __builtin_frame_address(0);
             if (ompt_callbacks.ompt_callback(ompt_event_taskwait_begin)) {
                 ompt_callbacks.ompt_callback(ompt_event_taskwait_begin)(
                                 my_parallel_id, my_task_id);
@@ -1399,10 +1400,13 @@
         taskdata->td_taskwait_thread = - taskdata->td_taskwait_thread;
 
 #if OMPT_SUPPORT && OMPT_TRACE
-        if (ompt_enabled &&
-            ompt_callbacks.ompt_callback(ompt_event_taskwait_end)) {
-            ompt_callbacks.ompt_callback(ompt_event_taskwait_end)(
+        if (ompt_enabled)
+        {
+            if(ompt_callbacks.ompt_callback(ompt_event_taskwait_end)) {
+                ompt_callbacks.ompt_callback(ompt_event_taskwait_end)(
                                 my_parallel_id, my_task_id);
+            }
+            taskdata->ompt_task_info.frame.reenter_runtime_frame = 0;
         }
 #endif
     }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D17145.47660.patch
Type: text/x-patch
Size: 1285 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/openmp-commits/attachments/20160211/fdec82b5/attachment.bin>