[Openmp-commits] [PATCH] Modify runtime to call correct functions for OMPT

[Jonas Hahnfeld]

================
Comment at: runtime/src/kmp.h:3071
@@ -3064,3 +3070,3 @@
 extern int __kmp_fork_call( ident_t *loc, int gtid, enum fork_context_e fork_context,
-  kmp_int32 argc, microtask_t microtask, launch_t invoker,
+  kmp_int32 argc, void *unwrapped_task, microtask_t microtask, launch_t invoker,
 /* TODO: revert workaround for Intel(R) 64 tracker #96 */
----------------
omalyshe wrote:
> It seems to be reasonable to put this additional argument under #if OMPT_SUPPORT macro as well. 
No problem, will do

================
Comment at: runtime/src/kmp_gsupport.c:343
@@ -277,3 +342,3 @@
 void
-__kmp_GOMP_fork_call(ident_t *loc, int gtid, microtask_t wrapper, int argc,...)
+__kmp_GOMP_fork_call(ident_t *loc, int gtid, void (*unwrapped_task)(void *), microtask_t wrapper, int argc,...)
 {
----------------
omalyshe wrote:
> Same here - let's put the additional argument under #if OMPT_SUPPORT
While I'm ok with this change as well, this is a bit more tricky: __kmp_GOMP_fork_call is used inside macros (line #832 for example).
I can't think of a better solution than defining a new macro that always takes the same arguments. The substitution will then depend on OMPT_SUPPORT...
I think that doesn't fulfill any purpose. Other ideas?

While at it we could also change the new __kmp_GOMP_serialized_parallel (line #389)

http://reviews.llvm.org/D8918

EMAIL PREFERENCES
  http://reviews.llvm.org/settings/panel/emailpreferences/