[OMPT] Formatting

[sconvent]

Summary

Applying clang-format to the /runtime/src/ folder

[Hahnfeld]

Hmm, this should generally be done for each change and not for the sake of formatting: https://llvm.org/docs/CodingStandards.html#introduction

but we explicitly do not want patches that do large-scale reformatting of existing code.

[AndreyChurbanov]

Actually the patch looks acceptable to me, as it is not a "large-scale reformatting" but only 6 lines of code.

[Hahnfeld]

Honestly I don't really care, but please keep the indention in ompt_try_start_tool or move the comment so that clang-format doesn't get it wrong.

[sconvent]

Exclude formatting of ompt_try_start_tool

[hbae]

runtime/src/ompt-general.cpp

220–221

Can you also remove this indentation?

[Hahnfeld]

runtime/src/ompt-general.cpp

220–221

I explicitly requested this change to be reverted. In my opinion the comment really belongs to this level as it relates to all function calls in the #if blocks. That said we might want to put it somewhere so that clang-format doesn't get it wrong.

runtime/src/kmp_ftn_entry.h

#else
   thread = __kmp_threads[gtid];
   // return thread -> th.th_team -> t.t_current_task[
   // thread->th.th_info.ds.ds_tid ] -> icvs.nproc;
   return thread->th.th_current_task->td_icvs.nproc;
 #endif
 }
 
 #if OMP_50_ENABLED
-int FTN_STDCALL FTN_CONTROL_TOOL(int command, int modifier,
-                                 void *arg) {
+int FTN_STDCALL FTN_CONTROL_TOOL(int command, int modifier, void *arg) {
 #if defined(KMP_STUB) || !OMPT_SUPPORT
   return -2;
 #else
   OMPT_STORE_RETURN_ADDRESS(__kmp_entry_gtid());
   if (!TCR_4(__kmp_init_middle)) {
     return -2;
   }
   kmp_info_t *this_thr = __kmp_threads[__kmp_entry_gtid()];

runtime/src/kmp_gsupport.cpp

 #endif /* KMP_DEBUG */
     void
     __kmp_GOMP_parallel_microtask_wrapper(int *gtid, int *npr,
                                           void (*task)(void *), void *data,
                                           unsigned num_threads, ident_t *loc,
                                           enum sched_type schedule, long start,
                                           long end, long incr,
                                           long chunk_size) {
   // Intialize the loop worksharing construct.
 
   KMP_DISPATCH_INIT(loc, *gtid, schedule, start, end, incr, chunk_size,
                     schedule != kmp_sch_static);
 
 #if OMPT_SUPPORT
   kmp_info_t *thr;
   ompt_frame_t *ompt_frame;
   omp_state_t enclosing_state;

runtime/src/kmp_i18n.cpp

void __kmp_msg(kmp_msg_severity_t severity, kmp_msg_t message, va_list args) {
   for (;;) {
     message = va_arg(args, kmp_msg_t);
     if (message.type == kmp_mt_dummy && message.str == NULL) {
       break;
     }
     switch (message.type) {
     case kmp_mt_hint: {
       format = kmp_i18n_fmt_Hint;
-      // we cannot skip %1$ and only use %2$ to print the message without the number
+      // we cannot skip %1$ and only use %2$ to print the message without the
+      // number
       fmsg = __kmp_msg_format(format, message.str);
     } break;
     case kmp_mt_syserr: {
       format = kmp_i18n_fmt_SysErr;
       fmsg = __kmp_msg_format(format, message.num, message.str);
     } break;
     default: { KMP_DEBUG_ASSERT(0); }
     }

runtime/src/kmp_taskdeps.cpp

kmp_int32 __kmpc_omp_task_with_deps(ident_t *loc_ref, kmp_int32 gtid,
 
   kmp_info_t *thread = __kmp_threads[gtid];
   kmp_taskdata_t *current_task = thread->th.th_current_task;
 
 #if OMPT_SUPPORT
   if (ompt_enabled.enabled) {
     OMPT_STORE_RETURN_ADDRESS(gtid);
     if (!current_task->ompt_task_info.frame.enter_frame)
-      current_task->ompt_task_info.frame.enter_frame = OMPT_GET_FRAME_ADDRESS(1);
+      current_task->ompt_task_info.frame.enter_frame =
+          OMPT_GET_FRAME_ADDRESS(1);
     if (ompt_enabled.ompt_callback_task_create) {
       ompt_data_t task_data = ompt_data_none;
       ompt_callbacks.ompt_callback(ompt_callback_task_create)(
           current_task ? &(current_task->ompt_task_info.task_data) : &task_data,
           current_task ? &(current_task->ompt_task_info.frame) : NULL,
           &(new_taskdata->ompt_task_info.task_data),
           ompt_task_explicit | TASK_TYPE_DETAILS_FORMAT(new_taskdata), 1,
           OMPT_LOAD_RETURN_ADDRESS(gtid));

runtime/src/ompt-general.cpp

ompt_try_start_tool(unsigned int omp_version, const char *runtime_version) {
   ompt_start_tool_result_t *ret = NULL;
   ompt_start_tool_t start_tool = NULL;
 #if KMP_OS_WINDOWS
   // Cannot use colon to describe a list of absolute paths on Windows
   const char *sep = ";";
 #else
   const char *sep = ":";
 #endif
 
-  // Try in the current address space
 #if KMP_OS_DARWIN
+  // Try in the current address space
   ret = ompt_tool_darwin(omp_version, runtime_version);
 #elif OMPT_HAVE_WEAK_ATTRIBUTE
   ret = ompt_start_tool(omp_version, runtime_version);
 #elif OMPT_HAVE_PSAPI
   ret = ompt_tool_windows(omp_version, runtime_version);
 #else
 #error Activation of OMPT is not supported on this platform.
 #endif
return __ompt_get_task_info_internal(ancestor_level, type, task_data,
                                        task_frame, parallel_data, thread_num);
 }
 
 /*****************************************************************************
  * num_procs
  ****************************************************************************/
 
 OMPT_API_ROUTINE int ompt_get_num_procs(void) {
-// copied from kmp_ftn_entry.h (but modified: OMPT can only be called when runtime is initialized)
+  // copied from kmp_ftn_entry.h (but modified: OMPT can only be called when
+  // runtime is initialized)
   return __kmp_avail_proc;
 }
 
 /*****************************************************************************
  * places
  ****************************************************************************/
 
 OMPT_API_ROUTINE int ompt_get_num_places(void) {