From f89fbbb39561d8eeb4621bd39a26d58aa692dc84 Mon Sep 17 00:00:00 2001
From: Jonathan Peyton <jonathan.l.peyton@intel.com>
Date: Mon, 31 Aug 2015 18:15:00 +0000
Subject: [PATCH] Remove fork_context argument from __kmp_join_call() when OMPT
 is off

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

Differential Revision: http://reviews.llvm.org/D12495

llvm-svn: 246460
---
 openmp/runtime/src/kmp.h          |  5 ++++-
 openmp/runtime/src/kmp_csupport.c | 12 ++++++++++--
 openmp/runtime/src/kmp_gsupport.c |  7 +++++--
 openmp/runtime/src/kmp_runtime.c  | 11 +++++++++--
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/openmp/runtime/src/kmp.h b/openmp/runtime/src/kmp.h
index 070d492865371..c32e4bd6be36a 100644
--- a/openmp/runtime/src/kmp.h
+++ b/openmp/runtime/src/kmp.h
@@ -3102,7 +3102,10 @@ extern int __kmp_fork_call( ident_t *loc, int gtid, enum fork_context_e fork_con
 #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
diff --git a/openmp/runtime/src/kmp_csupport.c b/openmp/runtime/src/kmp_csupport.c
index e6e98130ca46a..281f47924bb0f 100644
--- a/openmp/runtime/src/kmp_csupport.c
+++ b/openmp/runtime/src/kmp_csupport.c
@@ -330,7 +330,11 @@ __kmpc_fork_call(ident_t *loc, kmp_int32 argc, kmpc_micro microtask, ...)
 #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 @@ __kmpc_fork_teams(ident_t *loc, kmp_int32 argc, kmpc_micro microtask, ...)
             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) {
diff --git a/openmp/runtime/src/kmp_gsupport.c b/openmp/runtime/src/kmp_gsupport.c
index 21bc0fbbfb68e..cff0e81873efe 100644
--- a/openmp/runtime/src/kmp_gsupport.c
+++ b/openmp/runtime/src/kmp_gsupport.c
@@ -535,8 +535,11 @@ xexpand(KMP_API_NAME_GOMP_PARALLEL_END)(void)
         }
 #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;
diff --git a/openmp/runtime/src/kmp_runtime.c b/openmp/runtime/src/kmp_runtime.c
index 64ca8f2f277aa..6790a81144ea2 100644
--- a/openmp/runtime/src/kmp_runtime.c
+++ b/openmp/runtime/src/kmp_runtime.c
@@ -2282,7 +2282,10 @@ __kmp_join_ompt(
 #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 @@ __kmp_teams_master( int gtid )
     
     // 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