[Openmp-commits] [PATCH] D12495: Remove fork_context argument from __kmp_join_call() when OMPT is off

[Jonathan Peyton via Openmp-commits]

jlpeyton created this revision.
jlpeyton added a reviewer: jmellorcrummey.
jlpeyton added a subscriber: openmp-commits.
jlpeyton set the repository for this revision to rL LLVM.

Conditionally include the fork_context parameter to 
```
__kmp_join_call()
```
only if OMPT_SUPPORT=1

Repository:
  rL LLVM

http://reviews.llvm.org/D12495

Files:
  runtime/src/kmp.h
  runtime/src/kmp_csupport.c
  runtime/src/kmp_gsupport.c
  runtime/src/kmp_runtime.c

Index: runtime/src/kmp_runtime.c
===================================================================
--- runtime/src/kmp_runtime.c
+++ runtime/src/kmp_runtime.c
@@ -2282,7 +2282,10 @@
 #endif
 
 void
-__kmp_join_call(ident_t *loc, int gtid, enum fork_context_e fork_context
+__kmp_join_call(ident_t *loc, int gtid
+#if OMPT_SUPPORT
+               , enum fork_context_e fork_context
+#endif
 #if OMP_40_ENABLED
                , int exit_teams
 #endif /* OMP_40_ENABLED */
@@ -6984,7 +6987,11 @@
     
     // AC: last parameter "1" eliminates join barrier which won't work because
     // worker threads are in a fork barrier waiting for more parallel regions
-    __kmp_join_call( loc, gtid, fork_context_intel, 1 ); 
+    __kmp_join_call( loc, gtid
+#if OMPT_SUPPORT
+        , fork_context_intel
+#endif
+        , 1 ); 
 }
 
 int
Index: runtime/src/kmp_gsupport.c
===================================================================
--- runtime/src/kmp_gsupport.c
+++ runtime/src/kmp_gsupport.c
@@ -535,8 +535,11 @@
         }
 #endif
 
-        __kmp_join_call(&loc, gtid, fork_context_gnu);
-
+        __kmp_join_call(&loc, gtid
+#if OMPT_SUPPORT
+            , fork_context_gnu
+#endif
+        );
 #if OMPT_SUPPORT
         if (ompt_status & ompt_status_track) {
           ompt_frame->reenter_runtime_frame = NULL;
Index: runtime/src/kmp_csupport.c
===================================================================
--- runtime/src/kmp_csupport.c
+++ runtime/src/kmp_csupport.c
@@ -330,7 +330,11 @@
 #if INCLUDE_SSC_MARKS
     SSC_MARK_JOINING();
 #endif
-    __kmp_join_call( loc, gtid, fork_context_intel );
+    __kmp_join_call( loc, gtid
+#if OMPT_SUPPORT
+        , fork_context_intel
+#endif
+    );
 
     va_end( ap );
 
@@ -421,7 +425,11 @@
             ap
 #endif
             );
-    __kmp_join_call( loc, gtid, fork_context_intel );
+    __kmp_join_call( loc, gtid
+#if OMPT_SUPPORT
+        , fork_context_intel
+#endif
+    );
 
 #if OMPT_SUPPORT
     if (ompt_status & ompt_status_track) {
Index: runtime/src/kmp.h
===================================================================
--- runtime/src/kmp.h
+++ runtime/src/kmp.h
@@ -3102,7 +3102,10 @@
 #endif
                              );
 
-extern void __kmp_join_call( ident_t *loc, int gtid, enum fork_context_e fork_context
+extern void __kmp_join_call( ident_t *loc, int gtid
+#if OMPT_SUPPORT
+                           , enum fork_context_e fork_context
+#endif
 #if OMP_40_ENABLED
                            , int exit_teams = 0
 #endif


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D12495.33593.patch
Type: text/x-patch
Size: 2524 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/openmp-commits/attachments/20150831/126d5c06/attachment.bin>