Remove fork_context argument from __kmp_join_call() when OMPT is off

[jlpeyton]

Summary

Conditionally include the fork_context parameter to

__kmp_join_call()

only if OMPT_SUPPORT=1

[jmellorcrummey]

The change looks OK. If it is being made to isolate changes needed only by OMPT, then fine. If it is being made because there is concern that passing an extra argument to this routine might be a performance issue, then I suggest that there are bigger fish to fry than this.

openmp/trunk/runtime/src/kmp.h

 /* TODO: revert workaround for Intel(R) 64 tracker #96 */
 #if (KMP_ARCH_ARM || KMP_ARCH_X86_64 || KMP_ARCH_AARCH64) && KMP_OS_LINUX
                              va_list *ap
 #else
                              va_list ap
 #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
                            );
 
 extern void __kmp_serialized_parallel(ident_t *id, kmp_int32 gtid);
 extern void __kmp_internal_fork( ident_t *id, int gtid, kmp_team_t *team );
 extern void __kmp_internal_join( ident_t *id, int gtid, kmp_team_t *team );

openmp/trunk/runtime/src/kmp_csupport.c

#if (KMP_ARCH_X86_64 || KMP_ARCH_ARM || KMP_ARCH_AARCH64) && KMP_OS_LINUX
             &ap
 #else
             ap
 #endif
             );
 #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 );
 
 #if OMPT_SUPPORT
     if (ompt_status & ompt_status_track) {
         parent_team->t.t_implicit_task_taskdata[tid].
             ompt_task_info.frame.reenter_runtime_frame = 0;
     }
#endif
             VOLATILE_CAST(microtask_t) __kmp_teams_master, // "wrapped" task
             VOLATILE_CAST(launch_t)    __kmp_invoke_teams_master,
 #if (KMP_ARCH_X86_64 || KMP_ARCH_ARM || KMP_ARCH_AARCH64) && KMP_OS_LINUX
             &ap
 #else
             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) {
         parent_team->t.t_implicit_task_taskdata[tid].
            ompt_task_info.frame.reenter_runtime_frame = NULL;
     }
 #endif
 

openmp/trunk/runtime/src/kmp_gsupport.c

#if OMPT_SUPPORT
         if (ompt_status & ompt_status_track) {
           // Set reenter frame in parent task, which will become current task
           // in the midst of join. This is needed before the end_parallel callback.
           ompt_frame = __ompt_get_task_frame_internal(1);
           ompt_frame->reenter_runtime_frame = __builtin_frame_address(0);
         }
 #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;
         }
 #endif
     }
     else {
         __kmpc_end_serialized_parallel(&loc, gtid);

openmp/trunk/runtime/src/kmp_runtime.c

if (ompt_callbacks.ompt_callback(ompt_event_parallel_end)) {
             parallel_id, task_info->task_id, OMPT_INVOKER(fork_context));
     }
 
     __kmp_join_restore_state(thread,team);
 }
 #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 */
 )
 {
     KMP_TIME_DEVELOPER_BLOCK(KMP_join_call);
     kmp_team_t     *team;
     kmp_team_t     *parent_team;
#endif
             VOLATILE_CAST(launch_t) __kmp_invoke_task_func,
             NULL );
 #if INCLUDE_SSC_MARKS
     SSC_MARK_JOINING();
 #endif
     
     // 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
 __kmp_invoke_teams_master( int gtid )
 {
     kmp_info_t  *this_thr = __kmp_threads[ gtid ];
     kmp_team_t  *team     = this_thr->th.th_team;
     #if KMP_DEBUG