[Openmp-commits] [openmp] 309b00a - [OpenMP][NFC] clang-format the whole openmp project

Shilei Tian via Openmp-commits openmp-commits at lists.llvm.org
Sat Feb 20 09:46:40 PST 2021


Author: Shilei Tian
Date: 2021-02-20T12:46:32-05:00
New Revision: 309b00a42e902e816dad03c2c2f1a9e41ba130bc

URL: https://github.com/llvm/llvm-project/commit/309b00a42e902e816dad03c2c2f1a9e41ba130bc
DIFF: https://github.com/llvm/llvm-project/commit/309b00a42e902e816dad03c2c2f1a9e41ba130bc.diff

LOG: [OpenMP][NFC] clang-format the whole openmp project

Same script as D95318. Test files are excluded.

Reviewed By: AndreyChurbanov

Differential Revision: https://reviews.llvm.org/D97088

Added: 
    

Modified: 
    openmp/libomptarget/deviceRTLs/amdgcn/src/amdgcn_locks.hip
    openmp/libomptarget/deviceRTLs/common/omptarget.h
    openmp/libomptarget/deviceRTLs/common/omptargeti.h
    openmp/libomptarget/deviceRTLs/common/src/cancel.cu
    openmp/libomptarget/deviceRTLs/common/src/critical.cu
    openmp/libomptarget/deviceRTLs/common/src/data_sharing.cu
    openmp/libomptarget/deviceRTLs/common/src/loop.cu
    openmp/libomptarget/deviceRTLs/common/src/omptarget.cu
    openmp/libomptarget/deviceRTLs/common/src/parallel.cu
    openmp/libomptarget/deviceRTLs/common/src/reduction.cu
    openmp/libomptarget/deviceRTLs/common/src/support.cu
    openmp/libomptarget/deviceRTLs/common/src/task.cu
    openmp/libomptarget/deviceRTLs/common/state-queuei.h
    openmp/libomptarget/deviceRTLs/common/support.h
    openmp/libomptarget/deviceRTLs/interface.h
    openmp/libomptarget/deviceRTLs/nvptx/src/target_impl.cu
    openmp/libomptarget/deviceRTLs/nvptx/src/target_impl.h
    openmp/runtime/doc/doxygen/libomp_interface.h
    openmp/runtime/src/kmp.h
    openmp/runtime/src/kmp_affinity.cpp
    openmp/runtime/src/kmp_affinity.h
    openmp/runtime/src/kmp_alloc.cpp
    openmp/runtime/src/kmp_atomic.cpp
    openmp/runtime/src/kmp_atomic.h
    openmp/runtime/src/kmp_barrier.cpp
    openmp/runtime/src/kmp_csupport.cpp
    openmp/runtime/src/kmp_dispatch.cpp
    openmp/runtime/src/kmp_environment.cpp
    openmp/runtime/src/kmp_error.cpp
    openmp/runtime/src/kmp_ftn_entry.h
    openmp/runtime/src/kmp_gsupport.cpp
    openmp/runtime/src/kmp_i18n.cpp
    openmp/runtime/src/kmp_io.cpp
    openmp/runtime/src/kmp_itt.cpp
    openmp/runtime/src/kmp_itt.h
    openmp/runtime/src/kmp_lock.cpp
    openmp/runtime/src/kmp_lock.h
    openmp/runtime/src/kmp_os.h
    openmp/runtime/src/kmp_platform.h
    openmp/runtime/src/kmp_runtime.cpp
    openmp/runtime/src/kmp_sched.cpp
    openmp/runtime/src/kmp_settings.cpp
    openmp/runtime/src/kmp_stats.cpp
    openmp/runtime/src/kmp_stats.h
    openmp/runtime/src/kmp_str.cpp
    openmp/runtime/src/kmp_taskdeps.cpp
    openmp/runtime/src/kmp_taskdeps.h
    openmp/runtime/src/kmp_tasking.cpp
    openmp/runtime/src/kmp_threadprivate.cpp
    openmp/runtime/src/kmp_utility.cpp
    openmp/runtime/src/kmp_version.cpp
    openmp/runtime/src/kmp_wait_release.h
    openmp/runtime/src/ompt-event-specific.h
    openmp/runtime/src/ompt-general.cpp
    openmp/runtime/src/ompt-specific.h
    openmp/runtime/src/test-touch.c
    openmp/runtime/src/thirdparty/ittnotify/disable_warnings.h
    openmp/runtime/src/thirdparty/ittnotify/ittnotify.h
    openmp/runtime/src/thirdparty/ittnotify/ittnotify_config.h
    openmp/runtime/src/thirdparty/ittnotify/ittnotify_static.cpp
    openmp/runtime/src/thirdparty/ittnotify/ittnotify_static.h
    openmp/runtime/src/thirdparty/ittnotify/ittnotify_types.h
    openmp/runtime/src/thirdparty/ittnotify/legacy/ittnotify.h
    openmp/runtime/src/z_Linux_util.cpp
    openmp/tools/archer/ompt-tsan.cpp
    openmp/tools/multiplex/ompt-multiplex.h

Removed: 
    


################################################################################
diff  --git a/openmp/libomptarget/deviceRTLs/amdgcn/src/amdgcn_locks.hip b/openmp/libomptarget/deviceRTLs/amdgcn/src/amdgcn_locks.hip
index 77746fa65bc4..abcc67e03f54 100644
--- a/openmp/libomptarget/deviceRTLs/amdgcn/src/amdgcn_locks.hip
+++ b/openmp/libomptarget/deviceRTLs/amdgcn/src/amdgcn_locks.hip
@@ -26,6 +26,9 @@ DEVICE void __kmpc_impl_init_lock(omp_lock_t *) { warn(); }
 DEVICE void __kmpc_impl_destroy_lock(omp_lock_t *) { warn(); }
 DEVICE void __kmpc_impl_set_lock(omp_lock_t *) { warn(); }
 DEVICE void __kmpc_impl_unset_lock(omp_lock_t *) { warn(); }
-DEVICE int __kmpc_impl_test_lock(omp_lock_t *lock) { warn(); return 0;}
+DEVICE int __kmpc_impl_test_lock(omp_lock_t *lock) {
+  warn();
+  return 0;
+}
 
 #pragma omp end declare target

diff  --git a/openmp/libomptarget/deviceRTLs/common/omptarget.h b/openmp/libomptarget/deviceRTLs/common/omptarget.h
index e179ca5271fa..dde56524b4f0 100644
--- a/openmp/libomptarget/deviceRTLs/common/omptarget.h
+++ b/openmp/libomptarget/deviceRTLs/common/omptarget.h
@@ -40,7 +40,7 @@ class omptarget_nvptx_SharedArgs {
 public:
   // All these methods must be called by the master thread only.
   INLINE void Init() {
-    args  = buffer;
+    args = buffer;
     nArgs = MAX_SHARED_ARGS;
   }
   INLINE void DeInit() {
@@ -62,6 +62,7 @@ class omptarget_nvptx_SharedArgs {
   }
   // Called by all threads.
   INLINE void **GetArgs() const { return args; };
+
 private:
   // buffer of pre-allocated arguments.
   void *buffer[MAX_SHARED_ARGS];
@@ -91,7 +92,7 @@ struct __kmpc_data_sharing_slot {
 struct DataSharingStateTy {
   __kmpc_data_sharing_slot *SlotPtr[DS_Max_Warp_Number];
   void *StackPtr[DS_Max_Warp_Number];
-  void * volatile FramePtr[DS_Max_Warp_Number];
+  void *volatile FramePtr[DS_Max_Warp_Number];
   __kmpc_impl_lanemask_t ActiveThreads[DS_Max_Warp_Number];
 };
 

diff  --git a/openmp/libomptarget/deviceRTLs/common/omptargeti.h b/openmp/libomptarget/deviceRTLs/common/omptargeti.h
index 108724e0bd88..888b66b541ee 100644
--- a/openmp/libomptarget/deviceRTLs/common/omptargeti.h
+++ b/openmp/libomptarget/deviceRTLs/common/omptargeti.h
@@ -30,8 +30,7 @@ INLINE void omptarget_nvptx_TaskDescr::SetRuntimeSched(omp_sched_t sched) {
   items.flags |= val;
 }
 
-INLINE void
-omptarget_nvptx_TaskDescr::InitLevelZeroTaskDescr() {
+INLINE void omptarget_nvptx_TaskDescr::InitLevelZeroTaskDescr() {
   // slow method
   // flag:
   //   default sched is static,
@@ -53,10 +52,9 @@ INLINE void omptarget_nvptx_TaskDescr::InitLevelOneTaskDescr(
   //   dyn is off (unused now anyway, but may need to sample from host ?)
   //   in L1 parallel
 
-  items.flags =
-      TaskDescr_InPar | TaskDescr_IsParConstr; // set flag to parallel
+  items.flags = TaskDescr_InPar | TaskDescr_IsParConstr; // set flag to parallel
   items.threadId =
-      GetThreadIdInBlock(); // get ids from cuda (only called for 1st level)
+      GetThreadIdInBlock();   // get ids from cuda (only called for 1st level)
   items.runtimeChunkSize = 1; // preferred chunking statik with chunk 1
   prev = parentTaskDescr;
 }

diff  --git a/openmp/libomptarget/deviceRTLs/common/src/cancel.cu b/openmp/libomptarget/deviceRTLs/common/src/cancel.cu
index 0e5cd2b60554..e4df954029dc 100644
--- a/openmp/libomptarget/deviceRTLs/common/src/cancel.cu
+++ b/openmp/libomptarget/deviceRTLs/common/src/cancel.cu
@@ -11,8 +11,8 @@
 //===----------------------------------------------------------------------===//
 #pragma omp declare target
 
-#include "interface.h"
 #include "common/debug.h"
+#include "interface.h"
 
 EXTERN int32_t __kmpc_cancellationpoint(kmp_Ident *loc, int32_t global_tid,
                                         int32_t cancelVal) {

diff  --git a/openmp/libomptarget/deviceRTLs/common/src/critical.cu b/openmp/libomptarget/deviceRTLs/common/src/critical.cu
index 3fd89c50aa46..48692aa581f2 100644
--- a/openmp/libomptarget/deviceRTLs/common/src/critical.cu
+++ b/openmp/libomptarget/deviceRTLs/common/src/critical.cu
@@ -11,8 +11,8 @@
 //===----------------------------------------------------------------------===//
 #pragma omp declare target
 
-#include "interface.h"
 #include "common/debug.h"
+#include "interface.h"
 
 EXTERN
 void __kmpc_critical(kmp_Ident *loc, int32_t global_tid,

diff  --git a/openmp/libomptarget/deviceRTLs/common/src/data_sharing.cu b/openmp/libomptarget/deviceRTLs/common/src/data_sharing.cu
index 577c50a8bb84..d3bff1cb85eb 100644
--- a/openmp/libomptarget/deviceRTLs/common/src/data_sharing.cu
+++ b/openmp/libomptarget/deviceRTLs/common/src/data_sharing.cu
@@ -62,7 +62,7 @@ EXTERN void __kmpc_data_sharing_init_stack_spmd() {
   __kmpc_impl_threadfence_block();
 }
 
-INLINE static void* data_sharing_push_stack_common(size_t PushSize) {
+INLINE static void *data_sharing_push_stack_common(size_t PushSize) {
   ASSERT0(LT_FUSSY, isRuntimeInitialized(), "Expected initialized runtime.");
 
   // Only warp active master threads manage the stack.
@@ -103,7 +103,7 @@ INLINE static void* data_sharing_push_stack_common(size_t PushSize) {
       size_t DefaultSlotSize = DS_Worker_Warp_Slot_Size;
       if (DefaultSlotSize > NewSize)
         NewSize = DefaultSlotSize;
-      NewSlot = (__kmpc_data_sharing_slot *) SafeMalloc(
+      NewSlot = (__kmpc_data_sharing_slot *)SafeMalloc(
           sizeof(__kmpc_data_sharing_slot) + NewSize,
           "Global memory slot allocation.");
 
@@ -163,8 +163,8 @@ EXTERN void *__kmpc_data_sharing_push_stack(size_t DataSize,
 
   // Compute the start address of the frame of each thread in the warp.
   uintptr_t FrameStartAddress =
-      (uintptr_t) data_sharing_push_stack_common(PushSize);
-  FrameStartAddress += (uintptr_t) (GetLaneId() * DataSize);
+      (uintptr_t)data_sharing_push_stack_common(PushSize);
+  FrameStartAddress += (uintptr_t)(GetLaneId() * DataSize);
   return (void *)FrameStartAddress;
 }
 

diff  --git a/openmp/libomptarget/deviceRTLs/common/src/loop.cu b/openmp/libomptarget/deviceRTLs/common/src/loop.cu
index a3ace098f06c..c203bc961717 100644
--- a/openmp/libomptarget/deviceRTLs/common/src/loop.cu
+++ b/openmp/libomptarget/deviceRTLs/common/src/loop.cu
@@ -410,7 +410,7 @@ public:
                                      T loopLowerBound, T loopUpperBound) {
     T N = NextIter();
     lb = loopLowerBound + N * chunkSize;
-    ub = lb + chunkSize - 1;  // Clang uses i <= ub
+    ub = lb + chunkSize - 1; // Clang uses i <= ub
 
     // 3 result cases:
     //  a. lb and ub < loopUpperBound --> NOT_FINISHED
@@ -567,9 +567,9 @@ EXTERN int __kmpc_dispatch_next_4(kmp_Ident *loc, int32_t tid, int32_t *p_last,
       loc, tid, p_last, p_lb, p_ub, p_st);
 }
 
-EXTERN int __kmpc_dispatch_next_4u(kmp_Ident *loc, int32_t tid,
-                                   int32_t *p_last, uint32_t *p_lb,
-                                   uint32_t *p_ub, int32_t *p_st) {
+EXTERN int __kmpc_dispatch_next_4u(kmp_Ident *loc, int32_t tid, int32_t *p_last,
+                                   uint32_t *p_lb, uint32_t *p_ub,
+                                   int32_t *p_st) {
   PRINT0(LD_IO, "call kmpc_dispatch_next_4u\n");
   return omptarget_nvptx_LoopSupport<uint32_t, int32_t>::dispatch_next(
       loc, tid, p_last, p_lb, p_ub, p_st);
@@ -582,9 +582,9 @@ EXTERN int __kmpc_dispatch_next_8(kmp_Ident *loc, int32_t tid, int32_t *p_last,
       loc, tid, p_last, p_lb, p_ub, p_st);
 }
 
-EXTERN int __kmpc_dispatch_next_8u(kmp_Ident *loc, int32_t tid,
-                                   int32_t *p_last, uint64_t *p_lb,
-                                   uint64_t *p_ub, int64_t *p_st) {
+EXTERN int __kmpc_dispatch_next_8u(kmp_Ident *loc, int32_t tid, int32_t *p_last,
+                                   uint64_t *p_lb, uint64_t *p_ub,
+                                   int64_t *p_st) {
   PRINT0(LD_IO, "call kmpc_dispatch_next_8u\n");
   return omptarget_nvptx_LoopSupport<uint64_t, int64_t>::dispatch_next(
       loc, tid, p_last, p_lb, p_ub, p_st);
@@ -708,10 +708,12 @@ void __kmpc_for_static_init_8u_simple_spmd(kmp_Ident *loc, int32_t global_tid,
 }
 
 EXTERN
-void __kmpc_for_static_init_4_simple_generic(
-    kmp_Ident *loc, int32_t global_tid, int32_t schedtype, int32_t *plastiter,
-    int32_t *plower, int32_t *pupper, int32_t *pstride, int32_t incr,
-    int32_t chunk) {
+void __kmpc_for_static_init_4_simple_generic(kmp_Ident *loc, int32_t global_tid,
+                                             int32_t schedtype,
+                                             int32_t *plastiter,
+                                             int32_t *plower, int32_t *pupper,
+                                             int32_t *pstride, int32_t incr,
+                                             int32_t chunk) {
   PRINT0(LD_IO, "call kmpc_for_static_init_4_simple_generic\n");
   omptarget_nvptx_LoopSupport<int32_t, int32_t>::for_static_init(
       global_tid, schedtype, plastiter, plower, pupper, pstride, chunk,
@@ -730,10 +732,12 @@ void __kmpc_for_static_init_4u_simple_generic(
 }
 
 EXTERN
-void __kmpc_for_static_init_8_simple_generic(
-    kmp_Ident *loc, int32_t global_tid, int32_t schedtype, int32_t *plastiter,
-    int64_t *plower, int64_t *pupper, int64_t *pstride, int64_t incr,
-    int64_t chunk) {
+void __kmpc_for_static_init_8_simple_generic(kmp_Ident *loc, int32_t global_tid,
+                                             int32_t schedtype,
+                                             int32_t *plastiter,
+                                             int64_t *plower, int64_t *pupper,
+                                             int64_t *pstride, int64_t incr,
+                                             int64_t chunk) {
   PRINT0(LD_IO, "call kmpc_for_static_init_8_simple_generic\n");
   omptarget_nvptx_LoopSupport<int64_t, int64_t>::for_static_init(
       global_tid, schedtype, plastiter, plower, pupper, pstride, chunk,

diff  --git a/openmp/libomptarget/deviceRTLs/common/src/omptarget.cu b/openmp/libomptarget/deviceRTLs/common/src/omptarget.cu
index 82d1db1dce3e..39b7b5ccbd55 100644
--- a/openmp/libomptarget/deviceRTLs/common/src/omptarget.cu
+++ b/openmp/libomptarget/deviceRTLs/common/src/omptarget.cu
@@ -79,7 +79,8 @@ EXTERN void __kmpc_kernel_deinit(int16_t IsOMPRuntimeInitialized) {
   omptarget_nvptx_workFn = 0;
 }
 
-EXTERN void __kmpc_spmd_kernel_init(int ThreadLimit, int16_t RequiresOMPRuntime) {
+EXTERN void __kmpc_spmd_kernel_init(int ThreadLimit,
+                                    int16_t RequiresOMPRuntime) {
   PRINT0(LD_IO, "call to __kmpc_spmd_kernel_init\n");
 
   setExecutionParameters(Spmd, RequiresOMPRuntime ? RuntimeInitialized

diff  --git a/openmp/libomptarget/deviceRTLs/common/src/parallel.cu b/openmp/libomptarget/deviceRTLs/common/src/parallel.cu
index 790730ffdec9..6014f3110baf 100644
--- a/openmp/libomptarget/deviceRTLs/common/src/parallel.cu
+++ b/openmp/libomptarget/deviceRTLs/common/src/parallel.cu
@@ -188,9 +188,9 @@ EXTERN void __kmpc_kernel_end_parallel() {
   // If we have the whole warp, reconverge all the threads in the warp before
   // actually trying to change the parallel level. Otherwise, parallel level can
   // be changed incorrectly because of threads divergence.
-    bool IsActiveParallelRegion = threadsInTeam != 1;
-    DecParallelLevel(IsActiveParallelRegion,
-                     IsActiveParallelRegion ? __kmpc_impl_all_lanes : 1u);
+  bool IsActiveParallelRegion = threadsInTeam != 1;
+  DecParallelLevel(IsActiveParallelRegion,
+                   IsActiveParallelRegion ? __kmpc_impl_all_lanes : 1u);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -281,7 +281,8 @@ EXTERN int32_t __kmpc_global_thread_num(kmp_Ident *loc) {
 EXTERN void __kmpc_push_num_threads(kmp_Ident *loc, int32_t tid,
                                     int32_t num_threads) {
   PRINT(LD_IO, "call kmpc_push_num_threads %d\n", num_threads);
-  ASSERT0(LT_FUSSY, checkRuntimeInitialized(loc), "Runtime must be initialized.");
+  ASSERT0(LT_FUSSY, checkRuntimeInitialized(loc),
+          "Runtime must be initialized.");
   tid = GetLogicalThreadIdInBlock(checkSPMDMode(loc));
   omptarget_nvptx_threadPrivateContext->NumThreadsForNextParallel(tid) =
       num_threads;
@@ -293,12 +294,10 @@ EXTERN void __kmpc_push_num_threads(kmp_Ident *loc, int32_t tid,
 EXTERN void __kmpc_push_num_teams(kmp_Ident *loc, int32_t tid,
                                   int32_t num_teams, int32_t thread_limit) {
   PRINT(LD_IO, "call kmpc_push_num_teams %d\n", (int)num_teams);
-  ASSERT0(LT_FUSSY, 0,
-          "should never have anything with new teams on device");
+  ASSERT0(LT_FUSSY, 0, "should never have anything with new teams on device");
 }
 
-EXTERN void __kmpc_push_proc_bind(kmp_Ident *loc, uint32_t tid,
-                                  int proc_bind) {
+EXTERN void __kmpc_push_proc_bind(kmp_Ident *loc, uint32_t tid, int proc_bind) {
   PRINT(LD_IO, "call kmpc_push_proc_bind %d\n", (int)proc_bind);
 }
 

diff  --git a/openmp/libomptarget/deviceRTLs/common/src/reduction.cu b/openmp/libomptarget/deviceRTLs/common/src/reduction.cu
index df2f77031980..7b1bb3c2f6ce 100644
--- a/openmp/libomptarget/deviceRTLs/common/src/reduction.cu
+++ b/openmp/libomptarget/deviceRTLs/common/src/reduction.cu
@@ -25,11 +25,11 @@ EXTERN int32_t __kmpc_shuffle_int32(int32_t val, int16_t delta, int16_t size) {
 }
 
 EXTERN int64_t __kmpc_shuffle_int64(int64_t val, int16_t delta, int16_t size) {
-   uint32_t lo, hi;
-   __kmpc_impl_unpack(val, lo, hi);
-   hi = __kmpc_impl_shfl_down_sync(__kmpc_impl_all_lanes, hi, delta, size);
-   lo = __kmpc_impl_shfl_down_sync(__kmpc_impl_all_lanes, lo, delta, size);
-   return __kmpc_impl_pack(lo, hi);
+  uint32_t lo, hi;
+  __kmpc_impl_unpack(val, lo, hi);
+  hi = __kmpc_impl_shfl_down_sync(__kmpc_impl_all_lanes, hi, delta, size);
+  lo = __kmpc_impl_shfl_down_sync(__kmpc_impl_all_lanes, lo, delta, size);
+  return __kmpc_impl_pack(lo, hi);
 }
 
 INLINE static void gpu_regular_warp_reduce(void *reduce_data,
@@ -84,16 +84,16 @@ static int32_t nvptx_parallel_reduce_nowait(
   uint32_t NumThreads = GetNumberOfOmpThreads(isSPMDExecutionMode);
   if (NumThreads == 1)
     return 1;
-  /*
-   * This reduce function handles reduction within a team. It handles
-   * parallel regions in both L1 and L2 parallelism levels. It also
-   * supports Generic, SPMD, and NoOMP modes.
-   *
-   * 1. Reduce within a warp.
-   * 2. Warp master copies value to warp 0 via shared memory.
-   * 3. Warp 0 reduces to a single value.
-   * 4. The reduced value is available in the thread that returns 1.
-   */
+    /*
+     * This reduce function handles reduction within a team. It handles
+     * parallel regions in both L1 and L2 parallelism levels. It also
+     * supports Generic, SPMD, and NoOMP modes.
+     *
+     * 1. Reduce within a warp.
+     * 2. Warp master copies value to warp 0 via shared memory.
+     * 3. Warp 0 reduces to a single value.
+     * 4. The reduced value is available in the thread that returns 1.
+     */
 
 #if defined(__CUDA_ARCH__) && __CUDA_ARCH__ >= 700
   uint32_t WarpsNeeded = (NumThreads + WARPSIZE - 1) / WARPSIZE;

diff  --git a/openmp/libomptarget/deviceRTLs/common/src/support.cu b/openmp/libomptarget/deviceRTLs/common/src/support.cu
index f9b4ad300053..ca0ce2021d8b 100644
--- a/openmp/libomptarget/deviceRTLs/common/src/support.cu
+++ b/openmp/libomptarget/deviceRTLs/common/src/support.cu
@@ -11,9 +11,9 @@
 //===----------------------------------------------------------------------===//
 #pragma omp declare target
 
-#include "common/support.h"
 #include "common/debug.h"
 #include "common/omptarget.h"
+#include "common/support.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // Execution Parameters
@@ -58,9 +58,7 @@ DEVICE bool checkSPMDMode(kmp_Ident *loc) {
   return isSPMDMode();
 }
 
-DEVICE bool checkGenericMode(kmp_Ident *loc) {
-  return !checkSPMDMode(loc);
-}
+DEVICE bool checkGenericMode(kmp_Ident *loc) { return !checkSPMDMode(loc); }
 
 DEVICE bool checkRuntimeUninitialized(kmp_Ident *loc) {
   if (!loc)
@@ -107,7 +105,9 @@ DEVICE bool checkRuntimeInitialized(kmp_Ident *loc) {
 //      If NumThreads is 1024, master id is 992.
 //
 // Called in Generic Execution Mode only.
-DEVICE int GetMasterThreadID() { return (GetNumberOfThreadsInBlock() - 1) & ~(WARPSIZE - 1); }
+DEVICE int GetMasterThreadID() {
+  return (GetNumberOfThreadsInBlock() - 1) & ~(WARPSIZE - 1);
+}
 
 // The last warp is reserved for the master; other warps are workers.
 // Called in Generic Execution Mode only.

diff  --git a/openmp/libomptarget/deviceRTLs/common/src/task.cu b/openmp/libomptarget/deviceRTLs/common/src/task.cu
index f28cd2b81c69..a5186707dfb6 100644
--- a/openmp/libomptarget/deviceRTLs/common/src/task.cu
+++ b/openmp/libomptarget/deviceRTLs/common/src/task.cu
@@ -31,7 +31,7 @@
 #include "common/omptarget.h"
 
 EXTERN kmp_TaskDescr *__kmpc_omp_task_alloc(
-    kmp_Ident *loc,     // unused
+    kmp_Ident *loc,      // unused
     uint32_t global_tid, // unused
     int32_t flag, // unused (because in our impl, all are immediately exec
     size_t sizeOfTaskInclPrivate, size_t sizeOfSharedTable,

diff  --git a/openmp/libomptarget/deviceRTLs/common/state-queuei.h b/openmp/libomptarget/deviceRTLs/common/state-queuei.h
index 902eff9031ae..50efb81a6d65 100644
--- a/openmp/libomptarget/deviceRTLs/common/state-queuei.h
+++ b/openmp/libomptarget/deviceRTLs/common/state-queuei.h
@@ -29,8 +29,7 @@ INLINE uint32_t omptarget_nvptx_Queue<ElementType, SIZE>::DEQUEUE_TICKET() {
 }
 
 template <typename ElementType, uint32_t SIZE>
-INLINE uint32_t
-omptarget_nvptx_Queue<ElementType, SIZE>::ID(uint32_t ticket) {
+INLINE uint32_t omptarget_nvptx_Queue<ElementType, SIZE>::ID(uint32_t ticket) {
   return (ticket / SIZE) * 2;
 }
 

diff  --git a/openmp/libomptarget/deviceRTLs/common/support.h b/openmp/libomptarget/deviceRTLs/common/support.h
index a46432825782..4d260de72aa8 100644
--- a/openmp/libomptarget/deviceRTLs/common/support.h
+++ b/openmp/libomptarget/deviceRTLs/common/support.h
@@ -57,8 +57,8 @@ DEVICE int GetNumberOfWorkersInTeam();
 
 // get OpenMP thread and team ids
 DEVICE int GetOmpThreadId(int threadId,
-                          bool isSPMDExecutionMode);    // omp_thread_num
-DEVICE int GetOmpTeamId();                              // omp_team_num
+                          bool isSPMDExecutionMode); // omp_thread_num
+DEVICE int GetOmpTeamId();                           // omp_team_num
 
 // get OpenMP number of threads and team
 DEVICE int GetNumberOfOmpThreads(bool isSPMDExecutionMode); // omp_num_threads

diff  --git a/openmp/libomptarget/deviceRTLs/interface.h b/openmp/libomptarget/deviceRTLs/interface.h
index e27e4faec341..6a7e1b42b10a 100644
--- a/openmp/libomptarget/deviceRTLs/interface.h
+++ b/openmp/libomptarget/deviceRTLs/interface.h
@@ -180,14 +180,14 @@ enum {
 typedef int kmp_int32;
 typedef struct ident {
   kmp_int32 reserved_1; /**<  might be used in Fortran; see above  */
-  kmp_int32 flags; /**<  also f.flags; KMP_IDENT_xxx flags; KMP_IDENT_KMPC
-                      identifies this union member  */
+  kmp_int32 flags;      /**<  also f.flags; KMP_IDENT_xxx flags; KMP_IDENT_KMPC
+                           identifies this union member  */
   kmp_int32 reserved_2; /**<  not really used in Fortran any more; see above */
   kmp_int32 reserved_3; /**<  source[4] in Fortran, do not use for C++  */
-  char const *psource; /**<  String describing the source location.
-                       The string is composed of semi-colon separated fields
-                       which describe the source file, the function and a pair
-                       of line numbers that delimit the construct. */
+  char const *psource;  /**<  String describing the source location.
+                        The string is composed of semi-colon separated fields
+                        which describe the source file, the function and a pair
+                        of line numbers that delimit the construct. */
 } ident_t;
 
 // parallel defs
@@ -220,8 +220,7 @@ EXTERN int32_t __kmpc_global_thread_num(kmp_Ident *loc);
 EXTERN void __kmpc_push_num_threads(kmp_Ident *loc, int32_t global_tid,
                                     int32_t num_threads);
 EXTERN void __kmpc_serialized_parallel(kmp_Ident *loc, uint32_t global_tid);
-EXTERN void __kmpc_end_serialized_parallel(kmp_Ident *loc,
-                                           uint32_t global_tid);
+EXTERN void __kmpc_end_serialized_parallel(kmp_Ident *loc, uint32_t global_tid);
 EXTERN uint16_t __kmpc_parallel_level(kmp_Ident *loc, uint32_t global_tid);
 
 // proc bind
@@ -280,9 +279,8 @@ void __kmpc_for_static_init_8u_simple_spmd(kmp_Ident *loc, int32_t global_tid,
                                            int64_t *pstride, int64_t incr,
                                            int64_t chunk);
 EXTERN
-void __kmpc_for_static_init_4_simple_generic(kmp_Ident *loc,
-                                             int32_t global_tid, int32_t sched,
-                                             int32_t *plastiter,
+void __kmpc_for_static_init_4_simple_generic(kmp_Ident *loc, int32_t global_tid,
+                                             int32_t sched, int32_t *plastiter,
                                              int32_t *plower, int32_t *pupper,
                                              int32_t *pstride, int32_t incr,
                                              int32_t chunk);
@@ -292,9 +290,8 @@ void __kmpc_for_static_init_4u_simple_generic(
     uint32_t *plower, uint32_t *pupper, int32_t *pstride, int32_t incr,
     int32_t chunk);
 EXTERN
-void __kmpc_for_static_init_8_simple_generic(kmp_Ident *loc,
-                                             int32_t global_tid, int32_t sched,
-                                             int32_t *plastiter,
+void __kmpc_for_static_init_8_simple_generic(kmp_Ident *loc, int32_t global_tid,
+                                             int32_t sched, int32_t *plastiter,
                                              int64_t *plower, int64_t *pupper,
                                              int64_t *pstride, int64_t incr,
                                              int64_t chunk);
@@ -382,8 +379,8 @@ EXTERN __kmpc_impl_lanemask_t __kmpc_warp_active_thread_mask();
 EXTERN void __kmpc_syncwarp(__kmpc_impl_lanemask_t);
 
 // tasks
-EXTERN kmp_TaskDescr *__kmpc_omp_task_alloc(kmp_Ident *loc,
-                                            uint32_t global_tid, int32_t flag,
+EXTERN kmp_TaskDescr *__kmpc_omp_task_alloc(kmp_Ident *loc, uint32_t global_tid,
+                                            int32_t flag,
                                             size_t sizeOfTaskInclPrivate,
                                             size_t sizeOfSharedTable,
                                             kmp_TaskFctPtr sub);
@@ -430,8 +427,9 @@ EXTERN void __kmpc_kernel_end_parallel();
 EXTERN void __kmpc_data_sharing_init_stack();
 EXTERN void __kmpc_data_sharing_init_stack_spmd();
 EXTERN void *__kmpc_data_sharing_coalesced_push_stack(size_t size,
-    int16_t UseSharedMemory);
-EXTERN void *__kmpc_data_sharing_push_stack(size_t size, int16_t UseSharedMemory);
+                                                      int16_t UseSharedMemory);
+EXTERN void *__kmpc_data_sharing_push_stack(size_t size,
+                                            int16_t UseSharedMemory);
 EXTERN void __kmpc_data_sharing_pop_stack(void *a);
 EXTERN void __kmpc_begin_sharing_variables(void ***GlobalArgs, size_t nArgs);
 EXTERN void __kmpc_end_sharing_variables();

diff  --git a/openmp/libomptarget/deviceRTLs/nvptx/src/target_impl.cu b/openmp/libomptarget/deviceRTLs/nvptx/src/target_impl.cu
index 12d9c4fbe548..b895487116a0 100644
--- a/openmp/libomptarget/deviceRTLs/nvptx/src/target_impl.cu
+++ b/openmp/libomptarget/deviceRTLs/nvptx/src/target_impl.cu
@@ -11,8 +11,8 @@
 //===----------------------------------------------------------------------===//
 #pragma omp declare target
 
-#include "target_impl.h"
 #include "common/debug.h"
+#include "target_impl.h"
 
 DEVICE void __kmpc_impl_unpack(uint64_t val, uint32_t &lo, uint32_t &hi) {
   asm volatile("mov.b64 {%0,%1}, %2;" : "=r"(lo), "=r"(hi) : "l"(val));

diff  --git a/openmp/libomptarget/deviceRTLs/nvptx/src/target_impl.h b/openmp/libomptarget/deviceRTLs/nvptx/src/target_impl.h
index 52a7d32faa98..e92ada5b0be8 100644
--- a/openmp/libomptarget/deviceRTLs/nvptx/src/target_impl.h
+++ b/openmp/libomptarget/deviceRTLs/nvptx/src/target_impl.h
@@ -34,8 +34,8 @@
 
 #define WARPSIZE 32
 
-// Maximum number of preallocated arguments to an outlined parallel/simd function.
-// Anything more requires dynamic memory allocation.
+// Maximum number of preallocated arguments to an outlined parallel/simd
+// function. Anything more requires dynamic memory allocation.
 #define MAX_SHARED_ARGS 20
 
 // Maximum number of omp state objects per SM allocated statically in global

diff  --git a/openmp/runtime/doc/doxygen/libomp_interface.h b/openmp/runtime/doc/doxygen/libomp_interface.h
index 103932505579..f5ef36ae2c43 100644
--- a/openmp/runtime/doc/doxygen/libomp_interface.h
+++ b/openmp/runtime/doc/doxygen/libomp_interface.h
@@ -1,3 +1,4 @@
+// clang-format off
 // This file does not contain any code; it just contains additional text and formatting
 // for doxygen.
 
@@ -63,7 +64,7 @@ supported are shown in the table below.
 <tr><td>OS X\other<td>Yes(1,3,4)<td>No<td>Yes(4,6,7)
 <tr><td>Windows\other OS<td>Yes(1,4)<td>No<td>No
 </table>
-(1) On IA-32 architecture and Intel®  64, icc/icl versions 12.x 
+(1) On IA-32 architecture and Intel®  64, icc/icl versions 12.x
     are supported (12.1 is recommended).<br>
 (2) gcc version 4.7 is supported.<br>
 (3) For icc on OS X\other, OS X\other version 10.5.8 is supported.<br>
@@ -131,9 +132,9 @@ void foo()
 
 @subsection SEC_SHAREDVARS Addressing shared variables
 
-In real uses of the OpenMP\other API there are normally references 
-from the outlined code  to shared variables that are in scope in the containing function. 
-Therefore the containing function must be able to address 
+In real uses of the OpenMP\other API there are normally references
+from the outlined code  to shared variables that are in scope in the containing function.
+Therefore the containing function must be able to address
 these variables. The runtime supports two alternate ways of doing
 this.
 
@@ -173,7 +174,7 @@ to the outlined functions. In this way the offsets of the shared variables
 are known (since they are inside the struct) without needing to know
 the complete layout of the parent stack-frame. From the point of view
 of the runtime either of these techniques is equivalent, since in either
-case it only has to pass a single argument to the outlined function to allow 
+case it only has to pass a single argument to the outlined function to allow
 it to access shared variables.
 
 A scheme like this is how gcc\other generates outlined functions.
@@ -202,49 +203,49 @@ This example shows the code generated for a parallel for with reduction and dyna
 extern float foo( void );
 
 int main () {
-    int i; 
-    float r = 0.0; 
-    #pragma omp parallel for schedule(dynamic) reduction(+:r) 
+    int i;
+    float r = 0.0;
+    #pragma omp parallel for schedule(dynamic) reduction(+:r)
     for ( i = 0; i < 10; i ++ ) {
-        r += foo(); 
+        r += foo();
     }
 }
 @endcode
 
 The transformed code looks like this.
 @code
-extern float foo( void ); 
+extern float foo( void );
 
 int main () {
-    static int zero = 0; 
-    auto int gtid; 
-    auto float r = 0.0; 
-    __kmpc_begin( & loc3, 0 ); 
+    static int zero = 0;
+    auto int gtid;
+    auto float r = 0.0;
+    __kmpc_begin( & loc3, 0 );
     // The gtid is not actually required in this example so could be omitted;
     // We show its initialization here because it is often required for calls into
     // the runtime and should be locally cached like this.
-    gtid = __kmpc_global thread num( & loc3 ); 
-    __kmpc_fork call( & loc7, 1, main_7_parallel_3, & r ); 
-    __kmpc_end( & loc0 ); 
-    return 0; 
+    gtid = __kmpc_global thread num( & loc3 );
+    __kmpc_fork call( & loc7, 1, main_7_parallel_3, & r );
+    __kmpc_end( & loc0 );
+    return 0;
 }
 
-struct main_10_reduction_t_5 { float r_10_rpr; }; 
+struct main_10_reduction_t_5 { float r_10_rpr; };
 
 static kmp_critical_name lck = { 0 };
-static ident_t loc10; // loc10.flags should contain KMP_IDENT_ATOMIC_REDUCE bit set 
+static ident_t loc10; // loc10.flags should contain KMP_IDENT_ATOMIC_REDUCE bit set
                       // if compiler has generated an atomic reduction.
 
 void main_7_parallel_3( int *gtid, int *btid, float *r_7_shp ) {
-    auto int i_7_pr; 
-    auto int lower, upper, liter, incr; 
-    auto struct main_10_reduction_t_5 reduce; 
-    reduce.r_10_rpr = 0.F; 
-    liter = 0; 
-    __kmpc_dispatch_init_4( & loc7,*gtid, 35, 0, 9, 1, 1 ); 
+    auto int i_7_pr;
+    auto int lower, upper, liter, incr;
+    auto struct main_10_reduction_t_5 reduce;
+    reduce.r_10_rpr = 0.F;
+    liter = 0;
+    __kmpc_dispatch_init_4( & loc7,*gtid, 35, 0, 9, 1, 1 );
     while ( __kmpc_dispatch_next_4( & loc7, *gtid, & liter, & lower, & upper, & incr ) ) {
-        for( i_7_pr = lower; upper >= i_7_pr; i_7_pr ++ ) 
-          reduce.r_10_rpr += foo(); 
+        for( i_7_pr = lower; upper >= i_7_pr; i_7_pr ++ )
+          reduce.r_10_rpr += foo();
     }
     switch( __kmpc_reduce_nowait( & loc10, *gtid, 1, 4, & reduce, main_10_reduce_5, & lck ) ) {
         case 1:
@@ -256,12 +257,12 @@ void main_7_parallel_3( int *gtid, int *btid, float *r_7_shp ) {
            break;
         default:;
     }
-} 
+}
 
-void main_10_reduce_5( struct main_10_reduction_t_5 *reduce_lhs, 
-                       struct main_10_reduction_t_5 *reduce_rhs ) 
-{ 
-    reduce_lhs->r_10_rpr += reduce_rhs->r_10_rpr; 
+void main_10_reduce_5( struct main_10_reduction_t_5 *reduce_lhs,
+                       struct main_10_reduction_t_5 *reduce_rhs )
+{
+    reduce_lhs->r_10_rpr += reduce_rhs->r_10_rpr;
 }
 @endcode
 
@@ -282,9 +283,9 @@ These functions are used for implementing <tt>\#pragma omp parallel</tt>.
 These functions return information about the currently executing thread.
 
 @defgroup WORK_SHARING Work Sharing
-These functions are used for implementing 
-<tt>\#pragma omp for</tt>, <tt>\#pragma omp sections</tt>, <tt>\#pragma omp single</tt> and 
-<tt>\#pragma omp master</tt> constructs. 
+These functions are used for implementing
+<tt>\#pragma omp for</tt>, <tt>\#pragma omp sections</tt>, <tt>\#pragma omp single</tt> and
+<tt>\#pragma omp master</tt> constructs.
 
 When handling loops, there are 
diff erent functions for each of the signed and unsigned 32 and 64 bit integer types
 which have the name suffixes `_4`, `_4u`, `_8` and `_8u`. The semantics of each of the functions is the same,
@@ -293,9 +294,9 @@ so they are only described once.
 Static loop scheduling is handled by  @ref __kmpc_for_static_init_4 and friends. Only a single call is needed,
 since the iterations to be executed by any give thread can be determined as soon as the loop parameters are known.
 
-Dynamic scheduling is handled by the @ref __kmpc_dispatch_init_4 and @ref __kmpc_dispatch_next_4 functions. 
+Dynamic scheduling is handled by the @ref __kmpc_dispatch_init_4 and @ref __kmpc_dispatch_next_4 functions.
 The init function is called once in each thread outside the loop, while the next function is called each
-time that the previous chunk of work has been exhausted. 
+time that the previous chunk of work has been exhausted.
 
 @defgroup SYNCHRONIZATION Synchronization
 These functions are used for implementing barriers.

diff  --git a/openmp/runtime/src/kmp.h b/openmp/runtime/src/kmp.h
index 17ca2bf4738b..fe554105fe11 100644
--- a/openmp/runtime/src/kmp.h
+++ b/openmp/runtime/src/kmp.h
@@ -1075,13 +1075,11 @@ extern void __kmp_fini_memkind();
 /* Calculate new number of monitor wakeups for a specific block time based on
    previous monitor_wakeups. Only allow increasing number of wakeups */
 #define KMP_WAKEUPS_FROM_BLOCKTIME(blocktime, monitor_wakeups)                 \
-  (((blocktime) == KMP_MAX_BLOCKTIME)                                          \
+  (((blocktime) == KMP_MAX_BLOCKTIME)   ? (monitor_wakeups)                    \
+   : ((blocktime) == KMP_MIN_BLOCKTIME) ? KMP_MAX_MONITOR_WAKEUPS              \
+   : ((monitor_wakeups) > (KMP_BLOCKTIME_MULTIPLIER / (blocktime)))            \
        ? (monitor_wakeups)                                                     \
-       : ((blocktime) == KMP_MIN_BLOCKTIME)                                    \
-             ? KMP_MAX_MONITOR_WAKEUPS                                         \
-             : ((monitor_wakeups) > (KMP_BLOCKTIME_MULTIPLIER / (blocktime)))  \
-                   ? (monitor_wakeups)                                         \
-                   : (KMP_BLOCKTIME_MULTIPLIER) / (blocktime))
+       : (KMP_BLOCKTIME_MULTIPLIER) / (blocktime))
 
 /* Calculate number of intervals for a specific block time based on
    monitor_wakeups */
@@ -1368,8 +1366,7 @@ static inline void __kmp_x86_pause(void) { _mm_pause(); }
 #endif
 #endif // KMP_HAVE_WAITPKG_INTRINSICS
 KMP_ATTRIBUTE_TARGET_WAITPKG
-static inline int
-__kmp_tpause(uint32_t hint, uint64_t counter) {
+static inline int __kmp_tpause(uint32_t hint, uint64_t counter) {
 #if !KMP_HAVE_WAITPKG_INTRINSICS
   uint32_t timeHi = uint32_t(counter >> 32);
   uint32_t timeLo = uint32_t(counter & 0xffffffff);
@@ -1385,8 +1382,7 @@ __kmp_tpause(uint32_t hint, uint64_t counter) {
 #endif
 }
 KMP_ATTRIBUTE_TARGET_WAITPKG
-static inline void
-__kmp_umonitor(void *cacheline) {
+static inline void __kmp_umonitor(void *cacheline) {
 #if !KMP_HAVE_WAITPKG_INTRINSICS
   __asm__ volatile("# umonitor\n.byte 0xF3, 0x0F, 0xAE, 0x01 "
                    :
@@ -1397,8 +1393,7 @@ __kmp_umonitor(void *cacheline) {
 #endif
 }
 KMP_ATTRIBUTE_TARGET_WAITPKG
-static inline int
-__kmp_umwait(uint32_t hint, uint64_t counter) {
+static inline int __kmp_umwait(uint32_t hint, uint64_t counter) {
 #if !KMP_HAVE_WAITPKG_INTRINSICS
   uint32_t timeHi = uint32_t(counter >> 32);
   uint32_t timeLo = uint32_t(counter & 0xffffffff);
@@ -1911,9 +1906,8 @@ typedef enum kmp_bar_pat { /* Barrier communication patterns */
                                0, /* Single level (degenerate) tree */
                            bp_tree_bar =
                                1, /* Balanced tree with branching factor 2^n */
-                           bp_hyper_bar =
-                               2, /* Hypercube-embedded tree with min branching
-                                     factor 2^n */
+                           bp_hyper_bar = 2, /* Hypercube-embedded tree with min
+                                                branching factor 2^n */
                            bp_hierarchical_bar = 3, /* Machine hierarchy tree */
                            bp_last_bar /* Placeholder to mark the end */
 } kmp_bar_pat_e;
@@ -2698,7 +2692,9 @@ typedef union KMP_ALIGN_CACHE kmp_info {
 
 // OpenMP thread team data structures
 
-typedef struct kmp_base_data { volatile kmp_uint32 t_value; } kmp_base_data_t;
+typedef struct kmp_base_data {
+  volatile kmp_uint32 t_value;
+} kmp_base_data_t;
 
 typedef union KMP_ALIGN_CACHE kmp_sleep_team {
   double dt_align; /* use worst case alignment */
@@ -3073,9 +3069,8 @@ extern int __kmp_ncores; /* Total number of cores for threads placement */
 extern int __kmp_abort_delay;
 
 extern int __kmp_need_register_atfork_specified;
-extern int
-    __kmp_need_register_atfork; /* At initialization, call pthread_atfork to
-                                   install fork handler */
+extern int __kmp_need_register_atfork; /* At initialization, call pthread_atfork
+                                          to install fork handler */
 extern int __kmp_gtid_mode; /* Method of getting gtid, values:
                                0 - not set, will be set at runtime
                                1 - using stack search
@@ -3443,7 +3438,7 @@ extern void __kmp_wait_64(kmp_info_t *this_thr, kmp_flag_64<> *flag,
                           ,
                           void *itt_sync_obj
 #endif
-                          );
+);
 extern void __kmp_release_64(kmp_flag_64<> *flag);
 
 extern void __kmp_infinite_loop(void);
@@ -3701,7 +3696,7 @@ extern int __kmp_invoke_microtask(microtask_t pkfn, int gtid, int npr, int argc,
                                   ,
                                   void **exit_frame_ptr
 #endif
-                                  );
+);
 
 /* ------------------------------------------------------------------------ */
 
@@ -3778,12 +3773,9 @@ KMP_EXPORT kmp_task_t *__kmpc_omp_task_alloc(ident_t *loc_ref, kmp_int32 gtid,
                                              size_t sizeof_kmp_task_t,
                                              size_t sizeof_shareds,
                                              kmp_routine_entry_t task_entry);
-KMP_EXPORT kmp_task_t *__kmpc_omp_target_task_alloc(ident_t *loc_ref, kmp_int32 gtid,
-                                                    kmp_int32 flags,
-                                                    size_t sizeof_kmp_task_t,
-                                                    size_t sizeof_shareds,
-                                                    kmp_routine_entry_t task_entry,
-                                                    kmp_int64 device_id);
+KMP_EXPORT kmp_task_t *__kmpc_omp_target_task_alloc(
+    ident_t *loc_ref, kmp_int32 gtid, kmp_int32 flags, size_t sizeof_kmp_task_t,
+    size_t sizeof_shareds, kmp_routine_entry_t task_entry, kmp_int64 device_id);
 KMP_EXPORT void __kmpc_omp_task_begin_if0(ident_t *loc_ref, kmp_int32 gtid,
                                           kmp_task_t *task);
 KMP_EXPORT void __kmpc_omp_task_complete_if0(ident_t *loc_ref, kmp_int32 gtid,

diff  --git a/openmp/runtime/src/kmp_affinity.cpp b/openmp/runtime/src/kmp_affinity.cpp
index 2fff2c88d271..03f2e19339fd 100644
--- a/openmp/runtime/src/kmp_affinity.cpp
+++ b/openmp/runtime/src/kmp_affinity.cpp
@@ -597,9 +597,8 @@ static int __kmp_hwloc_get_nobjs_under_obj(hwloc_obj_t obj,
   hwloc_obj_t first;
   for (first = hwloc_get_obj_below_by_type(__kmp_hwloc_topology, obj->type,
                                            obj->logical_index, type, 0);
-       first != NULL &&
-       hwloc_get_ancestor_obj_by_type(__kmp_hwloc_topology, obj->type, first) ==
-           obj;
+       first != NULL && hwloc_get_ancestor_obj_by_type(__kmp_hwloc_topology,
+                                                       obj->type, first) == obj;
        first = hwloc_get_next_obj_by_type(__kmp_hwloc_topology, first->type,
                                           first)) {
     ++retval;
@@ -926,8 +925,9 @@ static int __kmp_affinity_create_hwloc_map(AddrUnsPair **address2os,
       c = ratio[level];
       plural = (c > 1);
       if (level == 0) {
-        __kmp_str_buf_print(&buf, "%d %s", c, __kmp_hw_get_catalog_string(
-                                                  numerator_type, plural));
+        __kmp_str_buf_print(
+            &buf, "%d %s", c,
+            __kmp_hw_get_catalog_string(numerator_type, plural));
       } else {
         __kmp_str_buf_print(&buf, " x %d %s/%s", c,
                             __kmp_hw_get_catalog_string(numerator_type, plural),
@@ -1969,8 +1969,9 @@ static int __kmp_affinity_create_x2apicid_map(AddrUnsPair **address2os,
       c = ratio[level];
       plural = (c > 1);
       if (level == 0) {
-        __kmp_str_buf_print(&buf, "%d %s", c, __kmp_hw_get_catalog_string(
-                                                  numerator_type, plural));
+        __kmp_str_buf_print(
+            &buf, "%d %s", c,
+            __kmp_hw_get_catalog_string(numerator_type, plural));
       } else {
         __kmp_str_buf_print(&buf, " x %d %s/%s", c,
                             __kmp_hw_get_catalog_string(numerator_type, plural),
@@ -2074,7 +2075,7 @@ static void __kmp_dispatch_set_hierarchy_values() {
   __kmp_hier_max_units[kmp_hier_layer_e::LAYER_THREAD + 1] =
       nPackages * nCoresPerPkg * __kmp_nThreadsPerCore;
   __kmp_hier_max_units[kmp_hier_layer_e::LAYER_L1 + 1] = __kmp_ncores;
-#if KMP_ARCH_X86_64 && (KMP_OS_LINUX || KMP_OS_FREEBSD || KMP_OS_WINDOWS) && \
+#if KMP_ARCH_X86_64 && (KMP_OS_LINUX || KMP_OS_FREEBSD || KMP_OS_WINDOWS) &&   \
     KMP_MIC_SUPPORTED
   if (__kmp_mic_type >= mic3)
     __kmp_hier_max_units[kmp_hier_layer_e::LAYER_L2 + 1] = __kmp_ncores / 2;
@@ -2089,7 +2090,7 @@ static void __kmp_dispatch_set_hierarchy_values() {
   __kmp_hier_threads_per[kmp_hier_layer_e::LAYER_THREAD + 1] = 1;
   __kmp_hier_threads_per[kmp_hier_layer_e::LAYER_L1 + 1] =
       __kmp_nThreadsPerCore;
-#if KMP_ARCH_X86_64 && (KMP_OS_LINUX || KMP_OS_FREEBSD || KMP_OS_WINDOWS) && \
+#if KMP_ARCH_X86_64 && (KMP_OS_LINUX || KMP_OS_FREEBSD || KMP_OS_WINDOWS) &&   \
     KMP_MIC_SUPPORTED
   if (__kmp_mic_type >= mic3)
     __kmp_hier_threads_per[kmp_hier_layer_e::LAYER_L2 + 1] =
@@ -4078,12 +4079,10 @@ static void __kmp_apply_thread_places(AddrUnsPair **pAddr, int depth) {
         }
       }
     }
-    KMP_DEBUG_ASSERT(n_old ==
-                     nPackages * nDiesPerPkg * nCoresPerPkg *
-                         __kmp_nThreadsPerCore);
-    KMP_DEBUG_ASSERT(n_new ==
-                     __kmp_hws_socket.num * __kmp_hws_die.num *
-                         __kmp_hws_core.num * __kmp_hws_proc.num);
+    KMP_DEBUG_ASSERT(n_old == nPackages * nDiesPerPkg * nCoresPerPkg *
+                                  __kmp_nThreadsPerCore);
+    KMP_DEBUG_ASSERT(n_new == __kmp_hws_socket.num * __kmp_hws_die.num *
+                                  __kmp_hws_core.num * __kmp_hws_proc.num);
     nPackages = __kmp_hws_socket.num; // correct nPackages
     nCoresPerPkg = __kmp_hws_core.num; // correct nCoresPerPkg
     nDiesPerPkg = __kmp_hws_die.num; // correct nDiesPerPkg
@@ -4450,9 +4449,9 @@ static void __kmp_aux_affinity_initialize(void) {
   }
 #endif // KMP_USE_HWLOC
 
-// If the user has specified that a particular topology discovery method is to be
-// used, then we abort if that method fails. The exception is group affinity,
-// which might have been implicitly set.
+  // If the user has specified that a particular topology discovery method is to
+  // be used, then we abort if that method fails. The exception is group
+  // affinity, which might have been implicitly set.
 
 #if KMP_ARCH_X86 || KMP_ARCH_X86_64
 
@@ -4570,7 +4569,7 @@ static void __kmp_aux_affinity_initialize(void) {
 #if KMP_USE_HWLOC
       && __kmp_tile_depth == 0
 #endif
-      ) {
+  ) {
     // tiles requested but not detected, warn user on this
     KMP_WARNING(AffTilesNoTiles, "KMP_AFFINITY");
   }
@@ -4615,10 +4614,10 @@ static void __kmp_aux_affinity_initialize(void) {
     }
     break;
 
-  // The other affinity types rely on sorting the Addresses according to some
-  // permutation of the machine topology tree. Set __kmp_affinity_compact and
-  // __kmp_affinity_offset appropriately, then jump to a common code fragment
-  // to do the sort and create the array of affinity masks.
+    // The other affinity types rely on sorting the Addresses according to some
+    // permutation of the machine topology tree. Set __kmp_affinity_compact and
+    // __kmp_affinity_offset appropriately, then jump to a common code fragment
+    // to do the sort and create the array of affinity masks.
 
   case affinity_logical:
     __kmp_affinity_compact = 0;
@@ -4964,14 +4963,15 @@ int __kmp_aux_set_affinity(void **mask) {
   }
 
   gtid = __kmp_entry_gtid();
-  KA_TRACE(1000, (""); {
-    char buf[KMP_AFFIN_MASK_PRINT_LEN];
-    __kmp_affinity_print_mask(buf, KMP_AFFIN_MASK_PRINT_LEN,
-                              (kmp_affin_mask_t *)(*mask));
-    __kmp_debug_printf(
-        "kmp_set_affinity: setting affinity mask for thread %d = %s\n", gtid,
-        buf);
-  });
+  KA_TRACE(
+      1000, (""); {
+        char buf[KMP_AFFIN_MASK_PRINT_LEN];
+        __kmp_affinity_print_mask(buf, KMP_AFFIN_MASK_PRINT_LEN,
+                                  (kmp_affin_mask_t *)(*mask));
+        __kmp_debug_printf(
+            "kmp_set_affinity: setting affinity mask for thread %d = %s\n",
+            gtid, buf);
+      });
 
   if (__kmp_env_consistency_check) {
     if ((mask == NULL) || (*mask == NULL)) {
@@ -5032,13 +5032,15 @@ int __kmp_aux_get_affinity(void **mask) {
   th = __kmp_threads[gtid];
   KMP_DEBUG_ASSERT(th->th.th_affin_mask != NULL);
 
-  KA_TRACE(1000, (""); {
-    char buf[KMP_AFFIN_MASK_PRINT_LEN];
-    __kmp_affinity_print_mask(buf, KMP_AFFIN_MASK_PRINT_LEN,
-                              th->th.th_affin_mask);
-    __kmp_printf("kmp_get_affinity: stored affinity mask for thread %d = %s\n",
-                 gtid, buf);
-  });
+  KA_TRACE(
+      1000, (""); {
+        char buf[KMP_AFFIN_MASK_PRINT_LEN];
+        __kmp_affinity_print_mask(buf, KMP_AFFIN_MASK_PRINT_LEN,
+                                  th->th.th_affin_mask);
+        __kmp_printf(
+            "kmp_get_affinity: stored affinity mask for thread %d = %s\n", gtid,
+            buf);
+      });
 
   if (__kmp_env_consistency_check) {
     if ((mask == NULL) || (*mask == NULL)) {
@@ -5049,13 +5051,15 @@ int __kmp_aux_get_affinity(void **mask) {
 #if !KMP_OS_WINDOWS
 
   retval = __kmp_get_system_affinity((kmp_affin_mask_t *)(*mask), FALSE);
-  KA_TRACE(1000, (""); {
-    char buf[KMP_AFFIN_MASK_PRINT_LEN];
-    __kmp_affinity_print_mask(buf, KMP_AFFIN_MASK_PRINT_LEN,
-                              (kmp_affin_mask_t *)(*mask));
-    __kmp_printf("kmp_get_affinity: system affinity mask for thread %d = %s\n",
-                 gtid, buf);
-  });
+  KA_TRACE(
+      1000, (""); {
+        char buf[KMP_AFFIN_MASK_PRINT_LEN];
+        __kmp_affinity_print_mask(buf, KMP_AFFIN_MASK_PRINT_LEN,
+                                  (kmp_affin_mask_t *)(*mask));
+        __kmp_printf(
+            "kmp_get_affinity: system affinity mask for thread %d = %s\n", gtid,
+            buf);
+      });
   return retval;
 
 #else
@@ -5084,15 +5088,16 @@ int __kmp_aux_set_affinity_mask_proc(int proc, void **mask) {
     return -1;
   }
 
-  KA_TRACE(1000, (""); {
-    int gtid = __kmp_entry_gtid();
-    char buf[KMP_AFFIN_MASK_PRINT_LEN];
-    __kmp_affinity_print_mask(buf, KMP_AFFIN_MASK_PRINT_LEN,
-                              (kmp_affin_mask_t *)(*mask));
-    __kmp_debug_printf("kmp_set_affinity_mask_proc: setting proc %d in "
-                       "affinity mask for thread %d = %s\n",
-                       proc, gtid, buf);
-  });
+  KA_TRACE(
+      1000, (""); {
+        int gtid = __kmp_entry_gtid();
+        char buf[KMP_AFFIN_MASK_PRINT_LEN];
+        __kmp_affinity_print_mask(buf, KMP_AFFIN_MASK_PRINT_LEN,
+                                  (kmp_affin_mask_t *)(*mask));
+        __kmp_debug_printf("kmp_set_affinity_mask_proc: setting proc %d in "
+                           "affinity mask for thread %d = %s\n",
+                           proc, gtid, buf);
+      });
 
   if (__kmp_env_consistency_check) {
     if ((mask == NULL) || (*mask == NULL)) {
@@ -5116,15 +5121,16 @@ int __kmp_aux_unset_affinity_mask_proc(int proc, void **mask) {
     return -1;
   }
 
-  KA_TRACE(1000, (""); {
-    int gtid = __kmp_entry_gtid();
-    char buf[KMP_AFFIN_MASK_PRINT_LEN];
-    __kmp_affinity_print_mask(buf, KMP_AFFIN_MASK_PRINT_LEN,
-                              (kmp_affin_mask_t *)(*mask));
-    __kmp_debug_printf("kmp_unset_affinity_mask_proc: unsetting proc %d in "
-                       "affinity mask for thread %d = %s\n",
-                       proc, gtid, buf);
-  });
+  KA_TRACE(
+      1000, (""); {
+        int gtid = __kmp_entry_gtid();
+        char buf[KMP_AFFIN_MASK_PRINT_LEN];
+        __kmp_affinity_print_mask(buf, KMP_AFFIN_MASK_PRINT_LEN,
+                                  (kmp_affin_mask_t *)(*mask));
+        __kmp_debug_printf("kmp_unset_affinity_mask_proc: unsetting proc %d in "
+                           "affinity mask for thread %d = %s\n",
+                           proc, gtid, buf);
+      });
 
   if (__kmp_env_consistency_check) {
     if ((mask == NULL) || (*mask == NULL)) {
@@ -5148,15 +5154,16 @@ int __kmp_aux_get_affinity_mask_proc(int proc, void **mask) {
     return -1;
   }
 
-  KA_TRACE(1000, (""); {
-    int gtid = __kmp_entry_gtid();
-    char buf[KMP_AFFIN_MASK_PRINT_LEN];
-    __kmp_affinity_print_mask(buf, KMP_AFFIN_MASK_PRINT_LEN,
-                              (kmp_affin_mask_t *)(*mask));
-    __kmp_debug_printf("kmp_get_affinity_mask_proc: getting proc %d in "
-                       "affinity mask for thread %d = %s\n",
-                       proc, gtid, buf);
-  });
+  KA_TRACE(
+      1000, (""); {
+        int gtid = __kmp_entry_gtid();
+        char buf[KMP_AFFIN_MASK_PRINT_LEN];
+        __kmp_affinity_print_mask(buf, KMP_AFFIN_MASK_PRINT_LEN,
+                                  (kmp_affin_mask_t *)(*mask));
+        __kmp_debug_printf("kmp_get_affinity_mask_proc: getting proc %d in "
+                           "affinity mask for thread %d = %s\n",
+                           proc, gtid, buf);
+      });
 
   if (__kmp_env_consistency_check) {
     if ((mask == NULL) || (*mask == NULL)) {

diff  --git a/openmp/runtime/src/kmp_affinity.h b/openmp/runtime/src/kmp_affinity.h
index 013080bbc9ea..f1604c13ee57 100644
--- a/openmp/runtime/src/kmp_affinity.h
+++ b/openmp/runtime/src/kmp_affinity.h
@@ -337,8 +337,8 @@ class KMPNativeAffinity : public KMPAffinity {
       long retval =
           syscall(__NR_sched_getaffinity, 0, __kmp_affin_mask_size, mask);
 #elif KMP_OS_FREEBSD
-      int r =
-          pthread_getaffinity_np(pthread_self(), __kmp_affin_mask_size, reinterpret_cast<cpuset_t *>(mask));
+      int r = pthread_getaffinity_np(pthread_self(), __kmp_affin_mask_size,
+                                     reinterpret_cast<cpuset_t *>(mask));
       int retval = (r == 0 ? 0 : -1);
 #endif
       if (retval >= 0) {
@@ -357,8 +357,8 @@ class KMPNativeAffinity : public KMPAffinity {
       long retval =
           syscall(__NR_sched_setaffinity, 0, __kmp_affin_mask_size, mask);
 #elif KMP_OS_FREEBSD
-      int r =
-          pthread_setaffinity_np(pthread_self(), __kmp_affin_mask_size, reinterpret_cast<cpuset_t *>(mask));
+      int r = pthread_setaffinity_np(pthread_self(), __kmp_affin_mask_size,
+                                     reinterpret_cast<cpuset_t *>(mask));
       int retval = (r == 0 ? 0 : -1);
 #endif
       if (retval >= 0) {

diff  --git a/openmp/runtime/src/kmp_alloc.cpp b/openmp/runtime/src/kmp_alloc.cpp
index 31981d5c1d55..4bb3d2030e6c 100644
--- a/openmp/runtime/src/kmp_alloc.cpp
+++ b/openmp/runtime/src/kmp_alloc.cpp
@@ -315,7 +315,7 @@ static void __kmp_bget_enqueue(kmp_info_t *th, void *buf
                                ,
                                kmp_int32 rel_gtid
 #endif
-                               ) {
+) {
   bfhead_t *b = BFH(((char *)buf) - sizeof(bhead_t));
 
   KMP_DEBUG_ASSERT(b->bh.bb.bsize != 0);
@@ -738,7 +738,7 @@ static void brel(kmp_info_t *th, void *buf) {
                        ,
                        __kmp_gtid_from_thread(th)
 #endif
-                           );
+    );
     return;
   }
 
@@ -1945,10 +1945,9 @@ void *___kmp_fast_allocate(kmp_info_t *this_thr, size_t size KMP_SRC_LOC_DECL) {
   if (ptr != NULL) {
     // pop the head of no-sync free list
     this_thr->th.th_free_lists[index].th_free_list_self = *((void **)ptr);
-    KMP_DEBUG_ASSERT(
-        this_thr ==
-        ((kmp_mem_descr_t *)((kmp_uintptr_t)ptr - sizeof(kmp_mem_descr_t)))
-            ->ptr_aligned);
+    KMP_DEBUG_ASSERT(this_thr == ((kmp_mem_descr_t *)((kmp_uintptr_t)ptr -
+                                                      sizeof(kmp_mem_descr_t)))
+                                     ->ptr_aligned);
     goto end;
   }
   ptr = TCR_SYNC_PTR(this_thr->th.th_free_lists[index].th_free_list_sync);
@@ -1964,10 +1963,9 @@ void *___kmp_fast_allocate(kmp_info_t *this_thr, size_t size KMP_SRC_LOC_DECL) {
     // push the rest of chain into no-sync free list (can be NULL if there was
     // the only block)
     this_thr->th.th_free_lists[index].th_free_list_self = *((void **)ptr);
-    KMP_DEBUG_ASSERT(
-        this_thr ==
-        ((kmp_mem_descr_t *)((kmp_uintptr_t)ptr - sizeof(kmp_mem_descr_t)))
-            ->ptr_aligned);
+    KMP_DEBUG_ASSERT(this_thr == ((kmp_mem_descr_t *)((kmp_uintptr_t)ptr -
+                                                      sizeof(kmp_mem_descr_t)))
+                                     ->ptr_aligned);
     goto end;
   }
 

diff  --git a/openmp/runtime/src/kmp_atomic.cpp b/openmp/runtime/src/kmp_atomic.cpp
index 99b4e84dc5ef..d219eee13777 100644
--- a/openmp/runtime/src/kmp_atomic.cpp
+++ b/openmp/runtime/src/kmp_atomic.cpp
@@ -3381,7 +3381,7 @@ void __kmpc_atomic_1(ident_t *id_ref, int gtid, void *lhs, void *rhs,
 #else
       TRUE
 #endif // KMP_ARCH_X86 && defined(KMP_GOMP_COMPAT)
-      ) {
+  ) {
     kmp_int8 old_value, new_value;
 
     old_value = *(kmp_int8 *)lhs;
@@ -3398,7 +3398,7 @@ void __kmpc_atomic_1(ident_t *id_ref, int gtid, void *lhs, void *rhs,
 
     return;
   } else {
-// All 1-byte data is of integer data type.
+    // All 1-byte data is of integer data type.
 
 #ifdef KMP_GOMP_COMPAT
     if (__kmp_atomic_mode == 2) {
@@ -3428,7 +3428,7 @@ void __kmpc_atomic_2(ident_t *id_ref, int gtid, void *lhs, void *rhs,
 #else
       !((kmp_uintptr_t)lhs & 0x1) /* make sure address is 2-byte aligned */
 #endif // KMP_ARCH_X86 && defined(KMP_GOMP_COMPAT)
-      ) {
+  ) {
     kmp_int16 old_value, new_value;
 
     old_value = *(kmp_int16 *)lhs;
@@ -3445,7 +3445,7 @@ void __kmpc_atomic_2(ident_t *id_ref, int gtid, void *lhs, void *rhs,
 
     return;
   } else {
-// All 2-byte data is of integer data type.
+    // All 2-byte data is of integer data type.
 
 #ifdef KMP_GOMP_COMPAT
     if (__kmp_atomic_mode == 2) {
@@ -3477,7 +3477,7 @@ void __kmpc_atomic_4(ident_t *id_ref, int gtid, void *lhs, void *rhs,
 #else
       !((kmp_uintptr_t)lhs & 0x3) /* make sure address is 4-byte aligned */
 #endif // KMP_ARCH_X86 || KMP_ARCH_X86_64
-      ) {
+  ) {
     kmp_int32 old_value, new_value;
 
     old_value = *(kmp_int32 *)lhs;
@@ -3494,8 +3494,8 @@ void __kmpc_atomic_4(ident_t *id_ref, int gtid, void *lhs, void *rhs,
 
     return;
   } else {
-// Use __kmp_atomic_lock_4i for all 4-byte data,
-// even if it isn't of integer data type.
+    // Use __kmp_atomic_lock_4i for all 4-byte data,
+    // even if it isn't of integer data type.
 
 #ifdef KMP_GOMP_COMPAT
     if (__kmp_atomic_mode == 2) {
@@ -3527,7 +3527,7 @@ void __kmpc_atomic_8(ident_t *id_ref, int gtid, void *lhs, void *rhs,
 #else
       !((kmp_uintptr_t)lhs & 0x7) /* make sure address is 8-byte aligned */
 #endif // KMP_ARCH_X86 && defined(KMP_GOMP_COMPAT)
-      ) {
+  ) {
     kmp_int64 old_value, new_value;
 
     old_value = *(kmp_int64 *)lhs;
@@ -3543,8 +3543,8 @@ void __kmpc_atomic_8(ident_t *id_ref, int gtid, void *lhs, void *rhs,
 
     return;
   } else {
-// Use __kmp_atomic_lock_8i for all 8-byte data,
-// even if it isn't of integer data type.
+    // Use __kmp_atomic_lock_8i for all 8-byte data,
+    // even if it isn't of integer data type.
 
 #ifdef KMP_GOMP_COMPAT
     if (__kmp_atomic_mode == 2) {

diff  --git a/openmp/runtime/src/kmp_atomic.h b/openmp/runtime/src/kmp_atomic.h
index 8f70928ca985..6a0827aaf1ea 100644
--- a/openmp/runtime/src/kmp_atomic.h
+++ b/openmp/runtime/src/kmp_atomic.h
@@ -363,8 +363,8 @@ static inline void __kmp_acquire_atomic_lock(kmp_atomic_lock_t *lck,
 #if OMPT_SUPPORT && OMPT_OPTIONAL
   if (ompt_enabled.ompt_callback_mutex_acquire) {
     ompt_callbacks.ompt_callback(ompt_callback_mutex_acquire)(
-        ompt_mutex_atomic, 0, kmp_mutex_impl_queuing, (ompt_wait_id_t)(uintptr_t)lck,
-        OMPT_GET_RETURN_ADDRESS(0));
+        ompt_mutex_atomic, 0, kmp_mutex_impl_queuing,
+        (ompt_wait_id_t)(uintptr_t)lck, OMPT_GET_RETURN_ADDRESS(0));
   }
 #endif
 
@@ -373,7 +373,8 @@ static inline void __kmp_acquire_atomic_lock(kmp_atomic_lock_t *lck,
 #if OMPT_SUPPORT && OMPT_OPTIONAL
   if (ompt_enabled.ompt_callback_mutex_acquired) {
     ompt_callbacks.ompt_callback(ompt_callback_mutex_acquired)(
-        ompt_mutex_atomic, (ompt_wait_id_t)(uintptr_t)lck, OMPT_GET_RETURN_ADDRESS(0));
+        ompt_mutex_atomic, (ompt_wait_id_t)(uintptr_t)lck,
+        OMPT_GET_RETURN_ADDRESS(0));
   }
 #endif
 }
@@ -389,7 +390,8 @@ static inline void __kmp_release_atomic_lock(kmp_atomic_lock_t *lck,
 #if OMPT_SUPPORT && OMPT_OPTIONAL
   if (ompt_enabled.ompt_callback_mutex_released) {
     ompt_callbacks.ompt_callback(ompt_callback_mutex_released)(
-        ompt_mutex_atomic, (ompt_wait_id_t)(uintptr_t)lck, OMPT_GET_RETURN_ADDRESS(0));
+        ompt_mutex_atomic, (ompt_wait_id_t)(uintptr_t)lck,
+        OMPT_GET_RETURN_ADDRESS(0));
   }
 #endif
 }

diff  --git a/openmp/runtime/src/kmp_barrier.cpp b/openmp/runtime/src/kmp_barrier.cpp
index 4da2d0bd5220..9eb6701162e9 100644
--- a/openmp/runtime/src/kmp_barrier.cpp
+++ b/openmp/runtime/src/kmp_barrier.cpp
@@ -204,7 +204,7 @@ static bool __kmp_linear_barrier_release_template(
              other_threads[i]->th.th_bar[bt].bb.b_go + KMP_BARRIER_STATE_BUMP));
         ANNOTATE_BARRIER_BEGIN(other_threads[i]);
         kmp_flag_64<> flag(&other_threads[i]->th.th_bar[bt].bb.b_go,
-                         other_threads[i]);
+                           other_threads[i]);
         flag.release();
       }
     }
@@ -288,10 +288,9 @@ static bool __kmp_linear_barrier_release_cancellable(
 }
 
 // Tree barrier
-static void
-__kmp_tree_barrier_gather(enum barrier_type bt, kmp_info_t *this_thr, int gtid,
-                          int tid, void (*reduce)(void *, void *)
-                                       USE_ITT_BUILD_ARG(void *itt_sync_obj)) {
+static void __kmp_tree_barrier_gather(
+    enum barrier_type bt, kmp_info_t *this_thr, int gtid, int tid,
+    void (*reduce)(void *, void *) USE_ITT_BUILD_ARG(void *itt_sync_obj)) {
   KMP_TIME_DEVELOPER_PARTITIONED_BLOCK(KMP_tree_gather);
   kmp_team_t *team = this_thr->th.th_team;
   kmp_bstate_t *thr_bar = &this_thr->th.th_bar[bt].bb;
@@ -508,10 +507,9 @@ static void __kmp_tree_barrier_release(
 }
 
 // Hyper Barrier
-static void
-__kmp_hyper_barrier_gather(enum barrier_type bt, kmp_info_t *this_thr, int gtid,
-                           int tid, void (*reduce)(void *, void *)
-                                        USE_ITT_BUILD_ARG(void *itt_sync_obj)) {
+static void __kmp_hyper_barrier_gather(
+    enum barrier_type bt, kmp_info_t *this_thr, int gtid, int tid,
+    void (*reduce)(void *, void *) USE_ITT_BUILD_ARG(void *itt_sync_obj)) {
   KMP_TIME_DEVELOPER_PARTITIONED_BLOCK(KMP_hyper_gather);
   kmp_team_t *team = this_thr->th.th_team;
   kmp_bstate_t *thr_bar = &this_thr->th.th_bar[bt].bb;
@@ -2027,7 +2025,8 @@ void __kmp_fork_barrier(int gtid, int tid) {
 #endif
     if (!KMP_MASTER_TID(ds_tid) && ompt_enabled.ompt_callback_implicit_task) {
       ompt_callbacks.ompt_callback(ompt_callback_implicit_task)(
-          ompt_scope_end, NULL, task_data, 0, ds_tid, ompt_task_implicit); // TODO: Can this be ompt_task_initial?
+          ompt_scope_end, NULL, task_data, 0, ds_tid,
+          ompt_task_implicit); // TODO: Can this be ompt_task_initial?
     }
   }
 #endif
@@ -2108,7 +2107,7 @@ void __kmp_fork_barrier(int gtid, int tid) {
 #if KMP_AFFINITY_SUPPORTED
         || (__kmp_affinity_type == affinity_balanced && team->t.t_size_changed)
 #endif
-            ) {
+    ) {
       // NULL means use the affinity-format-var ICV
       __kmp_aux_display_affinity(gtid, NULL);
       this_thr->th.th_prev_num_threads = team->t.t_nproc;

diff  --git a/openmp/runtime/src/kmp_csupport.cpp b/openmp/runtime/src/kmp_csupport.cpp
index b2388627e2b9..2addb3d87d39 100644
--- a/openmp/runtime/src/kmp_csupport.cpp
+++ b/openmp/runtime/src/kmp_csupport.cpp
@@ -316,7 +316,7 @@ void __kmpc_fork_call(ident_t *loc, kmp_int32 argc, kmpc_micro microtask, ...) {
                     ,
                     fork_context_intel
 #endif
-                    );
+    );
 
     va_end(ap);
   }
@@ -438,7 +438,7 @@ void __kmpc_fork_teams(ident_t *loc, kmp_int32 argc, kmpc_micro microtask,
                   ,
                   fork_context_intel
 #endif
-                  );
+  );
 
   // Pop current CG root off list
   KMP_DEBUG_ASSERT(this_thr->th.th_cg_roots);
@@ -594,7 +594,7 @@ void __kmpc_end_serialized_parallel(ident_t *loc, kmp_int32 global_tid) {
   --serial_team->t.t_serialized;
   if (serial_team->t.t_serialized == 0) {
 
-/* return to the parallel section */
+    /* return to the parallel section */
 
 #if KMP_ARCH_X86 || KMP_ARCH_X86_64
     if (__kmp_inherit_fp_control && serial_team->t.t_fp_control_saved) {
@@ -1202,10 +1202,10 @@ void __kmpc_critical(ident_t *loc, kmp_int32 global_tid,
   if (__kmp_env_consistency_check)
     __kmp_push_sync(global_tid, ct_critical, loc, lck);
 
-// since the critical directive binds to all threads, not just the current
-// team we have to check this even if we are in a serialized team.
-// also, even if we are the uber thread, we still have to conduct the lock,
-// as we have to contend with sibling threads.
+    // since the critical directive binds to all threads, not just the current
+    // team we have to check this even if we are in a serialized team.
+    // also, even if we are the uber thread, we still have to conduct the lock,
+    // as we have to contend with sibling threads.
 
 #if USE_ITT_BUILD
   __kmp_itt_critical_acquiring(lck);
@@ -2110,21 +2110,21 @@ void __kmpc_copyprivate(ident_t *loc, kmp_int32 gtid, size_t cpy_size,
   if (!didit)
     (*cpy_func)(cpy_data, *data_ptr);
 
-// Consider next barrier a user-visible barrier for barrier region boundaries
-// Nesting checks are already handled by the single construct checks
+  // Consider next barrier a user-visible barrier for barrier region boundaries
+  // Nesting checks are already handled by the single construct checks
   {
 #if OMPT_SUPPORT
     OMPT_STORE_RETURN_ADDRESS(gtid);
 #endif
 #if USE_ITT_NOTIFY
-  __kmp_threads[gtid]->th.th_ident = loc; // TODO: check if it is needed (e.g.
+    __kmp_threads[gtid]->th.th_ident = loc; // TODO: check if it is needed (e.g.
 // tasks can overwrite the location)
 #endif
-  __kmp_barrier(bs_plain_barrier, gtid, FALSE, 0, NULL, NULL);
+    __kmp_barrier(bs_plain_barrier, gtid, FALSE, 0, NULL, NULL);
 #if OMPT_SUPPORT && OMPT_OPTIONAL
-  if (ompt_enabled.enabled) {
-    ompt_frame->enter_frame = ompt_data_none;
-  }
+    if (ompt_enabled.enabled) {
+      ompt_frame->enter_frame = ompt_data_none;
+    }
 #endif
   }
 }
@@ -2669,7 +2669,7 @@ void __kmpc_set_nest_lock(ident_t *loc, kmp_int32 gtid, void **user_lock) {
 #endif
   int acquire_status =
       KMP_D_LOCK_FUNC(user_lock, set)((kmp_dyna_lock_t *)user_lock, gtid);
-  (void) acquire_status;
+  (void)acquire_status;
 #if USE_ITT_BUILD
   __kmp_itt_lock_acquired((kmp_user_lock_p)user_lock);
 #endif
@@ -2862,7 +2862,7 @@ void __kmpc_unset_nest_lock(ident_t *loc, kmp_int32 gtid, void **user_lock) {
 #endif
   int release_status =
       KMP_D_LOCK_FUNC(user_lock, unset)((kmp_dyna_lock_t *)user_lock, gtid);
-  (void) release_status;
+  (void)release_status;
 
 #if OMPT_SUPPORT && OMPT_OPTIONAL
   // This is the case, if called from omp_init_lock_with_hint:
@@ -3082,7 +3082,7 @@ int __kmpc_test_lock(ident_t *loc, kmp_int32 gtid, void **user_lock) {
 
   return (rc ? FTN_TRUE : FTN_FALSE);
 
-/* Can't use serial interval since not block structured */
+  /* Can't use serial interval since not block structured */
 
 #endif // KMP_USE_DYNAMIC_LOCK
 }
@@ -3200,7 +3200,7 @@ int __kmpc_test_nest_lock(ident_t *loc, kmp_int32 gtid, void **user_lock) {
 #endif
   return rc;
 
-/* Can't use serial interval since not block structured */
+  /* Can't use serial interval since not block structured */
 
 #endif // KMP_USE_DYNAMIC_LOCK
 }

diff  --git a/openmp/runtime/src/kmp_dispatch.cpp b/openmp/runtime/src/kmp_dispatch.cpp
index 3e9fc7c804bb..cf0d40144b47 100644
--- a/openmp/runtime/src/kmp_dispatch.cpp
+++ b/openmp/runtime/src/kmp_dispatch.cpp
@@ -391,7 +391,7 @@ void __kmp_dispatch_init_algorithm(ident_t *loc, int gtid,
       schedule = kmp_sch_dynamic_chunked;
       KD_TRACE(100, ("__kmp_dispatch_init_algorithm: T#%d switching to "
                      "kmp_sch_dynamic_chunked\n",
-                      gtid));
+                     gtid));
       if (pr->u.p.parm1 <= 0)
         pr->u.p.parm1 = KMP_DEFAULT_CHUNK;
       break;
@@ -615,8 +615,9 @@ void __kmp_dispatch_init_algorithm(ident_t *loc, int gtid,
 #define GUIDED_ANALYTICAL_WORKAROUND (x)
 #endif
         /* dynamic-style scheduling offset */
-        pr->u.p.count = tc - __kmp_dispatch_guided_remaining(
-                                 tc, GUIDED_ANALYTICAL_WORKAROUND, cross) -
+        pr->u.p.count = tc -
+                        __kmp_dispatch_guided_remaining(
+                            tc, GUIDED_ANALYTICAL_WORKAROUND, cross) -
                         cross * chunk;
 #if KMP_USE_X87CONTROL
         // restore FPCW
@@ -702,7 +703,7 @@ void __kmp_dispatch_init_algorithm(ident_t *loc, int gtid,
     __kmp_fatal(KMP_MSG(UnknownSchedTypeDetected), // Primary message
                 KMP_HNT(GetNewerLibrary), // Hint
                 __kmp_msg_null // Variadic argument list terminator
-                );
+    );
   } break;
   } // switch
   pr->schedule = schedule;
@@ -1814,7 +1815,7 @@ int __kmp_dispatch_next_algorithm(int gtid,
     __kmp_fatal(KMP_MSG(UnknownSchedTypeDetected), // Primary message
                 KMP_HNT(GetNewerLibrary), // Hint
                 __kmp_msg_null // Variadic argument list terminator
-                );
+    );
   } break;
   } // switch
   if (p_last)
@@ -1902,7 +1903,7 @@ static int __kmp_dispatch_next(ident_t *loc, int gtid, kmp_int32 *p_last,
                                ,
                                void *codeptr
 #endif
-                               ) {
+) {
 
   typedef typename traits_t<T>::unsigned_t UT;
   typedef typename traits_t<T>::signed_t ST;
@@ -2429,7 +2430,7 @@ int __kmpc_dispatch_next_4(ident_t *loc, kmp_int32 gtid, kmp_int32 *p_last,
                                         ,
                                         OMPT_LOAD_RETURN_ADDRESS(gtid)
 #endif
-                                            );
+  );
 }
 
 /*!
@@ -2446,7 +2447,7 @@ int __kmpc_dispatch_next_4u(ident_t *loc, kmp_int32 gtid, kmp_int32 *p_last,
                                          ,
                                          OMPT_LOAD_RETURN_ADDRESS(gtid)
 #endif
-                                             );
+  );
 }
 
 /*!
@@ -2462,7 +2463,7 @@ int __kmpc_dispatch_next_8(ident_t *loc, kmp_int32 gtid, kmp_int32 *p_last,
                                         ,
                                         OMPT_LOAD_RETURN_ADDRESS(gtid)
 #endif
-                                            );
+  );
 }
 
 /*!
@@ -2479,7 +2480,7 @@ int __kmpc_dispatch_next_8u(ident_t *loc, kmp_int32 gtid, kmp_int32 *p_last,
                                          ,
                                          OMPT_LOAD_RETURN_ADDRESS(gtid)
 #endif
-                                             );
+  );
 }
 
 /*!
@@ -2541,7 +2542,7 @@ kmp_uint32
 __kmp_wait_4(volatile kmp_uint32 *spinner, kmp_uint32 checker,
              kmp_uint32 (*pred)(kmp_uint32, kmp_uint32),
              void *obj // Higher-level synchronization object, or NULL.
-             ) {
+) {
   // note: we may not belong to a team at this point
   volatile kmp_uint32 *spin = spinner;
   kmp_uint32 check = checker;
@@ -2567,7 +2568,7 @@ __kmp_wait_4(volatile kmp_uint32 *spinner, kmp_uint32 checker,
 void __kmp_wait_4_ptr(void *spinner, kmp_uint32 checker,
                       kmp_uint32 (*pred)(void *, kmp_uint32),
                       void *obj // Higher-level synchronization object, or NULL.
-                      ) {
+) {
   // note: we may not belong to a team at this point
   void *spin = spinner;
   kmp_uint32 check = checker;

diff  --git a/openmp/runtime/src/kmp_environment.cpp b/openmp/runtime/src/kmp_environment.cpp
index 893b8f524850..b35027b57f03 100644
--- a/openmp/runtime/src/kmp_environment.cpp
+++ b/openmp/runtime/src/kmp_environment.cpp
@@ -236,7 +236,7 @@ void __kmp_env_unset(char const *name) {
 static void
 ___kmp_env_blk_parse_string(kmp_env_blk_t *block, // M: Env block to fill.
                             char const *env // I: String to parse.
-                            ) {
+) {
 
   char const chr_delimiter = '|';
   char const str_delimiter[] = {chr_delimiter, 0};
@@ -305,7 +305,7 @@ ___kmp_env_blk_parse_string(kmp_env_blk_t *block, // M: Env block to fill.
 static void ___kmp_env_blk_parse_windows(
     kmp_env_blk_t *block, // M: Env block to fill.
     char const *env // I: Pointer to Windows* OS (DOS) environment block.
-    ) {
+) {
 
   char *bulk = NULL;
   kmp_env_var_t *vars = NULL;
@@ -380,7 +380,7 @@ static void ___kmp_env_blk_parse_windows(
 static void
 ___kmp_env_blk_parse_unix(kmp_env_blk_t *block, // M: Env block to fill.
                           char **env // I: Unix environment to parse.
-                          ) {
+) {
   char *bulk = NULL;
   kmp_env_var_t *vars = NULL;
   int count = 0;
@@ -428,7 +428,7 @@ ___kmp_env_blk_parse_unix(kmp_env_blk_t *block, // M: Env block to fill.
 
 void __kmp_env_blk_init(kmp_env_blk_t *block, // M: Block to initialize.
                         char const *bulk // I: Initialization string, or NULL.
-                        ) {
+) {
 
   if (bulk != NULL) {
     ___kmp_env_blk_parse_string(block, bulk);
@@ -460,7 +460,7 @@ static int ___kmp_env_var_cmp( // Comparison function for qsort().
 
 void __kmp_env_blk_sort(
     kmp_env_blk_t *block // M: Block of environment variables to sort.
-    ) {
+) {
 
   qsort(CCAST(kmp_env_var_t *, block->vars), block->count,
         sizeof(kmp_env_var_t),
@@ -470,7 +470,7 @@ void __kmp_env_blk_sort(
 
 void __kmp_env_blk_free(
     kmp_env_blk_t *block // M: Block of environment variables to free.
-    ) {
+) {
 
   KMP_INTERNAL_FREE(CCAST(kmp_env_var_t *, block->vars));
   __kmp_str_free(&(block->bulk));
@@ -481,10 +481,9 @@ void __kmp_env_blk_free(
 } // __kmp_env_blk_free
 
 char const * // R: Value of variable or NULL if variable does not exist.
-    __kmp_env_blk_var(
-        kmp_env_blk_t *block, // I: Block of environment variables.
-        char const *name // I: Name of variable to find.
-        ) {
+__kmp_env_blk_var(kmp_env_blk_t *block, // I: Block of environment variables.
+                  char const *name // I: Name of variable to find.
+) {
 
   int i;
   for (i = 0; i < block->count; ++i) {

diff  --git a/openmp/runtime/src/kmp_error.cpp b/openmp/runtime/src/kmp_error.cpp
index 7fc0ce17a05c..e0bff8a03075 100644
--- a/openmp/runtime/src/kmp_error.cpp
+++ b/openmp/runtime/src/kmp_error.cpp
@@ -20,17 +20,22 @@
 #define MIN_STACK 100
 
 static char const *cons_text_c[] = {
-    "(none)", "\"parallel\"", "work-sharing", /* this is not called "for"
-                                                 because of lowering of
-                                                 "sections" pragmas */
+    "(none)",
+    "\"parallel\"",
+    "work-sharing", /* this is not called "for"
+                       because of lowering of
+                       "sections" pragmas */
     "\"ordered\" work-sharing", /* this is not called "for ordered" because of
                                    lowering of "sections" pragmas */
     "\"sections\"",
     "work-sharing", /* this is not called "single" because of lowering of
                        "sections" pragmas */
-    "\"critical\"", "\"ordered\"", /* in PARALLEL */
+    "\"critical\"",
+    "\"ordered\"", /* in PARALLEL */
     "\"ordered\"", /* in PDO */
-    "\"master\"", "\"reduce\"", "\"barrier\""};
+    "\"master\"",
+    "\"reduce\"",
+    "\"barrier\""};
 
 #define get_src(ident) ((ident) == NULL ? NULL : (ident)->psource)
 
@@ -106,7 +111,7 @@ static char *__kmp_pragma(int ct, ident_t const *ident) {
 void __kmp_error_construct(kmp_i18n_id_t id, // Message identifier.
                            enum cons_type ct, // Construct type.
                            ident_t const *ident // Construct ident.
-                           ) {
+) {
   char *construct = __kmp_pragma(ct, ident);
   __kmp_fatal(__kmp_msg_format(id, construct), __kmp_msg_null);
   KMP_INTERNAL_FREE(construct);
@@ -116,7 +121,7 @@ void __kmp_error_construct2(kmp_i18n_id_t id, // Message identifier.
                             enum cons_type ct, // First construct type.
                             ident_t const *ident, // First construct ident.
                             struct cons_data const *cons // Second construct.
-                            ) {
+) {
   char *construct1 = __kmp_pragma(ct, ident);
   char *construct2 = __kmp_pragma(cons->type, cons->ident);
   __kmp_fatal(__kmp_msg_format(id, construct1, construct2), __kmp_msg_null);

diff  --git a/openmp/runtime/src/kmp_ftn_entry.h b/openmp/runtime/src/kmp_ftn_entry.h
index 935feacc34f2..5c5f470c6878 100644
--- a/openmp/runtime/src/kmp_ftn_entry.h
+++ b/openmp/runtime/src/kmp_ftn_entry.h
@@ -432,7 +432,7 @@ class ConvertedString {
 /*
  * Set the value of the affinity-format-var ICV on the current device to the
  * format specified in the argument.
-*/
+ */
 void FTN_STDCALL FTN_SET_AFFINITY_FORMAT(char const *format, size_t size) {
 #ifdef KMP_STUB
   return;
@@ -453,7 +453,7 @@ void FTN_STDCALL FTN_SET_AFFINITY_FORMAT(char const *format, size_t size) {
  * specification (not including null byte character) and writes the value of the
  * affinity-format-var ICV on the current device to buffer. If the return value
  * is larger than size, the affinity format specification is truncated.
-*/
+ */
 size_t FTN_STDCALL FTN_GET_AFFINITY_FORMAT(char *buffer, size_t size) {
 #ifdef KMP_STUB
   return 0;
@@ -475,7 +475,7 @@ size_t FTN_STDCALL FTN_GET_AFFINITY_FORMAT(char *buffer, size_t size) {
  * Prints the thread affinity information of the current thread in the format
  * specified by the format argument. If the format is NULL or a zero-length
  * string, the value of the affinity-format-var ICV is used.
-*/
+ */
 void FTN_STDCALL FTN_DISPLAY_AFFINITY(char const *format, size_t size) {
 #ifdef KMP_STUB
   return;
@@ -499,7 +499,7 @@ void FTN_STDCALL FTN_DISPLAY_AFFINITY(char const *format, size_t size) {
  * used. The buffer must be allocated prior to calling the routine. If the
  * return value is larger than size, the affinity format specification is
  * truncated.
-*/
+ */
 size_t FTN_STDCALL FTN_CAPTURE_AFFINITY(char *buffer, char const *format,
                                         size_t buf_size, size_t for_size) {
 #if defined(KMP_STUB)
@@ -531,7 +531,7 @@ int FTN_STDCALL KMP_EXPAND_NAME(FTN_GET_THREAD_NUM)(void) {
   int gtid;
 
 #if KMP_OS_DARWIN || KMP_OS_DRAGONFLY || KMP_OS_FREEBSD || KMP_OS_NETBSD ||    \
-        KMP_OS_HURD|| KMP_OS_OPENBSD
+    KMP_OS_HURD || KMP_OS_OPENBSD
   gtid = __kmp_entry_gtid();
 #elif KMP_OS_WINDOWS
   if (!__kmp_init_parallel ||
@@ -715,7 +715,7 @@ int FTN_STDCALL KMP_EXPAND_NAME(FTN_GET_LEVEL)(void) {
 }
 
 int FTN_STDCALL
-    KMP_EXPAND_NAME(FTN_GET_ANCESTOR_THREAD_NUM)(int KMP_DEREF level) {
+KMP_EXPAND_NAME(FTN_GET_ANCESTOR_THREAD_NUM)(int KMP_DEREF level) {
 #ifdef KMP_STUB
   return (KMP_DEREF level) ? (-1) : (0);
 #else
@@ -873,8 +873,8 @@ int FTN_STDCALL KMP_EXPAND_NAME(FTN_GET_PARTITION_NUM_PLACES)(void) {
 #endif
 }
 
-void
-    FTN_STDCALL KMP_EXPAND_NAME(FTN_GET_PARTITION_PLACE_NUMS)(int *place_nums) {
+void FTN_STDCALL
+KMP_EXPAND_NAME(FTN_GET_PARTITION_PLACE_NUMS)(int *place_nums) {
 #if defined(KMP_STUB) || !KMP_AFFINITY_SUPPORTED
 // Nothing.
 #else
@@ -939,7 +939,8 @@ void FTN_STDCALL KMP_EXPAND_NAME(FTN_SET_DEFAULT_DEVICE)(int KMP_DEREF arg) {
 
 // Get number of NON-HOST devices.
 // libomptarget, if loaded, provides this function in api.cpp.
-int FTN_STDCALL KMP_EXPAND_NAME(FTN_GET_NUM_DEVICES)(void) KMP_WEAK_ATTRIBUTE_EXTERNAL;
+int FTN_STDCALL KMP_EXPAND_NAME(FTN_GET_NUM_DEVICES)(void)
+    KMP_WEAK_ATTRIBUTE_EXTERNAL;
 int FTN_STDCALL KMP_EXPAND_NAME(FTN_GET_NUM_DEVICES)(void) {
 #if KMP_MIC || KMP_OS_DARWIN || defined(KMP_STUB)
   return 0;
@@ -959,7 +960,8 @@ int FTN_STDCALL KMP_EXPAND_NAME(FTN_GET_NUM_DEVICES)(void) {
 
 // This function always returns true when called on host device.
 // Compiler/libomptarget should handle when it is called inside target region.
-int FTN_STDCALL KMP_EXPAND_NAME(FTN_IS_INITIAL_DEVICE)(void) KMP_WEAK_ATTRIBUTE_EXTERNAL;
+int FTN_STDCALL KMP_EXPAND_NAME(FTN_IS_INITIAL_DEVICE)(void)
+    KMP_WEAK_ATTRIBUTE_EXTERNAL;
 int FTN_STDCALL KMP_EXPAND_NAME(FTN_IS_INITIAL_DEVICE)(void) {
   return 1; // This is the host
 }
@@ -1266,7 +1268,7 @@ void FTN_STDCALL FTN_SET_DEFAULTS(char const *str
                                   ,
                                   int len
 #endif
-                                  ) {
+) {
 #ifndef KMP_STUB
 #ifdef PASS_ARGS_BY_VALUE
   int len = (int)KMP_STRLEN(str);

diff  --git a/openmp/runtime/src/kmp_gsupport.cpp b/openmp/runtime/src/kmp_gsupport.cpp
index 11a35873f366..c622b81d8b73 100644
--- a/openmp/runtime/src/kmp_gsupport.cpp
+++ b/openmp/runtime/src/kmp_gsupport.cpp
@@ -242,8 +242,8 @@ void *KMP_EXPAND_NAME(KMP_API_NAME_GOMP_SINGLE_COPY_START)(void) {
   if (__kmp_enter_single(gtid, &loc, FALSE))
     return NULL;
 
-// Wait for the first thread to set the copyprivate data pointer,
-// and for all other threads to reach this point.
+    // Wait for the first thread to set the copyprivate data pointer,
+    // and for all other threads to reach this point.
 
 #if OMPT_SUPPORT && OMPT_OPTIONAL
   ompt_frame_t *ompt_frame;
@@ -463,7 +463,8 @@ static void __kmp_GOMP_fork_call(ident_t *loc, int gtid, unsigned num_threads,
       ompt_team_size = __kmp_team_from_gtid(gtid)->t.t_nproc;
       ompt_callbacks.ompt_callback(ompt_callback_implicit_task)(
           ompt_scope_begin, &(team_info->parallel_data),
-          &(task_info->task_data), ompt_team_size, __kmp_tid_from_gtid(gtid), ompt_task_implicit); // TODO: Can this be ompt_task_initial?
+          &(task_info->task_data), ompt_team_size, __kmp_tid_from_gtid(gtid),
+          ompt_task_implicit); // TODO: Can this be ompt_task_initial?
       task_info->thread_num = __kmp_tid_from_gtid(gtid);
     }
     thr->th.ompt_thread_info.state = ompt_state_work_parallel;
@@ -526,7 +527,7 @@ void KMP_EXPAND_NAME(KMP_API_NAME_GOMP_PARALLEL_END)(void) {
                   ,
                   fork_context_gnu
 #endif
-                  );
+  );
 }
 
 // Loop worksharing constructs
@@ -960,12 +961,12 @@ LOOP_START_ULL(KMP_EXPAND_NAME(KMP_API_NAME_GOMP_LOOP_ULL_GUIDED_START),
 LOOP_NEXT_ULL(KMP_EXPAND_NAME(KMP_API_NAME_GOMP_LOOP_ULL_GUIDED_NEXT), {})
 LOOP_START_ULL(
     KMP_EXPAND_NAME(KMP_API_NAME_GOMP_LOOP_ULL_NONMONOTONIC_DYNAMIC_START),
-               kmp_sch_dynamic_chunked)
+    kmp_sch_dynamic_chunked)
 LOOP_NEXT_ULL(
     KMP_EXPAND_NAME(KMP_API_NAME_GOMP_LOOP_ULL_NONMONOTONIC_DYNAMIC_NEXT), {})
 LOOP_START_ULL(
     KMP_EXPAND_NAME(KMP_API_NAME_GOMP_LOOP_ULL_NONMONOTONIC_GUIDED_START),
-               kmp_sch_guided_chunked)
+    kmp_sch_guided_chunked)
 LOOP_NEXT_ULL(
     KMP_EXPAND_NAME(KMP_API_NAME_GOMP_LOOP_ULL_NONMONOTONIC_GUIDED_NEXT), {})
 LOOP_RUNTIME_START_ULL(
@@ -1232,7 +1233,8 @@ void KMP_EXPAND_NAME(KMP_API_NAME_GOMP_TASK)(void (*func)(void *), void *data,
   kmp_taskdata_t *current_task;
   if (ompt_enabled.enabled) {
     current_task = __kmp_threads[gtid]->th.th_current_task;
-    current_task->ompt_task_info.frame.enter_frame.ptr = OMPT_GET_FRAME_ADDRESS(0);
+    current_task->ompt_task_info.frame.enter_frame.ptr =
+        OMPT_GET_FRAME_ADDRESS(0);
   }
   OMPT_STORE_RETURN_ADDRESS(gtid);
 #endif
@@ -1494,10 +1496,10 @@ void KMP_EXPAND_NAME(KMP_API_NAME_GOMP_PARALLEL_SECTIONS)(void (*task)(void *),
 
   {
 #if OMPT_SUPPORT
-  OMPT_STORE_RETURN_ADDRESS(gtid);
+    OMPT_STORE_RETURN_ADDRESS(gtid);
 #endif
 
-  KMP_DISPATCH_INIT(&loc, gtid, kmp_nm_dynamic_chunked, 1, count, 1, 1, TRUE);
+    KMP_DISPATCH_INIT(&loc, gtid, kmp_nm_dynamic_chunked, 1, count, 1, 1, TRUE);
   }
   task(data);
   KMP_EXPAND_NAME(KMP_API_NAME_GOMP_PARALLEL_END)();
@@ -1541,10 +1543,10 @@ PARALLEL_LOOP(KMP_EXPAND_NAME(KMP_API_NAME_GOMP_PARALLEL_LOOP_DYNAMIC),
               kmp_sch_dynamic_chunked, OMPT_LOOP_PRE, OMPT_LOOP_POST)
 PARALLEL_LOOP(
     KMP_EXPAND_NAME(KMP_API_NAME_GOMP_PARALLEL_LOOP_NONMONOTONIC_GUIDED),
-              kmp_sch_guided_chunked, OMPT_LOOP_PRE, OMPT_LOOP_POST)
+    kmp_sch_guided_chunked, OMPT_LOOP_PRE, OMPT_LOOP_POST)
 PARALLEL_LOOP(
     KMP_EXPAND_NAME(KMP_API_NAME_GOMP_PARALLEL_LOOP_NONMONOTONIC_DYNAMIC),
-              kmp_sch_dynamic_chunked, OMPT_LOOP_PRE, OMPT_LOOP_POST)
+    kmp_sch_dynamic_chunked, OMPT_LOOP_PRE, OMPT_LOOP_POST)
 PARALLEL_LOOP(KMP_EXPAND_NAME(KMP_API_NAME_GOMP_PARALLEL_LOOP_GUIDED),
               kmp_sch_guided_chunked, OMPT_LOOP_PRE, OMPT_LOOP_POST)
 PARALLEL_LOOP(KMP_EXPAND_NAME(KMP_API_NAME_GOMP_PARALLEL_LOOP_RUNTIME),

diff  --git a/openmp/runtime/src/kmp_i18n.cpp b/openmp/runtime/src/kmp_i18n.cpp
index d2651cfabdf3..a164aa180dd4 100644
--- a/openmp/runtime/src/kmp_i18n.cpp
+++ b/openmp/runtime/src/kmp_i18n.cpp
@@ -364,9 +364,10 @@ void __kmp_i18n_do_catopen() {
          Issue hint in this case so cause of trouble is more understandable. */
       kmp_msg_t err_code = KMP_SYSERRCODE(error);
       __kmp_msg(kmp_ms_warning, KMP_MSG(CantOpenMessageCatalog, path.str),
-                err_code, (error == ERROR_BAD_EXE_FORMAT
-                               ? KMP_HNT(BadExeFormat, path.str, KMP_ARCH_STR)
-                               : __kmp_msg_null),
+                err_code,
+                (error == ERROR_BAD_EXE_FORMAT
+                     ? KMP_HNT(BadExeFormat, path.str, KMP_ARCH_STR)
+                     : __kmp_msg_null),
                 __kmp_msg_null);
       if (__kmp_generate_warnings == kmp_warnings_off) {
         __kmp_str_free(&err_code.str);
@@ -488,7 +489,7 @@ static char const *___catgets(kmp_i18n_id_t id) {
                             wmsg, wlen, // Wide buffer and size.
                             NULL, 0, // Buffer and size.
                             NULL, NULL // Default char and used default char.
-                            );
+  );
   if (len <= 0) {
     goto end;
   }
@@ -502,7 +503,7 @@ static char const *___catgets(kmp_i18n_id_t id) {
                            wmsg, wlen, // Wide buffer and size.
                            msg, len, // Buffer and size.
                            NULL, NULL // Default char and used default char.
-                           );
+  );
   if (rc <= 0 || rc > len) {
     goto end;
   }
@@ -701,11 +702,11 @@ static char *sys_error(int err) {
 
 #else // Non-Windows* OS: Linux* OS or OS X*
 
-/* There are 2 incompatible versions of strerror_r:
+  /* There are 2 incompatible versions of strerror_r:
 
-   char * strerror_r( int, char *, size_t );  // GNU version
-   int    strerror_r( int, char *, size_t );  // XSI version
-*/
+     char * strerror_r( int, char *, size_t );  // GNU version
+     int    strerror_r( int, char *, size_t );  // XSI version
+  */
 
 #if (defined(__GLIBC__) && defined(_GNU_SOURCE)) ||                            \
     (defined(__BIONIC__) && defined(_GNU_SOURCE) &&                            \
@@ -806,7 +807,9 @@ void __kmp_msg(kmp_msg_severity_t severity, kmp_msg_t message, va_list args) {
   case kmp_ms_fatal: {
     format = kmp_i18n_fmt_Fatal;
   } break;
-  default: { KMP_DEBUG_ASSERT(0); }
+  default: {
+    KMP_DEBUG_ASSERT(0);
+  }
   }
   fmsg = __kmp_msg_format(format, message.num, message.str);
   __kmp_str_free(&message.str);
@@ -830,7 +833,9 @@ void __kmp_msg(kmp_msg_severity_t severity, kmp_msg_t message, va_list args) {
       format = kmp_i18n_fmt_SysErr;
       fmsg = __kmp_msg_format(format, message.num, message.str);
     } break;
-    default: { KMP_DEBUG_ASSERT(0); }
+    default: {
+      KMP_DEBUG_ASSERT(0);
+    }
     }
     __kmp_str_free(&message.str);
     __kmp_str_buf_cat(&buffer, fmsg.str, fmsg.len);

diff  --git a/openmp/runtime/src/kmp_io.cpp b/openmp/runtime/src/kmp_io.cpp
index 01bd910de38f..578e6e671cdf 100644
--- a/openmp/runtime/src/kmp_io.cpp
+++ b/openmp/runtime/src/kmp_io.cpp
@@ -152,8 +152,8 @@ void __kmp_vprintf(enum kmp_io out_stream, char const *format, va_list ap) {
     int chars = 0;
 
 #ifdef KMP_DEBUG_PIDS
-    chars = KMP_SNPRINTF(db, __kmp_debug_buf_chars, "pid=%d: ",
-                         (kmp_int32)getpid());
+    chars = KMP_SNPRINTF(db, __kmp_debug_buf_chars,
+                         "pid=%d: ", (kmp_int32)getpid());
 #endif
     chars += KMP_VSNPRINTF(db, __kmp_debug_buf_chars, format, ap);
 
@@ -161,16 +161,18 @@ void __kmp_vprintf(enum kmp_io out_stream, char const *format, va_list ap) {
       if (chars + 1 > __kmp_debug_buf_warn_chars) {
 #if KMP_OS_WINDOWS
         DWORD count;
-        __kmp_str_buf_print(&__kmp_console_buf, "OMP warning: Debugging buffer "
-                                                "overflow; increase "
-                                                "KMP_DEBUG_BUF_CHARS to %d\n",
+        __kmp_str_buf_print(&__kmp_console_buf,
+                            "OMP warning: Debugging buffer "
+                            "overflow; increase "
+                            "KMP_DEBUG_BUF_CHARS to %d\n",
                             chars + 1);
         WriteFile(stream, __kmp_console_buf.str, __kmp_console_buf.used, &count,
                   NULL);
         __kmp_str_buf_clear(&__kmp_console_buf);
 #else
-        fprintf(stream, "OMP warning: Debugging buffer overflow; "
-                        "increase KMP_DEBUG_BUF_CHARS to %d\n",
+        fprintf(stream,
+                "OMP warning: Debugging buffer overflow; "
+                "increase KMP_DEBUG_BUF_CHARS to %d\n",
                 chars + 1);
         fflush(stream);
 #endif

diff  --git a/openmp/runtime/src/kmp_itt.cpp b/openmp/runtime/src/kmp_itt.cpp
index fa286eccad22..0aa8a70fc70f 100644
--- a/openmp/runtime/src/kmp_itt.cpp
+++ b/openmp/runtime/src/kmp_itt.cpp
@@ -63,9 +63,9 @@ void __kmp_itt_reset() {
 
 void __kmp_itt_initialize() {
 
-// ITTNotify library is loaded and initialized at first call to any ittnotify
-// function, so we do not need to explicitly load it any more. Just report OMP
-// RTL version to ITTNotify.
+  // ITTNotify library is loaded and initialized at first call to any ittnotify
+  // function, so we do not need to explicitly load it any more. Just report OMP
+  // RTL version to ITTNotify.
 
 #if USE_ITT_NOTIFY
   // Backup a clean global state
@@ -153,7 +153,9 @@ extern "C" void __itt_error_handler(__itt_error_code err, va_list args) {
       __kmp_str_free(&err_code.str);
     }
   } break;
-  default: { KMP_WARNING(IttUnknownError, err); }
+  default: {
+    KMP_WARNING(IttUnknownError, err);
+  }
   }
 } // __itt_error_handler
 

diff  --git a/openmp/runtime/src/kmp_itt.h b/openmp/runtime/src/kmp_itt.h
index 6b64cd461f3c..4340b188409f 100644
--- a/openmp/runtime/src/kmp_itt.h
+++ b/openmp/runtime/src/kmp_itt.h
@@ -90,16 +90,16 @@ __kmp_inline void __kmp_itt_barrier_finished(int gtid, void *object);
 __kmp_inline void *__kmp_itt_taskwait_object(int gtid);
 __kmp_inline void __kmp_itt_taskwait_starting(int gtid, void *object);
 __kmp_inline void __kmp_itt_taskwait_finished(int gtid, void *object);
-#define KMP_ITT_TASKWAIT_STARTING(obj) \
-    if (UNLIKELY(__itt_sync_create_ptr)) { \
-      obj = __kmp_itt_taskwait_object(gtid); \
-      if (obj != NULL) { \
-        __kmp_itt_taskwait_starting(gtid, obj); \
-      } \
-    }
-#define KMP_ITT_TASKWAIT_FINISHED(obj) \
-    if (UNLIKELY(obj != NULL)) \
-      __kmp_itt_taskwait_finished(gtid, obj);
+#define KMP_ITT_TASKWAIT_STARTING(obj)                                         \
+  if (UNLIKELY(__itt_sync_create_ptr)) {                                       \
+    obj = __kmp_itt_taskwait_object(gtid);                                     \
+    if (obj != NULL) {                                                         \
+      __kmp_itt_taskwait_starting(gtid, obj);                                  \
+    }                                                                          \
+  }
+#define KMP_ITT_TASKWAIT_FINISHED(obj)                                         \
+  if (UNLIKELY(obj != NULL))                                                   \
+    __kmp_itt_taskwait_finished(gtid, obj);
 
 // --- Task reporting ---
 __kmp_inline void __kmp_itt_task_starting(void *object);

diff  --git a/openmp/runtime/src/kmp_lock.cpp b/openmp/runtime/src/kmp_lock.cpp
index 05e879dbd59f..f32be22476ef 100644
--- a/openmp/runtime/src/kmp_lock.cpp
+++ b/openmp/runtime/src/kmp_lock.cpp
@@ -1490,8 +1490,8 @@ int __kmp_release_queuing_lock(kmp_queuing_lock_t *lck, kmp_int32 gtid) {
 #endif
       return KMP_LOCK_RELEASED;
     }
-/* KMP_CPU_PAUSE(); don't want to make releasing thread hold up acquiring
-   threads */
+    /* KMP_CPU_PAUSE(); don't want to make releasing thread hold up acquiring
+       threads */
 
 #ifdef DEBUG_QUEUING_LOCKS
     TRACE_LOCK(gtid + 1, "rel retry");
@@ -1919,9 +1919,10 @@ void __kmp_print_speculative_stats() {
   }
 
   fprintf(statsFile, "Speculative lock statistics (all approximate!)\n");
-  fprintf(statsFile, " Lock parameters: \n"
-                     "   max_soft_retries               : %10d\n"
-                     "   max_badness                    : %10d\n",
+  fprintf(statsFile,
+          " Lock parameters: \n"
+          "   max_soft_retries               : %10d\n"
+          "   max_badness                    : %10d\n",
           __kmp_adaptive_backoff_params.max_soft_retries,
           __kmp_adaptive_backoff_params.max_badness);
   fprintf(statsFile, " Non-speculative acquire attempts : %10d\n",

diff  --git a/openmp/runtime/src/kmp_lock.h b/openmp/runtime/src/kmp_lock.h
index 3b70f95c7c56..4f6ad6414e53 100644
--- a/openmp/runtime/src/kmp_lock.h
+++ b/openmp/runtime/src/kmp_lock.h
@@ -655,9 +655,8 @@ extern int (*__kmp_acquire_user_lock_with_checks_)(kmp_user_lock_p lck,
       KMP_INIT_YIELD(spins);                                                   \
       do {                                                                     \
         KMP_YIELD_OVERSUB_ELSE_SPIN(spins);                                    \
-      } while (                                                                \
-          lck->tas.lk.poll != 0 ||                                             \
-          !__kmp_atomic_compare_store_acq(&lck->tas.lk.poll, 0, gtid + 1));    \
+      } while (lck->tas.lk.poll != 0 || !__kmp_atomic_compare_store_acq(       \
+                                            &lck->tas.lk.poll, 0, gtid + 1));  \
     }                                                                          \
     KMP_FSYNC_ACQUIRED(lck);                                                   \
   } else {                                                                     \

diff  --git a/openmp/runtime/src/kmp_os.h b/openmp/runtime/src/kmp_os.h
index 590a2c710cc9..563ed8f7c25f 100644
--- a/openmp/runtime/src/kmp_os.h
+++ b/openmp/runtime/src/kmp_os.h
@@ -333,13 +333,13 @@ extern "C" {
 //   Code from libcxx/include/__config
 // Use a function like macro to imply that it must be followed by a semicolon
 #if __cplusplus > 201402L && __has_cpp_attribute(fallthrough)
-#  define KMP_FALLTHROUGH() [[fallthrough]]
+#define KMP_FALLTHROUGH() [[fallthrough]]
 #elif __has_cpp_attribute(clang::fallthrough)
-#  define KMP_FALLTHROUGH() [[clang::fallthrough]]
+#define KMP_FALLTHROUGH() [[clang::fallthrough]]
 #elif __has_attribute(fallthrough) || __GNUC__ >= 7
-#  define KMP_FALLTHROUGH() __attribute__((__fallthrough__))
+#define KMP_FALLTHROUGH() __attribute__((__fallthrough__))
 #else
-#  define KMP_FALLTHROUGH() ((void)0)
+#define KMP_FALLTHROUGH() ((void)0)
 #endif
 
 #if KMP_HAVE_ATTRIBUTE_WAITPKG
@@ -680,26 +680,28 @@ extern kmp_real64 __kmp_xchg_real64(volatile kmp_real64 *p, kmp_real64 v);
   __sync_val_compare_and_swap((volatile kmp_uint32 *)(p), (kmp_uint32)(cv),    \
                               (kmp_uint32)(sv))
 #if KMP_ARCH_MIPS
-static inline bool mips_sync_bool_compare_and_swap(
-  volatile kmp_uint64 *p, kmp_uint64 cv, kmp_uint64 sv) {
+static inline bool mips_sync_bool_compare_and_swap(volatile kmp_uint64 *p,
+                                                   kmp_uint64 cv,
+                                                   kmp_uint64 sv) {
   return __atomic_compare_exchange(p, &cv, &sv, false, __ATOMIC_SEQ_CST,
-                                                       __ATOMIC_SEQ_CST);
+                                   __ATOMIC_SEQ_CST);
 }
-static inline bool mips_sync_val_compare_and_swap(
-  volatile kmp_uint64 *p, kmp_uint64 cv, kmp_uint64 sv) {
+static inline bool mips_sync_val_compare_and_swap(volatile kmp_uint64 *p,
+                                                  kmp_uint64 cv,
+                                                  kmp_uint64 sv) {
   __atomic_compare_exchange(p, &cv, &sv, false, __ATOMIC_SEQ_CST,
-                                                __ATOMIC_SEQ_CST);
+                            __ATOMIC_SEQ_CST);
   return cv;
 }
 #define KMP_COMPARE_AND_STORE_ACQ64(p, cv, sv)                                 \
-  mips_sync_bool_compare_and_swap((volatile kmp_uint64 *)(p), (kmp_uint64)(cv),\
-                               (kmp_uint64)(sv))
+  mips_sync_bool_compare_and_swap((volatile kmp_uint64 *)(p),                  \
+                                  (kmp_uint64)(cv), (kmp_uint64)(sv))
 #define KMP_COMPARE_AND_STORE_REL64(p, cv, sv)                                 \
-  mips_sync_bool_compare_and_swap((volatile kmp_uint64 *)(p), (kmp_uint64)(cv),\
-                               (kmp_uint64)(sv))
+  mips_sync_bool_compare_and_swap((volatile kmp_uint64 *)(p),                  \
+                                  (kmp_uint64)(cv), (kmp_uint64)(sv))
 #define KMP_COMPARE_AND_STORE_RET64(p, cv, sv)                                 \
   mips_sync_val_compare_and_swap((volatile kmp_uint64 *)(p), (kmp_uint64)(cv), \
-                              (kmp_uint64)(sv))
+                                 (kmp_uint64)(sv))
 #else
 #define KMP_COMPARE_AND_STORE_ACQ64(p, cv, sv)                                 \
   __sync_bool_compare_and_swap((volatile kmp_uint64 *)(p), (kmp_uint64)(cv),   \

diff  --git a/openmp/runtime/src/kmp_platform.h b/openmp/runtime/src/kmp_platform.h
index 4296ca31d67d..4dbc0158880e 100644
--- a/openmp/runtime/src/kmp_platform.h
+++ b/openmp/runtime/src/kmp_platform.h
@@ -70,14 +70,13 @@
 #define KMP_OS_HURD 1
 #endif
 
-#if (1 !=                                                                      \
-     KMP_OS_LINUX + KMP_OS_DRAGONFLY + KMP_OS_FREEBSD + KMP_OS_NETBSD +        \
-         KMP_OS_OPENBSD + KMP_OS_DARWIN + KMP_OS_WINDOWS + KMP_OS_HURD)
+#if (1 != KMP_OS_LINUX + KMP_OS_DRAGONFLY + KMP_OS_FREEBSD + KMP_OS_NETBSD +   \
+              KMP_OS_OPENBSD + KMP_OS_DARWIN + KMP_OS_WINDOWS + KMP_OS_HURD)
 #error Unknown OS
 #endif
 
 #if KMP_OS_LINUX || KMP_OS_DRAGONFLY || KMP_OS_FREEBSD || KMP_OS_NETBSD ||     \
-        KMP_OS_OPENBSD || KMP_OS_DARWIN || KMP_OS_HURD
+    KMP_OS_OPENBSD || KMP_OS_DARWIN || KMP_OS_HURD
 #undef KMP_OS_UNIX
 #define KMP_OS_UNIX 1
 #endif
@@ -195,9 +194,9 @@
   ((KMP_ARCH_X86 || KMP_ARCH_X86_64) && (KMP_OS_LINUX || KMP_OS_WINDOWS))
 
 // TODO: Fixme - This is clever, but really fugly
-#if (1 !=                                                                      \
-     KMP_ARCH_X86 + KMP_ARCH_X86_64 + KMP_ARCH_ARM + KMP_ARCH_PPC64 +          \
-     KMP_ARCH_AARCH64 + KMP_ARCH_MIPS + KMP_ARCH_MIPS64 + KMP_ARCH_RISCV64)
+#if (1 != KMP_ARCH_X86 + KMP_ARCH_X86_64 + KMP_ARCH_ARM + KMP_ARCH_PPC64 +     \
+              KMP_ARCH_AARCH64 + KMP_ARCH_MIPS + KMP_ARCH_MIPS64 +             \
+              KMP_ARCH_RISCV64)
 #error Unknown or unsupported architecture
 #endif
 

diff  --git a/openmp/runtime/src/kmp_runtime.cpp b/openmp/runtime/src/kmp_runtime.cpp
index 8799d72bca6d..50edf75401d0 100644
--- a/openmp/runtime/src/kmp_runtime.cpp
+++ b/openmp/runtime/src/kmp_runtime.cpp
@@ -1372,7 +1372,8 @@ void __kmp_serialized_parallel(ident_t *loc, kmp_int32 global_tid) {
   serial_team->t.ompt_team_info.master_return_address = codeptr;
   if (ompt_enabled.enabled &&
       this_thr->th.ompt_thread_info.state != ompt_state_overhead) {
-    OMPT_CUR_TASK_INFO(this_thr)->frame.exit_frame.ptr = OMPT_GET_FRAME_ADDRESS(0);
+    OMPT_CUR_TASK_INFO(this_thr)->frame.exit_frame.ptr =
+        OMPT_GET_FRAME_ADDRESS(0);
 
     ompt_lw_taskteam_t lw_taskteam;
     __ompt_lw_taskteam_init(&lw_taskteam, this_thr, global_tid,
@@ -1386,14 +1387,16 @@ void __kmp_serialized_parallel(ident_t *loc, kmp_int32 global_tid) {
     if (ompt_enabled.ompt_callback_implicit_task) {
       ompt_callbacks.ompt_callback(ompt_callback_implicit_task)(
           ompt_scope_begin, OMPT_CUR_TEAM_DATA(this_thr),
-          OMPT_CUR_TASK_DATA(this_thr), 1, __kmp_tid_from_gtid(global_tid), ompt_task_implicit); // TODO: Can this be ompt_task_initial?
-      OMPT_CUR_TASK_INFO(this_thr)
-          ->thread_num = __kmp_tid_from_gtid(global_tid);
+          OMPT_CUR_TASK_DATA(this_thr), 1, __kmp_tid_from_gtid(global_tid),
+          ompt_task_implicit); // TODO: Can this be ompt_task_initial?
+      OMPT_CUR_TASK_INFO(this_thr)->thread_num =
+          __kmp_tid_from_gtid(global_tid);
     }
 
     /* OMPT state */
     this_thr->th.ompt_thread_info.state = ompt_state_work_parallel;
-    OMPT_CUR_TASK_INFO(this_thr)->frame.exit_frame.ptr = OMPT_GET_FRAME_ADDRESS(0);
+    OMPT_CUR_TASK_INFO(this_thr)->frame.exit_frame.ptr =
+        OMPT_GET_FRAME_ADDRESS(0);
   }
 #endif
 }
@@ -1544,8 +1547,8 @@ int __kmp_fork_call(ident_t *loc, int gtid,
           /* OMPT implicit task begin */
           implicit_task_data = OMPT_CUR_TASK_DATA(master_th);
           if (ompt_enabled.ompt_callback_implicit_task) {
-            OMPT_CUR_TASK_INFO(master_th)
-                ->thread_num = __kmp_tid_from_gtid(gtid);
+            OMPT_CUR_TASK_INFO(master_th)->thread_num =
+                __kmp_tid_from_gtid(gtid);
             ompt_callbacks.ompt_callback(ompt_callback_implicit_task)(
                 ompt_scope_begin, OMPT_CUR_TEAM_DATA(master_th),
                 implicit_task_data, 1,
@@ -1570,7 +1573,7 @@ int __kmp_fork_call(ident_t *loc, int gtid,
                                  ,
                                  exit_frame_p
 #endif
-                                 );
+          );
         }
 
 #if OMPT_SUPPORT
@@ -1755,7 +1758,7 @@ int __kmp_fork_call(ident_t *loc, int gtid,
         if (!ap) {
           // revert change made in __kmpc_serialized_parallel()
           master_th->th.th_serial_team->t.t_level--;
-// Get args from parent team for teams construct
+          // Get args from parent team for teams construct
 
 #if OMPT_SUPPORT
           void *dummy;
@@ -1774,8 +1777,8 @@ int __kmp_fork_call(ident_t *loc, int gtid,
             task_info = OMPT_CUR_TASK_INFO(master_th);
             exit_frame_p = &(task_info->frame.exit_frame.ptr);
             if (ompt_enabled.ompt_callback_implicit_task) {
-              OMPT_CUR_TASK_INFO(master_th)
-                  ->thread_num = __kmp_tid_from_gtid(gtid);
+              OMPT_CUR_TASK_INFO(master_th)->thread_num =
+                  __kmp_tid_from_gtid(gtid);
               ompt_callbacks.ompt_callback(ompt_callback_implicit_task)(
                   ompt_scope_begin, OMPT_CUR_TEAM_DATA(master_th),
                   &(task_info->task_data), 1,
@@ -1799,7 +1802,7 @@ int __kmp_fork_call(ident_t *loc, int gtid,
                                    ,
                                    exit_frame_p
 #endif
-                                   );
+            );
           }
 
 #if OMPT_SUPPORT
@@ -1889,8 +1892,8 @@ int __kmp_fork_call(ident_t *loc, int gtid,
                   ompt_scope_begin, OMPT_CUR_TEAM_DATA(master_th),
                   implicit_task_data, 1, __kmp_tid_from_gtid(gtid),
                   ompt_task_implicit);
-              OMPT_CUR_TASK_INFO(master_th)
-                  ->thread_num = __kmp_tid_from_gtid(gtid);
+              OMPT_CUR_TASK_INFO(master_th)->thread_num =
+                  __kmp_tid_from_gtid(gtid);
             }
 
             /* OMPT state */
@@ -1908,7 +1911,7 @@ int __kmp_fork_call(ident_t *loc, int gtid,
                                    ,
                                    exit_frame_p
 #endif
-                                   );
+            );
           }
 
 #if OMPT_SUPPORT
@@ -2655,7 +2658,7 @@ void __kmp_set_num_threads(int new_nth, int gtid) {
 #if KMP_NESTED_HOT_TEAMS
       && __kmp_hot_teams_max_level && !__kmp_hot_teams_mode
 #endif
-      ) {
+  ) {
     kmp_team_t *hot_team = root->r.r_hot_team;
     int f;
 
@@ -3200,7 +3203,7 @@ static void __kmp_initialize_root(kmp_root_t *root) {
                           __kmp_nested_proc_bind.bind_types[0], &r_icvs,
                           0 // argc
                           USE_NESTED_HOT_ARG(NULL) // master thread is unknown
-                          );
+      );
 #if USE_DEBUGGER
   // Non-NULL value should be assigned to make the debugger display the root
   // team.
@@ -3237,7 +3240,7 @@ static void __kmp_initialize_root(kmp_root_t *root) {
                           __kmp_nested_proc_bind.bind_types[0], &r_icvs,
                           0 // argc
                           USE_NESTED_HOT_ARG(NULL) // master thread is unknown
-                          );
+      );
   KF_TRACE(10, ("__kmp_initialize_root: after hot_team = %p\n", hot_team));
 
   root->r.r_hot_team = hot_team;
@@ -3268,7 +3271,7 @@ typedef kmp_team_list_item_t *kmp_team_list_t;
 static void __kmp_print_structure_team_accum( // Add team to list of teams.
     kmp_team_list_t list, // List of teams.
     kmp_team_p const *team // Team to add.
-    ) {
+) {
 
   // List must terminate with item where both entry and next are NULL.
   // Team is added to the list only once.
@@ -3312,7 +3315,7 @@ static void __kmp_print_structure_team_accum( // Add team to list of teams.
 
 static void __kmp_print_structure_team(char const *title, kmp_team_p const *team
 
-                                       ) {
+) {
   __kmp_printf("%s", title);
   if (team != NULL) {
     __kmp_printf("%2x %p\n", team->t.t_id, team);
@@ -3535,9 +3538,9 @@ static int __kmp_expand_threads(int nNeed) {
   kmp_info_t **newThreads;
   kmp_root_t **newRoot;
 
-// All calls to __kmp_expand_threads should be under __kmp_forkjoin_lock, so
-// resizing __kmp_threads does not need additional protection if foreign
-// threads are present
+  // All calls to __kmp_expand_threads should be under __kmp_forkjoin_lock, so
+  // resizing __kmp_threads does not need additional protection if foreign
+  // threads are present
 
 #if KMP_OS_WINDOWS && !KMP_DYNAMIC_LIB
   /* only for Windows static library */
@@ -3856,7 +3859,8 @@ int __kmp_register_root(int initial_thread) {
     }
     ompt_data_t *task_data;
     ompt_data_t *parallel_data;
-    __ompt_get_task_info_internal(0, NULL, &task_data, NULL, &parallel_data, NULL);
+    __ompt_get_task_info_internal(0, NULL, &task_data, NULL, &parallel_data,
+                                  NULL);
     if (ompt_enabled.ompt_callback_implicit_task) {
       ompt_callbacks.ompt_callback(ompt_callback_implicit_task)(
           ompt_scope_begin, parallel_data, task_data, 1, 1, ompt_task_initial);
@@ -3951,7 +3955,8 @@ static int __kmp_reset_root(int gtid, kmp_root_t *root) {
 #if OMPT_SUPPORT
   ompt_data_t *task_data;
   ompt_data_t *parallel_data;
-  __ompt_get_task_info_internal(0, NULL, &task_data, NULL, &parallel_data, NULL);
+  __ompt_get_task_info_internal(0, NULL, &task_data, NULL, &parallel_data,
+                                NULL);
   if (ompt_enabled.ompt_callback_implicit_task) {
     ompt_callbacks.ompt_callback(ompt_callback_implicit_task)(
         ompt_scope_end, parallel_data, task_data, 0, 1, ompt_task_initial);
@@ -4192,8 +4197,9 @@ static void __kmp_initialize_info(kmp_info_t *this_thr, kmp_team_t *team,
             &dispatch->th_disp_buffer[team->t.t_max_nproc == 1
                                           ? 1
                                           : __kmp_dispatch_num_buffers],
-            disp_size, "th_%d.th_dispatch.th_disp_buffer "
-                       "(team_%d.t_dispatch[%d].th_disp_buffer)",
+            disp_size,
+            "th_%d.th_dispatch.th_disp_buffer "
+            "(team_%d.t_dispatch[%d].th_disp_buffer)",
             gtid, team->t.t_id, gtid);
       }
     } else {
@@ -5978,7 +5984,7 @@ static void __kmp_reap_thread(kmp_info_t *thread, int is_root) {
   TCW_SYNC_PTR(__kmp_threads[gtid], NULL);
 
   --__kmp_all_nth;
-// __kmp_nth was decremented when thread is added to the pool.
+  // __kmp_nth was decremented when thread is added to the pool.
 
 #ifdef KMP_ADJUST_BLOCKTIME
   /* Adjust blocktime back to user setting or default if necessary */
@@ -6526,7 +6532,7 @@ void __kmp_register_library_startup(void) {
       if (tail != NULL) {
         long *flag_addr = 0;
         long flag_val = 0;
-        KMP_SSCANF(flag_addr_str, "%p", RCAST(void**, &flag_addr));
+        KMP_SSCANF(flag_addr_str, "%p", RCAST(void **, &flag_addr));
         KMP_SSCANF(flag_val_str, "%lx", &flag_val);
         if (flag_addr != 0 && flag_val != 0 && strcmp(file_name, "") != 0) {
           // First, check whether environment-encoded address is mapped into
@@ -6571,7 +6577,9 @@ void __kmp_register_library_startup(void) {
         __kmp_env_unset(name);
 #endif
       } break;
-      default: { KMP_DEBUG_ASSERT(0); } break;
+      default: {
+        KMP_DEBUG_ASSERT(0);
+      } break;
       }
     }
     KMP_INTERNAL_FREE((void *)value);
@@ -7277,8 +7285,8 @@ int __kmp_invoke_task_func(int gtid) {
   int ompt_team_size;
 
   if (ompt_enabled.enabled) {
-    exit_frame_p = &(
-        team->t.t_implicit_task_taskdata[tid].ompt_task_info.frame.exit_frame.ptr);
+    exit_frame_p = &(team->t.t_implicit_task_taskdata[tid]
+                         .ompt_task_info.frame.exit_frame.ptr);
   } else {
     exit_frame_p = &dummy;
   }
@@ -7311,10 +7319,10 @@ int __kmp_invoke_task_func(int gtid) {
                               ,
                               exit_frame_p
 #endif
-                              );
+  );
 #if OMPT_SUPPORT
   *exit_frame_p = NULL;
-   this_thr->th.ompt_thread_info.parallel_flags |= ompt_parallel_team;
+  this_thr->th.ompt_thread_info.parallel_flags |= ompt_parallel_team;
 #endif
 
 #if KMP_STATS_ENABLED
@@ -7629,7 +7637,7 @@ void __kmp_internal_join(ident_t *id, int gtid, kmp_team_t *team) {
   KMP_ASSERT(KMP_MASTER_GTID(gtid));
   KMP_MB(); /* Flush all pending memory write invalidates.  */
 
-/* Join barrier after fork */
+  /* Join barrier after fork */
 
 #ifdef KMP_DEBUG
   if (__kmp_threads[gtid] &&
@@ -7673,7 +7681,8 @@ void __kmp_internal_join(ident_t *id, int gtid, kmp_team_t *team) {
 #endif
     if (!KMP_MASTER_TID(ds_tid) && ompt_enabled.ompt_callback_implicit_task) {
       ompt_callbacks.ompt_callback(ompt_callback_implicit_task)(
-          ompt_scope_end, NULL, task_data, 0, ds_tid, ompt_task_implicit); // TODO: Can this be ompt_task_initial?
+          ompt_scope_end, NULL, task_data, 0, ds_tid,
+          ompt_task_implicit); // TODO: Can this be ompt_task_initial?
     }
   }
 #endif
@@ -8103,7 +8112,7 @@ int __kmp_aux_get_num_teams() {
  *
  * Implementation-specific field types can be added
  * If a type is unknown, print "undefined"
-*/
+ */
 
 // Structure holding the short name, long name, and corresponding data type
 // for snprintf.  A table of these will represent the entire valid keyword
@@ -8298,7 +8307,7 @@ static int __kmp_aux_capture_affinity_field(int gtid, const kmp_info_t *th,
  * (not including null byte character)
  * The resultant string is printed to buffer, which the caller can then
  * handle afterwards
-*/
+ */
 size_t __kmp_aux_capture_affinity(int gtid, const char *format,
                                   kmp_str_buf_t *buffer) {
   const char *parse_ptr;

diff  --git a/openmp/runtime/src/kmp_sched.cpp b/openmp/runtime/src/kmp_sched.cpp
index 2d8f644c88b2..8da89a63b040 100644
--- a/openmp/runtime/src/kmp_sched.cpp
+++ b/openmp/runtime/src/kmp_sched.cpp
@@ -78,7 +78,7 @@ static void __kmp_for_static_init(ident_t *loc, kmp_int32 global_tid,
                                   ,
                                   void *codeptr
 #endif
-                                  ) {
+) {
   KMP_COUNT_BLOCK(OMP_LOOP_STATIC);
   KMP_PUSH_PARTITIONED_TIMER(OMP_loop_static);
   KMP_PUSH_PARTITIONED_TIMER(OMP_loop_static_scheduling);
@@ -811,7 +811,7 @@ void __kmpc_for_static_init_4(ident_t *loc, kmp_int32 gtid, kmp_int32 schedtype,
                                    ,
                                    OMPT_GET_RETURN_ADDRESS(0)
 #endif
-                                       );
+  );
 }
 
 /*!
@@ -828,7 +828,7 @@ void __kmpc_for_static_init_4u(ident_t *loc, kmp_int32 gtid,
                                     ,
                                     OMPT_GET_RETURN_ADDRESS(0)
 #endif
-                                        );
+  );
 }
 
 /*!
@@ -844,7 +844,7 @@ void __kmpc_for_static_init_8(ident_t *loc, kmp_int32 gtid, kmp_int32 schedtype,
                                    ,
                                    OMPT_GET_RETURN_ADDRESS(0)
 #endif
-                                       );
+  );
 }
 
 /*!
@@ -861,7 +861,7 @@ void __kmpc_for_static_init_8u(ident_t *loc, kmp_int32 gtid,
                                     ,
                                     OMPT_GET_RETURN_ADDRESS(0)
 #endif
-                                        );
+  );
 }
 /*!
 @}

diff  --git a/openmp/runtime/src/kmp_settings.cpp b/openmp/runtime/src/kmp_settings.cpp
index b711813d9c96..48551db9dfbf 100644
--- a/openmp/runtime/src/kmp_settings.cpp
+++ b/openmp/runtime/src/kmp_settings.cpp
@@ -223,11 +223,11 @@ static int __kmp_strcasecmp_with_sentinel(char const *a, char const *b,
     ++a;
     ++b;
   }
-  return *a
-             ? (*b && *b != sentinel)
-                   ? (int)(unsigned char)*a - (int)(unsigned char)*b
-                   : 1
-             : (*b && *b != sentinel) ? -1 : 0;
+  return *a                       ? (*b && *b != sentinel)
+                                        ? (int)(unsigned char)*a - (int)(unsigned char)*b
+                                        : 1
+         : (*b && *b != sentinel) ? -1
+                                  : 0;
 }
 
 // =============================================================================
@@ -272,7 +272,7 @@ static int __kmp_stg_check_rivals( // 0 -- Ok, 1 -- errors found.
     char const *name, // Name of variable.
     char const *value, // Value of the variable.
     kmp_setting_t **rivals // List of rival settings (must include current one).
-    );
+);
 
 // -----------------------------------------------------------------------------
 // Helper parse functions.
@@ -367,7 +367,7 @@ static void __kmp_stg_parse_int(
     int min, // I: Minimum allowed value.
     int max, // I: Maximum allowed value.
     int *out // O: Output (parsed) value.
-    ) {
+) {
   char const *msg = NULL;
   kmp_uint64 uint = *out;
   __kmp_str_to_uint(value, &uint, &msg);
@@ -910,7 +910,7 @@ static void __kmp_stg_parse_stackpad(char const *name, char const *value,
                       KMP_MIN_STKPADDING, // Min value
                       KMP_MAX_STKPADDING, // Max value
                       &__kmp_stkpadding // Var to initialize
-                      );
+  );
 } // __kmp_stg_parse_stackpad
 
 static void __kmp_stg_print_stackpad(kmp_str_buf_t *buffer, char const *name,
@@ -2424,7 +2424,9 @@ static void __kmp_parse_affinity_env(char const *name, char const *value,
       KMP_WARNING(AffNoParam, name, "default");
     }
   } break;
-  default: { KMP_ASSERT(0); }
+  default: {
+    KMP_ASSERT(0);
+  }
   }
 } // __kmp_parse_affinity_env
 
@@ -4700,7 +4702,8 @@ static void __kmp_stg_print_adaptive_lock_props(kmp_str_buf_t *buffer,
 static void __kmp_stg_parse_speculative_statsfile(char const *name,
                                                   char const *value,
                                                   void *data) {
-  __kmp_stg_parse_file(name, value, "", CCAST(char**, &__kmp_speculative_statsfile));
+  __kmp_stg_parse_file(name, value, "",
+                       CCAST(char **, &__kmp_speculative_statsfile));
 } // __kmp_stg_parse_speculative_statsfile
 
 static void __kmp_stg_print_speculative_statsfile(kmp_str_buf_t *buffer,
@@ -4948,12 +4951,11 @@ static void __kmp_stg_print_forkjoin_frames_mode(kmp_str_buf_t *buffer,
 // -----------------------------------------------------------------------------
 // KMP_ENABLE_TASK_THROTTLING
 
-static void __kmp_stg_parse_task_throttling(char const *name,
-                                            char const *value, void *data) {
+static void __kmp_stg_parse_task_throttling(char const *name, char const *value,
+                                            void *data) {
   __kmp_stg_parse_bool(name, value, &__kmp_enable_task_throttling);
 } // __kmp_stg_parse_task_throttling
 
-
 static void __kmp_stg_print_task_throttling(kmp_str_buf_t *buffer,
                                             char const *name, void *data) {
   __kmp_stg_print_bool(buffer, name, __kmp_enable_task_throttling);
@@ -5065,12 +5067,14 @@ static void __kmp_stg_print_omp_tool_libraries(kmp_str_buf_t *buffer,
 static char *__kmp_tool_verbose_init = NULL;
 
 static void __kmp_stg_parse_omp_tool_verbose_init(char const *name,
-                                                  char const *value, void *data) {
+                                                  char const *value,
+                                                  void *data) {
   __kmp_stg_parse_str(name, value, &__kmp_tool_verbose_init);
 } // __kmp_stg_parse_omp_tool_libraries
 
 static void __kmp_stg_print_omp_tool_verbose_init(kmp_str_buf_t *buffer,
-                                                  char const *name, void *data) {
+                                                  char const *name,
+                                                  void *data) {
   if (__kmp_tool_verbose_init)
     __kmp_stg_print_str(buffer, name, __kmp_tool_libraries);
   else {
@@ -5604,7 +5608,7 @@ static int __kmp_stg_check_rivals( // 0 -- Ok, 1 -- errors found.
     char const *name, // Name of variable.
     char const *value, // Value of the variable.
     kmp_setting_t **rivals // List of rival settings (must include current one).
-    ) {
+) {
 
   if (rivals == NULL) {
     return 0;
@@ -5724,15 +5728,15 @@ void __kmp_env_initialize(char const *string) {
   __kmp_affinity_notype = NULL;
   char const *aff_str = __kmp_env_blk_var(&block, "KMP_AFFINITY");
   if (aff_str != NULL) {
-// Check if the KMP_AFFINITY type is specified in the string.
-// We just search the string for "compact", "scatter", etc.
-// without really parsing the string.  The syntax of the
-// KMP_AFFINITY env var is such that none of the affinity
-// type names can appear anywhere other that the type
-// specifier, even as substrings.
-//
-// I can't find a case-insensitive version of strstr on Windows* OS.
-// Use the case-sensitive version for now.
+    // Check if the KMP_AFFINITY type is specified in the string.
+    // We just search the string for "compact", "scatter", etc.
+    // without really parsing the string.  The syntax of the
+    // KMP_AFFINITY env var is such that none of the affinity
+    // type names can appear anywhere other that the type
+    // specifier, even as substrings.
+    //
+    // I can't find a case-insensitive version of strstr on Windows* OS.
+    // Use the case-sensitive version for now.
 
 #if KMP_OS_WINDOWS
 #define FIND strstr
@@ -6103,7 +6107,7 @@ void __kmp_env_print() {
 #ifdef KMP_GOMP_COMPAT
         || strncmp(name, "GOMP_", 5) == 0
 #endif // KMP_GOMP_COMPAT
-        ) {
+    ) {
       __kmp_str_buf_print(&buffer, "   %s=%s\n", name, value);
     }
   }
@@ -6131,7 +6135,6 @@ void __kmp_env_print_2() {
   __kmp_display_env_impl(__kmp_display_env, __kmp_display_env_verbose);
 } // __kmp_env_print_2
 
-
 void __kmp_display_env_impl(int display_env, int display_env_verbose) {
   kmp_env_blk_t block;
   kmp_str_buf_t buffer;
@@ -6149,8 +6152,7 @@ void __kmp_display_env_impl(int display_env, int display_env_verbose) {
 
   for (int i = 0; i < __kmp_stg_count; ++i) {
     if (__kmp_stg_table[i].print != NULL &&
-        ((display_env &&
-          strncmp(__kmp_stg_table[i].name, "OMP_", 4) == 0) ||
+        ((display_env && strncmp(__kmp_stg_table[i].name, "OMP_", 4) == 0) ||
          display_env_verbose)) {
       __kmp_stg_table[i].print(&buffer, __kmp_stg_table[i].name,
                                __kmp_stg_table[i].data);

diff  --git a/openmp/runtime/src/kmp_stats.cpp b/openmp/runtime/src/kmp_stats.cpp
index 280c4738c595..47a80d97c2fd 100644
--- a/openmp/runtime/src/kmp_stats.cpp
+++ b/openmp/runtime/src/kmp_stats.cpp
@@ -700,16 +700,18 @@ void kmp_stats_output_module::printPloticusFile() {
                    "   pagesize: 15 10\n"
                    "   scale: 1.0\n\n");
 
-  fprintf(plotOut, "#proc getdata\n"
-                   "   file: %s\n\n",
+  fprintf(plotOut,
+          "#proc getdata\n"
+          "   file: %s\n\n",
           eventsFileName);
 
-  fprintf(plotOut, "#proc areadef\n"
-                   "   title: OpenMP Sampling Timeline\n"
-                   "   titledetails: align=center size=16\n"
-                   "   rectangle: 1 1 13 9\n"
-                   "   xautorange: datafield=2,3\n"
-                   "   yautorange: -1 %d\n\n",
+  fprintf(plotOut,
+          "#proc areadef\n"
+          "   title: OpenMP Sampling Timeline\n"
+          "   titledetails: align=center size=16\n"
+          "   rectangle: 1 1 13 9\n"
+          "   xautorange: datafield=2,3\n"
+          "   yautorange: -1 %d\n\n",
           size);
 
   fprintf(plotOut, "#proc xaxis\n"
@@ -718,12 +720,13 @@ void kmp_stats_output_module::printPloticusFile() {
                    "   label: Time (ticks)\n"
                    "   labeldetails: size=14\n\n");
 
-  fprintf(plotOut, "#proc yaxis\n"
-                   "   stubs: inc 1\n"
-                   "   stubrange: 0 %d\n"
-                   "   stubdetails: size=12\n"
-                   "   label: Thread #\n"
-                   "   labeldetails: size=14\n\n",
+  fprintf(plotOut,
+          "#proc yaxis\n"
+          "   stubs: inc 1\n"
+          "   stubrange: 0 %d\n"
+          "   stubdetails: size=12\n"
+          "   label: Thread #\n"
+          "   labeldetails: size=14\n\n",
           size - 1);
 
   fprintf(plotOut, "#proc bars\n"
@@ -737,10 +740,11 @@ void kmp_stats_output_module::printPloticusFile() {
   for (i = 0; i < TIMER_LAST; i++) {
     if (timeStat::logEvent((timer_e)i)) {
       rgb_color c = getEventColor((timer_e)i);
-      fprintf(plotOut, "#proc legendentry\n"
-                       "   sampletype: color\n"
-                       "   label: %s\n"
-                       "   details: rgb(%1.1f,%1.1f,%1.1f)\n\n",
+      fprintf(plotOut,
+              "#proc legendentry\n"
+              "   sampletype: color\n"
+              "   label: %s\n"
+              "   details: rgb(%1.1f,%1.1f,%1.1f)\n\n",
               timeStat::name((timer_e)i), c.r, c.g, c.b);
     }
   }
@@ -833,10 +837,10 @@ void kmp_stats_output_module::outputStats(const char *heading) {
     for (timer_e s = timer_e(0); s < TIMER_LAST; s = timer_e(s + 1)) {
       // See if we should ignore this timer when aggregating
       if ((timeStat::masterOnly(s) && (t != 0)) || // Timer only valid on master
-          // and this thread is worker
+                                                   // and this thread is worker
           (timeStat::workerOnly(s) && (t == 0)) // Timer only valid on worker
           // and this thread is the master
-          ) {
+      ) {
         continue;
       }
 

diff  --git a/openmp/runtime/src/kmp_stats.h b/openmp/runtime/src/kmp_stats.h
index 7f4a9492b24f..1a1ec8ba2720 100644
--- a/openmp/runtime/src/kmp_stats.h
+++ b/openmp/runtime/src/kmp_stats.h
@@ -289,7 +289,7 @@ enum stats_state_e {
  * same as that of a timer above.
  *
  * @ingroup STATS_GATHERING
-*/
+ */
 #define KMP_FOREACH_EXPLICIT_TIMER(macro, arg) KMP_FOREACH_TIMER(macro, arg)
 
 #define ENUMERATE(name, ignore, prefix) prefix##name,
@@ -884,7 +884,7 @@ extern kmp_stats_output_module __kmp_stats_output;
  * a timer statistics.
  *
  * @ingroup STATS_GATHERING
-*/
+ */
 #define KMP_COUNT_VALUE(name, value)                                           \
   __kmp_stats_thread_ptr->getTimer(TIMER_##name)->addSample((double)value)
 
@@ -897,7 +897,7 @@ extern kmp_stats_output_module __kmp_stats_output;
  * counter for the executing thread.
  *
  * @ingroup STATS_GATHERING
-*/
+ */
 #define KMP_COUNT_BLOCK(name)                                                  \
   __kmp_stats_thread_ptr->getCounter(COUNTER_##name)->increment()
 
@@ -917,7 +917,7 @@ extern kmp_stats_output_module __kmp_stats_output;
  * macro is called.
  *
  * @ingroup STATS_GATHERING
-*/
+ */
 #define KMP_OUTPUT_STATS(heading_string) __kmp_output_stats(heading_string)
 
 /*!
@@ -926,7 +926,7 @@ extern kmp_stats_output_module __kmp_stats_output;
  * @param name timer which you want this thread to begin with
  *
  * @ingroup STATS_GATHERING
-*/
+ */
 #define KMP_INIT_PARTITIONED_TIMERS(name)                                      \
   __kmp_stats_thread_ptr->getPartitionedTimers()->init(explicitTimer(          \
       __kmp_stats_thread_ptr->getTimer(TIMER_##name), TIMER_##name))
@@ -963,7 +963,7 @@ extern kmp_stats_output_module __kmp_stats_output;
  * \details Reset all stats for all threads.
  *
  * @ingroup STATS_GATHERING
-*/
+ */
 #define KMP_RESET_STATS() __kmp_reset_stats()
 
 #if (KMP_DEVELOPER_STATS)

diff  --git a/openmp/runtime/src/kmp_str.cpp b/openmp/runtime/src/kmp_str.cpp
index 6838bffeca4e..ffce2b88ab35 100644
--- a/openmp/runtime/src/kmp_str.cpp
+++ b/openmp/runtime/src/kmp_str.cpp
@@ -169,14 +169,15 @@ int __kmp_str_buf_vprint(kmp_str_buf_t *buffer, char const *format,
 
     // Try to format string.
     {
-/* On Linux* OS Intel(R) 64, vsnprintf() modifies args argument, so vsnprintf()
-   crashes if it is called for the second time with the same args. To prevent
-   the crash, we have to pass a fresh intact copy of args to vsnprintf() on each
-   iteration.
+      /* On Linux* OS Intel(R) 64, vsnprintf() modifies args argument, so
+         vsnprintf() crashes if it is called for the second time with the same
+         args. To prevent the crash, we have to pass a fresh intact copy of args
+         to vsnprintf() on each iteration.
 
-   Unfortunately, standard va_copy() macro is not available on Windows* OS.
-   However, it seems vsnprintf() does not modify args argument on Windows* OS.
-*/
+         Unfortunately, standard va_copy() macro is not available on Windows*
+         OS. However, it seems vsnprintf() does not modify args argument on
+         Windows* OS.
+      */
 
 #if !KMP_OS_WINDOWS
       va_list _args;
@@ -403,7 +404,7 @@ void __kmp_str_loc_free(kmp_str_loc_t *loc) {
 int __kmp_str_eqf( // True, if strings are equal, false otherwise.
     char const *lhs, // First string.
     char const *rhs // Second string.
-    ) {
+) {
   int result;
 #if KMP_OS_WINDOWS
   result = (_stricmp(lhs, rhs) == 0);
@@ -447,7 +448,7 @@ int __kmp_str_eqf( // True, if strings are equal, false otherwise.
 char *__kmp_str_format( // Allocated string.
     char const *format, // Format string.
     ... // Other parameters.
-    ) {
+) {
   va_list args;
   int size = 512;
   char *buffer = NULL;
@@ -546,7 +547,7 @@ void __kmp_str_split(char *str, // I: String to split.
                      char delim, // I: Character to split on.
                      char **head, // O: Pointer to head (may be NULL).
                      char **tail // O: Pointer to tail (may be NULL).
-                     ) {
+) {
   char *h = str;
   char *t = NULL;
   if (str != NULL) {
@@ -570,7 +571,7 @@ char *__kmp_str_token(
     char *str, // String to split into tokens. Note: String *is* modified!
     char const *delim, // Delimiters.
     char **buf // Internal buffer.
-    ) {
+) {
   char *token = NULL;
 #if KMP_OS_WINDOWS
   // On Windows* OS there is no strtok_r() function. Let us implement it.
@@ -652,7 +653,7 @@ void __kmp_str_to_size( // R: Error code.
     size_t *out, // O: Parsed number.
     size_t dfactor, // I: The factor if none of the letters specified.
     char const **error // O: Null if everything is ok, error message otherwise.
-    ) {
+) {
 
   size_t value = 0;
   size_t factor = 0;
@@ -751,7 +752,7 @@ void __kmp_str_to_uint( // R: Error code.
     char const *str, // I: String of characters, unsigned number.
     kmp_uint64 *out, // O: Parsed number.
     char const **error // O: Null if everything is ok, error message otherwise.
-    ) {
+) {
   size_t value = 0;
   int overflow = 0;
   int i = 0;

diff  --git a/openmp/runtime/src/kmp_taskdeps.cpp b/openmp/runtime/src/kmp_taskdeps.cpp
index fb33e9295ab4..655e21f21721 100644
--- a/openmp/runtime/src/kmp_taskdeps.cpp
+++ b/openmp/runtime/src/kmp_taskdeps.cpp
@@ -54,7 +54,7 @@ static inline kmp_depnode_t *__kmp_node_ref(kmp_depnode_t *node) {
 
 enum { KMP_DEPHASH_OTHER_SIZE = 97, KMP_DEPHASH_MASTER_SIZE = 997 };
 
-size_t sizes[] = { 997, 2003, 4001, 8191, 16001, 32003, 64007, 131071, 270029 };
+size_t sizes[] = {997, 2003, 4001, 8191, 16001, 32003, 64007, 131071, 270029};
 const size_t MAX_GEN = 8;
 
 static inline size_t __kmp_dephash_hash(kmp_intptr_t addr, size_t hsize) {
@@ -152,11 +152,11 @@ static kmp_dephash_t *__kmp_dephash_create(kmp_info_t *thread,
 #define ENTRY_LAST_INS 0
 #define ENTRY_LAST_MTXS 1
 
-static kmp_dephash_entry *
-__kmp_dephash_find(kmp_info_t *thread, kmp_dephash_t **hash, kmp_intptr_t addr) {
+static kmp_dephash_entry *__kmp_dephash_find(kmp_info_t *thread,
+                                             kmp_dephash_t **hash,
+                                             kmp_intptr_t addr) {
   kmp_dephash_t *h = *hash;
-  if (h->nelements != 0
-      && h->nconflicts/h->size >= 1) {
+  if (h->nelements != 0 && h->nconflicts / h->size >= 1) {
     *hash = __kmp_dephash_extend(thread, h);
     h = *hash;
   }
@@ -537,13 +537,13 @@ kmp_int32 __kmpc_omp_task_with_deps(ident_t *loc_ref, kmp_int32 gtid,
           OMPT_LOAD_OR_GET_RETURN_ADDRESS(gtid));
     }
 
-    new_taskdata->ompt_task_info.frame.enter_frame.ptr = OMPT_GET_FRAME_ADDRESS(0);
+    new_taskdata->ompt_task_info.frame.enter_frame.ptr =
+        OMPT_GET_FRAME_ADDRESS(0);
   }
 
 #if OMPT_OPTIONAL
   /* OMPT grab all dependences if requested by the tool */
-  if (ndeps + ndeps_noalias > 0 &&
-      ompt_enabled.ompt_callback_dependences) {
+  if (ndeps + ndeps_noalias > 0 && ompt_enabled.ompt_callback_dependences) {
     kmp_int32 i;
 
     int ompt_ndeps = ndeps + ndeps_noalias;

diff  --git a/openmp/runtime/src/kmp_taskdeps.h b/openmp/runtime/src/kmp_taskdeps.h
index a1ddf3638433..34db94f2d57f 100644
--- a/openmp/runtime/src/kmp_taskdeps.h
+++ b/openmp/runtime/src/kmp_taskdeps.h
@@ -2,7 +2,6 @@
  * kmp_taskdeps.h
  */
 
-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
@@ -11,7 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-
 #ifndef KMP_TASKDEPS_H
 #define KMP_TASKDEPS_H
 

diff  --git a/openmp/runtime/src/kmp_tasking.cpp b/openmp/runtime/src/kmp_tasking.cpp
index dde7a9640ef3..94c63d500571 100644
--- a/openmp/runtime/src/kmp_tasking.cpp
+++ b/openmp/runtime/src/kmp_tasking.cpp
@@ -564,8 +564,10 @@ static inline void __ompt_task_init(kmp_taskdata_t *task, int tid) {
   task->ompt_task_info.task_data.value = 0;
   task->ompt_task_info.frame.exit_frame = ompt_data_none;
   task->ompt_task_info.frame.enter_frame = ompt_data_none;
-  task->ompt_task_info.frame.exit_frame_flags = ompt_frame_runtime | ompt_frame_framepointer;
-  task->ompt_task_info.frame.enter_frame_flags = ompt_frame_runtime | ompt_frame_framepointer;
+  task->ompt_task_info.frame.exit_frame_flags =
+      ompt_frame_runtime | ompt_frame_framepointer;
+  task->ompt_task_info.frame.enter_frame_flags =
+      ompt_frame_runtime | ompt_frame_framepointer;
 }
 
 // __ompt_task_start:
@@ -640,7 +642,8 @@ static void __kmpc_omp_task_begin_if0_template(ident_t *loc_ref, kmp_int32 gtid,
       current_task->ompt_task_info.frame.enter_frame.ptr =
           taskdata->ompt_task_info.frame.exit_frame.ptr = frame_address;
       current_task->ompt_task_info.frame.enter_frame_flags =
-          taskdata->ompt_task_info.frame.exit_frame_flags = ompt_frame_application | ompt_frame_framepointer;
+          taskdata->ompt_task_info.frame.exit_frame_flags =
+              ompt_frame_application | ompt_frame_framepointer;
     }
     if (ompt_enabled.ompt_callback_task_create) {
       ompt_task_info_t *parent_info = &(current_task->ompt_task_info);
@@ -957,7 +960,6 @@ static void __kmp_task_finish(kmp_int32 gtid, kmp_task_t *task,
     taskdata->td_flags.executing = 0; // suspend the finishing task
   }
 
-
   KA_TRACE(
       20, ("__kmp_task_finish: T#%d finished task %p, %d incomplete children\n",
            gtid, taskdata, children));
@@ -999,7 +1001,8 @@ static void __kmpc_omp_task_complete_if0_template(ident_t *loc_ref,
     ompt_frame_t *ompt_frame;
     __ompt_get_task_info_internal(0, NULL, NULL, &ompt_frame, NULL, NULL);
     ompt_frame->enter_frame = ompt_data_none;
-    ompt_frame->enter_frame_flags = ompt_frame_runtime | ompt_frame_framepointer;
+    ompt_frame->enter_frame_flags =
+        ompt_frame_runtime | ompt_frame_framepointer;
   }
 #endif
 
@@ -1422,7 +1425,7 @@ kmp_task_t *__kmpc_omp_task_alloc(ident_t *loc_ref, kmp_int32 gtid,
   kmp_tasking_flags_t *input_flags = (kmp_tasking_flags_t *)&flags;
   __kmp_assert_valid_gtid(gtid);
   input_flags->native = FALSE;
-// __kmp_task_alloc() sets up all other runtime flags
+  // __kmp_task_alloc() sets up all other runtime flags
   KA_TRACE(10, ("__kmpc_omp_task_alloc(enter): T#%d loc=%p, flags=(%s %s %s) "
                 "sizeof_task=%ld sizeof_shared=%ld entry=%p\n",
                 gtid, loc_ref, input_flags->tiedness ? "tied  " : "untied",
@@ -1632,7 +1635,6 @@ static void __kmp_invoke_task(kmp_int32 gtid, kmp_task_t *task,
     KMP_FSYNC_CANCEL(taskdata); // destroy self (just executed)
     KMP_FSYNC_RELEASING(taskdata->td_parent); // releasing parent
 #endif
-
   }
 
   // Proxy tasks are not handled by the runtime
@@ -1775,7 +1777,8 @@ kmp_int32 __kmpc_omp_task(ident_t *loc_ref, kmp_int32 gtid,
       OMPT_STORE_RETURN_ADDRESS(gtid);
       parent = new_taskdata->td_parent;
       if (!parent->ompt_task_info.frame.enter_frame.ptr) {
-        parent->ompt_task_info.frame.enter_frame.ptr = OMPT_GET_FRAME_ADDRESS(0);
+        parent->ompt_task_info.frame.enter_frame.ptr =
+            OMPT_GET_FRAME_ADDRESS(0);
       }
       if (ompt_enabled.ompt_callback_task_create) {
         ompt_data_t task_data = ompt_data_none;
@@ -3341,7 +3344,7 @@ static int __kmp_realloc_task_threads_data(kmp_info_t *thread,
           __kmp_init_task_stack(__kmp_gtid_from_thread(thread), thread_data);
         }
 #endif // BUILD_TIED_TASK_STACK
-        // Install the new data and free the old data
+       // Install the new data and free the old data
         (*threads_data_p) = new_data;
         __kmp_free(old_data);
       } else {
@@ -4261,8 +4264,8 @@ void __kmp_taskloop_linear(ident_t *loc, int gtid, kmp_task_t *task,
   kmp_task_t *next_task;
   kmp_int32 lastpriv = 0;
 
-  KMP_DEBUG_ASSERT(
-      tc == num_tasks * grainsize + (last_chunk < 0 ? last_chunk : extras));
+  KMP_DEBUG_ASSERT(tc == num_tasks * grainsize +
+                             (last_chunk < 0 ? last_chunk : extras));
   KMP_DEBUG_ASSERT(num_tasks > extras);
   KMP_DEBUG_ASSERT(num_tasks > 0);
   KA_TRACE(20, ("__kmp_taskloop_linear: T#%d: %lld tasks, grainsize %lld, "
@@ -4322,7 +4325,7 @@ void __kmp_taskloop_linear(ident_t *loc, int gtid, kmp_task_t *task,
               next_task_bounds.get_upper_offset()));
 #if OMPT_SUPPORT
     __kmp_omp_taskloop_task(NULL, gtid, next_task,
-                           codeptr_ra); // schedule new task
+                            codeptr_ra); // schedule new task
 #else
     __kmp_omp_task(gtid, next_task, true); // schedule new task
 #endif
@@ -4458,8 +4461,8 @@ void __kmp_taskloop_recur(ident_t *loc, int gtid, kmp_task_t *task,
   size_t upper_offset =
       (char *)ub - (char *)task; // remember offset of ub in the task structure
 
-  KMP_DEBUG_ASSERT(
-      tc == num_tasks * grainsize + (last_chunk < 0 ? last_chunk : extras));
+  KMP_DEBUG_ASSERT(tc == num_tasks * grainsize +
+                             (last_chunk < 0 ? last_chunk : extras));
   KMP_DEBUG_ASSERT(num_tasks > extras);
   KMP_DEBUG_ASSERT(num_tasks > 0);
 
@@ -4653,8 +4656,8 @@ static void __kmp_taskloop(ident_t *loc, int gtid, kmp_task_t *task, int if_val,
     KMP_ASSERT2(0, "unknown scheduling of taskloop");
   }
 
-  KMP_DEBUG_ASSERT(
-      tc == num_tasks * grainsize + (last_chunk < 0 ? last_chunk : extras));
+  KMP_DEBUG_ASSERT(tc == num_tasks * grainsize +
+                             (last_chunk < 0 ? last_chunk : extras));
   KMP_DEBUG_ASSERT(num_tasks > extras);
   KMP_DEBUG_ASSERT(num_tasks > 0);
   // =========================================================================

diff  --git a/openmp/runtime/src/kmp_threadprivate.cpp b/openmp/runtime/src/kmp_threadprivate.cpp
index 270c90abfde2..8cdd4c125f3f 100644
--- a/openmp/runtime/src/kmp_threadprivate.cpp
+++ b/openmp/runtime/src/kmp_threadprivate.cpp
@@ -410,7 +410,7 @@ struct private_common *kmp_threadprivate_insert(int gtid, void *pc_addr,
   }
 
   __kmp_release_lock(&__kmp_global_lock, gtid);
-/* +++++++++ END OF CRITICAL SECTION +++++++++ */
+  /* +++++++++ END OF CRITICAL SECTION +++++++++ */
 
 #ifdef USE_CHECKS_COMMON
   if (pc_size > d_tn->cmn_size) {

diff  --git a/openmp/runtime/src/kmp_utility.cpp b/openmp/runtime/src/kmp_utility.cpp
index f163f0551aa5..423b08e73703 100644
--- a/openmp/runtime/src/kmp_utility.cpp
+++ b/openmp/runtime/src/kmp_utility.cpp
@@ -92,7 +92,7 @@ int __kmp_get_logical_id(int log_per_phy, int apic_id) {
 
 static kmp_uint64 __kmp_parse_frequency( // R: Frequency in Hz.
     char const *frequency // I: Float number and unit: MHz, GHz, or TGz.
-    ) {
+) {
 
   double value = 0.0;
   char *unit = NULL;

diff  --git a/openmp/runtime/src/kmp_version.cpp b/openmp/runtime/src/kmp_version.cpp
index 7464d1972684..2c82a17b0bf5 100644
--- a/openmp/runtime/src/kmp_version.cpp
+++ b/openmp/runtime/src/kmp_version.cpp
@@ -178,7 +178,7 @@ void __kmp_print_version_1(void) {
 #else
       "no"
 #endif
-          );
+  );
   __kmp_printf("%s", buffer.str);
   __kmp_str_buf_free(&buffer);
   K_DIAG(1, ("KMP_VERSION is true\n"));

diff  --git a/openmp/runtime/src/kmp_wait_release.h b/openmp/runtime/src/kmp_wait_release.h
index bb7a3e0d483d..7544d9279497 100644
--- a/openmp/runtime/src/kmp_wait_release.h
+++ b/openmp/runtime/src/kmp_wait_release.h
@@ -983,7 +983,7 @@ class kmp_flag_oncore : public kmp_flag_native<kmp_uint64> {
     else if (flag_switch) {
       this_thr->th.th_bar[bt].bb.wait_flag = KMP_BARRIER_SWITCHING;
       kmp_flag_64<> flag(&this_thr->th.th_bar[bt].bb.b_go,
-                       (kmp_uint64)KMP_BARRIER_STATE_BUMP);
+                         (kmp_uint64)KMP_BARRIER_STATE_BUMP);
       __kmp_wait_64(this_thr, &flag, TRUE USE_ITT_BUILD_ARG(itt_sync_obj));
     }
     return false;

diff  --git a/openmp/runtime/src/ompt-event-specific.h b/openmp/runtime/src/ompt-event-specific.h
index 9b780f5b221d..799fa0d578ea 100644
--- a/openmp/runtime/src/ompt-event-specific.h
+++ b/openmp/runtime/src/ompt-event-specific.h
@@ -79,8 +79,7 @@
 
 #define ompt_callback_mutex_released_implemented ompt_event_MAY_ALWAYS_OPTIONAL
 
-#define ompt_callback_dependences_implemented                             \
-  ompt_event_MAY_ALWAYS_OPTIONAL
+#define ompt_callback_dependences_implemented ompt_event_MAY_ALWAYS_OPTIONAL
 #define ompt_callback_task_dependence_implemented ompt_event_MAY_ALWAYS_OPTIONAL
 
 #define ompt_callback_work_implemented ompt_event_MAY_ALWAYS_OPTIONAL

diff  --git a/openmp/runtime/src/ompt-general.cpp b/openmp/runtime/src/ompt-general.cpp
index c52a3f28c2e7..ea0fa7a2a4c5 100644
--- a/openmp/runtime/src/ompt-general.cpp
+++ b/openmp/runtime/src/ompt-general.cpp
@@ -308,7 +308,7 @@ ompt_try_start_tool(unsigned int omp_version, const char *runtime_version) {
 #else
 #error Activation of OMPT is not supported on this platform.
 #endif
-        {// if (start_tool)
+        { // if (start_tool)
           ret = (*start_tool)(omp_version, runtime_version);
           if (ret) {
             OMPT_VERBOSE_INIT_CONTINUED_PRINT("Success.\n");
@@ -428,9 +428,10 @@ void ompt_pre_init() {
     break;
 
   case omp_tool_error:
-    fprintf(stderr, "Warning: OMP_TOOL has invalid value \"%s\".\n"
-                    "  legal values are (NULL,\"\",\"disabled\","
-                    "\"enabled\").\n",
+    fprintf(stderr,
+            "Warning: OMP_TOOL has invalid value \"%s\".\n"
+            "  legal values are (NULL,\"\",\"disabled\","
+            "\"enabled\").\n",
             ompt_env_var);
     break;
   }
@@ -459,7 +460,8 @@ void ompt_post_init() {
   //--------------------------------------------------
   if (ompt_start_tool_result) {
     ompt_enabled.enabled = !!ompt_start_tool_result->initialize(
-        ompt_fn_lookup, omp_get_initial_device(), &(ompt_start_tool_result->tool_data));
+        ompt_fn_lookup, omp_get_initial_device(),
+        &(ompt_start_tool_result->tool_data));
 
     if (!ompt_enabled.enabled) {
       // tool not enabled, zero out the bitmap, and done
@@ -477,7 +479,8 @@ void ompt_post_init() {
     }
     ompt_data_t *task_data;
     ompt_data_t *parallel_data;
-    __ompt_get_task_info_internal(0, NULL, &task_data, NULL, &parallel_data, NULL);
+    __ompt_get_task_info_internal(0, NULL, &task_data, NULL, &parallel_data,
+                                  NULL);
     if (ompt_enabled.ompt_callback_implicit_task) {
       ompt_callbacks.ompt_callback(ompt_callback_implicit_task)(
           ompt_scope_begin, parallel_data, task_data, 1, 1, ompt_task_initial);
@@ -540,7 +543,7 @@ OMPT_API_ROUTINE int ompt_enumerate_mutex_impls(int current_impl,
  ****************************************************************************/
 
 OMPT_API_ROUTINE ompt_set_result_t ompt_set_callback(ompt_callbacks_t which,
-                                       ompt_callback_t callback) {
+                                                     ompt_callback_t callback) {
   switch (which) {
 
 #define ompt_event_macro(event_name, callback_type, event_id)                  \
@@ -782,7 +785,7 @@ OMPT_API_ROUTINE int ompt_get_ompt_version() { return OMPT_VERSION; }
 */
 
 /*****************************************************************************
-* application-facing API
+ * application-facing API
  ****************************************************************************/
 
 /*----------------------------------------------------------------------------

diff  --git a/openmp/runtime/src/ompt-specific.h b/openmp/runtime/src/ompt-specific.h
index 18816e7337c1..4d76dfcec593 100644
--- a/openmp/runtime/src/ompt-specific.h
+++ b/openmp/runtime/src/ompt-specific.h
@@ -23,8 +23,8 @@
 void __ompt_team_assign_id(kmp_team_t *team, ompt_data_t ompt_pid);
 void __ompt_thread_assign_wait_id(void *variable);
 
-void __ompt_lw_taskteam_init(ompt_lw_taskteam_t *lwt, kmp_info_t *thr,
-                             int gtid, ompt_data_t *ompt_pid, void *codeptr);
+void __ompt_lw_taskteam_init(ompt_lw_taskteam_t *lwt, kmp_info_t *thr, int gtid,
+                             ompt_data_t *ompt_pid, void *codeptr);
 
 void __ompt_lw_taskteam_link(ompt_lw_taskteam_t *lwt, kmp_info_t *thr,
                              int on_heap, bool always = false);
@@ -85,9 +85,9 @@ inline void *__ompt_load_return_address(int gtid) {
 #define OMPT_LOAD_RETURN_ADDRESS(gtid) __ompt_load_return_address(gtid)
 #define OMPT_LOAD_OR_GET_RETURN_ADDRESS(gtid)                                  \
   ((ompt_enabled.enabled && gtid >= 0 && __kmp_threads[gtid] &&                \
-      __kmp_threads[gtid]->th.ompt_thread_info.return_address)?                \
-      __ompt_load_return_address(gtid):                                        \
-      __builtin_return_address(0))
+    __kmp_threads[gtid]->th.ompt_thread_info.return_address)                   \
+       ? __ompt_load_return_address(gtid)                                      \
+       : __builtin_return_address(0))
 
 //******************************************************************************
 // inline functions

diff  --git a/openmp/runtime/src/test-touch.c b/openmp/runtime/src/test-touch.c
index 71e05e76683d..62e81fe0ed49 100644
--- a/openmp/runtime/src/test-touch.c
+++ b/openmp/runtime/src/test-touch.c
@@ -1,6 +1,5 @@
 // test-touch.c //
 
-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
@@ -9,22 +8,21 @@
 //
 //===----------------------------------------------------------------------===//
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 extern double omp_get_wtime();
-extern int    omp_get_num_threads();
-extern int    omp_get_max_threads();
+extern int omp_get_num_threads();
+extern int omp_get_max_threads();
 #ifdef __cplusplus
 }
 #endif
 
 int main() {
-    omp_get_wtime();
-    omp_get_num_threads();
-    omp_get_max_threads();
-    return 0;
+  omp_get_wtime();
+  omp_get_num_threads();
+  omp_get_max_threads();
+  return 0;
 }
 
 // end of file //

diff  --git a/openmp/runtime/src/thirdparty/ittnotify/disable_warnings.h b/openmp/runtime/src/thirdparty/ittnotify/disable_warnings.h
index 6b06035b41fb..e331ffe72950 100644
--- a/openmp/runtime/src/thirdparty/ittnotify/disable_warnings.h
+++ b/openmp/runtime/src/thirdparty/ittnotify/disable_warnings.h
@@ -1,4 +1,4 @@
-
+// clang-format off
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
@@ -7,23 +7,24 @@
 //
 //===----------------------------------------------------------------------===//
 
-
 #include "ittnotify_config.h"
 
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 
-#pragma warning (disable: 593)   /* parameter "XXXX" was set but never used                 */
-#pragma warning (disable: 344)   /* typedef name has already been declared (with same type) */
-#pragma warning (disable: 174)   /* expression has no effect                                */
-#pragma warning (disable: 4127)  /* conditional expression is constant                      */
-#pragma warning (disable: 4306)  /* conversion from '?' to '?' of greater size              */
+#pragma warning(disable: 593) /* parameter "XXXX" was set but never used */
+#pragma warning(disable: 344) /* typedef name has already been declared (with
+                                  same type) */
+#pragma warning(disable: 174) /* expression has no effect */
+#pragma warning(disable: 4127) /* conditional expression is constant */
+#pragma warning(disable: 4306) /* conversion from '?' to '?' of greater size */
 
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
 #if defined __INTEL_COMPILER
 
-#pragma warning (disable: 869)  /* parameter "XXXXX" was never referenced                  */
-#pragma warning (disable: 1418) /* external function definition with no prior declaration  */
-#pragma warning (disable: 1419) /* external declaration in primary source file             */
+#pragma warning(disable: 869) /* parameter "XXXXX" was never referenced */
+#pragma warning(disable: 1418) /* external function definition with no prior
+                                  declaration  */
+#pragma warning(disable: 1419) /* external declaration in primary source file */
 
 #endif /* __INTEL_COMPILER */

diff  --git a/openmp/runtime/src/thirdparty/ittnotify/ittnotify.h b/openmp/runtime/src/thirdparty/ittnotify/ittnotify.h
index db1c0d0d9d21..e1eee8cde613 100644
--- a/openmp/runtime/src/thirdparty/ittnotify/ittnotify.h
+++ b/openmp/runtime/src/thirdparty/ittnotify/ittnotify.h
@@ -78,59 +78,59 @@ The same ID may not be reused for 
diff erent instances, unless a previous
 
 /** @cond exclude_from_documentation */
 #ifndef ITT_OS_WIN
-#  define ITT_OS_WIN   1
+#define ITT_OS_WIN 1
 #endif /* ITT_OS_WIN */
 
 #ifndef ITT_OS_LINUX
-#  define ITT_OS_LINUX 2
+#define ITT_OS_LINUX 2
 #endif /* ITT_OS_LINUX */
 
 #ifndef ITT_OS_MAC
-#  define ITT_OS_MAC   3
+#define ITT_OS_MAC 3
 #endif /* ITT_OS_MAC */
 
 #ifndef ITT_OS_FREEBSD
-#  define ITT_OS_FREEBSD   4
+#define ITT_OS_FREEBSD 4
 #endif /* ITT_OS_FREEBSD */
 
 #ifndef ITT_OS
-#  if defined WIN32 || defined _WIN32
-#    define ITT_OS ITT_OS_WIN
-#  elif defined( __APPLE__ ) && defined( __MACH__ )
-#    define ITT_OS ITT_OS_MAC
-#  elif defined( __FreeBSD__ )
-#    define ITT_OS ITT_OS_FREEBSD
-#  else
-#    define ITT_OS ITT_OS_LINUX
-#  endif
+#if defined WIN32 || defined _WIN32
+#define ITT_OS ITT_OS_WIN
+#elif defined(__APPLE__) && defined(__MACH__)
+#define ITT_OS ITT_OS_MAC
+#elif defined(__FreeBSD__)
+#define ITT_OS ITT_OS_FREEBSD
+#else
+#define ITT_OS ITT_OS_LINUX
+#endif
 #endif /* ITT_OS */
 
 #ifndef ITT_PLATFORM_WIN
-#  define ITT_PLATFORM_WIN 1
+#define ITT_PLATFORM_WIN 1
 #endif /* ITT_PLATFORM_WIN */
 
 #ifndef ITT_PLATFORM_POSIX
-#  define ITT_PLATFORM_POSIX 2
+#define ITT_PLATFORM_POSIX 2
 #endif /* ITT_PLATFORM_POSIX */
 
 #ifndef ITT_PLATFORM_MAC
-#  define ITT_PLATFORM_MAC 3
+#define ITT_PLATFORM_MAC 3
 #endif /* ITT_PLATFORM_MAC */
 
 #ifndef ITT_PLATFORM_FREEBSD
-#  define ITT_PLATFORM_FREEBSD 4
+#define ITT_PLATFORM_FREEBSD 4
 #endif /* ITT_PLATFORM_FREEBSD */
 
 #ifndef ITT_PLATFORM
-#  if ITT_OS==ITT_OS_WIN
-#    define ITT_PLATFORM ITT_PLATFORM_WIN
-#  elif ITT_OS==ITT_OS_MAC
-#    define ITT_PLATFORM ITT_PLATFORM_MAC
-#  elif ITT_OS==ITT_OS_FREEBSD
-#    define ITT_PLATFORM ITT_PLATFORM_FREEBSD
-#  else
-#    define ITT_PLATFORM ITT_PLATFORM_POSIX
-#  endif
+#if ITT_OS == ITT_OS_WIN
+#define ITT_PLATFORM ITT_PLATFORM_WIN
+#elif ITT_OS == ITT_OS_MAC
+#define ITT_PLATFORM ITT_PLATFORM_MAC
+#elif ITT_OS == ITT_OS_FREEBSD
+#define ITT_PLATFORM ITT_PLATFORM_FREEBSD
+#else
+#define ITT_PLATFORM ITT_PLATFORM_POSIX
+#endif
 #endif /* ITT_PLATFORM */
 
 #if defined(_UNICODE) && !defined(UNICODE)
@@ -138,9 +138,9 @@ The same ID may not be reused for 
diff erent instances, unless a previous
 #endif
 
 #include <stddef.h>
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #include <tchar.h>
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #include <stdint.h>
 #if defined(UNICODE) || defined(_UNICODE)
 #include <wchar.h>
@@ -148,69 +148,71 @@ The same ID may not be reused for 
diff erent instances, unless a previous
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
 #ifndef ITTAPI_CDECL
-#  if ITT_PLATFORM==ITT_PLATFORM_WIN
-#    define ITTAPI_CDECL __cdecl
-#  else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#    if defined _M_IX86 || defined __i386__
-#      define ITTAPI_CDECL __attribute__ ((cdecl))
-#    else  /* _M_IX86 || __i386__ */
-#      define ITTAPI_CDECL /* actual only on x86 platform */
-#    endif /* _M_IX86 || __i386__ */
-#  endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define ITTAPI_CDECL __cdecl
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#if defined _M_IX86 || defined __i386__
+#define ITTAPI_CDECL __attribute__((cdecl))
+#else /* _M_IX86 || __i386__ */
+#define ITTAPI_CDECL /* actual only on x86 platform */
+#endif /* _M_IX86 || __i386__ */
+#endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* ITTAPI_CDECL */
 
 #ifndef STDCALL
-#  if ITT_PLATFORM==ITT_PLATFORM_WIN
-#    define STDCALL __stdcall
-#  else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#    if defined _M_IX86 || defined __i386__
-#      define STDCALL __attribute__ ((stdcall))
-#    else  /* _M_IX86 || __i386__ */
-#      define STDCALL /* supported only on x86 platform */
-#    endif /* _M_IX86 || __i386__ */
-#  endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define STDCALL __stdcall
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#if defined _M_IX86 || defined __i386__
+#define STDCALL __attribute__((stdcall))
+#else /* _M_IX86 || __i386__ */
+#define STDCALL /* supported only on x86 platform */
+#endif /* _M_IX86 || __i386__ */
+#endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* STDCALL */
 
-#define ITTAPI    ITTAPI_CDECL
+#define ITTAPI ITTAPI_CDECL
 #define LIBITTAPI ITTAPI_CDECL
 
 /* TODO: Temporary for compatibility! */
-#define ITTAPI_CALL    ITTAPI_CDECL
+#define ITTAPI_CALL ITTAPI_CDECL
 #define LIBITTAPI_CALL ITTAPI_CDECL
 
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 /* use __forceinline (VC++ specific) */
-#define ITT_INLINE           __forceinline
+#define ITT_INLINE __forceinline
 #define ITT_INLINE_ATTRIBUTE /* nothing */
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 /*
  * Generally, functions are not inlined unless optimization is specified.
  * For functions declared inline, this attribute inlines the function even
  * if no optimization level was specified.
  */
 #ifdef __STRICT_ANSI__
-#define ITT_INLINE           static
+#define ITT_INLINE static
 #define ITT_INLINE_ATTRIBUTE __attribute__((unused))
-#else  /* __STRICT_ANSI__ */
-#define ITT_INLINE           static inline
+#else /* __STRICT_ANSI__ */
+#define ITT_INLINE static inline
 #define ITT_INLINE_ATTRIBUTE __attribute__((always_inline, unused))
 #endif /* __STRICT_ANSI__ */
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 /** @endcond */
 
 #ifdef INTEL_ITTNOTIFY_ENABLE_LEGACY
-#  if ITT_PLATFORM==ITT_PLATFORM_WIN
-#    pragma message("WARNING!!! Deprecated API is used. Please undefine INTEL_ITTNOTIFY_ENABLE_LEGACY macro")
-#  else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#    warning "Deprecated API is used. Please undefine INTEL_ITTNOTIFY_ENABLE_LEGACY macro"
-#  endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#  include "legacy/ittnotify.h"
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#pragma message(                                                               \
+    "WARNING!!! Deprecated API is used. Please undefine INTEL_ITTNOTIFY_ENABLE_LEGACY macro")
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#warning                                                                       \
+    "Deprecated API is used. Please undefine INTEL_ITTNOTIFY_ENABLE_LEGACY macro"
+#endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#include "legacy/ittnotify.h"
 #endif /* INTEL_ITTNOTIFY_ENABLE_LEGACY */
 
 /** @cond exclude_from_documentation */
 /* Helper macro for joining tokens */
-#define ITT_JOIN_AUX(p,n) p##n
-#define ITT_JOIN(p,n)     ITT_JOIN_AUX(p,n)
+#define ITT_JOIN_AUX(p, n) p##n
+#define ITT_JOIN(p, n) ITT_JOIN_AUX(p, n)
 
 #ifdef ITT_MAJOR
 #undef ITT_MAJOR
@@ -218,43 +220,75 @@ The same ID may not be reused for 
diff erent instances, unless a previous
 #ifdef ITT_MINOR
 #undef ITT_MINOR
 #endif
-#define ITT_MAJOR     3
-#define ITT_MINOR     0
+#define ITT_MAJOR 3
+#define ITT_MINOR 0
 
 /* Standard versioning of a token with major and minor version numbers */
-#define ITT_VERSIONIZE(x)    \
-    ITT_JOIN(x,              \
-    ITT_JOIN(_,              \
-    ITT_JOIN(ITT_MAJOR,      \
-    ITT_JOIN(_, ITT_MINOR))))
+#define ITT_VERSIONIZE(x)                                                      \
+  ITT_JOIN(x, ITT_JOIN(_, ITT_JOIN(ITT_MAJOR, ITT_JOIN(_, ITT_MINOR))))
 
 #ifndef INTEL_ITTNOTIFY_PREFIX
-#  define INTEL_ITTNOTIFY_PREFIX __itt_
+#define INTEL_ITTNOTIFY_PREFIX __itt_
 #endif /* INTEL_ITTNOTIFY_PREFIX */
 #ifndef INTEL_ITTNOTIFY_POSTFIX
-#  define INTEL_ITTNOTIFY_POSTFIX _ptr_
+#define INTEL_ITTNOTIFY_POSTFIX _ptr_
 #endif /* INTEL_ITTNOTIFY_POSTFIX */
 
-#define ITTNOTIFY_NAME_AUX(n) ITT_JOIN(INTEL_ITTNOTIFY_PREFIX,n)
-#define ITTNOTIFY_NAME(n)     ITT_VERSIONIZE(ITTNOTIFY_NAME_AUX(ITT_JOIN(n,INTEL_ITTNOTIFY_POSTFIX)))
+#define ITTNOTIFY_NAME_AUX(n) ITT_JOIN(INTEL_ITTNOTIFY_PREFIX, n)
+#define ITTNOTIFY_NAME(n)                                                      \
+  ITT_VERSIONIZE(ITTNOTIFY_NAME_AUX(ITT_JOIN(n, INTEL_ITTNOTIFY_POSTFIX)))
 
 #define ITTNOTIFY_VOID(n) (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)
-#define ITTNOTIFY_DATA(n) (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)
-
-#define ITTNOTIFY_VOID_D0(n,d)       (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d)
-#define ITTNOTIFY_VOID_D1(n,d,x)     (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x)
-#define ITTNOTIFY_VOID_D2(n,d,x,y)   (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x,y)
-#define ITTNOTIFY_VOID_D3(n,d,x,y,z) (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x,y,z)
-#define ITTNOTIFY_VOID_D4(n,d,x,y,z,a)     (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x,y,z,a)
-#define ITTNOTIFY_VOID_D5(n,d,x,y,z,a,b)   (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x,y,z,a,b)
-#define ITTNOTIFY_VOID_D6(n,d,x,y,z,a,b,c) (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x,y,z,a,b,c)
-#define ITTNOTIFY_DATA_D0(n,d)       (!(d)->flags) ?       0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d)
-#define ITTNOTIFY_DATA_D1(n,d,x)     (!(d)->flags) ?       0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x)
-#define ITTNOTIFY_DATA_D2(n,d,x,y)   (!(d)->flags) ?       0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x,y)
-#define ITTNOTIFY_DATA_D3(n,d,x,y,z) (!(d)->flags) ?       0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x,y,z)
-#define ITTNOTIFY_DATA_D4(n,d,x,y,z,a)     (!(d)->flags) ? 0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x,y,z,a)
-#define ITTNOTIFY_DATA_D5(n,d,x,y,z,a,b)   (!(d)->flags) ? 0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x,y,z,a,b)
-#define ITTNOTIFY_DATA_D6(n,d,x,y,z,a,b,c) (!(d)->flags) ? 0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x,y,z,a,b,c)
+#define ITTNOTIFY_DATA(n) (!ITTNOTIFY_NAME(n)) ? 0 : ITTNOTIFY_NAME(n)
+
+#define ITTNOTIFY_VOID_D0(n, d)                                                \
+  (!(d)->flags)          ? (void)0                                             \
+  : (!ITTNOTIFY_NAME(n)) ? (void)0                                             \
+                         : ITTNOTIFY_NAME(n)(d)
+#define ITTNOTIFY_VOID_D1(n, d, x)                                             \
+  (!(d)->flags)          ? (void)0                                             \
+  : (!ITTNOTIFY_NAME(n)) ? (void)0                                             \
+                         : ITTNOTIFY_NAME(n)(d, x)
+#define ITTNOTIFY_VOID_D2(n, d, x, y)                                          \
+  (!(d)->flags)          ? (void)0                                             \
+  : (!ITTNOTIFY_NAME(n)) ? (void)0                                             \
+                         : ITTNOTIFY_NAME(n)(d, x, y)
+#define ITTNOTIFY_VOID_D3(n, d, x, y, z)                                       \
+  (!(d)->flags)          ? (void)0                                             \
+  : (!ITTNOTIFY_NAME(n)) ? (void)0                                             \
+                         : ITTNOTIFY_NAME(n)(d, x, y, z)
+#define ITTNOTIFY_VOID_D4(n, d, x, y, z, a)                                    \
+  (!(d)->flags)          ? (void)0                                             \
+  : (!ITTNOTIFY_NAME(n)) ? (void)0                                             \
+                         : ITTNOTIFY_NAME(n)(d, x, y, z, a)
+#define ITTNOTIFY_VOID_D5(n, d, x, y, z, a, b)                                 \
+  (!(d)->flags)          ? (void)0                                             \
+  : (!ITTNOTIFY_NAME(n)) ? (void)0                                             \
+                         : ITTNOTIFY_NAME(n)(d, x, y, z, a, b)
+#define ITTNOTIFY_VOID_D6(n, d, x, y, z, a, b, c)                              \
+  (!(d)->flags)          ? (void)0                                             \
+  : (!ITTNOTIFY_NAME(n)) ? (void)0                                             \
+                         : ITTNOTIFY_NAME(n)(d, x, y, z, a, b, c)
+#define ITTNOTIFY_DATA_D0(n, d)                                                \
+  (!(d)->flags) ? 0 : (!ITTNOTIFY_NAME(n)) ? 0 : ITTNOTIFY_NAME(n)(d)
+#define ITTNOTIFY_DATA_D1(n, d, x)                                             \
+  (!(d)->flags) ? 0 : (!ITTNOTIFY_NAME(n)) ? 0 : ITTNOTIFY_NAME(n)(d, x)
+#define ITTNOTIFY_DATA_D2(n, d, x, y)                                          \
+  (!(d)->flags) ? 0 : (!ITTNOTIFY_NAME(n)) ? 0 : ITTNOTIFY_NAME(n)(d, x, y)
+#define ITTNOTIFY_DATA_D3(n, d, x, y, z)                                       \
+  (!(d)->flags) ? 0 : (!ITTNOTIFY_NAME(n)) ? 0 : ITTNOTIFY_NAME(n)(d, x, y, z)
+#define ITTNOTIFY_DATA_D4(n, d, x, y, z, a)                                    \
+  (!(d)->flags)          ? 0                                                   \
+  : (!ITTNOTIFY_NAME(n)) ? 0                                                   \
+                         : ITTNOTIFY_NAME(n)(d, x, y, z, a)
+#define ITTNOTIFY_DATA_D5(n, d, x, y, z, a, b)                                 \
+  (!(d)->flags)          ? 0                                                   \
+  : (!ITTNOTIFY_NAME(n)) ? 0                                                   \
+                         : ITTNOTIFY_NAME(n)(d, x, y, z, a, b)
+#define ITTNOTIFY_DATA_D6(n, d, x, y, z, a, b, c)                              \
+  (!(d)->flags)          ? 0                                                   \
+  : (!ITTNOTIFY_NAME(n)) ? 0                                                   \
+                         : ITTNOTIFY_NAME(n)(d, x, y, z, a, b, c)
 
 #ifdef ITT_STUB
 #undef ITT_STUB
@@ -262,9 +296,9 @@ The same ID may not be reused for 
diff erent instances, unless a previous
 #ifdef ITT_STUBV
 #undef ITT_STUBV
 #endif
-#define ITT_STUBV(api,type,name,args)                             \
-    typedef type (api* ITT_JOIN(ITTNOTIFY_NAME(name),_t)) args;   \
-    extern ITT_JOIN(ITTNOTIFY_NAME(name),_t) ITTNOTIFY_NAME(name);
+#define ITT_STUBV(api, type, name, args)                                       \
+  typedef type(api *ITT_JOIN(ITTNOTIFY_NAME(name), _t)) args;                  \
+  extern ITT_JOIN(ITTNOTIFY_NAME(name), _t) ITTNOTIFY_NAME(name);
 #define ITT_STUB ITT_STUBV
 /** @endcond */
 
@@ -282,9 +316,11 @@ extern "C" {
 /**
  * @defgroup control Collection Control
  * @ingroup public
- * General behavior: application continues to run, but no profiling information is being collected
+ * General behavior: application continues to run, but no profiling information
+ * is being collected
  *
- * Pausing occurs not only for the current thread but for all process as well as spawned processes
+ * Pausing occurs not only for the current thread but for all process as well as
+ * spawned processes
  * - Intel(R) Parallel Inspector and Intel(R) Inspector XE:
  *   - Does not analyze or report errors that involve memory access.
  *   - Other errors are reported as usual. Pausing data collection in
@@ -310,25 +346,25 @@ void ITTAPI __itt_detach(void);
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, pause,  (void))
+ITT_STUBV(ITTAPI, void, pause, (void))
 ITT_STUBV(ITTAPI, void, resume, (void))
 ITT_STUBV(ITTAPI, void, detach, (void))
-#define __itt_pause      ITTNOTIFY_VOID(pause)
-#define __itt_pause_ptr  ITTNOTIFY_NAME(pause)
-#define __itt_resume     ITTNOTIFY_VOID(resume)
+#define __itt_pause ITTNOTIFY_VOID(pause)
+#define __itt_pause_ptr ITTNOTIFY_NAME(pause)
+#define __itt_resume ITTNOTIFY_VOID(resume)
 #define __itt_resume_ptr ITTNOTIFY_NAME(resume)
-#define __itt_detach     ITTNOTIFY_VOID(detach)
+#define __itt_detach ITTNOTIFY_VOID(detach)
 #define __itt_detach_ptr ITTNOTIFY_NAME(detach)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_pause()
-#define __itt_pause_ptr  0
+#define __itt_pause_ptr 0
 #define __itt_resume()
 #define __itt_resume_ptr 0
 #define __itt_detach()
 #define __itt_detach_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#define __itt_pause_ptr  0
+#else /* INTEL_NO_MACRO_BODY */
+#define __itt_pause_ptr 0
 #define __itt_resume_ptr 0
 #define __itt_detach_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
@@ -346,40 +382,40 @@ ITT_STUBV(ITTAPI, void, detach, (void))
  * @brief Sets thread name of calling thread
  * @param[in] name - name of thread
  */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-void ITTAPI __itt_thread_set_nameA(const char    *name);
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+void ITTAPI __itt_thread_set_nameA(const char *name);
 void ITTAPI __itt_thread_set_nameW(const wchar_t *name);
 #if defined(UNICODE) || defined(_UNICODE)
-#  define __itt_thread_set_name     __itt_thread_set_nameW
-#  define __itt_thread_set_name_ptr __itt_thread_set_nameW_ptr
+#define __itt_thread_set_name __itt_thread_set_nameW
+#define __itt_thread_set_name_ptr __itt_thread_set_nameW_ptr
 #else /* UNICODE */
-#  define __itt_thread_set_name     __itt_thread_set_nameA
-#  define __itt_thread_set_name_ptr __itt_thread_set_nameA_ptr
+#define __itt_thread_set_name __itt_thread_set_nameA
+#define __itt_thread_set_name_ptr __itt_thread_set_nameA_ptr
 #endif /* UNICODE */
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 void ITTAPI __itt_thread_set_name(const char *name);
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUBV(ITTAPI, void, thread_set_nameA, (const char    *name))
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUBV(ITTAPI, void, thread_set_nameA, (const char *name))
 ITT_STUBV(ITTAPI, void, thread_set_nameW, (const wchar_t *name))
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-ITT_STUBV(ITTAPI, void, thread_set_name,  (const char    *name))
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+ITT_STUBV(ITTAPI, void, thread_set_name, (const char *name))
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-#define __itt_thread_set_nameA     ITTNOTIFY_VOID(thread_set_nameA)
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define __itt_thread_set_nameA ITTNOTIFY_VOID(thread_set_nameA)
 #define __itt_thread_set_nameA_ptr ITTNOTIFY_NAME(thread_set_nameA)
-#define __itt_thread_set_nameW     ITTNOTIFY_VOID(thread_set_nameW)
+#define __itt_thread_set_nameW ITTNOTIFY_VOID(thread_set_nameW)
 #define __itt_thread_set_nameW_ptr ITTNOTIFY_NAME(thread_set_nameW)
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_thread_set_name     ITTNOTIFY_VOID(thread_set_name)
+#define __itt_thread_set_name ITTNOTIFY_VOID(thread_set_name)
 #define __itt_thread_set_name_ptr ITTNOTIFY_NAME(thread_set_name)
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_ITTNOTIFY_API */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_thread_set_nameA(name)
 #define __itt_thread_set_nameA_ptr 0
 #define __itt_thread_set_nameW(name)
@@ -389,8 +425,8 @@ ITT_STUBV(ITTAPI, void, thread_set_name,  (const char    *name))
 #define __itt_thread_set_name_ptr 0
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_MACRO_BODY */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_thread_set_nameA_ptr 0
 #define __itt_thread_set_nameW_ptr 0
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
@@ -402,7 +438,8 @@ ITT_STUBV(ITTAPI, void, thread_set_name,  (const char    *name))
 /** @cond exclude_from_gpa_documentation */
 
 /**
- * @brief Mark current thread as ignored from this point on, for the duration of its existence.
+ * @brief Mark current thread as ignored from this point on, for the duration of
+ * its existence.
  */
 void ITTAPI __itt_thread_ignore(void);
 
@@ -410,13 +447,13 @@ void ITTAPI __itt_thread_ignore(void);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(ITTAPI, void, thread_ignore, (void))
-#define __itt_thread_ignore     ITTNOTIFY_VOID(thread_ignore)
+#define __itt_thread_ignore ITTNOTIFY_VOID(thread_ignore)
 #define __itt_thread_ignore_ptr ITTNOTIFY_NAME(thread_ignore)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_thread_ignore()
 #define __itt_thread_ignore_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_thread_ignore_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -430,9 +467,11 @@ ITT_STUBV(ITTAPI, void, thread_ignore, (void))
  * @{
  */
 
+// clang-format off
 /*****************************************************************//**
  * @name group of functions used for error suppression in correctness tools
  *********************************************************************/
+// clang-format on
 /** @{ */
 /**
  * @hideinitializer
@@ -442,13 +481,15 @@ ITT_STUBV(ITTAPI, void, thread_ignore, (void))
 
 /**
  * @hideinitializer
- * @brief possible value for suppression mask (suppresses errors from threading analysis)
+ * @brief possible value for suppression mask (suppresses errors from threading
+ * analysis)
  */
 #define __itt_suppress_threading_errors 0x000000ff
 
 /**
  * @hideinitializer
- * @brief possible value for suppression mask (suppresses errors from memory analysis)
+ * @brief possible value for suppression mask (suppresses errors from memory
+ * analysis)
  */
 #define __itt_suppress_memory_errors 0x0000ff00
 
@@ -461,13 +502,13 @@ void ITTAPI __itt_suppress_push(unsigned int mask);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(ITTAPI, void, suppress_push, (unsigned int mask))
-#define __itt_suppress_push     ITTNOTIFY_VOID(suppress_push)
+#define __itt_suppress_push ITTNOTIFY_VOID(suppress_push)
 #define __itt_suppress_push_ptr ITTNOTIFY_NAME(suppress_push)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_suppress_push(mask)
 #define __itt_suppress_push_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_suppress_push_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -481,13 +522,13 @@ void ITTAPI __itt_suppress_pop(void);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(ITTAPI, void, suppress_pop, (void))
-#define __itt_suppress_pop     ITTNOTIFY_VOID(suppress_pop)
+#define __itt_suppress_pop ITTNOTIFY_VOID(suppress_pop)
 #define __itt_suppress_pop_ptr ITTNOTIFY_NAME(suppress_pop)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_suppress_pop()
 #define __itt_suppress_pop_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_suppress_pop_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -497,47 +538,56 @@ ITT_STUBV(ITTAPI, void, suppress_pop, (void))
  * @brief Enumerator for the disable methods
  */
 typedef enum __itt_suppress_mode {
-    __itt_unsuppress_range,
-    __itt_suppress_range
+  __itt_unsuppress_range,
+  __itt_suppress_range
 } __itt_suppress_mode_t;
 
 /**
- * @brief Mark a range of memory for error suppression or unsuppression for error types included in mask
+ * @brief Mark a range of memory for error suppression or unsuppression for
+ * error types included in mask
  */
-void ITTAPI __itt_suppress_mark_range(__itt_suppress_mode_t mode, unsigned int mask, void * address, size_t size);
+void ITTAPI __itt_suppress_mark_range(__itt_suppress_mode_t mode,
+                                      unsigned int mask, void *address,
+                                      size_t size);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, suppress_mark_range, (__itt_suppress_mode_t mode, unsigned int mask, void * address, size_t size))
-#define __itt_suppress_mark_range     ITTNOTIFY_VOID(suppress_mark_range)
+ITT_STUBV(ITTAPI, void, suppress_mark_range,
+          (__itt_suppress_mode_t mode, unsigned int mask, void *address,
+           size_t size))
+#define __itt_suppress_mark_range ITTNOTIFY_VOID(suppress_mark_range)
 #define __itt_suppress_mark_range_ptr ITTNOTIFY_NAME(suppress_mark_range)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_suppress_mark_range(mask)
 #define __itt_suppress_mark_range_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_suppress_mark_range_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
 /**
- * @brief Undo the effect of a matching call to __itt_suppress_mark_range.   If not matching
- *        call is found, nothing is changed.
+ * @brief Undo the effect of a matching call to __itt_suppress_mark_range.   If
+ * not matching call is found, nothing is changed.
  */
-void ITTAPI __itt_suppress_clear_range(__itt_suppress_mode_t mode, unsigned int mask, void * address, size_t size);
+void ITTAPI __itt_suppress_clear_range(__itt_suppress_mode_t mode,
+                                       unsigned int mask, void *address,
+                                       size_t size);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, suppress_clear_range, (__itt_suppress_mode_t mode, unsigned int mask, void * address, size_t size))
-#define __itt_suppress_clear_range     ITTNOTIFY_VOID(suppress_clear_range)
+ITT_STUBV(ITTAPI, void, suppress_clear_range,
+          (__itt_suppress_mode_t mode, unsigned int mask, void *address,
+           size_t size))
+#define __itt_suppress_clear_range ITTNOTIFY_VOID(suppress_clear_range)
 #define __itt_suppress_clear_range_ptr ITTNOTIFY_NAME(suppress_clear_range)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_suppress_clear_range(mask)
 #define __itt_suppress_clear_range_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_suppress_clear_range_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -560,7 +610,7 @@ ITT_STUBV(ITTAPI, void, suppress_clear_range, (__itt_suppress_mode_t mode, unsig
  * @hideinitializer
  * @brief possible value of attribute argument for sync object type
  */
-#define __itt_attr_mutex   2
+#define __itt_attr_mutex 2
 
 /**
 @brief Name a synchronization object
@@ -573,40 +623,47 @@ no name will be assigned to the object.
 @param[in] attribute  one of [#__itt_attr_barrier, #__itt_attr_mutex]
  */
 
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-void ITTAPI __itt_sync_createA(void *addr, const char    *objtype, const char    *objname, int attribute);
-void ITTAPI __itt_sync_createW(void *addr, const wchar_t *objtype, const wchar_t *objname, int attribute);
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+void ITTAPI __itt_sync_createA(void *addr, const char *objtype,
+                               const char *objname, int attribute);
+void ITTAPI __itt_sync_createW(void *addr, const wchar_t *objtype,
+                               const wchar_t *objname, int attribute);
 #if defined(UNICODE) || defined(_UNICODE)
-#  define __itt_sync_create     __itt_sync_createW
-#  define __itt_sync_create_ptr __itt_sync_createW_ptr
+#define __itt_sync_create __itt_sync_createW
+#define __itt_sync_create_ptr __itt_sync_createW_ptr
 #else /* UNICODE */
-#  define __itt_sync_create     __itt_sync_createA
-#  define __itt_sync_create_ptr __itt_sync_createA_ptr
+#define __itt_sync_create __itt_sync_createA
+#define __itt_sync_create_ptr __itt_sync_createA_ptr
 #endif /* UNICODE */
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-void ITTAPI __itt_sync_create (void *addr, const char *objtype, const char *objname, int attribute);
+void ITTAPI __itt_sync_create(void *addr, const char *objtype,
+                              const char *objname, int attribute);
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUBV(ITTAPI, void, sync_createA, (void *addr, const char    *objtype, const char    *objname, int attribute))
-ITT_STUBV(ITTAPI, void, sync_createW, (void *addr, const wchar_t *objtype, const wchar_t *objname, int attribute))
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-ITT_STUBV(ITTAPI, void, sync_create,  (void *addr, const char*    objtype, const char*    objname, int attribute))
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUBV(ITTAPI, void, sync_createA,
+          (void *addr, const char *objtype, const char *objname, int attribute))
+ITT_STUBV(ITTAPI, void, sync_createW,
+          (void *addr, const wchar_t *objtype, const wchar_t *objname,
+           int attribute))
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+ITT_STUBV(ITTAPI, void, sync_create,
+          (void *addr, const char *objtype, const char *objname, int attribute))
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-#define __itt_sync_createA     ITTNOTIFY_VOID(sync_createA)
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define __itt_sync_createA ITTNOTIFY_VOID(sync_createA)
 #define __itt_sync_createA_ptr ITTNOTIFY_NAME(sync_createA)
-#define __itt_sync_createW     ITTNOTIFY_VOID(sync_createW)
+#define __itt_sync_createW ITTNOTIFY_VOID(sync_createW)
 #define __itt_sync_createW_ptr ITTNOTIFY_NAME(sync_createW)
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_sync_create     ITTNOTIFY_VOID(sync_create)
+#define __itt_sync_create ITTNOTIFY_VOID(sync_create)
 #define __itt_sync_create_ptr ITTNOTIFY_NAME(sync_create)
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_ITTNOTIFY_API */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_sync_createA(addr, objtype, objname, attribute)
 #define __itt_sync_createA_ptr 0
 #define __itt_sync_createW(addr, objtype, objname, attribute)
@@ -616,8 +673,8 @@ ITT_STUBV(ITTAPI, void, sync_create,  (void *addr, const char*    objtype, const
 #define __itt_sync_create_ptr 0
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_MACRO_BODY */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_sync_createA_ptr 0
 #define __itt_sync_createW_ptr 0
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
@@ -634,15 +691,15 @@ synchronization object.
 @param[in] addr  handle for the synchronization object.
 @param[in] name  null-terminated object name string.
 */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-void ITTAPI __itt_sync_renameA(void *addr, const char    *name);
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+void ITTAPI __itt_sync_renameA(void *addr, const char *name);
 void ITTAPI __itt_sync_renameW(void *addr, const wchar_t *name);
 #if defined(UNICODE) || defined(_UNICODE)
-#  define __itt_sync_rename     __itt_sync_renameW
-#  define __itt_sync_rename_ptr __itt_sync_renameW_ptr
+#define __itt_sync_rename __itt_sync_renameW
+#define __itt_sync_rename_ptr __itt_sync_renameW_ptr
 #else /* UNICODE */
-#  define __itt_sync_rename     __itt_sync_renameA
-#  define __itt_sync_rename_ptr __itt_sync_renameA_ptr
+#define __itt_sync_rename __itt_sync_renameA
+#define __itt_sync_rename_ptr __itt_sync_renameA_ptr
 #endif /* UNICODE */
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 void ITTAPI __itt_sync_rename(void *addr, const char *name);
@@ -651,23 +708,23 @@ void ITTAPI __itt_sync_rename(void *addr, const char *name);
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUBV(ITTAPI, void, sync_renameA, (void *addr, const char    *name))
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUBV(ITTAPI, void, sync_renameA, (void *addr, const char *name))
 ITT_STUBV(ITTAPI, void, sync_renameW, (void *addr, const wchar_t *name))
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-ITT_STUBV(ITTAPI, void, sync_rename,  (void *addr, const char    *name))
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+ITT_STUBV(ITTAPI, void, sync_rename, (void *addr, const char *name))
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-#define __itt_sync_renameA     ITTNOTIFY_VOID(sync_renameA)
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define __itt_sync_renameA ITTNOTIFY_VOID(sync_renameA)
 #define __itt_sync_renameA_ptr ITTNOTIFY_NAME(sync_renameA)
-#define __itt_sync_renameW     ITTNOTIFY_VOID(sync_renameW)
+#define __itt_sync_renameW ITTNOTIFY_VOID(sync_renameW)
 #define __itt_sync_renameW_ptr ITTNOTIFY_NAME(sync_renameW)
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_sync_rename     ITTNOTIFY_VOID(sync_rename)
+#define __itt_sync_rename ITTNOTIFY_VOID(sync_rename)
 #define __itt_sync_rename_ptr ITTNOTIFY_NAME(sync_rename)
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_ITTNOTIFY_API */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_sync_renameA(addr, name)
 #define __itt_sync_renameA_ptr 0
 #define __itt_sync_renameW(addr, name)
@@ -677,8 +734,8 @@ ITT_STUBV(ITTAPI, void, sync_rename,  (void *addr, const char    *name))
 #define __itt_sync_rename_ptr 0
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_MACRO_BODY */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_sync_renameA_ptr 0
 #define __itt_sync_renameW_ptr 0
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
@@ -697,37 +754,39 @@ void ITTAPI __itt_sync_destroy(void *addr);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(ITTAPI, void, sync_destroy, (void *addr))
-#define __itt_sync_destroy     ITTNOTIFY_VOID(sync_destroy)
+#define __itt_sync_destroy ITTNOTIFY_VOID(sync_destroy)
 #define __itt_sync_destroy_ptr ITTNOTIFY_NAME(sync_destroy)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_sync_destroy(addr)
 #define __itt_sync_destroy_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_sync_destroy_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
+// clang-format off
 /*****************************************************************//**
  * @name group of functions is used for performance measurement tools
  *********************************************************************/
+// clang-format on
 /** @{ */
 /**
  * @brief Enter spin loop on user-defined sync object
  */
-void ITTAPI __itt_sync_prepare(void* addr);
+void ITTAPI __itt_sync_prepare(void *addr);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(ITTAPI, void, sync_prepare, (void *addr))
-#define __itt_sync_prepare     ITTNOTIFY_VOID(sync_prepare)
+#define __itt_sync_prepare ITTNOTIFY_VOID(sync_prepare)
 #define __itt_sync_prepare_ptr ITTNOTIFY_NAME(sync_prepare)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_sync_prepare(addr)
 #define __itt_sync_prepare_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_sync_prepare_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -741,13 +800,13 @@ void ITTAPI __itt_sync_cancel(void *addr);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(ITTAPI, void, sync_cancel, (void *addr))
-#define __itt_sync_cancel     ITTNOTIFY_VOID(sync_cancel)
+#define __itt_sync_cancel ITTNOTIFY_VOID(sync_cancel)
 #define __itt_sync_cancel_ptr ITTNOTIFY_NAME(sync_cancel)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_sync_cancel(addr)
 #define __itt_sync_cancel_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_sync_cancel_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -761,33 +820,34 @@ void ITTAPI __itt_sync_acquired(void *addr);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(ITTAPI, void, sync_acquired, (void *addr))
-#define __itt_sync_acquired     ITTNOTIFY_VOID(sync_acquired)
+#define __itt_sync_acquired ITTNOTIFY_VOID(sync_acquired)
 #define __itt_sync_acquired_ptr ITTNOTIFY_NAME(sync_acquired)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_sync_acquired(addr)
 #define __itt_sync_acquired_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_sync_acquired_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
 /**
- * @brief Start sync object releasing code. Is called before the lock release call.
+ * @brief Start sync object releasing code. Is called before the lock release
+ * call.
  */
-void ITTAPI __itt_sync_releasing(void* addr);
+void ITTAPI __itt_sync_releasing(void *addr);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(ITTAPI, void, sync_releasing, (void *addr))
-#define __itt_sync_releasing     ITTNOTIFY_VOID(sync_releasing)
+#define __itt_sync_releasing ITTNOTIFY_VOID(sync_releasing)
 #define __itt_sync_releasing_ptr ITTNOTIFY_NAME(sync_releasing)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_sync_releasing(addr)
 #define __itt_sync_releasing_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_sync_releasing_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -795,33 +855,36 @@ ITT_STUBV(ITTAPI, void, sync_releasing, (void *addr))
 
 /** @} sync group */
 
+// clang-format off
 /**************************************************************//**
  * @name group of functions is used for correctness checking tools
  ******************************************************************/
+// clang-format on
 /** @{ */
 /**
  * @ingroup legacy
  * @deprecated Legacy API
  * @brief Fast synchronization which does no require spinning.
- * - This special function is to be used by TBB and OpenMP libraries only when they know
- *   there is no spin but they need to suppress TC warnings about shared variable modifications.
- * - It only has corresponding pointers in static library and does not have corresponding function
- *   in dynamic library.
+ * - This special function is to be used by TBB and OpenMP libraries only when
+ * they know there is no spin but they need to suppress TC warnings about shared
+ * variable modifications.
+ * - It only has corresponding pointers in static library and does not have
+ * corresponding function in dynamic library.
  * @see void __itt_sync_prepare(void* addr);
  */
-void ITTAPI __itt_fsync_prepare(void* addr);
+void ITTAPI __itt_fsync_prepare(void *addr);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(ITTAPI, void, fsync_prepare, (void *addr))
-#define __itt_fsync_prepare     ITTNOTIFY_VOID(fsync_prepare)
+#define __itt_fsync_prepare ITTNOTIFY_VOID(fsync_prepare)
 #define __itt_fsync_prepare_ptr ITTNOTIFY_NAME(fsync_prepare)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_fsync_prepare(addr)
 #define __itt_fsync_prepare_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_fsync_prepare_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -830,10 +893,11 @@ ITT_STUBV(ITTAPI, void, fsync_prepare, (void *addr))
  * @ingroup legacy
  * @deprecated Legacy API
  * @brief Fast synchronization which does no require spinning.
- * - This special function is to be used by TBB and OpenMP libraries only when they know
- *   there is no spin but they need to suppress TC warnings about shared variable modifications.
- * - It only has corresponding pointers in static library and does not have corresponding function
- *   in dynamic library.
+ * - This special function is to be used by TBB and OpenMP libraries only when
+ * they know there is no spin but they need to suppress TC warnings about shared
+ * variable modifications.
+ * - It only has corresponding pointers in static library and does not have
+ * corresponding function in dynamic library.
  * @see void __itt_sync_cancel(void *addr);
  */
 void ITTAPI __itt_fsync_cancel(void *addr);
@@ -842,13 +906,13 @@ void ITTAPI __itt_fsync_cancel(void *addr);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(ITTAPI, void, fsync_cancel, (void *addr))
-#define __itt_fsync_cancel     ITTNOTIFY_VOID(fsync_cancel)
+#define __itt_fsync_cancel ITTNOTIFY_VOID(fsync_cancel)
 #define __itt_fsync_cancel_ptr ITTNOTIFY_NAME(fsync_cancel)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_fsync_cancel(addr)
 #define __itt_fsync_cancel_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_fsync_cancel_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -857,10 +921,11 @@ ITT_STUBV(ITTAPI, void, fsync_cancel, (void *addr))
  * @ingroup legacy
  * @deprecated Legacy API
  * @brief Fast synchronization which does no require spinning.
- * - This special function is to be used by TBB and OpenMP libraries only when they know
- *   there is no spin but they need to suppress TC warnings about shared variable modifications.
- * - It only has corresponding pointers in static library and does not have corresponding function
- *   in dynamic library.
+ * - This special function is to be used by TBB and OpenMP libraries only when
+ * they know there is no spin but they need to suppress TC warnings about shared
+ * variable modifications.
+ * - It only has corresponding pointers in static library and does not have
+ * corresponding function in dynamic library.
  * @see void __itt_sync_acquired(void *addr);
  */
 void ITTAPI __itt_fsync_acquired(void *addr);
@@ -869,13 +934,13 @@ void ITTAPI __itt_fsync_acquired(void *addr);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(ITTAPI, void, fsync_acquired, (void *addr))
-#define __itt_fsync_acquired     ITTNOTIFY_VOID(fsync_acquired)
+#define __itt_fsync_acquired ITTNOTIFY_VOID(fsync_acquired)
 #define __itt_fsync_acquired_ptr ITTNOTIFY_NAME(fsync_acquired)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_fsync_acquired(addr)
 #define __itt_fsync_acquired_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_fsync_acquired_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -884,25 +949,26 @@ ITT_STUBV(ITTAPI, void, fsync_acquired, (void *addr))
  * @ingroup legacy
  * @deprecated Legacy API
  * @brief Fast synchronization which does no require spinning.
- * - This special function is to be used by TBB and OpenMP libraries only when they know
- *   there is no spin but they need to suppress TC warnings about shared variable modifications.
- * - It only has corresponding pointers in static library and does not have corresponding function
- *   in dynamic library.
+ * - This special function is to be used by TBB and OpenMP libraries only when
+ * they know there is no spin but they need to suppress TC warnings about shared
+ * variable modifications.
+ * - It only has corresponding pointers in static library and does not have
+ * corresponding function in dynamic library.
  * @see void __itt_sync_releasing(void* addr);
  */
-void ITTAPI __itt_fsync_releasing(void* addr);
+void ITTAPI __itt_fsync_releasing(void *addr);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(ITTAPI, void, fsync_releasing, (void *addr))
-#define __itt_fsync_releasing     ITTNOTIFY_VOID(fsync_releasing)
+#define __itt_fsync_releasing ITTNOTIFY_VOID(fsync_releasing)
 #define __itt_fsync_releasing_ptr ITTNOTIFY_NAME(fsync_releasing)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_fsync_releasing(addr)
 #define __itt_fsync_releasing_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_fsync_releasing_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -935,18 +1001,20 @@ ITT_STUBV(ITTAPI, void, fsync_releasing, (void *addr))
  */
 #if !defined(_ADVISOR_ANNOTATE_H_) || defined(ANNOTATE_EXPAND_NULL)
 
-typedef void* __itt_model_site;             /*!< @brief handle for lexical site     */
-typedef void* __itt_model_site_instance;    /*!< @brief handle for dynamic instance */
-typedef void* __itt_model_task;             /*!< @brief handle for lexical site     */
-typedef void* __itt_model_task_instance;    /*!< @brief handle for dynamic instance */
+typedef void *__itt_model_site; /*!< @brief handle for lexical site     */
+typedef void
+    *__itt_model_site_instance; /*!< @brief handle for dynamic instance */
+typedef void *__itt_model_task; /*!< @brief handle for lexical site     */
+typedef void
+    *__itt_model_task_instance; /*!< @brief handle for dynamic instance */
 
 /**
  * @enum __itt_model_disable
  * @brief Enumerator for the disable methods
  */
 typedef enum {
-    __itt_model_disable_observation,
-    __itt_model_disable_collection
+  __itt_model_disable_observation,
+  __itt_model_disable_collection
 } __itt_model_disable;
 
 #endif /* !_ADVISOR_ANNOTATE_H_ || ANNOTATE_EXPAND_NULL */
@@ -963,65 +1031,72 @@ typedef enum {
  * lexical sites match, it is unspecified whether they are treated as the
  * same or 
diff erent for data presentation.
  */
-void ITTAPI __itt_model_site_begin(__itt_model_site *site, __itt_model_site_instance *instance, const char *name);
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+void ITTAPI __itt_model_site_begin(__itt_model_site *site,
+                                   __itt_model_site_instance *instance,
+                                   const char *name);
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 void ITTAPI __itt_model_site_beginW(const wchar_t *name);
 #endif
 void ITTAPI __itt_model_site_beginA(const char *name);
 void ITTAPI __itt_model_site_beginAL(const char *name, size_t siteNameLen);
-void ITTAPI __itt_model_site_end  (__itt_model_site *site, __itt_model_site_instance *instance);
+void ITTAPI __itt_model_site_end(__itt_model_site *site,
+                                 __itt_model_site_instance *instance);
 void ITTAPI __itt_model_site_end_2(void);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, model_site_begin,  (__itt_model_site *site, __itt_model_site_instance *instance, const char *name))
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUBV(ITTAPI, void, model_site_beginW,  (const wchar_t *name))
+ITT_STUBV(ITTAPI, void, model_site_begin,
+          (__itt_model_site * site, __itt_model_site_instance *instance,
+           const char *name))
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUBV(ITTAPI, void, model_site_beginW, (const wchar_t *name))
 #endif
-ITT_STUBV(ITTAPI, void, model_site_beginA,  (const char *name))
-ITT_STUBV(ITTAPI, void, model_site_beginAL,  (const char *name, size_t siteNameLen))
-ITT_STUBV(ITTAPI, void, model_site_end,    (__itt_model_site *site, __itt_model_site_instance *instance))
-ITT_STUBV(ITTAPI, void, model_site_end_2,  (void))
-#define __itt_model_site_begin      ITTNOTIFY_VOID(model_site_begin)
-#define __itt_model_site_begin_ptr  ITTNOTIFY_NAME(model_site_begin)
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-#define __itt_model_site_beginW      ITTNOTIFY_VOID(model_site_beginW)
-#define __itt_model_site_beginW_ptr  ITTNOTIFY_NAME(model_site_beginW)
+ITT_STUBV(ITTAPI, void, model_site_beginA, (const char *name))
+ITT_STUBV(ITTAPI, void, model_site_beginAL,
+          (const char *name, size_t siteNameLen))
+ITT_STUBV(ITTAPI, void, model_site_end,
+          (__itt_model_site * site, __itt_model_site_instance *instance))
+ITT_STUBV(ITTAPI, void, model_site_end_2, (void))
+#define __itt_model_site_begin ITTNOTIFY_VOID(model_site_begin)
+#define __itt_model_site_begin_ptr ITTNOTIFY_NAME(model_site_begin)
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define __itt_model_site_beginW ITTNOTIFY_VOID(model_site_beginW)
+#define __itt_model_site_beginW_ptr ITTNOTIFY_NAME(model_site_beginW)
 #endif
-#define __itt_model_site_beginA      ITTNOTIFY_VOID(model_site_beginA)
-#define __itt_model_site_beginA_ptr  ITTNOTIFY_NAME(model_site_beginA)
-#define __itt_model_site_beginAL      ITTNOTIFY_VOID(model_site_beginAL)
-#define __itt_model_site_beginAL_ptr  ITTNOTIFY_NAME(model_site_beginAL)
-#define __itt_model_site_end        ITTNOTIFY_VOID(model_site_end)
-#define __itt_model_site_end_ptr    ITTNOTIFY_NAME(model_site_end)
-#define __itt_model_site_end_2        ITTNOTIFY_VOID(model_site_end_2)
-#define __itt_model_site_end_2_ptr    ITTNOTIFY_NAME(model_site_end_2)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#define __itt_model_site_beginA ITTNOTIFY_VOID(model_site_beginA)
+#define __itt_model_site_beginA_ptr ITTNOTIFY_NAME(model_site_beginA)
+#define __itt_model_site_beginAL ITTNOTIFY_VOID(model_site_beginAL)
+#define __itt_model_site_beginAL_ptr ITTNOTIFY_NAME(model_site_beginAL)
+#define __itt_model_site_end ITTNOTIFY_VOID(model_site_end)
+#define __itt_model_site_end_ptr ITTNOTIFY_NAME(model_site_end)
+#define __itt_model_site_end_2 ITTNOTIFY_VOID(model_site_end_2)
+#define __itt_model_site_end_2_ptr ITTNOTIFY_NAME(model_site_end_2)
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_model_site_begin(site, instance, name)
-#define __itt_model_site_begin_ptr  0
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#define __itt_model_site_begin_ptr 0
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_model_site_beginW(name)
-#define __itt_model_site_beginW_ptr  0
+#define __itt_model_site_beginW_ptr 0
 #endif
 #define __itt_model_site_beginA(name)
-#define __itt_model_site_beginA_ptr  0
+#define __itt_model_site_beginA_ptr 0
 #define __itt_model_site_beginAL(name, siteNameLen)
-#define __itt_model_site_beginAL_ptr  0
+#define __itt_model_site_beginAL_ptr 0
 #define __itt_model_site_end(site, instance)
-#define __itt_model_site_end_ptr    0
+#define __itt_model_site_end_ptr 0
 #define __itt_model_site_end_2()
-#define __itt_model_site_end_2_ptr    0
+#define __itt_model_site_end_2_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#define __itt_model_site_begin_ptr  0
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-#define __itt_model_site_beginW_ptr  0
+#else /* INTEL_NO_MACRO_BODY */
+#define __itt_model_site_begin_ptr 0
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define __itt_model_site_beginW_ptr 0
 #endif
-#define __itt_model_site_beginA_ptr  0
-#define __itt_model_site_beginAL_ptr  0
-#define __itt_model_site_end_ptr    0
-#define __itt_model_site_end_2_ptr    0
+#define __itt_model_site_beginA_ptr 0
+#define __itt_model_site_beginAL_ptr 0
+#define __itt_model_site_end_ptr 0
+#define __itt_model_site_end_2_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
@@ -1036,8 +1111,10 @@ ITT_STUBV(ITTAPI, void, model_site_end_2,  (void))
  * should not fail due to construct nesting issues, nor attempt to directly
  * indicate the problem.
  */
-void ITTAPI __itt_model_task_begin(__itt_model_task *task, __itt_model_task_instance *instance, const char *name);
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+void ITTAPI __itt_model_task_begin(__itt_model_task *task,
+                                   __itt_model_task_instance *instance,
+                                   const char *name);
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 void ITTAPI __itt_model_task_beginW(const wchar_t *name);
 void ITTAPI __itt_model_iteration_taskW(const wchar_t *name);
 #endif
@@ -1045,74 +1122,80 @@ void ITTAPI __itt_model_task_beginA(const char *name);
 void ITTAPI __itt_model_task_beginAL(const char *name, size_t taskNameLen);
 void ITTAPI __itt_model_iteration_taskA(const char *name);
 void ITTAPI __itt_model_iteration_taskAL(const char *name, size_t taskNameLen);
-void ITTAPI __itt_model_task_end  (__itt_model_task *task, __itt_model_task_instance *instance);
+void ITTAPI __itt_model_task_end(__itt_model_task *task,
+                                 __itt_model_task_instance *instance);
 void ITTAPI __itt_model_task_end_2(void);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, model_task_begin,  (__itt_model_task *task, __itt_model_task_instance *instance, const char *name))
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUBV(ITTAPI, void, model_task_beginW,  (const wchar_t *name))
+ITT_STUBV(ITTAPI, void, model_task_begin,
+          (__itt_model_task * task, __itt_model_task_instance *instance,
+           const char *name))
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUBV(ITTAPI, void, model_task_beginW, (const wchar_t *name))
 ITT_STUBV(ITTAPI, void, model_iteration_taskW, (const wchar_t *name))
 #endif
-ITT_STUBV(ITTAPI, void, model_task_beginA,  (const char *name))
-ITT_STUBV(ITTAPI, void, model_task_beginAL,  (const char *name, size_t taskNameLen))
-ITT_STUBV(ITTAPI, void, model_iteration_taskA,  (const char *name))
-ITT_STUBV(ITTAPI, void, model_iteration_taskAL,  (const char *name, size_t taskNameLen))
-ITT_STUBV(ITTAPI, void, model_task_end,    (__itt_model_task *task, __itt_model_task_instance *instance))
-ITT_STUBV(ITTAPI, void, model_task_end_2,  (void))
-#define __itt_model_task_begin      ITTNOTIFY_VOID(model_task_begin)
-#define __itt_model_task_begin_ptr  ITTNOTIFY_NAME(model_task_begin)
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-#define __itt_model_task_beginW     ITTNOTIFY_VOID(model_task_beginW)
+ITT_STUBV(ITTAPI, void, model_task_beginA, (const char *name))
+ITT_STUBV(ITTAPI, void, model_task_beginAL,
+          (const char *name, size_t taskNameLen))
+ITT_STUBV(ITTAPI, void, model_iteration_taskA, (const char *name))
+ITT_STUBV(ITTAPI, void, model_iteration_taskAL,
+          (const char *name, size_t taskNameLen))
+ITT_STUBV(ITTAPI, void, model_task_end,
+          (__itt_model_task * task, __itt_model_task_instance *instance))
+ITT_STUBV(ITTAPI, void, model_task_end_2, (void))
+#define __itt_model_task_begin ITTNOTIFY_VOID(model_task_begin)
+#define __itt_model_task_begin_ptr ITTNOTIFY_NAME(model_task_begin)
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define __itt_model_task_beginW ITTNOTIFY_VOID(model_task_beginW)
 #define __itt_model_task_beginW_ptr ITTNOTIFY_NAME(model_task_beginW)
-#define __itt_model_iteration_taskW     ITTNOTIFY_VOID(model_iteration_taskW)
+#define __itt_model_iteration_taskW ITTNOTIFY_VOID(model_iteration_taskW)
 #define __itt_model_iteration_taskW_ptr ITTNOTIFY_NAME(model_iteration_taskW)
 #endif
-#define __itt_model_task_beginA    ITTNOTIFY_VOID(model_task_beginA)
+#define __itt_model_task_beginA ITTNOTIFY_VOID(model_task_beginA)
 #define __itt_model_task_beginA_ptr ITTNOTIFY_NAME(model_task_beginA)
-#define __itt_model_task_beginAL    ITTNOTIFY_VOID(model_task_beginAL)
+#define __itt_model_task_beginAL ITTNOTIFY_VOID(model_task_beginAL)
 #define __itt_model_task_beginAL_ptr ITTNOTIFY_NAME(model_task_beginAL)
-#define __itt_model_iteration_taskA    ITTNOTIFY_VOID(model_iteration_taskA)
+#define __itt_model_iteration_taskA ITTNOTIFY_VOID(model_iteration_taskA)
 #define __itt_model_iteration_taskA_ptr ITTNOTIFY_NAME(model_iteration_taskA)
-#define __itt_model_iteration_taskAL    ITTNOTIFY_VOID(model_iteration_taskAL)
+#define __itt_model_iteration_taskAL ITTNOTIFY_VOID(model_iteration_taskAL)
 #define __itt_model_iteration_taskAL_ptr ITTNOTIFY_NAME(model_iteration_taskAL)
-#define __itt_model_task_end        ITTNOTIFY_VOID(model_task_end)
-#define __itt_model_task_end_ptr    ITTNOTIFY_NAME(model_task_end)
-#define __itt_model_task_end_2        ITTNOTIFY_VOID(model_task_end_2)
-#define __itt_model_task_end_2_ptr    ITTNOTIFY_NAME(model_task_end_2)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#define __itt_model_task_end ITTNOTIFY_VOID(model_task_end)
+#define __itt_model_task_end_ptr ITTNOTIFY_NAME(model_task_end)
+#define __itt_model_task_end_2 ITTNOTIFY_VOID(model_task_end_2)
+#define __itt_model_task_end_2_ptr ITTNOTIFY_NAME(model_task_end_2)
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_model_task_begin(task, instance, name)
-#define __itt_model_task_begin_ptr  0
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#define __itt_model_task_begin_ptr 0
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_model_task_beginW(name)
-#define __itt_model_task_beginW_ptr  0
+#define __itt_model_task_beginW_ptr 0
 #endif
 #define __itt_model_task_beginA(name)
-#define __itt_model_task_beginA_ptr  0
+#define __itt_model_task_beginA_ptr 0
 #define __itt_model_task_beginAL(name, siteNameLen)
-#define __itt_model_task_beginAL_ptr  0
+#define __itt_model_task_beginAL_ptr 0
 #define __itt_model_iteration_taskA(name)
-#define __itt_model_iteration_taskA_ptr  0
+#define __itt_model_iteration_taskA_ptr 0
 #define __itt_model_iteration_taskAL(name, siteNameLen)
-#define __itt_model_iteration_taskAL_ptr  0
+#define __itt_model_iteration_taskAL_ptr 0
 #define __itt_model_task_end(task, instance)
-#define __itt_model_task_end_ptr    0
+#define __itt_model_task_end_ptr 0
 #define __itt_model_task_end_2()
-#define __itt_model_task_end_2_ptr    0
+#define __itt_model_task_end_2_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#define __itt_model_task_begin_ptr  0
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_MACRO_BODY */
+#define __itt_model_task_begin_ptr 0
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_model_task_beginW_ptr 0
 #endif
-#define __itt_model_task_beginA_ptr  0
-#define __itt_model_task_beginAL_ptr  0
-#define __itt_model_iteration_taskA_ptr    0
-#define __itt_model_iteration_taskAL_ptr    0
-#define __itt_model_task_end_ptr    0
-#define __itt_model_task_end_2_ptr    0
+#define __itt_model_task_beginA_ptr 0
+#define __itt_model_task_beginAL_ptr 0
+#define __itt_model_iteration_taskA_ptr 0
+#define __itt_model_iteration_taskAL_ptr 0
+#define __itt_model_task_end_ptr 0
+#define __itt_model_task_end_2_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
@@ -1140,15 +1223,15 @@ ITT_STUBV(ITTAPI, void, model_lock_acquire, (void *lock))
 ITT_STUBV(ITTAPI, void, model_lock_acquire_2, (void *lock))
 ITT_STUBV(ITTAPI, void, model_lock_release, (void *lock))
 ITT_STUBV(ITTAPI, void, model_lock_release_2, (void *lock))
-#define __itt_model_lock_acquire     ITTNOTIFY_VOID(model_lock_acquire)
+#define __itt_model_lock_acquire ITTNOTIFY_VOID(model_lock_acquire)
 #define __itt_model_lock_acquire_ptr ITTNOTIFY_NAME(model_lock_acquire)
-#define __itt_model_lock_acquire_2     ITTNOTIFY_VOID(model_lock_acquire_2)
+#define __itt_model_lock_acquire_2 ITTNOTIFY_VOID(model_lock_acquire_2)
 #define __itt_model_lock_acquire_2_ptr ITTNOTIFY_NAME(model_lock_acquire_2)
-#define __itt_model_lock_release     ITTNOTIFY_VOID(model_lock_release)
+#define __itt_model_lock_release ITTNOTIFY_VOID(model_lock_release)
 #define __itt_model_lock_release_ptr ITTNOTIFY_NAME(model_lock_release)
-#define __itt_model_lock_release_2     ITTNOTIFY_VOID(model_lock_release_2)
+#define __itt_model_lock_release_2 ITTNOTIFY_VOID(model_lock_release_2)
 #define __itt_model_lock_release_2_ptr ITTNOTIFY_NAME(model_lock_release_2)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_model_lock_acquire(lock)
 #define __itt_model_lock_acquire_ptr 0
 #define __itt_model_lock_acquire_2(lock)
@@ -1158,7 +1241,7 @@ ITT_STUBV(ITTAPI, void, model_lock_release_2, (void *lock))
 #define __itt_model_lock_release_2(lock)
 #define __itt_model_lock_release_2_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_model_lock_acquire_ptr 0
 #define __itt_model_lock_acquire_2_ptr 0
 #define __itt_model_lock_release_ptr 0
@@ -1173,26 +1256,29 @@ ITT_STUBV(ITTAPI, void, model_lock_release_2, (void *lock))
  * behavior, which may be required for correctness modeling to understand
  * when storage is not expected to be actually reused across threads.
  */
-void ITTAPI __itt_model_record_allocation  (void *addr, size_t size);
+void ITTAPI __itt_model_record_allocation(void *addr, size_t size);
 void ITTAPI __itt_model_record_deallocation(void *addr);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, model_record_allocation,   (void *addr, size_t size))
+ITT_STUBV(ITTAPI, void, model_record_allocation, (void *addr, size_t size))
 ITT_STUBV(ITTAPI, void, model_record_deallocation, (void *addr))
-#define __itt_model_record_allocation       ITTNOTIFY_VOID(model_record_allocation)
-#define __itt_model_record_allocation_ptr   ITTNOTIFY_NAME(model_record_allocation)
-#define __itt_model_record_deallocation     ITTNOTIFY_VOID(model_record_deallocation)
-#define __itt_model_record_deallocation_ptr ITTNOTIFY_NAME(model_record_deallocation)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#define __itt_model_record_allocation ITTNOTIFY_VOID(model_record_allocation)
+#define __itt_model_record_allocation_ptr                                      \
+  ITTNOTIFY_NAME(model_record_allocation)
+#define __itt_model_record_deallocation                                        \
+  ITTNOTIFY_VOID(model_record_deallocation)
+#define __itt_model_record_deallocation_ptr                                    \
+  ITTNOTIFY_NAME(model_record_deallocation)
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_model_record_allocation(addr, size)
-#define __itt_model_record_allocation_ptr   0
+#define __itt_model_record_allocation_ptr 0
 #define __itt_model_record_deallocation(addr)
 #define __itt_model_record_deallocation_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#define __itt_model_record_allocation_ptr   0
+#else /* INTEL_NO_MACRO_BODY */
+#define __itt_model_record_allocation_ptr 0
 #define __itt_model_record_deallocation_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -1202,20 +1288,20 @@ ITT_STUBV(ITTAPI, void, model_record_deallocation, (void *addr))
  *
  * Note particular storage is inductive through the end of the current site
  */
-void ITTAPI __itt_model_induction_uses(void* addr, size_t size);
+void ITTAPI __itt_model_induction_uses(void *addr, size_t size);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(ITTAPI, void, model_induction_uses, (void *addr, size_t size))
-#define __itt_model_induction_uses     ITTNOTIFY_VOID(model_induction_uses)
+#define __itt_model_induction_uses ITTNOTIFY_VOID(model_induction_uses)
 #define __itt_model_induction_uses_ptr ITTNOTIFY_NAME(model_induction_uses)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_model_induction_uses(addr, size)
-#define __itt_model_induction_uses_ptr   0
+#define __itt_model_induction_uses_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#define __itt_model_induction_uses_ptr   0
+#else /* INTEL_NO_MACRO_BODY */
+#define __itt_model_induction_uses_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
@@ -1225,20 +1311,20 @@ ITT_STUBV(ITTAPI, void, model_induction_uses, (void *addr, size_t size))
  * Note particular storage is used for reduction through the end
  * of the current site
  */
-void ITTAPI __itt_model_reduction_uses(void* addr, size_t size);
+void ITTAPI __itt_model_reduction_uses(void *addr, size_t size);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(ITTAPI, void, model_reduction_uses, (void *addr, size_t size))
-#define __itt_model_reduction_uses     ITTNOTIFY_VOID(model_reduction_uses)
+#define __itt_model_reduction_uses ITTNOTIFY_VOID(model_reduction_uses)
 #define __itt_model_reduction_uses_ptr ITTNOTIFY_NAME(model_reduction_uses)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_model_reduction_uses(addr, size)
-#define __itt_model_reduction_uses_ptr   0
+#define __itt_model_reduction_uses_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#define __itt_model_reduction_uses_ptr   0
+#else /* INTEL_NO_MACRO_BODY */
+#define __itt_model_reduction_uses_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
@@ -1248,20 +1334,20 @@ ITT_STUBV(ITTAPI, void, model_reduction_uses, (void *addr, size_t size))
  * Have correctness modeling record observations about uses of storage
  * through the end of the current site
  */
-void ITTAPI __itt_model_observe_uses(void* addr, size_t size);
+void ITTAPI __itt_model_observe_uses(void *addr, size_t size);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(ITTAPI, void, model_observe_uses, (void *addr, size_t size))
-#define __itt_model_observe_uses     ITTNOTIFY_VOID(model_observe_uses)
+#define __itt_model_observe_uses ITTNOTIFY_VOID(model_observe_uses)
 #define __itt_model_observe_uses_ptr ITTNOTIFY_NAME(model_observe_uses)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_model_observe_uses(addr, size)
-#define __itt_model_observe_uses_ptr   0
+#define __itt_model_observe_uses_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#define __itt_model_observe_uses_ptr   0
+#else /* INTEL_NO_MACRO_BODY */
+#define __itt_model_observe_uses_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
@@ -1271,19 +1357,19 @@ ITT_STUBV(ITTAPI, void, model_observe_uses, (void *addr, size_t size))
  * Clear the special handling of a piece of storage related to induction,
  * reduction or observe_uses
  */
-void ITTAPI __itt_model_clear_uses(void* addr);
+void ITTAPI __itt_model_clear_uses(void *addr);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(ITTAPI, void, model_clear_uses, (void *addr))
-#define __itt_model_clear_uses     ITTNOTIFY_VOID(model_clear_uses)
+#define __itt_model_clear_uses ITTNOTIFY_VOID(model_clear_uses)
 #define __itt_model_clear_uses_ptr ITTNOTIFY_NAME(model_clear_uses)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_model_clear_uses(addr)
 #define __itt_model_clear_uses_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_model_clear_uses_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -1317,15 +1403,15 @@ void ITTAPI __itt_model_aggregate_task(size_t x);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(ITTAPI, void, model_disable_push, (__itt_model_disable x))
-ITT_STUBV(ITTAPI, void, model_disable_pop,  (void))
+ITT_STUBV(ITTAPI, void, model_disable_pop, (void))
 ITT_STUBV(ITTAPI, void, model_aggregate_task, (size_t x))
-#define __itt_model_disable_push     ITTNOTIFY_VOID(model_disable_push)
+#define __itt_model_disable_push ITTNOTIFY_VOID(model_disable_push)
 #define __itt_model_disable_push_ptr ITTNOTIFY_NAME(model_disable_push)
-#define __itt_model_disable_pop      ITTNOTIFY_VOID(model_disable_pop)
-#define __itt_model_disable_pop_ptr  ITTNOTIFY_NAME(model_disable_pop)
-#define __itt_model_aggregate_task      ITTNOTIFY_VOID(model_aggregate_task)
-#define __itt_model_aggregate_task_ptr  ITTNOTIFY_NAME(model_aggregate_task)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#define __itt_model_disable_pop ITTNOTIFY_VOID(model_disable_pop)
+#define __itt_model_disable_pop_ptr ITTNOTIFY_NAME(model_disable_pop)
+#define __itt_model_aggregate_task ITTNOTIFY_VOID(model_aggregate_task)
+#define __itt_model_aggregate_task_ptr ITTNOTIFY_NAME(model_aggregate_task)
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_model_disable_push(x)
 #define __itt_model_disable_push_ptr 0
 #define __itt_model_disable_pop()
@@ -1333,7 +1419,7 @@ ITT_STUBV(ITTAPI, void, model_aggregate_task, (size_t x))
 #define __itt_model_aggregate_task(x)
 #define __itt_model_aggregate_task_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_model_disable_push_ptr 0
 #define __itt_model_disable_pop_ptr 0
 #define __itt_model_aggregate_task_ptr 0
@@ -1348,61 +1434,67 @@ ITT_STUBV(ITTAPI, void, model_aggregate_task, (size_t x))
  * @{
  */
 
-typedef void* __itt_heap_function;
+typedef void *__itt_heap_function;
 
 /**
  * @brief Create an identification for heap function
  * @return non-zero identifier or NULL
  */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-__itt_heap_function ITTAPI __itt_heap_function_createA(const char*    name, const char*    domain);
-__itt_heap_function ITTAPI __itt_heap_function_createW(const wchar_t* name, const wchar_t* domain);
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+__itt_heap_function ITTAPI __itt_heap_function_createA(const char *name,
+                                                       const char *domain);
+__itt_heap_function ITTAPI __itt_heap_function_createW(const wchar_t *name,
+                                                       const wchar_t *domain);
 #if defined(UNICODE) || defined(_UNICODE)
-#  define __itt_heap_function_create     __itt_heap_function_createW
-#  define __itt_heap_function_create_ptr __itt_heap_function_createW_ptr
+#define __itt_heap_function_create __itt_heap_function_createW
+#define __itt_heap_function_create_ptr __itt_heap_function_createW_ptr
 #else
-#  define __itt_heap_function_create     __itt_heap_function_createA
-#  define __itt_heap_function_create_ptr __itt_heap_function_createA_ptr
+#define __itt_heap_function_create __itt_heap_function_createA
+#define __itt_heap_function_create_ptr __itt_heap_function_createA_ptr
 #endif /* UNICODE */
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-__itt_heap_function ITTAPI __itt_heap_function_create(const char* name, const char* domain);
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+__itt_heap_function ITTAPI __itt_heap_function_create(const char *name,
+                                                      const char *domain);
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUB(ITTAPI, __itt_heap_function, heap_function_createA, (const char*    name, const char*    domain))
-ITT_STUB(ITTAPI, __itt_heap_function, heap_function_createW, (const wchar_t* name, const wchar_t* domain))
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-ITT_STUB(ITTAPI, __itt_heap_function, heap_function_create,  (const char*    name, const char*    domain))
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUB(ITTAPI, __itt_heap_function, heap_function_createA,
+         (const char *name, const char *domain))
+ITT_STUB(ITTAPI, __itt_heap_function, heap_function_createW,
+         (const wchar_t *name, const wchar_t *domain))
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+ITT_STUB(ITTAPI, __itt_heap_function, heap_function_create,
+         (const char *name, const char *domain))
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-#define __itt_heap_function_createA     ITTNOTIFY_DATA(heap_function_createA)
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define __itt_heap_function_createA ITTNOTIFY_DATA(heap_function_createA)
 #define __itt_heap_function_createA_ptr ITTNOTIFY_NAME(heap_function_createA)
-#define __itt_heap_function_createW     ITTNOTIFY_DATA(heap_function_createW)
+#define __itt_heap_function_createW ITTNOTIFY_DATA(heap_function_createW)
 #define __itt_heap_function_createW_ptr ITTNOTIFY_NAME(heap_function_createW)
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_heap_function_create      ITTNOTIFY_DATA(heap_function_create)
-#define __itt_heap_function_create_ptr  ITTNOTIFY_NAME(heap_function_create)
+#define __itt_heap_function_create ITTNOTIFY_DATA(heap_function_create)
+#define __itt_heap_function_create_ptr ITTNOTIFY_NAME(heap_function_create)
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_ITTNOTIFY_API */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_heap_function_createA(name, domain) (__itt_heap_function)0
 #define __itt_heap_function_createA_ptr 0
 #define __itt_heap_function_createW(name, domain) (__itt_heap_function)0
 #define __itt_heap_function_createW_ptr 0
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_heap_function_create(name, domain)  (__itt_heap_function)0
-#define __itt_heap_function_create_ptr  0
+#define __itt_heap_function_create(name, domain) (__itt_heap_function)0
+#define __itt_heap_function_create_ptr 0
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_MACRO_BODY */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_heap_function_createA_ptr 0
 #define __itt_heap_function_createW_ptr 0
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_heap_function_create_ptr  0
+#define __itt_heap_function_create_ptr 0
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -1410,120 +1502,130 @@ ITT_STUB(ITTAPI, __itt_heap_function, heap_function_create,  (const char*    nam
 /**
  * @brief Record an allocation begin occurrence.
  */
-void ITTAPI __itt_heap_allocate_begin(__itt_heap_function h, size_t size, int initialized);
+void ITTAPI __itt_heap_allocate_begin(__itt_heap_function h, size_t size,
+                                      int initialized);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, heap_allocate_begin, (__itt_heap_function h, size_t size, int initialized))
-#define __itt_heap_allocate_begin     ITTNOTIFY_VOID(heap_allocate_begin)
+ITT_STUBV(ITTAPI, void, heap_allocate_begin,
+          (__itt_heap_function h, size_t size, int initialized))
+#define __itt_heap_allocate_begin ITTNOTIFY_VOID(heap_allocate_begin)
 #define __itt_heap_allocate_begin_ptr ITTNOTIFY_NAME(heap_allocate_begin)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_heap_allocate_begin(h, size, initialized)
-#define __itt_heap_allocate_begin_ptr   0
+#define __itt_heap_allocate_begin_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#define __itt_heap_allocate_begin_ptr   0
+#else /* INTEL_NO_MACRO_BODY */
+#define __itt_heap_allocate_begin_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
 /**
  * @brief Record an allocation end occurrence.
  */
-void ITTAPI __itt_heap_allocate_end(__itt_heap_function h, void** addr, size_t size, int initialized);
+void ITTAPI __itt_heap_allocate_end(__itt_heap_function h, void **addr,
+                                    size_t size, int initialized);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, heap_allocate_end, (__itt_heap_function h, void** addr, size_t size, int initialized))
-#define __itt_heap_allocate_end     ITTNOTIFY_VOID(heap_allocate_end)
+ITT_STUBV(ITTAPI, void, heap_allocate_end,
+          (__itt_heap_function h, void **addr, size_t size, int initialized))
+#define __itt_heap_allocate_end ITTNOTIFY_VOID(heap_allocate_end)
 #define __itt_heap_allocate_end_ptr ITTNOTIFY_NAME(heap_allocate_end)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_heap_allocate_end(h, addr, size, initialized)
-#define __itt_heap_allocate_end_ptr   0
+#define __itt_heap_allocate_end_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#define __itt_heap_allocate_end_ptr   0
+#else /* INTEL_NO_MACRO_BODY */
+#define __itt_heap_allocate_end_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
 /**
  * @brief Record a free begin occurrence.
  */
-void ITTAPI __itt_heap_free_begin(__itt_heap_function h, void* addr);
+void ITTAPI __itt_heap_free_begin(__itt_heap_function h, void *addr);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, heap_free_begin, (__itt_heap_function h, void* addr))
-#define __itt_heap_free_begin     ITTNOTIFY_VOID(heap_free_begin)
+ITT_STUBV(ITTAPI, void, heap_free_begin, (__itt_heap_function h, void *addr))
+#define __itt_heap_free_begin ITTNOTIFY_VOID(heap_free_begin)
 #define __itt_heap_free_begin_ptr ITTNOTIFY_NAME(heap_free_begin)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_heap_free_begin(h, addr)
-#define __itt_heap_free_begin_ptr   0
+#define __itt_heap_free_begin_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#define __itt_heap_free_begin_ptr   0
+#else /* INTEL_NO_MACRO_BODY */
+#define __itt_heap_free_begin_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
 /**
  * @brief Record a free end occurrence.
  */
-void ITTAPI __itt_heap_free_end(__itt_heap_function h, void* addr);
+void ITTAPI __itt_heap_free_end(__itt_heap_function h, void *addr);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, heap_free_end, (__itt_heap_function h, void* addr))
-#define __itt_heap_free_end     ITTNOTIFY_VOID(heap_free_end)
+ITT_STUBV(ITTAPI, void, heap_free_end, (__itt_heap_function h, void *addr))
+#define __itt_heap_free_end ITTNOTIFY_VOID(heap_free_end)
 #define __itt_heap_free_end_ptr ITTNOTIFY_NAME(heap_free_end)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_heap_free_end(h, addr)
-#define __itt_heap_free_end_ptr   0
+#define __itt_heap_free_end_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#define __itt_heap_free_end_ptr   0
+#else /* INTEL_NO_MACRO_BODY */
+#define __itt_heap_free_end_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
 /**
  * @brief Record a reallocation begin occurrence.
  */
-void ITTAPI __itt_heap_reallocate_begin(__itt_heap_function h, void* addr, size_t new_size, int initialized);
+void ITTAPI __itt_heap_reallocate_begin(__itt_heap_function h, void *addr,
+                                        size_t new_size, int initialized);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, heap_reallocate_begin, (__itt_heap_function h, void* addr, size_t new_size, int initialized))
-#define __itt_heap_reallocate_begin     ITTNOTIFY_VOID(heap_reallocate_begin)
+ITT_STUBV(ITTAPI, void, heap_reallocate_begin,
+          (__itt_heap_function h, void *addr, size_t new_size, int initialized))
+#define __itt_heap_reallocate_begin ITTNOTIFY_VOID(heap_reallocate_begin)
 #define __itt_heap_reallocate_begin_ptr ITTNOTIFY_NAME(heap_reallocate_begin)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_heap_reallocate_begin(h, addr, new_size, initialized)
-#define __itt_heap_reallocate_begin_ptr   0
+#define __itt_heap_reallocate_begin_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#define __itt_heap_reallocate_begin_ptr   0
+#else /* INTEL_NO_MACRO_BODY */
+#define __itt_heap_reallocate_begin_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
 /**
  * @brief Record a reallocation end occurrence.
  */
-void ITTAPI __itt_heap_reallocate_end(__itt_heap_function h, void* addr, void** new_addr, size_t new_size, int initialized);
+void ITTAPI __itt_heap_reallocate_end(__itt_heap_function h, void *addr,
+                                      void **new_addr, size_t new_size,
+                                      int initialized);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, heap_reallocate_end, (__itt_heap_function h, void* addr, void** new_addr, size_t new_size, int initialized))
-#define __itt_heap_reallocate_end     ITTNOTIFY_VOID(heap_reallocate_end)
+ITT_STUBV(ITTAPI, void, heap_reallocate_end,
+          (__itt_heap_function h, void *addr, void **new_addr, size_t new_size,
+           int initialized))
+#define __itt_heap_reallocate_end ITTNOTIFY_VOID(heap_reallocate_end)
 #define __itt_heap_reallocate_end_ptr ITTNOTIFY_NAME(heap_reallocate_end)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_heap_reallocate_end(h, addr, new_addr, new_size, initialized)
-#define __itt_heap_reallocate_end_ptr   0
+#define __itt_heap_reallocate_end_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#define __itt_heap_reallocate_end_ptr   0
+#else /* INTEL_NO_MACRO_BODY */
+#define __itt_heap_reallocate_end_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
@@ -1533,15 +1635,17 @@ void ITTAPI __itt_heap_internal_access_begin(void);
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, heap_internal_access_begin,  (void))
-#define __itt_heap_internal_access_begin      ITTNOTIFY_VOID(heap_internal_access_begin)
-#define __itt_heap_internal_access_begin_ptr  ITTNOTIFY_NAME(heap_internal_access_begin)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+ITT_STUBV(ITTAPI, void, heap_internal_access_begin, (void))
+#define __itt_heap_internal_access_begin                                       \
+  ITTNOTIFY_VOID(heap_internal_access_begin)
+#define __itt_heap_internal_access_begin_ptr                                   \
+  ITTNOTIFY_NAME(heap_internal_access_begin)
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_heap_internal_access_begin()
-#define __itt_heap_internal_access_begin_ptr  0
+#define __itt_heap_internal_access_begin_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#define __itt_heap_internal_access_begin_ptr  0
+#else /* INTEL_NO_MACRO_BODY */
+#define __itt_heap_internal_access_begin_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
@@ -1552,13 +1656,14 @@ void ITTAPI __itt_heap_internal_access_end(void);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(ITTAPI, void, heap_internal_access_end, (void))
-#define __itt_heap_internal_access_end     ITTNOTIFY_VOID(heap_internal_access_end)
-#define __itt_heap_internal_access_end_ptr ITTNOTIFY_NAME(heap_internal_access_end)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#define __itt_heap_internal_access_end ITTNOTIFY_VOID(heap_internal_access_end)
+#define __itt_heap_internal_access_end_ptr                                     \
+  ITTNOTIFY_NAME(heap_internal_access_end)
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_heap_internal_access_end()
 #define __itt_heap_internal_access_end_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_heap_internal_access_end_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -1569,15 +1674,17 @@ void ITTAPI __itt_heap_record_memory_growth_begin(void);
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, heap_record_memory_growth_begin,  (void))
-#define __itt_heap_record_memory_growth_begin      ITTNOTIFY_VOID(heap_record_memory_growth_begin)
-#define __itt_heap_record_memory_growth_begin_ptr  ITTNOTIFY_NAME(heap_record_memory_growth_begin)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+ITT_STUBV(ITTAPI, void, heap_record_memory_growth_begin, (void))
+#define __itt_heap_record_memory_growth_begin                                  \
+  ITTNOTIFY_VOID(heap_record_memory_growth_begin)
+#define __itt_heap_record_memory_growth_begin_ptr                              \
+  ITTNOTIFY_NAME(heap_record_memory_growth_begin)
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_heap_record_memory_growth_begin()
-#define __itt_heap_record_memory_growth_begin_ptr  0
+#define __itt_heap_record_memory_growth_begin_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#define __itt_heap_record_memory_growth_begin_ptr  0
+#else /* INTEL_NO_MACRO_BODY */
+#define __itt_heap_record_memory_growth_begin_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
@@ -1588,13 +1695,15 @@ void ITTAPI __itt_heap_record_memory_growth_end(void);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(ITTAPI, void, heap_record_memory_growth_end, (void))
-#define __itt_heap_record_memory_growth_end     ITTNOTIFY_VOID(heap_record_memory_growth_end)
-#define __itt_heap_record_memory_growth_end_ptr ITTNOTIFY_NAME(heap_record_memory_growth_end)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#define __itt_heap_record_memory_growth_end                                    \
+  ITTNOTIFY_VOID(heap_record_memory_growth_end)
+#define __itt_heap_record_memory_growth_end_ptr                                \
+  ITTNOTIFY_NAME(heap_record_memory_growth_end)
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_heap_record_memory_growth_end()
 #define __itt_heap_record_memory_growth_end_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_heap_record_memory_growth_end_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -1614,22 +1723,21 @@ ITT_STUBV(ITTAPI, void, heap_record_memory_growth_end, (void))
  */
 #define __itt_heap_growth 0x00000002
 
-
 /** @brief heap reset detection */
 void ITTAPI __itt_heap_reset_detection(unsigned int reset_mask);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, heap_reset_detection,  (unsigned int reset_mask))
-#define __itt_heap_reset_detection      ITTNOTIFY_VOID(heap_reset_detection)
-#define __itt_heap_reset_detection_ptr  ITTNOTIFY_NAME(heap_reset_detection)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+ITT_STUBV(ITTAPI, void, heap_reset_detection, (unsigned int reset_mask))
+#define __itt_heap_reset_detection ITTNOTIFY_VOID(heap_reset_detection)
+#define __itt_heap_reset_detection_ptr ITTNOTIFY_NAME(heap_reset_detection)
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_heap_reset_detection()
-#define __itt_heap_reset_detection_ptr  0
+#define __itt_heap_reset_detection_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#define __itt_heap_reset_detection_ptr  0
+#else /* INTEL_NO_MACRO_BODY */
+#define __itt_heap_reset_detection_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
@@ -1640,13 +1748,13 @@ void ITTAPI __itt_heap_record(unsigned int record_mask);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(ITTAPI, void, heap_record, (unsigned int record_mask))
-#define __itt_heap_record     ITTNOTIFY_VOID(heap_record)
+#define __itt_heap_record ITTNOTIFY_VOID(heap_record)
 #define __itt_heap_record_ptr ITTNOTIFY_NAME(heap_record)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_heap_record()
 #define __itt_heap_record_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_heap_record_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -1665,18 +1773,18 @@ ITT_STUBV(ITTAPI, void, heap_record, (unsigned int record_mask))
 /** @cond exclude_from_documentation */
 #pragma pack(push, 8)
 
-typedef struct ___itt_domain
-{
-    volatile int flags; /*!< Zero if disabled, non-zero if enabled. The meaning of 
diff erent non-zero values is reserved to the runtime */
-    const char* nameA;  /*!< Copy of original name in ASCII. */
+typedef struct ___itt_domain {
+  volatile int flags; /*!< Zero if disabled, non-zero if enabled. The meaning of
+                         
diff erent non-zero values is reserved to the runtime */
+  const char *nameA; /*!< Copy of original name in ASCII. */
 #if defined(UNICODE) || defined(_UNICODE)
-    const wchar_t* nameW; /*!< Copy of original name in UNICODE. */
-#else  /* UNICODE || _UNICODE */
-    void* nameW;
+  const wchar_t *nameW; /*!< Copy of original name in UNICODE. */
+#else /* UNICODE || _UNICODE */
+  void *nameW;
 #endif /* UNICODE || _UNICODE */
-    int   extra1; /*!< Reserved to the runtime */
-    void* extra2; /*!< Reserved to the runtime */
-    struct ___itt_domain* next;
+  int extra1; /*!< Reserved to the runtime */
+  void *extra2; /*!< Reserved to the runtime */
+  struct ___itt_domain *next;
 } __itt_domain;
 
 #pragma pack(pop)
@@ -1692,55 +1800,55 @@ typedef struct ___itt_domain
  * which thread created the domain. This call is thread-safe.
  * @param[in] name name of domain
  */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-__itt_domain* ITTAPI __itt_domain_createA(const char    *name);
-__itt_domain* ITTAPI __itt_domain_createW(const wchar_t *name);
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+__itt_domain *ITTAPI __itt_domain_createA(const char *name);
+__itt_domain *ITTAPI __itt_domain_createW(const wchar_t *name);
 #if defined(UNICODE) || defined(_UNICODE)
-#  define __itt_domain_create     __itt_domain_createW
-#  define __itt_domain_create_ptr __itt_domain_createW_ptr
+#define __itt_domain_create __itt_domain_createW
+#define __itt_domain_create_ptr __itt_domain_createW_ptr
 #else /* UNICODE */
-#  define __itt_domain_create     __itt_domain_createA
-#  define __itt_domain_create_ptr __itt_domain_createA_ptr
+#define __itt_domain_create __itt_domain_createA
+#define __itt_domain_create_ptr __itt_domain_createA_ptr
 #endif /* UNICODE */
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-__itt_domain* ITTAPI __itt_domain_create(const char *name);
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+__itt_domain *ITTAPI __itt_domain_create(const char *name);
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUB(ITTAPI, __itt_domain*, domain_createA, (const char    *name))
-ITT_STUB(ITTAPI, __itt_domain*, domain_createW, (const wchar_t *name))
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-ITT_STUB(ITTAPI, __itt_domain*, domain_create,  (const char    *name))
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUB(ITTAPI, __itt_domain *, domain_createA, (const char *name))
+ITT_STUB(ITTAPI, __itt_domain *, domain_createW, (const wchar_t *name))
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+ITT_STUB(ITTAPI, __itt_domain *, domain_create, (const char *name))
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-#define __itt_domain_createA     ITTNOTIFY_DATA(domain_createA)
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define __itt_domain_createA ITTNOTIFY_DATA(domain_createA)
 #define __itt_domain_createA_ptr ITTNOTIFY_NAME(domain_createA)
-#define __itt_domain_createW     ITTNOTIFY_DATA(domain_createW)
+#define __itt_domain_createW ITTNOTIFY_DATA(domain_createW)
 #define __itt_domain_createW_ptr ITTNOTIFY_NAME(domain_createW)
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_domain_create     ITTNOTIFY_DATA(domain_create)
+#define __itt_domain_create ITTNOTIFY_DATA(domain_create)
 #define __itt_domain_create_ptr ITTNOTIFY_NAME(domain_create)
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-#define __itt_domain_createA(name) (__itt_domain*)0
+#else /* INTEL_NO_ITTNOTIFY_API */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define __itt_domain_createA(name) (__itt_domain *)0
 #define __itt_domain_createA_ptr 0
-#define __itt_domain_createW(name) (__itt_domain*)0
+#define __itt_domain_createW(name) (__itt_domain *)0
 #define __itt_domain_createW_ptr 0
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_domain_create(name)  (__itt_domain*)0
+#define __itt_domain_create(name) (__itt_domain *)0
 #define __itt_domain_create_ptr 0
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_MACRO_BODY */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_domain_createA_ptr 0
 #define __itt_domain_createW_ptr 0
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_domain_create_ptr  0
+#define __itt_domain_create_ptr 0
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -1756,35 +1864,36 @@ ITT_STUB(ITTAPI, __itt_domain*, domain_create,  (const char    *name))
 /** @cond exclude_from_documentation */
 #pragma pack(push, 8)
 
-typedef struct ___itt_id
-{
-    unsigned long long d1, d2, d3;
+typedef struct ___itt_id {
+  unsigned long long d1, d2, d3;
 } __itt_id;
 
 #pragma pack(pop)
 /** @endcond */
 
-static const __itt_id __itt_null = { 0, 0, 0 };
+static const __itt_id __itt_null = {0, 0, 0};
 
 /**
  * @ingroup ids
- * @brief A convenience function is provided to create an ID without domain control.
- * @brief This is a convenience function to initialize an __itt_id structure. This function
- * does not affect the collector runtime in any way. After you make the ID with this
- * function, you still must create it with the __itt_id_create function before using the ID
- * to identify a named entity.
+ * @brief A convenience function is provided to create an ID without domain
+ * control.
+ * @brief This is a convenience function to initialize an __itt_id structure.
+ * This function does not affect the collector runtime in any way. After you
+ * make the ID with this function, you still must create it with the
+ * __itt_id_create function before using the ID to identify a named entity.
  * @param[in] addr The address of object; high QWORD of the ID value.
- * @param[in] extra The extra data to unique identify object; low QWORD of the ID value.
- */
-
-ITT_INLINE __itt_id ITTAPI __itt_id_make(void* addr, unsigned long long extra) ITT_INLINE_ATTRIBUTE;
-ITT_INLINE __itt_id ITTAPI __itt_id_make(void* addr, unsigned long long extra)
-{
-    __itt_id id = __itt_null;
-    id.d1 = (unsigned long long)((uintptr_t)addr);
-    id.d2 = (unsigned long long)extra;
-    id.d3 = (unsigned long long)0; /* Reserved. Must be zero */
-    return id;
+ * @param[in] extra The extra data to unique identify object; low QWORD of the
+ * ID value.
+ */
+
+ITT_INLINE __itt_id ITTAPI __itt_id_make(void *addr, unsigned long long extra)
+    ITT_INLINE_ATTRIBUTE;
+ITT_INLINE __itt_id ITTAPI __itt_id_make(void *addr, unsigned long long extra) {
+  __itt_id id = __itt_null;
+  id.d1 = (unsigned long long)((uintptr_t)addr);
+  id.d2 = (unsigned long long)extra;
+  id.d3 = (unsigned long long)0; /* Reserved. Must be zero */
+  return id;
 }
 
 /**
@@ -1805,13 +1914,13 @@ void ITTAPI __itt_id_create(const __itt_domain *domain, __itt_id id);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(ITTAPI, void, id_create, (const __itt_domain *domain, __itt_id id))
-#define __itt_id_create(d,x) ITTNOTIFY_VOID_D1(id_create,d,x)
-#define __itt_id_create_ptr  ITTNOTIFY_NAME(id_create)
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#define __itt_id_create(domain,id)
+#define __itt_id_create(d, x) ITTNOTIFY_VOID_D1(id_create, d, x)
+#define __itt_id_create_ptr ITTNOTIFY_NAME(id_create)
+#else /* INTEL_NO_ITTNOTIFY_API */
+#define __itt_id_create(domain, id)
 #define __itt_id_create_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_id_create_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -1819,10 +1928,10 @@ ITT_STUBV(ITTAPI, void, id_create, (const __itt_domain *domain, __itt_id id))
 /**
  * @ingroup ids
  * @brief Destroy an instance of identifier.
- * This ends the lifetime of the current instance of the given ID value in the trace.
- * Any relationships that are established after this lifetime ends are invalid.
- * This call must be performed before the given ID value can be reused for a 
diff erent
- * named entity instance.
+ * This ends the lifetime of the current instance of the given ID value in the
+ * trace. Any relationships that are established after this lifetime ends are
+ * invalid. This call must be performed before the given ID value can be reused
+ * for a 
diff erent named entity instance.
  * @param[in] domain The domain controlling the execution of this call.
  * @param[in] id The ID to destroy.
  */
@@ -1832,13 +1941,13 @@ void ITTAPI __itt_id_destroy(const __itt_domain *domain, __itt_id id);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(ITTAPI, void, id_destroy, (const __itt_domain *domain, __itt_id id))
-#define __itt_id_destroy(d,x) ITTNOTIFY_VOID_D1(id_destroy,d,x)
-#define __itt_id_destroy_ptr  ITTNOTIFY_NAME(id_destroy)
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#define __itt_id_destroy(domain,id)
+#define __itt_id_destroy(d, x) ITTNOTIFY_VOID_D1(id_destroy, d, x)
+#define __itt_id_destroy_ptr ITTNOTIFY_NAME(id_destroy)
+#else /* INTEL_NO_ITTNOTIFY_API */
+#define __itt_id_destroy(domain, id)
 #define __itt_id_destroy_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_id_destroy_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -1854,17 +1963,16 @@ ITT_STUBV(ITTAPI, void, id_destroy, (const __itt_domain *domain, __itt_id id))
 /** @cond exclude_from_documentation */
 #pragma pack(push, 8)
 
-typedef struct ___itt_string_handle
-{
-    const char* strA; /*!< Copy of original string in ASCII. */
+typedef struct ___itt_string_handle {
+  const char *strA; /*!< Copy of original string in ASCII. */
 #if defined(UNICODE) || defined(_UNICODE)
-    const wchar_t* strW; /*!< Copy of original string in UNICODE. */
-#else  /* UNICODE || _UNICODE */
-    void* strW;
+  const wchar_t *strW; /*!< Copy of original string in UNICODE. */
+#else /* UNICODE || _UNICODE */
+  void *strW;
 #endif /* UNICODE || _UNICODE */
-    int   extra1; /*!< Reserved. Must be zero   */
-    void* extra2; /*!< Reserved. Must be zero   */
-    struct ___itt_string_handle* next;
+  int extra1; /*!< Reserved. Must be zero   */
+  void *extra2; /*!< Reserved. Must be zero   */
+  struct ___itt_string_handle *next;
 } __itt_string_handle;
 
 #pragma pack(pop)
@@ -1875,61 +1983,65 @@ typedef struct ___itt_string_handle
  * @brief Create a string handle.
  * Create and return handle value that can be associated with a string.
  * Consecutive calls to __itt_string_handle_create with the same name
- * return the same value. Because the set of string handles is expected to remain
- * static during the application's execution time, there is no mechanism to destroy a string handle.
- * Any string handle can be accessed by any thread in the process, regardless of which thread created
- * the string handle. This call is thread-safe.
+ * return the same value. Because the set of string handles is expected to
+ * remain static during the application's execution time, there is no mechanism
+ * to destroy a string handle. Any string handle can be accessed by any thread
+ * in the process, regardless of which thread created the string handle. This
+ * call is thread-safe.
  * @param[in] name The input string
  */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-__itt_string_handle* ITTAPI __itt_string_handle_createA(const char    *name);
-__itt_string_handle* ITTAPI __itt_string_handle_createW(const wchar_t *name);
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+__itt_string_handle *ITTAPI __itt_string_handle_createA(const char *name);
+__itt_string_handle *ITTAPI __itt_string_handle_createW(const wchar_t *name);
 #if defined(UNICODE) || defined(_UNICODE)
-#  define __itt_string_handle_create     __itt_string_handle_createW
-#  define __itt_string_handle_create_ptr __itt_string_handle_createW_ptr
+#define __itt_string_handle_create __itt_string_handle_createW
+#define __itt_string_handle_create_ptr __itt_string_handle_createW_ptr
 #else /* UNICODE */
-#  define __itt_string_handle_create     __itt_string_handle_createA
-#  define __itt_string_handle_create_ptr __itt_string_handle_createA_ptr
+#define __itt_string_handle_create __itt_string_handle_createA
+#define __itt_string_handle_create_ptr __itt_string_handle_createA_ptr
 #endif /* UNICODE */
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-__itt_string_handle* ITTAPI __itt_string_handle_create(const char *name);
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+__itt_string_handle *ITTAPI __itt_string_handle_create(const char *name);
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUB(ITTAPI, __itt_string_handle*, string_handle_createA, (const char    *name))
-ITT_STUB(ITTAPI, __itt_string_handle*, string_handle_createW, (const wchar_t *name))
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-ITT_STUB(ITTAPI, __itt_string_handle*, string_handle_create,  (const char    *name))
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUB(ITTAPI, __itt_string_handle *, string_handle_createA,
+         (const char *name))
+ITT_STUB(ITTAPI, __itt_string_handle *, string_handle_createW,
+         (const wchar_t *name))
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+ITT_STUB(ITTAPI, __itt_string_handle *, string_handle_create,
+         (const char *name))
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-#define __itt_string_handle_createA     ITTNOTIFY_DATA(string_handle_createA)
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define __itt_string_handle_createA ITTNOTIFY_DATA(string_handle_createA)
 #define __itt_string_handle_createA_ptr ITTNOTIFY_NAME(string_handle_createA)
-#define __itt_string_handle_createW     ITTNOTIFY_DATA(string_handle_createW)
+#define __itt_string_handle_createW ITTNOTIFY_DATA(string_handle_createW)
 #define __itt_string_handle_createW_ptr ITTNOTIFY_NAME(string_handle_createW)
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_string_handle_create     ITTNOTIFY_DATA(string_handle_create)
+#define __itt_string_handle_create ITTNOTIFY_DATA(string_handle_create)
 #define __itt_string_handle_create_ptr ITTNOTIFY_NAME(string_handle_create)
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-#define __itt_string_handle_createA(name) (__itt_string_handle*)0
+#else /* INTEL_NO_ITTNOTIFY_API */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define __itt_string_handle_createA(name) (__itt_string_handle *)0
 #define __itt_string_handle_createA_ptr 0
-#define __itt_string_handle_createW(name) (__itt_string_handle*)0
+#define __itt_string_handle_createW(name) (__itt_string_handle *)0
 #define __itt_string_handle_createW_ptr 0
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_string_handle_create(name)  (__itt_string_handle*)0
+#define __itt_string_handle_create(name) (__itt_string_handle *)0
 #define __itt_string_handle_create_ptr 0
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_MACRO_BODY */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_string_handle_createA_ptr 0
 #define __itt_string_handle_createW_ptr 0
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_string_handle_create_ptr  0
+#define __itt_string_handle_create_ptr 0
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -1946,9 +2058,9 @@ typedef unsigned long long __itt_timestamp;
 /**
  * @ingroup timestamps
  * @brief Return timestamp corresponding to the current moment.
- * This returns the timestamp in the format that is the most relevant for the current
- * host or platform (RDTSC, QPC, and others). You can use the "<" operator to
- * compare __itt_timestamp values.
+ * This returns the timestamp in the format that is the most relevant for the
+ * current host or platform (RDTSC, QPC, and others). You can use the "<"
+ * operator to compare __itt_timestamp values.
  */
 __itt_timestamp ITTAPI __itt_get_timestamp(void);
 
@@ -1956,13 +2068,13 @@ __itt_timestamp ITTAPI __itt_get_timestamp(void);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUB(ITTAPI, __itt_timestamp, get_timestamp, (void))
-#define __itt_get_timestamp      ITTNOTIFY_DATA(get_timestamp)
-#define __itt_get_timestamp_ptr  ITTNOTIFY_NAME(get_timestamp)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#define __itt_get_timestamp ITTNOTIFY_DATA(get_timestamp)
+#define __itt_get_timestamp_ptr ITTNOTIFY_NAME(get_timestamp)
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_get_timestamp()
 #define __itt_get_timestamp_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_get_timestamp_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -1983,11 +2095,14 @@ ITT_STUB(ITTAPI, __itt_timestamp, get_timestamp, (void))
  * Successive calls to __itt_region_begin with the same ID are ignored
  * until a call to __itt_region_end with the same ID
  * @param[in] domain The domain for this region instance
- * @param[in] id The instance ID for this region instance. Must not be __itt_null
- * @param[in] parentid The instance ID for the parent of this region instance, or __itt_null
+ * @param[in] id The instance ID for this region instance. Must not be
+ * __itt_null
+ * @param[in] parentid The instance ID for the parent of this region instance,
+ * or __itt_null
  * @param[in] name The name of this region
  */
-void ITTAPI __itt_region_begin(const __itt_domain *domain, __itt_id id, __itt_id parentid, __itt_string_handle *name);
+void ITTAPI __itt_region_begin(const __itt_domain *domain, __itt_id id,
+                               __itt_id parentid, __itt_string_handle *name);
 
 /**
  * @ingroup regions
@@ -2003,21 +2118,24 @@ void ITTAPI __itt_region_end(const __itt_domain *domain, __itt_id id);
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, region_begin, (const __itt_domain *domain, __itt_id id, __itt_id parentid, __itt_string_handle *name))
-ITT_STUBV(ITTAPI, void, region_end,   (const __itt_domain *domain, __itt_id id))
-#define __itt_region_begin(d,x,y,z) ITTNOTIFY_VOID_D3(region_begin,d,x,y,z)
-#define __itt_region_begin_ptr      ITTNOTIFY_NAME(region_begin)
-#define __itt_region_end(d,x)       ITTNOTIFY_VOID_D1(region_end,d,x)
-#define __itt_region_end_ptr        ITTNOTIFY_NAME(region_end)
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#define __itt_region_begin(d,x,y,z)
+ITT_STUBV(ITTAPI, void, region_begin,
+          (const __itt_domain *domain, __itt_id id, __itt_id parentid,
+           __itt_string_handle *name))
+ITT_STUBV(ITTAPI, void, region_end, (const __itt_domain *domain, __itt_id id))
+#define __itt_region_begin(d, x, y, z)                                         \
+  ITTNOTIFY_VOID_D3(region_begin, d, x, y, z)
+#define __itt_region_begin_ptr ITTNOTIFY_NAME(region_begin)
+#define __itt_region_end(d, x) ITTNOTIFY_VOID_D1(region_end, d, x)
+#define __itt_region_end_ptr ITTNOTIFY_NAME(region_end)
+#else /* INTEL_NO_ITTNOTIFY_API */
+#define __itt_region_begin(d, x, y, z)
 #define __itt_region_begin_ptr 0
-#define __itt_region_end(d,x)
-#define __itt_region_end_ptr   0
+#define __itt_region_end(d, x)
+#define __itt_region_end_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_region_begin_ptr 0
-#define __itt_region_end_ptr   0
+#define __itt_region_end_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 /** @} regions group */
@@ -2025,8 +2143,8 @@ ITT_STUBV(ITTAPI, void, region_end,   (const __itt_domain *domain, __itt_id id))
 /**
  * @defgroup frames Frames
  * @ingroup public
- * Frames are similar to regions, but are intended to be easier to use and to implement.
- * In particular:
+ * Frames are similar to regions, but are intended to be easier to use and to
+ * implement. In particular:
  * - Frames always represent periods of elapsed time
  * - By default, frames have no nesting relationships
  * @{
@@ -2067,32 +2185,37 @@ void ITTAPI __itt_frame_end_v3(const __itt_domain *domain, __itt_id *id);
  * @param[in] end Timestamp of the end of the frame
  */
 void ITTAPI __itt_frame_submit_v3(const __itt_domain *domain, __itt_id *id,
-    __itt_timestamp begin, __itt_timestamp end);
+                                  __itt_timestamp begin, __itt_timestamp end);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, frame_begin_v3,  (const __itt_domain *domain, __itt_id *id))
-ITT_STUBV(ITTAPI, void, frame_end_v3,    (const __itt_domain *domain, __itt_id *id))
-ITT_STUBV(ITTAPI, void, frame_submit_v3, (const __itt_domain *domain, __itt_id *id, __itt_timestamp begin, __itt_timestamp end))
-#define __itt_frame_begin_v3(d,x)      ITTNOTIFY_VOID_D1(frame_begin_v3,d,x)
-#define __itt_frame_begin_v3_ptr       ITTNOTIFY_NAME(frame_begin_v3)
-#define __itt_frame_end_v3(d,x)        ITTNOTIFY_VOID_D1(frame_end_v3,d,x)
-#define __itt_frame_end_v3_ptr         ITTNOTIFY_NAME(frame_end_v3)
-#define __itt_frame_submit_v3(d,x,b,e) ITTNOTIFY_VOID_D3(frame_submit_v3,d,x,b,e)
-#define __itt_frame_submit_v3_ptr      ITTNOTIFY_NAME(frame_submit_v3)
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#define __itt_frame_begin_v3(domain,id)
+ITT_STUBV(ITTAPI, void, frame_begin_v3,
+          (const __itt_domain *domain, __itt_id *id))
+ITT_STUBV(ITTAPI, void, frame_end_v3,
+          (const __itt_domain *domain, __itt_id *id))
+ITT_STUBV(ITTAPI, void, frame_submit_v3,
+          (const __itt_domain *domain, __itt_id *id, __itt_timestamp begin,
+           __itt_timestamp end))
+#define __itt_frame_begin_v3(d, x) ITTNOTIFY_VOID_D1(frame_begin_v3, d, x)
+#define __itt_frame_begin_v3_ptr ITTNOTIFY_NAME(frame_begin_v3)
+#define __itt_frame_end_v3(d, x) ITTNOTIFY_VOID_D1(frame_end_v3, d, x)
+#define __itt_frame_end_v3_ptr ITTNOTIFY_NAME(frame_end_v3)
+#define __itt_frame_submit_v3(d, x, b, e)                                      \
+  ITTNOTIFY_VOID_D3(frame_submit_v3, d, x, b, e)
+#define __itt_frame_submit_v3_ptr ITTNOTIFY_NAME(frame_submit_v3)
+#else /* INTEL_NO_ITTNOTIFY_API */
+#define __itt_frame_begin_v3(domain, id)
 #define __itt_frame_begin_v3_ptr 0
-#define __itt_frame_end_v3(domain,id)
-#define __itt_frame_end_v3_ptr   0
-#define __itt_frame_submit_v3(domain,id,begin,end)
-#define __itt_frame_submit_v3_ptr   0
+#define __itt_frame_end_v3(domain, id)
+#define __itt_frame_end_v3_ptr 0
+#define __itt_frame_submit_v3(domain, id, begin, end)
+#define __itt_frame_submit_v3_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_frame_begin_v3_ptr 0
-#define __itt_frame_end_v3_ptr   0
-#define __itt_frame_submit_v3_ptr   0
+#define __itt_frame_end_v3_ptr 0
+#define __itt_frame_submit_v3_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 /** @} frames group */
@@ -2109,23 +2232,28 @@ ITT_STUBV(ITTAPI, void, frame_submit_v3, (const __itt_domain *domain, __itt_id *
  * @brief Denotes a task_group instance.
  * Successive calls to __itt_task_group with the same ID are ignored.
  * @param[in] domain The domain for this task_group instance
- * @param[in] id The instance ID for this task_group instance. Must not be __itt_null.
- * @param[in] parentid The instance ID for the parent of this task_group instance, or __itt_null.
+ * @param[in] id The instance ID for this task_group instance. Must not be
+ * __itt_null.
+ * @param[in] parentid The instance ID for the parent of this task_group
+ * instance, or __itt_null.
  * @param[in] name The name of this task_group
  */
-void ITTAPI __itt_task_group(const __itt_domain *domain, __itt_id id, __itt_id parentid, __itt_string_handle *name);
+void ITTAPI __itt_task_group(const __itt_domain *domain, __itt_id id,
+                             __itt_id parentid, __itt_string_handle *name);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, task_group, (const __itt_domain *domain, __itt_id id, __itt_id parentid, __itt_string_handle *name))
-#define __itt_task_group(d,x,y,z) ITTNOTIFY_VOID_D3(task_group,d,x,y,z)
-#define __itt_task_group_ptr      ITTNOTIFY_NAME(task_group)
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#define __itt_task_group(d,x,y,z)
+ITT_STUBV(ITTAPI, void, task_group,
+          (const __itt_domain *domain, __itt_id id, __itt_id parentid,
+           __itt_string_handle *name))
+#define __itt_task_group(d, x, y, z) ITTNOTIFY_VOID_D3(task_group, d, x, y, z)
+#define __itt_task_group_ptr ITTNOTIFY_NAME(task_group)
+#else /* INTEL_NO_ITTNOTIFY_API */
+#define __itt_task_group(d, x, y, z)
 #define __itt_task_group_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_task_group_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -2156,10 +2284,12 @@ ITT_STUBV(ITTAPI, void, task_group, (const __itt_domain *domain, __itt_id id, __
  * @brief Begin a task instance.
  * @param[in] domain The domain for this task
  * @param[in] taskid The instance ID for this task instance, or __itt_null
- * @param[in] parentid The parent instance to which this task instance belongs, or __itt_null
+ * @param[in] parentid The parent instance to which this task instance belongs,
+ * or __itt_null
  * @param[in] name The name of this task
  */
-void ITTAPI __itt_task_begin(const __itt_domain *domain, __itt_id taskid, __itt_id parentid, __itt_string_handle *name);
+void ITTAPI __itt_task_begin(const __itt_domain *domain, __itt_id taskid,
+                             __itt_id parentid, __itt_string_handle *name);
 
 /**
  * @ingroup tasks
@@ -2169,7 +2299,8 @@ void ITTAPI __itt_task_begin(const __itt_domain *domain, __itt_id taskid, __itt_
  * @param[in] parentid The parent of this task (may be 0)
  * @param[in] fn The pointer to the function you are tracing
  */
-void ITTAPI __itt_task_begin_fn(const __itt_domain *domain, __itt_id taskid, __itt_id parentid, void* fn);
+void ITTAPI __itt_task_begin_fn(const __itt_domain *domain, __itt_id taskid,
+                                __itt_id parentid, void *fn);
 
 /**
  * @ingroup tasks
@@ -2182,11 +2313,14 @@ void ITTAPI __itt_task_end(const __itt_domain *domain);
  * @ingroup tasks
  * @brief Begin an overlapped task instance.
  * @param[in] domain The domain for this task.
- * @param[in] taskid The identifier for this task instance, *cannot* be __itt_null.
+ * @param[in] taskid The identifier for this task instance, *cannot* be
+ * __itt_null.
  * @param[in] parentid The parent of this task, or __itt_null.
  * @param[in] name The name of this task.
  */
-void ITTAPI __itt_task_begin_overlapped(const __itt_domain* domain, __itt_id taskid, __itt_id parentid, __itt_string_handle* name);
+void ITTAPI __itt_task_begin_overlapped(const __itt_domain *domain,
+                                        __itt_id taskid, __itt_id parentid,
+                                        __itt_string_handle *name);
 
 /**
  * @ingroup tasks
@@ -2194,49 +2328,59 @@ void ITTAPI __itt_task_begin_overlapped(const __itt_domain* domain, __itt_id tas
  * @param[in] domain The domain for this task
  * @param[in] taskid Explicit ID of finished task
  */
-void ITTAPI __itt_task_end_overlapped(const __itt_domain *domain, __itt_id taskid);
-
-/** @cond exclude_from_documentation */
-#ifndef INTEL_NO_MACRO_BODY
-#ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, task_begin,    (const __itt_domain *domain, __itt_id id, __itt_id parentid, __itt_string_handle *name))
-ITT_STUBV(ITTAPI, void, task_begin_fn, (const __itt_domain *domain, __itt_id id, __itt_id parentid, void* fn))
-ITT_STUBV(ITTAPI, void, task_end,      (const __itt_domain *domain))
-ITT_STUBV(ITTAPI, void, task_begin_overlapped, (const __itt_domain *domain, __itt_id taskid, __itt_id parentid, __itt_string_handle *name))
-ITT_STUBV(ITTAPI, void, task_end_overlapped,   (const __itt_domain *domain, __itt_id taskid))
-#define __itt_task_begin(d,x,y,z)    ITTNOTIFY_VOID_D3(task_begin,d,x,y,z)
-#define __itt_task_begin_ptr         ITTNOTIFY_NAME(task_begin)
-#define __itt_task_begin_fn(d,x,y,z) ITTNOTIFY_VOID_D3(task_begin_fn,d,x,y,z)
-#define __itt_task_begin_fn_ptr      ITTNOTIFY_NAME(task_begin_fn)
-#define __itt_task_end(d)            ITTNOTIFY_VOID_D0(task_end,d)
-#define __itt_task_end_ptr           ITTNOTIFY_NAME(task_end)
-#define __itt_task_begin_overlapped(d,x,y,z) ITTNOTIFY_VOID_D3(task_begin_overlapped,d,x,y,z)
-#define __itt_task_begin_overlapped_ptr      ITTNOTIFY_NAME(task_begin_overlapped)
-#define __itt_task_end_overlapped(d,x)       ITTNOTIFY_VOID_D1(task_end_overlapped,d,x)
-#define __itt_task_end_overlapped_ptr        ITTNOTIFY_NAME(task_end_overlapped)
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#define __itt_task_begin(domain,id,parentid,name)
-#define __itt_task_begin_ptr    0
-#define __itt_task_begin_fn(domain,id,parentid,fn)
+void ITTAPI __itt_task_end_overlapped(const __itt_domain *domain,
+                                      __itt_id taskid);
+
+/** @cond exclude_from_documentation */
+#ifndef INTEL_NO_MACRO_BODY
+#ifndef INTEL_NO_ITTNOTIFY_API
+ITT_STUBV(ITTAPI, void, task_begin,
+          (const __itt_domain *domain, __itt_id id, __itt_id parentid,
+           __itt_string_handle *name))
+ITT_STUBV(ITTAPI, void, task_begin_fn,
+          (const __itt_domain *domain, __itt_id id, __itt_id parentid,
+           void *fn))
+ITT_STUBV(ITTAPI, void, task_end, (const __itt_domain *domain))
+ITT_STUBV(ITTAPI, void, task_begin_overlapped,
+          (const __itt_domain *domain, __itt_id taskid, __itt_id parentid,
+           __itt_string_handle *name))
+ITT_STUBV(ITTAPI, void, task_end_overlapped,
+          (const __itt_domain *domain, __itt_id taskid))
+#define __itt_task_begin(d, x, y, z) ITTNOTIFY_VOID_D3(task_begin, d, x, y, z)
+#define __itt_task_begin_ptr ITTNOTIFY_NAME(task_begin)
+#define __itt_task_begin_fn(d, x, y, z)                                        \
+  ITTNOTIFY_VOID_D3(task_begin_fn, d, x, y, z)
+#define __itt_task_begin_fn_ptr ITTNOTIFY_NAME(task_begin_fn)
+#define __itt_task_end(d) ITTNOTIFY_VOID_D0(task_end, d)
+#define __itt_task_end_ptr ITTNOTIFY_NAME(task_end)
+#define __itt_task_begin_overlapped(d, x, y, z)                                \
+  ITTNOTIFY_VOID_D3(task_begin_overlapped, d, x, y, z)
+#define __itt_task_begin_overlapped_ptr ITTNOTIFY_NAME(task_begin_overlapped)
+#define __itt_task_end_overlapped(d, x)                                        \
+  ITTNOTIFY_VOID_D1(task_end_overlapped, d, x)
+#define __itt_task_end_overlapped_ptr ITTNOTIFY_NAME(task_end_overlapped)
+#else /* INTEL_NO_ITTNOTIFY_API */
+#define __itt_task_begin(domain, id, parentid, name)
+#define __itt_task_begin_ptr 0
+#define __itt_task_begin_fn(domain, id, parentid, fn)
 #define __itt_task_begin_fn_ptr 0
 #define __itt_task_end(domain)
-#define __itt_task_end_ptr      0
-#define __itt_task_begin_overlapped(domain,taskid,parentid,name)
-#define __itt_task_begin_overlapped_ptr         0
-#define __itt_task_end_overlapped(domain,taskid)
-#define __itt_task_end_overlapped_ptr           0
-#endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#define __itt_task_begin_ptr    0
+#define __itt_task_end_ptr 0
+#define __itt_task_begin_overlapped(domain, taskid, parentid, name)
+#define __itt_task_begin_overlapped_ptr 0
+#define __itt_task_end_overlapped(domain, taskid)
+#define __itt_task_end_overlapped_ptr 0
+#endif /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_MACRO_BODY */
+#define __itt_task_begin_ptr 0
 #define __itt_task_begin_fn_ptr 0
-#define __itt_task_end_ptr      0
+#define __itt_task_end_ptr 0
 #define __itt_task_begin_overlapped_ptr 0
-#define __itt_task_end_overlapped_ptr   0
+#define __itt_task_end_overlapped_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 /** @} tasks group */
 
-
 /**
  * @defgroup markers Markers
  * Markers represent a single discreet event in time. Markers have a scope,
@@ -2249,22 +2393,21 @@ ITT_STUBV(ITTAPI, void, task_end_overlapped,   (const __itt_domain *domain, __it
 /**
  * @brief Describes the scope of an event object in the trace.
  */
-typedef enum
-{
-    __itt_scope_unknown = 0,
-    __itt_scope_global,
-    __itt_scope_track_group,
-    __itt_scope_track,
-    __itt_scope_task,
-    __itt_scope_marker
+typedef enum {
+  __itt_scope_unknown = 0,
+  __itt_scope_global,
+  __itt_scope_track_group,
+  __itt_scope_track,
+  __itt_scope_task,
+  __itt_scope_marker
 } __itt_scope;
 
 /** @cond exclude_from_documentation */
-#define __itt_marker_scope_unknown  __itt_scope_unknown
-#define __itt_marker_scope_global   __itt_scope_global
-#define __itt_marker_scope_process  __itt_scope_track_group
-#define __itt_marker_scope_thread   __itt_scope_track
-#define __itt_marker_scope_task     __itt_scope_task
+#define __itt_marker_scope_unknown __itt_scope_unknown
+#define __itt_marker_scope_global __itt_scope_global
+#define __itt_marker_scope_process __itt_scope_track_group
+#define __itt_marker_scope_thread __itt_scope_track
+#define __itt_marker_scope_task __itt_scope_task
 /** @endcond */
 
 /**
@@ -2275,19 +2418,22 @@ typedef enum
  * @param[in] name The name for this marker
  * @param[in] scope The scope for this marker
  */
-void ITTAPI __itt_marker(const __itt_domain *domain, __itt_id id, __itt_string_handle *name, __itt_scope scope);
+void ITTAPI __itt_marker(const __itt_domain *domain, __itt_id id,
+                         __itt_string_handle *name, __itt_scope scope);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, marker, (const __itt_domain *domain, __itt_id id, __itt_string_handle *name, __itt_scope scope))
-#define __itt_marker(d,x,y,z) ITTNOTIFY_VOID_D3(marker,d,x,y,z)
-#define __itt_marker_ptr      ITTNOTIFY_NAME(marker)
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#define __itt_marker(domain,id,name,scope)
+ITT_STUBV(ITTAPI, void, marker,
+          (const __itt_domain *domain, __itt_id id, __itt_string_handle *name,
+           __itt_scope scope))
+#define __itt_marker(d, x, y, z) ITTNOTIFY_VOID_D3(marker, d, x, y, z)
+#define __itt_marker_ptr ITTNOTIFY_NAME(marker)
+#else /* INTEL_NO_ITTNOTIFY_API */
+#define __itt_marker(domain, id, name, scope)
 #define __itt_marker_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_marker_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -2312,40 +2458,48 @@ ITT_STUBV(ITTAPI, void, marker, (const __itt_domain *domain, __itt_id id, __itt_
  * @brief describes the type of metadata
  */
 typedef enum {
-    __itt_metadata_unknown = 0,
-    __itt_metadata_u64,     /**< Unsigned 64-bit integer */
-    __itt_metadata_s64,     /**< Signed 64-bit integer */
-    __itt_metadata_u32,     /**< Unsigned 32-bit integer */
-    __itt_metadata_s32,     /**< Signed 32-bit integer */
-    __itt_metadata_u16,     /**< Unsigned 16-bit integer */
-    __itt_metadata_s16,     /**< Signed 16-bit integer */
-    __itt_metadata_float,   /**< Signed 32-bit floating-point */
-    __itt_metadata_double   /**< SIgned 64-bit floating-point */
+  __itt_metadata_unknown = 0,
+  __itt_metadata_u64, /**< Unsigned 64-bit integer */
+  __itt_metadata_s64, /**< Signed 64-bit integer */
+  __itt_metadata_u32, /**< Unsigned 32-bit integer */
+  __itt_metadata_s32, /**< Signed 32-bit integer */
+  __itt_metadata_u16, /**< Unsigned 16-bit integer */
+  __itt_metadata_s16, /**< Signed 16-bit integer */
+  __itt_metadata_float, /**< Signed 32-bit floating-point */
+  __itt_metadata_double /**< SIgned 64-bit floating-point */
 } __itt_metadata_type;
 
 /**
  * @ingroup parameters
  * @brief Add metadata to an instance of a named entity.
  * @param[in] domain The domain controlling the call
- * @param[in] id The identifier of the instance to which the metadata is to be added, or __itt_null to add to the current task
+ * @param[in] id The identifier of the instance to which the metadata is to be
+ * added, or __itt_null to add to the current task
  * @param[in] key The name of the metadata
  * @param[in] type The type of the metadata
- * @param[in] count The number of elements of the given type. If count == 0, no metadata will be added.
+ * @param[in] count The number of elements of the given type. If count == 0, no
+ * metadata will be added.
  * @param[in] data The metadata itself
-*/
-void ITTAPI __itt_metadata_add(const __itt_domain *domain, __itt_id id, __itt_string_handle *key, __itt_metadata_type type, size_t count, void *data);
+ */
+void ITTAPI __itt_metadata_add(const __itt_domain *domain, __itt_id id,
+                               __itt_string_handle *key,
+                               __itt_metadata_type type, size_t count,
+                               void *data);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, metadata_add, (const __itt_domain *domain, __itt_id id, __itt_string_handle *key, __itt_metadata_type type, size_t count, void *data))
-#define __itt_metadata_add(d,x,y,z,a,b) ITTNOTIFY_VOID_D5(metadata_add,d,x,y,z,a,b)
-#define __itt_metadata_add_ptr          ITTNOTIFY_NAME(metadata_add)
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#define __itt_metadata_add(d,x,y,z,a,b)
+ITT_STUBV(ITTAPI, void, metadata_add,
+          (const __itt_domain *domain, __itt_id id, __itt_string_handle *key,
+           __itt_metadata_type type, size_t count, void *data))
+#define __itt_metadata_add(d, x, y, z, a, b)                                   \
+  ITTNOTIFY_VOID_D5(metadata_add, d, x, y, z, a, b)
+#define __itt_metadata_add_ptr ITTNOTIFY_NAME(metadata_add)
+#else /* INTEL_NO_ITTNOTIFY_API */
+#define __itt_metadata_add(d, x, y, z, a, b)
 #define __itt_metadata_add_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_metadata_add_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -2354,60 +2508,77 @@ ITT_STUBV(ITTAPI, void, metadata_add, (const __itt_domain *domain, __itt_id id,
  * @ingroup parameters
  * @brief Add string metadata to an instance of a named entity.
  * @param[in] domain The domain controlling the call
- * @param[in] id The identifier of the instance to which the metadata is to be added, or __itt_null to add to the current task
+ * @param[in] id The identifier of the instance to which the metadata is to be
+ * added, or __itt_null to add to the current task
  * @param[in] key The name of the metadata
  * @param[in] data The metadata itself
- * @param[in] length The number of characters in the string, or -1 if the length is unknown but the string is null-terminated
-*/
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-void ITTAPI __itt_metadata_str_addA(const __itt_domain *domain, __itt_id id, __itt_string_handle *key, const char *data, size_t length);
-void ITTAPI __itt_metadata_str_addW(const __itt_domain *domain, __itt_id id, __itt_string_handle *key, const wchar_t *data, size_t length);
+ * @param[in] length The number of characters in the string, or -1 if the length
+ * is unknown but the string is null-terminated
+ */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+void ITTAPI __itt_metadata_str_addA(const __itt_domain *domain, __itt_id id,
+                                    __itt_string_handle *key, const char *data,
+                                    size_t length);
+void ITTAPI __itt_metadata_str_addW(const __itt_domain *domain, __itt_id id,
+                                    __itt_string_handle *key,
+                                    const wchar_t *data, size_t length);
 #if defined(UNICODE) || defined(_UNICODE)
-#  define __itt_metadata_str_add     __itt_metadata_str_addW
-#  define __itt_metadata_str_add_ptr __itt_metadata_str_addW_ptr
+#define __itt_metadata_str_add __itt_metadata_str_addW
+#define __itt_metadata_str_add_ptr __itt_metadata_str_addW_ptr
 #else /* UNICODE */
-#  define __itt_metadata_str_add     __itt_metadata_str_addA
-#  define __itt_metadata_str_add_ptr __itt_metadata_str_addA_ptr
+#define __itt_metadata_str_add __itt_metadata_str_addA
+#define __itt_metadata_str_add_ptr __itt_metadata_str_addA_ptr
 #endif /* UNICODE */
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-void ITTAPI __itt_metadata_str_add(const __itt_domain *domain, __itt_id id, __itt_string_handle *key, const char *data, size_t length);
+void ITTAPI __itt_metadata_str_add(const __itt_domain *domain, __itt_id id,
+                                   __itt_string_handle *key, const char *data,
+                                   size_t length);
 #endif
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUBV(ITTAPI, void, metadata_str_addA, (const __itt_domain *domain, __itt_id id, __itt_string_handle *key, const char *data, size_t length))
-ITT_STUBV(ITTAPI, void, metadata_str_addW, (const __itt_domain *domain, __itt_id id, __itt_string_handle *key, const wchar_t *data, size_t length))
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-ITT_STUBV(ITTAPI, void, metadata_str_add, (const __itt_domain *domain, __itt_id id, __itt_string_handle *key, const char *data, size_t length))
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUBV(ITTAPI, void, metadata_str_addA,
+          (const __itt_domain *domain, __itt_id id, __itt_string_handle *key,
+           const char *data, size_t length))
+ITT_STUBV(ITTAPI, void, metadata_str_addW,
+          (const __itt_domain *domain, __itt_id id, __itt_string_handle *key,
+           const wchar_t *data, size_t length))
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+ITT_STUBV(ITTAPI, void, metadata_str_add,
+          (const __itt_domain *domain, __itt_id id, __itt_string_handle *key,
+           const char *data, size_t length))
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-#define __itt_metadata_str_addA(d,x,y,z,a) ITTNOTIFY_VOID_D4(metadata_str_addA,d,x,y,z,a)
-#define __itt_metadata_str_addA_ptr        ITTNOTIFY_NAME(metadata_str_addA)
-#define __itt_metadata_str_addW(d,x,y,z,a) ITTNOTIFY_VOID_D4(metadata_str_addW,d,x,y,z,a)
-#define __itt_metadata_str_addW_ptr        ITTNOTIFY_NAME(metadata_str_addW)
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define __itt_metadata_str_addA(d, x, y, z, a)                                 \
+  ITTNOTIFY_VOID_D4(metadata_str_addA, d, x, y, z, a)
+#define __itt_metadata_str_addA_ptr ITTNOTIFY_NAME(metadata_str_addA)
+#define __itt_metadata_str_addW(d, x, y, z, a)                                 \
+  ITTNOTIFY_VOID_D4(metadata_str_addW, d, x, y, z, a)
+#define __itt_metadata_str_addW_ptr ITTNOTIFY_NAME(metadata_str_addW)
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_metadata_str_add(d,x,y,z,a)  ITTNOTIFY_VOID_D4(metadata_str_add,d,x,y,z,a)
-#define __itt_metadata_str_add_ptr         ITTNOTIFY_NAME(metadata_str_add)
+#define __itt_metadata_str_add(d, x, y, z, a)                                  \
+  ITTNOTIFY_VOID_D4(metadata_str_add, d, x, y, z, a)
+#define __itt_metadata_str_add_ptr ITTNOTIFY_NAME(metadata_str_add)
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-#define __itt_metadata_str_addA(d,x,y,z,a)
+#else /* INTEL_NO_ITTNOTIFY_API */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define __itt_metadata_str_addA(d, x, y, z, a)
 #define __itt_metadata_str_addA_ptr 0
-#define __itt_metadata_str_addW(d,x,y,z,a)
+#define __itt_metadata_str_addW(d, x, y, z, a)
 #define __itt_metadata_str_addW_ptr 0
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_metadata_str_add(d,x,y,z,a)
+#define __itt_metadata_str_add(d, x, y, z, a)
 #define __itt_metadata_str_add_ptr 0
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_MACRO_BODY */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_metadata_str_addA_ptr 0
 #define __itt_metadata_str_addW_ptr 0
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_metadata_str_add_ptr  0
+#define __itt_metadata_str_add_ptr 0
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -2416,28 +2587,40 @@ ITT_STUBV(ITTAPI, void, metadata_str_add, (const __itt_domain *domain, __itt_id
  * @ingroup parameters
  * @brief Add metadata to an instance of a named entity.
  * @param[in] domain The domain controlling the call
- * @param[in] scope The scope of the instance to which the metadata is to be added
+ * @param[in] scope The scope of the instance to which the metadata is to be
+ added
 
- * @param[in] id The identifier of the instance to which the metadata is to be added, or __itt_null to add to the current task
+ * @param[in] id The identifier of the instance to which the metadata is to be
+ added, or __itt_null to add to the current task
 
  * @param[in] key The name of the metadata
  * @param[in] type The type of the metadata
- * @param[in] count The number of elements of the given type. If count == 0, no metadata will be added.
+ * @param[in] count The number of elements of the given type. If count == 0, no
+ metadata will be added.
  * @param[in] data The metadata itself
 */
-void ITTAPI __itt_metadata_add_with_scope(const __itt_domain *domain, __itt_scope scope, __itt_string_handle *key, __itt_metadata_type type, size_t count, void *data);
+void ITTAPI __itt_metadata_add_with_scope(const __itt_domain *domain,
+                                          __itt_scope scope,
+                                          __itt_string_handle *key,
+                                          __itt_metadata_type type,
+                                          size_t count, void *data);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, metadata_add_with_scope, (const __itt_domain *domain, __itt_scope scope, __itt_string_handle *key, __itt_metadata_type type, size_t count, void *data))
-#define __itt_metadata_add_with_scope(d,x,y,z,a,b) ITTNOTIFY_VOID_D5(metadata_add_with_scope,d,x,y,z,a,b)
-#define __itt_metadata_add_with_scope_ptr          ITTNOTIFY_NAME(metadata_add_with_scope)
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#define __itt_metadata_add_with_scope(d,x,y,z,a,b)
+ITT_STUBV(ITTAPI, void, metadata_add_with_scope,
+          (const __itt_domain *domain, __itt_scope scope,
+           __itt_string_handle *key, __itt_metadata_type type, size_t count,
+           void *data))
+#define __itt_metadata_add_with_scope(d, x, y, z, a, b)                        \
+  ITTNOTIFY_VOID_D5(metadata_add_with_scope, d, x, y, z, a, b)
+#define __itt_metadata_add_with_scope_ptr                                      \
+  ITTNOTIFY_NAME(metadata_add_with_scope)
+#else /* INTEL_NO_ITTNOTIFY_API */
+#define __itt_metadata_add_with_scope(d, x, y, z, a, b)
 #define __itt_metadata_add_with_scope_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_metadata_add_with_scope_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -2446,63 +2629,90 @@ ITT_STUBV(ITTAPI, void, metadata_add_with_scope, (const __itt_domain *domain, __
  * @ingroup parameters
  * @brief Add string metadata to an instance of a named entity.
  * @param[in] domain The domain controlling the call
- * @param[in] scope The scope of the instance to which the metadata is to be added
+ * @param[in] scope The scope of the instance to which the metadata is to be
+ added
 
- * @param[in] id The identifier of the instance to which the metadata is to be added, or __itt_null to add to the current task
+ * @param[in] id The identifier of the instance to which the metadata is to be
+ added, or __itt_null to add to the current task
 
  * @param[in] key The name of the metadata
  * @param[in] data The metadata itself
- * @param[in] length The number of characters in the string, or -1 if the length is unknown but the string is null-terminated
+ * @param[in] length The number of characters in the string, or -1 if the length
+ is unknown but the string is null-terminated
 */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-void ITTAPI __itt_metadata_str_add_with_scopeA(const __itt_domain *domain, __itt_scope scope, __itt_string_handle *key, const char *data, size_t length);
-void ITTAPI __itt_metadata_str_add_with_scopeW(const __itt_domain *domain, __itt_scope scope, __itt_string_handle *key, const wchar_t *data, size_t length);
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+void ITTAPI __itt_metadata_str_add_with_scopeA(const __itt_domain *domain,
+                                               __itt_scope scope,
+                                               __itt_string_handle *key,
+                                               const char *data, size_t length);
+void ITTAPI __itt_metadata_str_add_with_scopeW(const __itt_domain *domain,
+                                               __itt_scope scope,
+                                               __itt_string_handle *key,
+                                               const wchar_t *data,
+                                               size_t length);
 #if defined(UNICODE) || defined(_UNICODE)
-#  define __itt_metadata_str_add_with_scope     __itt_metadata_str_add_with_scopeW
-#  define __itt_metadata_str_add_with_scope_ptr __itt_metadata_str_add_with_scopeW_ptr
+#define __itt_metadata_str_add_with_scope __itt_metadata_str_add_with_scopeW
+#define __itt_metadata_str_add_with_scope_ptr                                  \
+  __itt_metadata_str_add_with_scopeW_ptr
 #else /* UNICODE */
-#  define __itt_metadata_str_add_with_scope     __itt_metadata_str_add_with_scopeA
-#  define __itt_metadata_str_add_with_scope_ptr __itt_metadata_str_add_with_scopeA_ptr
+#define __itt_metadata_str_add_with_scope __itt_metadata_str_add_with_scopeA
+#define __itt_metadata_str_add_with_scope_ptr                                  \
+  __itt_metadata_str_add_with_scopeA_ptr
 #endif /* UNICODE */
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-void ITTAPI __itt_metadata_str_add_with_scope(const __itt_domain *domain, __itt_scope scope, __itt_string_handle *key, const char *data, size_t length);
+void ITTAPI __itt_metadata_str_add_with_scope(const __itt_domain *domain,
+                                              __itt_scope scope,
+                                              __itt_string_handle *key,
+                                              const char *data, size_t length);
 #endif
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUBV(ITTAPI, void, metadata_str_add_with_scopeA, (const __itt_domain *domain, __itt_scope scope, __itt_string_handle *key, const char *data, size_t length))
-ITT_STUBV(ITTAPI, void, metadata_str_add_with_scopeW, (const __itt_domain *domain, __itt_scope scope, __itt_string_handle *key, const wchar_t *data, size_t length))
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-ITT_STUBV(ITTAPI, void, metadata_str_add_with_scope, (const __itt_domain *domain, __itt_scope scope, __itt_string_handle *key, const char *data, size_t length))
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUBV(ITTAPI, void, metadata_str_add_with_scopeA,
+          (const __itt_domain *domain, __itt_scope scope,
+           __itt_string_handle *key, const char *data, size_t length))
+ITT_STUBV(ITTAPI, void, metadata_str_add_with_scopeW,
+          (const __itt_domain *domain, __itt_scope scope,
+           __itt_string_handle *key, const wchar_t *data, size_t length))
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+ITT_STUBV(ITTAPI, void, metadata_str_add_with_scope,
+          (const __itt_domain *domain, __itt_scope scope,
+           __itt_string_handle *key, const char *data, size_t length))
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-#define __itt_metadata_str_add_with_scopeA(d,x,y,z,a) ITTNOTIFY_VOID_D4(metadata_str_add_with_scopeA,d,x,y,z,a)
-#define __itt_metadata_str_add_with_scopeA_ptr        ITTNOTIFY_NAME(metadata_str_add_with_scopeA)
-#define __itt_metadata_str_add_with_scopeW(d,x,y,z,a) ITTNOTIFY_VOID_D4(metadata_str_add_with_scopeW,d,x,y,z,a)
-#define __itt_metadata_str_add_with_scopeW_ptr        ITTNOTIFY_NAME(metadata_str_add_with_scopeW)
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define __itt_metadata_str_add_with_scopeA(d, x, y, z, a)                      \
+  ITTNOTIFY_VOID_D4(metadata_str_add_with_scopeA, d, x, y, z, a)
+#define __itt_metadata_str_add_with_scopeA_ptr                                 \
+  ITTNOTIFY_NAME(metadata_str_add_with_scopeA)
+#define __itt_metadata_str_add_with_scopeW(d, x, y, z, a)                      \
+  ITTNOTIFY_VOID_D4(metadata_str_add_with_scopeW, d, x, y, z, a)
+#define __itt_metadata_str_add_with_scopeW_ptr                                 \
+  ITTNOTIFY_NAME(metadata_str_add_with_scopeW)
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_metadata_str_add_with_scope(d,x,y,z,a)  ITTNOTIFY_VOID_D4(metadata_str_add_with_scope,d,x,y,z,a)
-#define __itt_metadata_str_add_with_scope_ptr         ITTNOTIFY_NAME(metadata_str_add_with_scope)
+#define __itt_metadata_str_add_with_scope(d, x, y, z, a)                       \
+  ITTNOTIFY_VOID_D4(metadata_str_add_with_scope, d, x, y, z, a)
+#define __itt_metadata_str_add_with_scope_ptr                                  \
+  ITTNOTIFY_NAME(metadata_str_add_with_scope)
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-#define __itt_metadata_str_add_with_scopeA(d,x,y,z,a)
-#define __itt_metadata_str_add_with_scopeA_ptr  0
-#define __itt_metadata_str_add_with_scopeW(d,x,y,z,a)
-#define __itt_metadata_str_add_with_scopeW_ptr  0
+#else /* INTEL_NO_ITTNOTIFY_API */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define __itt_metadata_str_add_with_scopeA(d, x, y, z, a)
+#define __itt_metadata_str_add_with_scopeA_ptr 0
+#define __itt_metadata_str_add_with_scopeW(d, x, y, z, a)
+#define __itt_metadata_str_add_with_scopeW_ptr 0
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_metadata_str_add_with_scope(d,x,y,z,a)
-#define __itt_metadata_str_add_with_scope_ptr   0
+#define __itt_metadata_str_add_with_scope(d, x, y, z, a)
+#define __itt_metadata_str_add_with_scope_ptr 0
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-#define __itt_metadata_str_add_with_scopeA_ptr  0
-#define __itt_metadata_str_add_with_scopeW_ptr  0
+#else /* INTEL_NO_MACRO_BODY */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define __itt_metadata_str_add_with_scopeA_ptr 0
+#define __itt_metadata_str_add_with_scopeW_ptr 0
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_metadata_str_add_with_scope_ptr   0
+#define __itt_metadata_str_add_with_scope_ptr 0
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -2519,23 +2729,30 @@ ITT_STUBV(ITTAPI, void, metadata_str_add_with_scope, (const __itt_domain *domain
 
 /**
  * @ingroup relations
- * @brief The kind of relation between two instances is specified by the enumerated type __itt_relation.
- * Relations between instances can be added with an API call. The relation
- * API uses instance IDs. Relations can be added before or after the actual
- * instances are created and persist independently of the instances. This
- * is the motivation for having 
diff erent lifetimes for instance IDs and
- * the actual instances.
- */
-typedef enum
-{
-    __itt_relation_is_unknown = 0,
-    __itt_relation_is_dependent_on,         /**< "A is dependent on B" means that A cannot start until B completes */
-    __itt_relation_is_sibling_of,           /**< "A is sibling of B" means that A and B were created as a group */
-    __itt_relation_is_parent_of,            /**< "A is parent of B" means that A created B */
-    __itt_relation_is_continuation_of,      /**< "A is continuation of B" means that A assumes the dependencies of B */
-    __itt_relation_is_child_of,             /**< "A is child of B" means that A was created by B (inverse of is_parent_of) */
-    __itt_relation_is_continued_by,         /**< "A is continued by B" means that B assumes the dependencies of A (inverse of is_continuation_of) */
-    __itt_relation_is_predecessor_to        /**< "A is predecessor to B" means that B cannot start until A completes (inverse of is_dependent_on) */
+ * @brief The kind of relation between two instances is specified by the
+ * enumerated type __itt_relation. Relations between instances can be added with
+ * an API call. The relation API uses instance IDs. Relations can be added
+ * before or after the actual instances are created and persist independently of
+ * the instances. This is the motivation for having 
diff erent lifetimes for
+ * instance IDs and the actual instances.
+ */
+typedef enum {
+  __itt_relation_is_unknown = 0,
+  __itt_relation_is_dependent_on, /**< "A is dependent on B" means that A cannot
+                                     start until B completes */
+  __itt_relation_is_sibling_of, /**< "A is sibling of B" means that A and B were
+                                   created as a group */
+  __itt_relation_is_parent_of, /**< "A is parent of B" means that A created B */
+  __itt_relation_is_continuation_of, /**< "A is continuation of B" means that A
+                                        assumes the dependencies of B */
+  __itt_relation_is_child_of, /**< "A is child of B" means that A was created by
+                                 B (inverse of is_parent_of) */
+  __itt_relation_is_continued_by, /**< "A is continued by B" means that B
+                                     assumes the dependencies of A (inverse of
+                                     is_continuation_of) */
+  __itt_relation_is_predecessor_to /**< "A is predecessor to B" means that B
+                                      cannot start until A completes (inverse of
+                                      is_dependent_on) */
 } __itt_relation;
 
 /**
@@ -2546,7 +2763,9 @@ typedef enum
  * @param[in] relation The kind of relation
  * @param[in] tail The ID for the tail of the relation
  */
-void ITTAPI __itt_relation_add_to_current(const __itt_domain *domain, __itt_relation relation, __itt_id tail);
+void ITTAPI __itt_relation_add_to_current(const __itt_domain *domain,
+                                          __itt_relation relation,
+                                          __itt_id tail);
 
 /**
  * @ingroup relations
@@ -2556,24 +2775,31 @@ void ITTAPI __itt_relation_add_to_current(const __itt_domain *domain, __itt_rela
  * @param[in] relation The kind of relation
  * @param[in] tail The ID for the tail of the relation
  */
-void ITTAPI __itt_relation_add(const __itt_domain *domain, __itt_id head, __itt_relation relation, __itt_id tail);
+void ITTAPI __itt_relation_add(const __itt_domain *domain, __itt_id head,
+                               __itt_relation relation, __itt_id tail);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, relation_add_to_current, (const __itt_domain *domain, __itt_relation relation, __itt_id tail))
-ITT_STUBV(ITTAPI, void, relation_add,            (const __itt_domain *domain, __itt_id head, __itt_relation relation, __itt_id tail))
-#define __itt_relation_add_to_current(d,x,y) ITTNOTIFY_VOID_D2(relation_add_to_current,d,x,y)
-#define __itt_relation_add_to_current_ptr    ITTNOTIFY_NAME(relation_add_to_current)
-#define __itt_relation_add(d,x,y,z)          ITTNOTIFY_VOID_D3(relation_add,d,x,y,z)
-#define __itt_relation_add_ptr               ITTNOTIFY_NAME(relation_add)
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#define __itt_relation_add_to_current(d,x,y)
+ITT_STUBV(ITTAPI, void, relation_add_to_current,
+          (const __itt_domain *domain, __itt_relation relation, __itt_id tail))
+ITT_STUBV(ITTAPI, void, relation_add,
+          (const __itt_domain *domain, __itt_id head, __itt_relation relation,
+           __itt_id tail))
+#define __itt_relation_add_to_current(d, x, y)                                 \
+  ITTNOTIFY_VOID_D2(relation_add_to_current, d, x, y)
+#define __itt_relation_add_to_current_ptr                                      \
+  ITTNOTIFY_NAME(relation_add_to_current)
+#define __itt_relation_add(d, x, y, z)                                         \
+  ITTNOTIFY_VOID_D3(relation_add, d, x, y, z)
+#define __itt_relation_add_ptr ITTNOTIFY_NAME(relation_add)
+#else /* INTEL_NO_ITTNOTIFY_API */
+#define __itt_relation_add_to_current(d, x, y)
 #define __itt_relation_add_to_current_ptr 0
-#define __itt_relation_add(d,x,y,z)
+#define __itt_relation_add(d, x, y, z)
 #define __itt_relation_add_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_relation_add_to_current_ptr 0
 #define __itt_relation_add_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
@@ -2583,30 +2809,29 @@ ITT_STUBV(ITTAPI, void, relation_add,            (const __itt_domain *domain, __
 /** @cond exclude_from_documentation */
 #pragma pack(push, 8)
 
-typedef struct ___itt_clock_info
-{
-    unsigned long long clock_freq; /*!< Clock domain frequency */
-    unsigned long long clock_base; /*!< Clock domain base timestamp */
+typedef struct ___itt_clock_info {
+  unsigned long long clock_freq; /*!< Clock domain frequency */
+  unsigned long long clock_base; /*!< Clock domain base timestamp */
 } __itt_clock_info;
 
 #pragma pack(pop)
 /** @endcond */
 
 /** @cond exclude_from_documentation */
-typedef void (ITTAPI *__itt_get_clock_info_fn)(__itt_clock_info* clock_info, void* data);
+typedef void(ITTAPI *__itt_get_clock_info_fn)(__itt_clock_info *clock_info,
+                                              void *data);
 /** @endcond */
 
 /** @cond exclude_from_documentation */
 #pragma pack(push, 8)
 
-typedef struct ___itt_clock_domain
-{
-    __itt_clock_info info;      /*!< Most recent clock domain info */
-    __itt_get_clock_info_fn fn; /*!< Callback function pointer */
-    void* fn_data;              /*!< Input argument for the callback function */
-    int   extra1;               /*!< Reserved. Must be zero */
-    void* extra2;               /*!< Reserved. Must be zero */
-    struct ___itt_clock_domain* next;
+typedef struct ___itt_clock_domain {
+  __itt_clock_info info; /*!< Most recent clock domain info */
+  __itt_get_clock_info_fn fn; /*!< Callback function pointer */
+  void *fn_data; /*!< Input argument for the callback function */
+  int extra1; /*!< Reserved. Must be zero */
+  void *extra2; /*!< Reserved. Must be zero */
+  struct ___itt_clock_domain *next;
 } __itt_clock_domain;
 
 #pragma pack(pop)
@@ -2616,28 +2841,30 @@ typedef struct ___itt_clock_domain
  * @ingroup clockdomains
  * @brief Create a clock domain.
  * Certain applications require the capability to trace their application using
- * a clock domain 
diff erent than the CPU, for instance the instrumentation of events
- * that occur on a GPU.
- * Because the set of domains is expected to be static over the application's execution time,
- * there is no mechanism to destroy a domain.
- * Any domain can be accessed by any thread in the process, regardless of which thread created
- * the domain. This call is thread-safe.
- * @param[in] fn A pointer to a callback function which retrieves alternative CPU timestamps
+ * a clock domain 
diff erent than the CPU, for instance the instrumentation of
+ * events that occur on a GPU. Because the set of domains is expected to be
+ * static over the application's execution time, there is no mechanism to
+ * destroy a domain. Any domain can be accessed by any thread in the process,
+ * regardless of which thread created the domain. This call is thread-safe.
+ * @param[in] fn A pointer to a callback function which retrieves alternative
+ * CPU timestamps
  * @param[in] fn_data Argument for a callback function; may be NULL
  */
-__itt_clock_domain* ITTAPI __itt_clock_domain_create(__itt_get_clock_info_fn fn, void* fn_data);
+__itt_clock_domain *ITTAPI __itt_clock_domain_create(__itt_get_clock_info_fn fn,
+                                                     void *fn_data);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUB(ITTAPI, __itt_clock_domain*, clock_domain_create, (__itt_get_clock_info_fn fn, void* fn_data))
-#define __itt_clock_domain_create     ITTNOTIFY_DATA(clock_domain_create)
+ITT_STUB(ITTAPI, __itt_clock_domain *, clock_domain_create,
+         (__itt_get_clock_info_fn fn, void *fn_data))
+#define __itt_clock_domain_create ITTNOTIFY_DATA(clock_domain_create)
 #define __itt_clock_domain_create_ptr ITTNOTIFY_NAME(clock_domain_create)
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#define __itt_clock_domain_create(fn,fn_data) (__itt_clock_domain*)0
+#else /* INTEL_NO_ITTNOTIFY_API */
+#define __itt_clock_domain_create(fn, fn_data) (__itt_clock_domain *)0
 #define __itt_clock_domain_create_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_clock_domain_create_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -2652,60 +2879,74 @@ void ITTAPI __itt_clock_domain_reset(void);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(ITTAPI, void, clock_domain_reset, (void))
-#define __itt_clock_domain_reset     ITTNOTIFY_VOID(clock_domain_reset)
+#define __itt_clock_domain_reset ITTNOTIFY_VOID(clock_domain_reset)
 #define __itt_clock_domain_reset_ptr ITTNOTIFY_NAME(clock_domain_reset)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_clock_domain_reset()
 #define __itt_clock_domain_reset_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_clock_domain_reset_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
 /**
  * @ingroup clockdomain
- * @brief Create an instance of identifier. This establishes the beginning of the lifetime of
- * an instance of the given ID in the trace. Once this lifetime starts, the ID can be used to
- * tag named entity instances in calls such as __itt_task_begin, and to specify relationships among
- * identified named entity instances, using the \ref relations APIs.
+ * @brief Create an instance of identifier. This establishes the beginning of
+ * the lifetime of an instance of the given ID in the trace. Once this lifetime
+ * starts, the ID can be used to tag named entity instances in calls such as
+ * __itt_task_begin, and to specify relationships among identified named entity
+ * instances, using the \ref relations APIs.
  * @param[in] domain The domain controlling the execution of this call.
- * @param[in] clock_domain The clock domain controlling the execution of this call.
+ * @param[in] clock_domain The clock domain controlling the execution of this
+ * call.
  * @param[in] timestamp The user defined timestamp.
  * @param[in] id The ID to create.
  */
-void ITTAPI __itt_id_create_ex(const __itt_domain* domain, __itt_clock_domain* clock_domain, unsigned long long timestamp, __itt_id id);
+void ITTAPI __itt_id_create_ex(const __itt_domain *domain,
+                               __itt_clock_domain *clock_domain,
+                               unsigned long long timestamp, __itt_id id);
 
 /**
  * @ingroup clockdomain
- * @brief Destroy an instance of identifier. This ends the lifetime of the current instance of the
- * given ID value in the trace. Any relationships that are established after this lifetime ends are
- * invalid. This call must be performed before the given ID value can be reused for a 
diff erent
- * named entity instance.
+ * @brief Destroy an instance of identifier. This ends the lifetime of the
+ * current instance of the given ID value in the trace. Any relationships that
+ * are established after this lifetime ends are invalid. This call must be
+ * performed before the given ID value can be reused for a 
diff erent named
+ * entity instance.
  * @param[in] domain The domain controlling the execution of this call.
- * @param[in] clock_domain The clock domain controlling the execution of this call.
+ * @param[in] clock_domain The clock domain controlling the execution of this
+ * call.
  * @param[in] timestamp The user defined timestamp.
  * @param[in] id The ID to destroy.
  */
-void ITTAPI __itt_id_destroy_ex(const __itt_domain* domain, __itt_clock_domain* clock_domain, unsigned long long timestamp, __itt_id id);
+void ITTAPI __itt_id_destroy_ex(const __itt_domain *domain,
+                                __itt_clock_domain *clock_domain,
+                                unsigned long long timestamp, __itt_id id);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, id_create_ex,  (const __itt_domain *domain, __itt_clock_domain* clock_domain, unsigned long long timestamp, __itt_id id))
-ITT_STUBV(ITTAPI, void, id_destroy_ex, (const __itt_domain *domain, __itt_clock_domain* clock_domain, unsigned long long timestamp, __itt_id id))
-#define __itt_id_create_ex(d,x,y,z)  ITTNOTIFY_VOID_D3(id_create_ex,d,x,y,z)
-#define __itt_id_create_ex_ptr       ITTNOTIFY_NAME(id_create_ex)
-#define __itt_id_destroy_ex(d,x,y,z) ITTNOTIFY_VOID_D3(id_destroy_ex,d,x,y,z)
-#define __itt_id_destroy_ex_ptr      ITTNOTIFY_NAME(id_destroy_ex)
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#define __itt_id_create_ex(domain,clock_domain,timestamp,id)
-#define __itt_id_create_ex_ptr    0
-#define __itt_id_destroy_ex(domain,clock_domain,timestamp,id)
+ITT_STUBV(ITTAPI, void, id_create_ex,
+          (const __itt_domain *domain, __itt_clock_domain *clock_domain,
+           unsigned long long timestamp, __itt_id id))
+ITT_STUBV(ITTAPI, void, id_destroy_ex,
+          (const __itt_domain *domain, __itt_clock_domain *clock_domain,
+           unsigned long long timestamp, __itt_id id))
+#define __itt_id_create_ex(d, x, y, z)                                         \
+  ITTNOTIFY_VOID_D3(id_create_ex, d, x, y, z)
+#define __itt_id_create_ex_ptr ITTNOTIFY_NAME(id_create_ex)
+#define __itt_id_destroy_ex(d, x, y, z)                                        \
+  ITTNOTIFY_VOID_D3(id_destroy_ex, d, x, y, z)
+#define __itt_id_destroy_ex_ptr ITTNOTIFY_NAME(id_destroy_ex)
+#else /* INTEL_NO_ITTNOTIFY_API */
+#define __itt_id_create_ex(domain, clock_domain, timestamp, id)
+#define __itt_id_create_ex_ptr 0
+#define __itt_id_destroy_ex(domain, clock_domain, timestamp, id)
 #define __itt_id_destroy_ex_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#define __itt_id_create_ex_ptr    0
+#else /* INTEL_NO_MACRO_BODY */
+#define __itt_id_create_ex_ptr 0
 #define __itt_id_destroy_ex_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -2714,59 +2955,83 @@ ITT_STUBV(ITTAPI, void, id_destroy_ex, (const __itt_domain *domain, __itt_clock_
  * @ingroup clockdomain
  * @brief Begin a task instance.
  * @param[in] domain The domain for this task
- * @param[in] clock_domain The clock domain controlling the execution of this call.
+ * @param[in] clock_domain The clock domain controlling the execution of this
+ * call.
  * @param[in] timestamp The user defined timestamp.
  * @param[in] taskid The instance ID for this task instance, or __itt_null
- * @param[in] parentid The parent instance to which this task instance belongs, or __itt_null
+ * @param[in] parentid The parent instance to which this task instance belongs,
+ * or __itt_null
  * @param[in] name The name of this task
  */
-void ITTAPI __itt_task_begin_ex(const __itt_domain* domain, __itt_clock_domain* clock_domain, unsigned long long timestamp, __itt_id taskid, __itt_id parentid, __itt_string_handle* name);
+void ITTAPI __itt_task_begin_ex(const __itt_domain *domain,
+                                __itt_clock_domain *clock_domain,
+                                unsigned long long timestamp, __itt_id taskid,
+                                __itt_id parentid, __itt_string_handle *name);
 
 /**
  * @ingroup clockdomain
  * @brief Begin a task instance.
  * @param[in] domain The domain for this task
- * @param[in] clock_domain The clock domain controlling the execution of this call.
+ * @param[in] clock_domain The clock domain controlling the execution of this
+ * call.
  * @param[in] timestamp The user defined timestamp.
  * @param[in] taskid The identifier for this task instance, or __itt_null
  * @param[in] parentid The parent of this task, or __itt_null
  * @param[in] fn The pointer to the function you are tracing
  */
-void ITTAPI __itt_task_begin_fn_ex(const __itt_domain* domain, __itt_clock_domain* clock_domain, unsigned long long timestamp, __itt_id taskid, __itt_id parentid, void* fn);
+void ITTAPI __itt_task_begin_fn_ex(const __itt_domain *domain,
+                                   __itt_clock_domain *clock_domain,
+                                   unsigned long long timestamp,
+                                   __itt_id taskid, __itt_id parentid,
+                                   void *fn);
 
 /**
  * @ingroup clockdomain
  * @brief End the current task instance.
  * @param[in] domain The domain for this task
- * @param[in] clock_domain The clock domain controlling the execution of this call.
+ * @param[in] clock_domain The clock domain controlling the execution of this
+ * call.
  * @param[in] timestamp The user defined timestamp.
  */
-void ITTAPI __itt_task_end_ex(const __itt_domain* domain, __itt_clock_domain* clock_domain, unsigned long long timestamp);
+void ITTAPI __itt_task_end_ex(const __itt_domain *domain,
+                              __itt_clock_domain *clock_domain,
+                              unsigned long long timestamp);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, task_begin_ex,        (const __itt_domain *domain, __itt_clock_domain* clock_domain, unsigned long long timestamp, __itt_id id, __itt_id parentid, __itt_string_handle *name))
-ITT_STUBV(ITTAPI, void, task_begin_fn_ex,     (const __itt_domain *domain, __itt_clock_domain* clock_domain, unsigned long long timestamp, __itt_id id, __itt_id parentid, void* fn))
-ITT_STUBV(ITTAPI, void, task_end_ex,          (const __itt_domain *domain, __itt_clock_domain* clock_domain, unsigned long long timestamp))
-#define __itt_task_begin_ex(d,x,y,z,a,b)      ITTNOTIFY_VOID_D5(task_begin_ex,d,x,y,z,a,b)
-#define __itt_task_begin_ex_ptr               ITTNOTIFY_NAME(task_begin_ex)
-#define __itt_task_begin_fn_ex(d,x,y,z,a,b)   ITTNOTIFY_VOID_D5(task_begin_fn_ex,d,x,y,z,a,b)
-#define __itt_task_begin_fn_ex_ptr            ITTNOTIFY_NAME(task_begin_fn_ex)
-#define __itt_task_end_ex(d,x,y)              ITTNOTIFY_VOID_D2(task_end_ex,d,x,y)
-#define __itt_task_end_ex_ptr                 ITTNOTIFY_NAME(task_end_ex)
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#define __itt_task_begin_ex(domain,clock_domain,timestamp,id,parentid,name)
-#define __itt_task_begin_ex_ptr          0
-#define __itt_task_begin_fn_ex(domain,clock_domain,timestamp,id,parentid,fn)
-#define __itt_task_begin_fn_ex_ptr       0
-#define __itt_task_end_ex(domain,clock_domain,timestamp)
-#define __itt_task_end_ex_ptr            0
+ITT_STUBV(ITTAPI, void, task_begin_ex,
+          (const __itt_domain *domain, __itt_clock_domain *clock_domain,
+           unsigned long long timestamp, __itt_id id, __itt_id parentid,
+           __itt_string_handle *name))
+ITT_STUBV(ITTAPI, void, task_begin_fn_ex,
+          (const __itt_domain *domain, __itt_clock_domain *clock_domain,
+           unsigned long long timestamp, __itt_id id, __itt_id parentid,
+           void *fn))
+ITT_STUBV(ITTAPI, void, task_end_ex,
+          (const __itt_domain *domain, __itt_clock_domain *clock_domain,
+           unsigned long long timestamp))
+#define __itt_task_begin_ex(d, x, y, z, a, b)                                  \
+  ITTNOTIFY_VOID_D5(task_begin_ex, d, x, y, z, a, b)
+#define __itt_task_begin_ex_ptr ITTNOTIFY_NAME(task_begin_ex)
+#define __itt_task_begin_fn_ex(d, x, y, z, a, b)                               \
+  ITTNOTIFY_VOID_D5(task_begin_fn_ex, d, x, y, z, a, b)
+#define __itt_task_begin_fn_ex_ptr ITTNOTIFY_NAME(task_begin_fn_ex)
+#define __itt_task_end_ex(d, x, y) ITTNOTIFY_VOID_D2(task_end_ex, d, x, y)
+#define __itt_task_end_ex_ptr ITTNOTIFY_NAME(task_end_ex)
+#else /* INTEL_NO_ITTNOTIFY_API */
+#define __itt_task_begin_ex(domain, clock_domain, timestamp, id, parentid, name)
+#define __itt_task_begin_ex_ptr 0
+#define __itt_task_begin_fn_ex(domain, clock_domain, timestamp, id, parentid,  \
+                               fn)
+#define __itt_task_begin_fn_ex_ptr 0
+#define __itt_task_end_ex(domain, clock_domain, timestamp)
+#define __itt_task_end_ex_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#define __itt_task_begin_ex_ptr          0
-#define __itt_task_begin_fn_ex_ptr       0
-#define __itt_task_end_ex_ptr            0
+#else /* INTEL_NO_MACRO_BODY */
+#define __itt_task_begin_ex_ptr 0
+#define __itt_task_begin_fn_ex_ptr 0
+#define __itt_task_end_ex_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
@@ -2785,26 +3050,31 @@ ITT_STUBV(ITTAPI, void, task_end_ex,          (const __itt_domain *domain, __itt
  */
 /** @cond exclude_from_documentation */
 
-typedef struct ___itt_counter* __itt_counter;
+typedef struct ___itt_counter *__itt_counter;
 
 /**
  * @brief Create an unsigned 64 bits integer counter with given name/domain
  *
- * After __itt_counter_create() is called, __itt_counter_inc(id), __itt_counter_inc_delta(id, delta),
- * __itt_counter_set_value(id, value_ptr) or __itt_counter_set_value_ex(id, clock_domain, timestamp, value_ptr)
- * can be used to change the value of the counter, where value_ptr is a pointer to an unsigned 64 bits integer
+ * After __itt_counter_create() is called, __itt_counter_inc(id),
+ * __itt_counter_inc_delta(id, delta),
+ * __itt_counter_set_value(id, value_ptr) or __itt_counter_set_value_ex(id,
+ * clock_domain, timestamp, value_ptr) can be used to change the value of the
+ * counter, where value_ptr is a pointer to an unsigned 64 bits integer
  *
- * The call is equal to __itt_counter_create_typed(name, domain, __itt_metadata_u64)
- */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-__itt_counter ITTAPI __itt_counter_createA(const char    *name, const char    *domain);
-__itt_counter ITTAPI __itt_counter_createW(const wchar_t *name, const wchar_t *domain);
+ * The call is equal to __itt_counter_create_typed(name, domain,
+ * __itt_metadata_u64)
+ */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+__itt_counter ITTAPI __itt_counter_createA(const char *name,
+                                           const char *domain);
+__itt_counter ITTAPI __itt_counter_createW(const wchar_t *name,
+                                           const wchar_t *domain);
 #if defined(UNICODE) || defined(_UNICODE)
-#  define __itt_counter_create     __itt_counter_createW
-#  define __itt_counter_create_ptr __itt_counter_createW_ptr
+#define __itt_counter_create __itt_counter_createW
+#define __itt_counter_create_ptr __itt_counter_createW_ptr
 #else /* UNICODE */
-#  define __itt_counter_create     __itt_counter_createA
-#  define __itt_counter_create_ptr __itt_counter_createA_ptr
+#define __itt_counter_create __itt_counter_createA
+#define __itt_counter_create_ptr __itt_counter_createA_ptr
 #endif /* UNICODE */
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 __itt_counter ITTAPI __itt_counter_create(const char *name, const char *domain);
@@ -2812,38 +3082,41 @@ __itt_counter ITTAPI __itt_counter_create(const char *name, const char *domain);
 
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUB(ITTAPI, __itt_counter, counter_createA, (const char    *name, const char    *domain))
-ITT_STUB(ITTAPI, __itt_counter, counter_createW, (const wchar_t *name, const wchar_t *domain))
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-ITT_STUB(ITTAPI, __itt_counter, counter_create,  (const char *name, const char *domain))
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUB(ITTAPI, __itt_counter, counter_createA,
+         (const char *name, const char *domain))
+ITT_STUB(ITTAPI, __itt_counter, counter_createW,
+         (const wchar_t *name, const wchar_t *domain))
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+ITT_STUB(ITTAPI, __itt_counter, counter_create,
+         (const char *name, const char *domain))
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-#define __itt_counter_createA     ITTNOTIFY_DATA(counter_createA)
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define __itt_counter_createA ITTNOTIFY_DATA(counter_createA)
 #define __itt_counter_createA_ptr ITTNOTIFY_NAME(counter_createA)
-#define __itt_counter_createW     ITTNOTIFY_DATA(counter_createW)
+#define __itt_counter_createW ITTNOTIFY_DATA(counter_createW)
 #define __itt_counter_createW_ptr ITTNOTIFY_NAME(counter_createW)
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_counter_create     ITTNOTIFY_DATA(counter_create)
+#define __itt_counter_create ITTNOTIFY_DATA(counter_create)
 #define __itt_counter_create_ptr ITTNOTIFY_NAME(counter_create)
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_ITTNOTIFY_API */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_counter_createA(name, domain)
 #define __itt_counter_createA_ptr 0
 #define __itt_counter_createW(name, domain)
 #define __itt_counter_createW_ptr 0
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #define __itt_counter_create(name, domain)
-#define __itt_counter_create_ptr  0
+#define __itt_counter_create_ptr 0
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_MACRO_BODY */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_counter_createA_ptr 0
 #define __itt_counter_createW_ptr 0
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_counter_create_ptr  0
+#define __itt_counter_create_ptr 0
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -2858,13 +3131,13 @@ void ITTAPI __itt_counter_inc(__itt_counter id);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(ITTAPI, void, counter_inc, (__itt_counter id))
-#define __itt_counter_inc     ITTNOTIFY_VOID(counter_inc)
+#define __itt_counter_inc ITTNOTIFY_VOID(counter_inc)
 #define __itt_counter_inc_ptr ITTNOTIFY_NAME(counter_inc)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_counter_inc(id)
 #define __itt_counter_inc_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_counter_inc_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -2877,14 +3150,15 @@ void ITTAPI __itt_counter_inc_delta(__itt_counter id, unsigned long long value);
 
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, counter_inc_delta, (__itt_counter id, unsigned long long value))
-#define __itt_counter_inc_delta     ITTNOTIFY_VOID(counter_inc_delta)
+ITT_STUBV(ITTAPI, void, counter_inc_delta,
+          (__itt_counter id, unsigned long long value))
+#define __itt_counter_inc_delta ITTNOTIFY_VOID(counter_inc_delta)
 #define __itt_counter_inc_delta_ptr ITTNOTIFY_NAME(counter_inc_delta)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_counter_inc_delta(id, value)
 #define __itt_counter_inc_delta_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_counter_inc_delta_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -2899,13 +3173,13 @@ void ITTAPI __itt_counter_dec(__itt_counter id);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(ITTAPI, void, counter_dec, (__itt_counter id))
-#define __itt_counter_dec     ITTNOTIFY_VOID(counter_dec)
+#define __itt_counter_dec ITTNOTIFY_VOID(counter_dec)
 #define __itt_counter_dec_ptr ITTNOTIFY_NAME(counter_dec)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_counter_dec(id)
 #define __itt_counter_dec_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_counter_dec_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -2918,14 +3192,15 @@ void ITTAPI __itt_counter_dec_delta(__itt_counter id, unsigned long long value);
 
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, counter_dec_delta, (__itt_counter id, unsigned long long value))
-#define __itt_counter_dec_delta     ITTNOTIFY_VOID(counter_dec_delta)
+ITT_STUBV(ITTAPI, void, counter_dec_delta,
+          (__itt_counter id, unsigned long long value))
+#define __itt_counter_dec_delta ITTNOTIFY_VOID(counter_dec_delta)
 #define __itt_counter_dec_delta_ptr ITTNOTIFY_NAME(counter_dec_delta)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_counter_dec_delta(id, value)
 #define __itt_counter_dec_delta_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_counter_dec_delta_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -2935,87 +3210,103 @@ ITT_STUBV(ITTAPI, void, counter_dec_delta, (__itt_counter id, unsigned long long
  * @brief Increment a counter by one.
  * The first call with a given name creates a counter by that name and sets its
  * value to zero. Successive calls increment the counter value.
- * @param[in] domain The domain controlling the call. Counter names are not domain specific.
- *            The domain argument is used only to enable or disable the API calls.
+ * @param[in] domain The domain controlling the call. Counter names are not
+ * domain specific. The domain argument is used only to enable or disable the
+ * API calls.
  * @param[in] name The name of the counter
  */
-void ITTAPI __itt_counter_inc_v3(const __itt_domain *domain, __itt_string_handle *name);
+void ITTAPI __itt_counter_inc_v3(const __itt_domain *domain,
+                                 __itt_string_handle *name);
 
 /**
  * @ingroup counters
  * @brief Increment a counter by the value specified in delta.
- * @param[in] domain The domain controlling the call. Counter names are not domain specific.
- *            The domain argument is used only to enable or disable the API calls.
+ * @param[in] domain The domain controlling the call. Counter names are not
+ * domain specific. The domain argument is used only to enable or disable the
+ * API calls.
  * @param[in] name The name of the counter
  * @param[in] delta The amount by which to increment the counter
  */
-void ITTAPI __itt_counter_inc_delta_v3(const __itt_domain *domain, __itt_string_handle *name, unsigned long long delta);
+void ITTAPI __itt_counter_inc_delta_v3(const __itt_domain *domain,
+                                       __itt_string_handle *name,
+                                       unsigned long long delta);
 
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, counter_inc_v3,       (const __itt_domain *domain, __itt_string_handle *name))
-ITT_STUBV(ITTAPI, void, counter_inc_delta_v3, (const __itt_domain *domain, __itt_string_handle *name, unsigned long long delta))
-#define __itt_counter_inc_v3(d,x)         ITTNOTIFY_VOID_D1(counter_inc_v3,d,x)
-#define __itt_counter_inc_v3_ptr          ITTNOTIFY_NAME(counter_inc_v3)
-#define __itt_counter_inc_delta_v3(d,x,y) ITTNOTIFY_VOID_D2(counter_inc_delta_v3,d,x,y)
-#define __itt_counter_inc_delta_v3_ptr    ITTNOTIFY_NAME(counter_inc_delta_v3)
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#define __itt_counter_inc_v3(domain,name)
-#define __itt_counter_inc_v3_ptr       0
-#define __itt_counter_inc_delta_v3(domain,name,delta)
+ITT_STUBV(ITTAPI, void, counter_inc_v3,
+          (const __itt_domain *domain, __itt_string_handle *name))
+ITT_STUBV(ITTAPI, void, counter_inc_delta_v3,
+          (const __itt_domain *domain, __itt_string_handle *name,
+           unsigned long long delta))
+#define __itt_counter_inc_v3(d, x) ITTNOTIFY_VOID_D1(counter_inc_v3, d, x)
+#define __itt_counter_inc_v3_ptr ITTNOTIFY_NAME(counter_inc_v3)
+#define __itt_counter_inc_delta_v3(d, x, y)                                    \
+  ITTNOTIFY_VOID_D2(counter_inc_delta_v3, d, x, y)
+#define __itt_counter_inc_delta_v3_ptr ITTNOTIFY_NAME(counter_inc_delta_v3)
+#else /* INTEL_NO_ITTNOTIFY_API */
+#define __itt_counter_inc_v3(domain, name)
+#define __itt_counter_inc_v3_ptr 0
+#define __itt_counter_inc_delta_v3(domain, name, delta)
 #define __itt_counter_inc_delta_v3_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#define __itt_counter_inc_v3_ptr       0
+#else /* INTEL_NO_MACRO_BODY */
+#define __itt_counter_inc_v3_ptr 0
 #define __itt_counter_inc_delta_v3_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
-
 /**
  * @ingroup counters
  * @brief Decrement a counter by one.
  * The first call with a given name creates a counter by that name and sets its
  * value to zero. Successive calls decrement the counter value.
- * @param[in] domain The domain controlling the call. Counter names are not domain specific.
- *            The domain argument is used only to enable or disable the API calls.
+ * @param[in] domain The domain controlling the call. Counter names are not
+ * domain specific. The domain argument is used only to enable or disable the
+ * API calls.
  * @param[in] name The name of the counter
  */
-void ITTAPI __itt_counter_dec_v3(const __itt_domain *domain, __itt_string_handle *name);
+void ITTAPI __itt_counter_dec_v3(const __itt_domain *domain,
+                                 __itt_string_handle *name);
 
 /**
  * @ingroup counters
  * @brief Decrement a counter by the value specified in delta.
- * @param[in] domain The domain controlling the call. Counter names are not domain specific.
- *            The domain argument is used only to enable or disable the API calls.
+ * @param[in] domain The domain controlling the call. Counter names are not
+ * domain specific. The domain argument is used only to enable or disable the
+ * API calls.
  * @param[in] name The name of the counter
  * @param[in] delta The amount by which to decrement the counter
  */
-void ITTAPI __itt_counter_dec_delta_v3(const __itt_domain *domain, __itt_string_handle *name, unsigned long long delta);
+void ITTAPI __itt_counter_dec_delta_v3(const __itt_domain *domain,
+                                       __itt_string_handle *name,
+                                       unsigned long long delta);
 
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, counter_dec_v3,       (const __itt_domain *domain, __itt_string_handle *name))
-ITT_STUBV(ITTAPI, void, counter_dec_delta_v3, (const __itt_domain *domain, __itt_string_handle *name, unsigned long long delta))
-#define __itt_counter_dec_v3(d,x)         ITTNOTIFY_VOID_D1(counter_dec_v3,d,x)
-#define __itt_counter_dec_v3_ptr          ITTNOTIFY_NAME(counter_dec_v3)
-#define __itt_counter_dec_delta_v3(d,x,y) ITTNOTIFY_VOID_D2(counter_dec_delta_v3,d,x,y)
-#define __itt_counter_dec_delta_v3_ptr    ITTNOTIFY_NAME(counter_dec_delta_v3)
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#define __itt_counter_dec_v3(domain,name)
-#define __itt_counter_dec_v3_ptr       0
-#define __itt_counter_dec_delta_v3(domain,name,delta)
+ITT_STUBV(ITTAPI, void, counter_dec_v3,
+          (const __itt_domain *domain, __itt_string_handle *name))
+ITT_STUBV(ITTAPI, void, counter_dec_delta_v3,
+          (const __itt_domain *domain, __itt_string_handle *name,
+           unsigned long long delta))
+#define __itt_counter_dec_v3(d, x) ITTNOTIFY_VOID_D1(counter_dec_v3, d, x)
+#define __itt_counter_dec_v3_ptr ITTNOTIFY_NAME(counter_dec_v3)
+#define __itt_counter_dec_delta_v3(d, x, y)                                    \
+  ITTNOTIFY_VOID_D2(counter_dec_delta_v3, d, x, y)
+#define __itt_counter_dec_delta_v3_ptr ITTNOTIFY_NAME(counter_dec_delta_v3)
+#else /* INTEL_NO_ITTNOTIFY_API */
+#define __itt_counter_dec_v3(domain, name)
+#define __itt_counter_dec_v3_ptr 0
+#define __itt_counter_dec_delta_v3(domain, name, delta)
 #define __itt_counter_dec_delta_v3_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#define __itt_counter_dec_v3_ptr       0
+#else /* INTEL_NO_MACRO_BODY */
+#define __itt_counter_dec_v3_ptr 0
 #define __itt_counter_dec_delta_v3_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
 /** @} counters group */
 
-
 /**
  * @brief Set the counter value
  */
@@ -3024,13 +3315,13 @@ void ITTAPI __itt_counter_set_value(__itt_counter id, void *value_ptr);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(ITTAPI, void, counter_set_value, (__itt_counter id, void *value_ptr))
-#define __itt_counter_set_value     ITTNOTIFY_VOID(counter_set_value)
+#define __itt_counter_set_value ITTNOTIFY_VOID(counter_set_value)
 #define __itt_counter_set_value_ptr ITTNOTIFY_NAME(counter_set_value)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_counter_set_value(id, value_ptr)
 #define __itt_counter_set_value_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_counter_set_value_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -3038,19 +3329,24 @@ ITT_STUBV(ITTAPI, void, counter_set_value, (__itt_counter id, void *value_ptr))
 /**
  * @brief Set the counter value
  */
-void ITTAPI __itt_counter_set_value_ex(__itt_counter id, __itt_clock_domain *clock_domain, unsigned long long timestamp, void *value_ptr);
+void ITTAPI __itt_counter_set_value_ex(__itt_counter id,
+                                       __itt_clock_domain *clock_domain,
+                                       unsigned long long timestamp,
+                                       void *value_ptr);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, counter_set_value_ex, (__itt_counter id, __itt_clock_domain *clock_domain, unsigned long long timestamp, void *value_ptr))
-#define __itt_counter_set_value_ex     ITTNOTIFY_VOID(counter_set_value_ex)
+ITT_STUBV(ITTAPI, void, counter_set_value_ex,
+          (__itt_counter id, __itt_clock_domain *clock_domain,
+           unsigned long long timestamp, void *value_ptr))
+#define __itt_counter_set_value_ex ITTNOTIFY_VOID(counter_set_value_ex)
 #define __itt_counter_set_value_ex_ptr ITTNOTIFY_NAME(counter_set_value_ex)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_counter_set_value_ex(id, clock_domain, timestamp, value_ptr)
 #define __itt_counter_set_value_ex_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_counter_set_value_ex_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -3058,64 +3354,76 @@ ITT_STUBV(ITTAPI, void, counter_set_value_ex, (__itt_counter id, __itt_clock_dom
 /**
  * @brief Create a typed counter with given name/domain
  *
- * After __itt_counter_create_typed() is called, __itt_counter_inc(id), __itt_counter_inc_delta(id, delta),
- * __itt_counter_set_value(id, value_ptr) or __itt_counter_set_value_ex(id, clock_domain, timestamp, value_ptr)
- * can be used to change the value of the counter
- */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-__itt_counter ITTAPI __itt_counter_create_typedA(const char    *name, const char    *domain, __itt_metadata_type type);
-__itt_counter ITTAPI __itt_counter_create_typedW(const wchar_t *name, const wchar_t *domain, __itt_metadata_type type);
+ * After __itt_counter_create_typed() is called, __itt_counter_inc(id),
+ * __itt_counter_inc_delta(id, delta),
+ * __itt_counter_set_value(id, value_ptr) or __itt_counter_set_value_ex(id,
+ * clock_domain, timestamp, value_ptr) can be used to change the value of the
+ * counter
+ */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+__itt_counter ITTAPI __itt_counter_create_typedA(const char *name,
+                                                 const char *domain,
+                                                 __itt_metadata_type type);
+__itt_counter ITTAPI __itt_counter_create_typedW(const wchar_t *name,
+                                                 const wchar_t *domain,
+                                                 __itt_metadata_type type);
 #if defined(UNICODE) || defined(_UNICODE)
-#  define __itt_counter_create_typed     __itt_counter_create_typedW
-#  define __itt_counter_create_typed_ptr __itt_counter_create_typedW_ptr
+#define __itt_counter_create_typed __itt_counter_create_typedW
+#define __itt_counter_create_typed_ptr __itt_counter_create_typedW_ptr
 #else /* UNICODE */
-#  define __itt_counter_create_typed     __itt_counter_create_typedA
-#  define __itt_counter_create_typed_ptr __itt_counter_create_typedA_ptr
+#define __itt_counter_create_typed __itt_counter_create_typedA
+#define __itt_counter_create_typed_ptr __itt_counter_create_typedA_ptr
 #endif /* UNICODE */
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-__itt_counter ITTAPI __itt_counter_create_typed(const char *name, const char *domain, __itt_metadata_type type);
+__itt_counter ITTAPI __itt_counter_create_typed(const char *name,
+                                                const char *domain,
+                                                __itt_metadata_type type);
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUB(ITTAPI, __itt_counter, counter_create_typedA, (const char    *name, const char    *domain, __itt_metadata_type type))
-ITT_STUB(ITTAPI, __itt_counter, counter_create_typedW, (const wchar_t *name, const wchar_t *domain, __itt_metadata_type type))
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-ITT_STUB(ITTAPI, __itt_counter, counter_create_typed,  (const char *name, const char *domain, __itt_metadata_type type))
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUB(ITTAPI, __itt_counter, counter_create_typedA,
+         (const char *name, const char *domain, __itt_metadata_type type))
+ITT_STUB(ITTAPI, __itt_counter, counter_create_typedW,
+         (const wchar_t *name, const wchar_t *domain, __itt_metadata_type type))
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+ITT_STUB(ITTAPI, __itt_counter, counter_create_typed,
+         (const char *name, const char *domain, __itt_metadata_type type))
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-#define __itt_counter_create_typedA     ITTNOTIFY_DATA(counter_create_typedA)
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define __itt_counter_create_typedA ITTNOTIFY_DATA(counter_create_typedA)
 #define __itt_counter_create_typedA_ptr ITTNOTIFY_NAME(counter_create_typedA)
-#define __itt_counter_create_typedW     ITTNOTIFY_DATA(counter_create_typedW)
+#define __itt_counter_create_typedW ITTNOTIFY_DATA(counter_create_typedW)
 #define __itt_counter_create_typedW_ptr ITTNOTIFY_NAME(counter_create_typedW)
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_counter_create_typed     ITTNOTIFY_DATA(counter_create_typed)
+#define __itt_counter_create_typed ITTNOTIFY_DATA(counter_create_typed)
 #define __itt_counter_create_typed_ptr ITTNOTIFY_NAME(counter_create_typed)
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_ITTNOTIFY_API */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_counter_create_typedA(name, domain, type)
 #define __itt_counter_create_typedA_ptr 0
 #define __itt_counter_create_typedW(name, domain, type)
 #define __itt_counter_create_typedW_ptr 0
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #define __itt_counter_create_typed(name, domain, type)
-#define __itt_counter_create_typed_ptr  0
+#define __itt_counter_create_typed_ptr 0
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_MACRO_BODY */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_counter_create_typedA_ptr 0
 #define __itt_counter_create_typedW_ptr 0
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_counter_create_typed_ptr  0
+#define __itt_counter_create_typed_ptr 0
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
 /**
- * @brief Destroy the counter identified by the pointer previously returned by __itt_counter_create() or
+ * @brief Destroy the counter identified by the pointer previously returned by
+ * __itt_counter_create() or
  * __itt_counter_create_typed()
  */
 void ITTAPI __itt_counter_destroy(__itt_counter id);
@@ -3123,13 +3431,13 @@ void ITTAPI __itt_counter_destroy(__itt_counter id);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(ITTAPI, void, counter_destroy, (__itt_counter id))
-#define __itt_counter_destroy     ITTNOTIFY_VOID(counter_destroy)
+#define __itt_counter_destroy ITTNOTIFY_VOID(counter_destroy)
 #define __itt_counter_destroy_ptr ITTNOTIFY_NAME(counter_destroy)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_counter_destroy(id)
 #define __itt_counter_destroy_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_counter_destroy_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -3139,26 +3447,34 @@ ITT_STUBV(ITTAPI, void, counter_destroy, (__itt_counter id))
  * @ingroup markers
  * @brief Create a marker instance.
  * @param[in] domain The domain for this marker
- * @param[in] clock_domain The clock domain controlling the execution of this call.
+ * @param[in] clock_domain The clock domain controlling the execution of this
+ * call.
  * @param[in] timestamp The user defined timestamp.
  * @param[in] id The instance ID for this marker, or __itt_null
  * @param[in] name The name for this marker
  * @param[in] scope The scope for this marker
  */
-void ITTAPI __itt_marker_ex(const __itt_domain *domain,  __itt_clock_domain* clock_domain, unsigned long long timestamp, __itt_id id, __itt_string_handle *name, __itt_scope scope);
+void ITTAPI __itt_marker_ex(const __itt_domain *domain,
+                            __itt_clock_domain *clock_domain,
+                            unsigned long long timestamp, __itt_id id,
+                            __itt_string_handle *name, __itt_scope scope);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, marker_ex,    (const __itt_domain *domain,  __itt_clock_domain* clock_domain, unsigned long long timestamp, __itt_id id, __itt_string_handle *name, __itt_scope scope))
-#define __itt_marker_ex(d,x,y,z,a,b)    ITTNOTIFY_VOID_D5(marker_ex,d,x,y,z,a,b)
-#define __itt_marker_ex_ptr             ITTNOTIFY_NAME(marker_ex)
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#define __itt_marker_ex(domain,clock_domain,timestamp,id,name,scope)
-#define __itt_marker_ex_ptr    0
+ITT_STUBV(ITTAPI, void, marker_ex,
+          (const __itt_domain *domain, __itt_clock_domain *clock_domain,
+           unsigned long long timestamp, __itt_id id, __itt_string_handle *name,
+           __itt_scope scope))
+#define __itt_marker_ex(d, x, y, z, a, b)                                      \
+  ITTNOTIFY_VOID_D5(marker_ex, d, x, y, z, a, b)
+#define __itt_marker_ex_ptr ITTNOTIFY_NAME(marker_ex)
+#else /* INTEL_NO_ITTNOTIFY_API */
+#define __itt_marker_ex(domain, clock_domain, timestamp, id, name, scope)
+#define __itt_marker_ex_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#define __itt_marker_ex_ptr    0
+#else /* INTEL_NO_MACRO_BODY */
+#define __itt_marker_ex_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
@@ -3167,64 +3483,82 @@ ITT_STUBV(ITTAPI, void, marker_ex,    (const __itt_domain *domain,  __itt_clock_
  * @brief Add a relation to the current task instance.
  * The current task instance is the head of the relation.
  * @param[in] domain The domain controlling this call
- * @param[in] clock_domain The clock domain controlling the execution of this call.
+ * @param[in] clock_domain The clock domain controlling the execution of this
+ * call.
  * @param[in] timestamp The user defined timestamp.
  * @param[in] relation The kind of relation
  * @param[in] tail The ID for the tail of the relation
  */
-void ITTAPI __itt_relation_add_to_current_ex(const __itt_domain *domain,  __itt_clock_domain* clock_domain, unsigned long long timestamp, __itt_relation relation, __itt_id tail);
+void ITTAPI __itt_relation_add_to_current_ex(const __itt_domain *domain,
+                                             __itt_clock_domain *clock_domain,
+                                             unsigned long long timestamp,
+                                             __itt_relation relation,
+                                             __itt_id tail);
 
 /**
  * @ingroup clockdomain
  * @brief Add a relation between two instance identifiers.
  * @param[in] domain The domain controlling this call
- * @param[in] clock_domain The clock domain controlling the execution of this call.
+ * @param[in] clock_domain The clock domain controlling the execution of this
+ * call.
  * @param[in] timestamp The user defined timestamp.
  * @param[in] head The ID for the head of the relation
  * @param[in] relation The kind of relation
  * @param[in] tail The ID for the tail of the relation
  */
-void ITTAPI __itt_relation_add_ex(const __itt_domain *domain,  __itt_clock_domain* clock_domain, unsigned long long timestamp, __itt_id head, __itt_relation relation, __itt_id tail);
+void ITTAPI __itt_relation_add_ex(const __itt_domain *domain,
+                                  __itt_clock_domain *clock_domain,
+                                  unsigned long long timestamp, __itt_id head,
+                                  __itt_relation relation, __itt_id tail);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, relation_add_to_current_ex, (const __itt_domain *domain, __itt_clock_domain* clock_domain, unsigned long long timestamp, __itt_relation relation, __itt_id tail))
-ITT_STUBV(ITTAPI, void, relation_add_ex,            (const __itt_domain *domain, __itt_clock_domain* clock_domain, unsigned long long timestamp, __itt_id head, __itt_relation relation, __itt_id tail))
-#define __itt_relation_add_to_current_ex(d,x,y,z,a) ITTNOTIFY_VOID_D4(relation_add_to_current_ex,d,x,y,z,a)
-#define __itt_relation_add_to_current_ex_ptr        ITTNOTIFY_NAME(relation_add_to_current_ex)
-#define __itt_relation_add_ex(d,x,y,z,a,b)          ITTNOTIFY_VOID_D5(relation_add_ex,d,x,y,z,a,b)
-#define __itt_relation_add_ex_ptr                   ITTNOTIFY_NAME(relation_add_ex)
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#define __itt_relation_add_to_current_ex(domain,clock_domain,timestamp,relation,tail)
+ITT_STUBV(ITTAPI, void, relation_add_to_current_ex,
+          (const __itt_domain *domain, __itt_clock_domain *clock_domain,
+           unsigned long long timestamp, __itt_relation relation,
+           __itt_id tail))
+ITT_STUBV(ITTAPI, void, relation_add_ex,
+          (const __itt_domain *domain, __itt_clock_domain *clock_domain,
+           unsigned long long timestamp, __itt_id head, __itt_relation relation,
+           __itt_id tail))
+#define __itt_relation_add_to_current_ex(d, x, y, z, a)                        \
+  ITTNOTIFY_VOID_D4(relation_add_to_current_ex, d, x, y, z, a)
+#define __itt_relation_add_to_current_ex_ptr                                   \
+  ITTNOTIFY_NAME(relation_add_to_current_ex)
+#define __itt_relation_add_ex(d, x, y, z, a, b)                                \
+  ITTNOTIFY_VOID_D5(relation_add_ex, d, x, y, z, a, b)
+#define __itt_relation_add_ex_ptr ITTNOTIFY_NAME(relation_add_ex)
+#else /* INTEL_NO_ITTNOTIFY_API */
+#define __itt_relation_add_to_current_ex(domain, clock_domain, timestamp,      \
+                                         relation, tail)
 #define __itt_relation_add_to_current_ex_ptr 0
-#define __itt_relation_add_ex(domain,clock_domain,timestamp,head,relation,tail)
+#define __itt_relation_add_ex(domain, clock_domain, timestamp, head, relation, \
+                              tail)
 #define __itt_relation_add_ex_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_relation_add_to_current_ex_ptr 0
 #define __itt_relation_add_ex_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
 /** @cond exclude_from_documentation */
-typedef enum ___itt_track_group_type
-{
-    __itt_track_group_type_normal = 0
+typedef enum ___itt_track_group_type {
+  __itt_track_group_type_normal = 0
 } __itt_track_group_type;
 /** @endcond */
 
 /** @cond exclude_from_documentation */
 #pragma pack(push, 8)
 
-typedef struct ___itt_track_group
-{
-    __itt_string_handle* name;     /*!< Name of the track group */
-    struct ___itt_track* track;    /*!< List of child tracks    */
-    __itt_track_group_type tgtype; /*!< Type of the track group */
-    int   extra1;                  /*!< Reserved. Must be zero  */
-    void* extra2;                  /*!< Reserved. Must be zero  */
-    struct ___itt_track_group* next;
+typedef struct ___itt_track_group {
+  __itt_string_handle *name; /*!< Name of the track group */
+  struct ___itt_track *track; /*!< List of child tracks    */
+  __itt_track_group_type tgtype; /*!< Type of the track group */
+  int extra1; /*!< Reserved. Must be zero  */
+  void *extra2; /*!< Reserved. Must be zero  */
+  struct ___itt_track_group *next;
 } __itt_track_group;
 
 #pragma pack(pop)
@@ -3234,25 +3568,24 @@ typedef struct ___itt_track_group
  * @brief Placeholder for custom track types. Currently, "normal" custom track
  * is the only available track type.
  */
-typedef enum ___itt_track_type
-{
-    __itt_track_type_normal = 0
+typedef enum ___itt_track_type {
+  __itt_track_type_normal = 0
 #ifdef INTEL_ITTNOTIFY_API_PRIVATE
-    , __itt_track_type_queue
+  ,
+  __itt_track_type_queue
 #endif /* INTEL_ITTNOTIFY_API_PRIVATE */
 } __itt_track_type;
 
 /** @cond exclude_from_documentation */
 #pragma pack(push, 8)
 
-typedef struct ___itt_track
-{
-    __itt_string_handle* name; /*!< Name of the track group */
-    __itt_track_group* group;  /*!< Parent group to a track */
-    __itt_track_type ttype;    /*!< Type of the track       */
-    int   extra1;              /*!< Reserved. Must be zero  */
-    void* extra2;              /*!< Reserved. Must be zero  */
-    struct ___itt_track* next;
+typedef struct ___itt_track {
+  __itt_string_handle *name; /*!< Name of the track group */
+  __itt_track_group *group; /*!< Parent group to a track */
+  __itt_track_type ttype; /*!< Type of the track       */
+  int extra1; /*!< Reserved. Must be zero  */
+  void *extra2; /*!< Reserved. Must be zero  */
+  struct ___itt_track *next;
 } __itt_track;
 
 #pragma pack(pop)
@@ -3261,19 +3594,21 @@ typedef struct ___itt_track
 /**
  * @brief Create logical track group.
  */
-__itt_track_group* ITTAPI __itt_track_group_create(__itt_string_handle* name, __itt_track_group_type track_group_type);
+__itt_track_group *ITTAPI __itt_track_group_create(
+    __itt_string_handle *name, __itt_track_group_type track_group_type);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUB(ITTAPI, __itt_track_group*, track_group_create, (__itt_string_handle* name, __itt_track_group_type track_group_type))
-#define __itt_track_group_create     ITTNOTIFY_DATA(track_group_create)
+ITT_STUB(ITTAPI, __itt_track_group *, track_group_create,
+         (__itt_string_handle * name, __itt_track_group_type track_group_type))
+#define __itt_track_group_create ITTNOTIFY_DATA(track_group_create)
 #define __itt_track_group_create_ptr ITTNOTIFY_NAME(track_group_create)
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#define __itt_track_group_create(name)  (__itt_track_group*)0
+#else /* INTEL_NO_ITTNOTIFY_API */
+#define __itt_track_group_create(name) (__itt_track_group *)0
 #define __itt_track_group_create_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_track_group_create_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -3281,19 +3616,23 @@ ITT_STUB(ITTAPI, __itt_track_group*, track_group_create, (__itt_string_handle* n
 /**
  * @brief Create logical track.
  */
-__itt_track* ITTAPI __itt_track_create(__itt_track_group* track_group, __itt_string_handle* name, __itt_track_type track_type);
+__itt_track *ITTAPI __itt_track_create(__itt_track_group *track_group,
+                                       __itt_string_handle *name,
+                                       __itt_track_type track_type);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUB(ITTAPI, __itt_track*, track_create, (__itt_track_group* track_group,__itt_string_handle* name, __itt_track_type track_type))
-#define __itt_track_create     ITTNOTIFY_DATA(track_create)
+ITT_STUB(ITTAPI, __itt_track *, track_create,
+         (__itt_track_group * track_group, __itt_string_handle *name,
+          __itt_track_type track_type))
+#define __itt_track_create ITTNOTIFY_DATA(track_create)
 #define __itt_track_create_ptr ITTNOTIFY_NAME(track_create)
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#define __itt_track_create(track_group,name,track_type)  (__itt_track*)0
+#else /* INTEL_NO_ITTNOTIFY_API */
+#define __itt_track_create(track_group, name, track_type) (__itt_track *)0
 #define __itt_track_create_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_track_create_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -3301,19 +3640,19 @@ ITT_STUB(ITTAPI, __itt_track*, track_create, (__itt_track_group* track_group,__i
 /**
  * @brief Set the logical track.
  */
-void ITTAPI __itt_set_track(__itt_track* track);
+void ITTAPI __itt_set_track(__itt_track *track);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, set_track, (__itt_track *track))
-#define __itt_set_track     ITTNOTIFY_VOID(set_track)
+ITT_STUBV(ITTAPI, void, set_track, (__itt_track * track))
+#define __itt_set_track ITTNOTIFY_VOID(set_track)
 #define __itt_set_track_ptr ITTNOTIFY_NAME(set_track)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_set_track(track)
 #define __itt_set_track_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_set_track_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -3331,65 +3670,68 @@ typedef int __itt_event;
 
 /**
  * @brief Create an event notification
- * @note name or namelen being null/name and namelen not matching, user event feature not enabled
+ * @note name or namelen being null/name and namelen not matching, user event
+ * feature not enabled
  * @return non-zero event identifier upon success and __itt_err otherwise
  */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-__itt_event LIBITTAPI __itt_event_createA(const char    *name, int namelen);
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+__itt_event LIBITTAPI __itt_event_createA(const char *name, int namelen);
 __itt_event LIBITTAPI __itt_event_createW(const wchar_t *name, int namelen);
 #if defined(UNICODE) || defined(_UNICODE)
-#  define __itt_event_create     __itt_event_createW
-#  define __itt_event_create_ptr __itt_event_createW_ptr
+#define __itt_event_create __itt_event_createW
+#define __itt_event_create_ptr __itt_event_createW_ptr
 #else
-#  define __itt_event_create     __itt_event_createA
-#  define __itt_event_create_ptr __itt_event_createA_ptr
+#define __itt_event_create __itt_event_createA
+#define __itt_event_create_ptr __itt_event_createA_ptr
 #endif /* UNICODE */
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 __itt_event LIBITTAPI __itt_event_create(const char *name, int namelen);
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUB(LIBITTAPI, __itt_event, event_createA, (const char    *name, int namelen))
-ITT_STUB(LIBITTAPI, __itt_event, event_createW, (const wchar_t *name, int namelen))
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-ITT_STUB(LIBITTAPI, __itt_event, event_create,  (const char    *name, int namelen))
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUB(LIBITTAPI, __itt_event, event_createA, (const char *name, int namelen))
+ITT_STUB(LIBITTAPI, __itt_event, event_createW,
+         (const wchar_t *name, int namelen))
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+ITT_STUB(LIBITTAPI, __itt_event, event_create, (const char *name, int namelen))
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-#define __itt_event_createA     ITTNOTIFY_DATA(event_createA)
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define __itt_event_createA ITTNOTIFY_DATA(event_createA)
 #define __itt_event_createA_ptr ITTNOTIFY_NAME(event_createA)
-#define __itt_event_createW     ITTNOTIFY_DATA(event_createW)
+#define __itt_event_createW ITTNOTIFY_DATA(event_createW)
 #define __itt_event_createW_ptr ITTNOTIFY_NAME(event_createW)
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_event_create      ITTNOTIFY_DATA(event_create)
-#define __itt_event_create_ptr  ITTNOTIFY_NAME(event_create)
+#define __itt_event_create ITTNOTIFY_DATA(event_create)
+#define __itt_event_create_ptr ITTNOTIFY_NAME(event_create)
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_ITTNOTIFY_API */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_event_createA(name, namelen) (__itt_event)0
 #define __itt_event_createA_ptr 0
 #define __itt_event_createW(name, namelen) (__itt_event)0
 #define __itt_event_createW_ptr 0
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_event_create(name, namelen)  (__itt_event)0
-#define __itt_event_create_ptr  0
+#define __itt_event_create(name, namelen) (__itt_event)0
+#define __itt_event_create_ptr 0
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_MACRO_BODY */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_event_createA_ptr 0
 #define __itt_event_createW_ptr 0
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_event_create_ptr  0
+#define __itt_event_create_ptr 0
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
 /**
  * @brief Record an event occurrence.
- * @return __itt_err upon failure (invalid event id/user event feature not enabled)
+ * @return __itt_err upon failure (invalid event id/user event feature not
+ * enabled)
  */
 int LIBITTAPI __itt_event_start(__itt_event event);
 
@@ -3397,13 +3739,13 @@ int LIBITTAPI __itt_event_start(__itt_event event);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUB(LIBITTAPI, int, event_start, (__itt_event event))
-#define __itt_event_start     ITTNOTIFY_DATA(event_start)
+#define __itt_event_start ITTNOTIFY_DATA(event_start)
 #define __itt_event_start_ptr ITTNOTIFY_NAME(event_start)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_event_start(event) (int)0
 #define __itt_event_start_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_event_start_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -3411,7 +3753,8 @@ ITT_STUB(LIBITTAPI, int, event_start, (__itt_event event))
 /**
  * @brief Record an event end occurrence.
  * @note It is optional if events do not have durations.
- * @return __itt_err upon failure (invalid event id/user event feature not enabled)
+ * @return __itt_err upon failure (invalid event id/user event feature not
+ * enabled)
  */
 int LIBITTAPI __itt_event_end(__itt_event event);
 
@@ -3419,19 +3762,18 @@ int LIBITTAPI __itt_event_end(__itt_event event);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUB(LIBITTAPI, int, event_end, (__itt_event event))
-#define __itt_event_end     ITTNOTIFY_DATA(event_end)
+#define __itt_event_end ITTNOTIFY_DATA(event_end)
 #define __itt_event_end_ptr ITTNOTIFY_NAME(event_end)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_event_end(event) (int)0
 #define __itt_event_end_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_event_end_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 /** @} events group */
 
-
 /**
  * @defgroup arrays Arrays Visualizer
  * @ingroup public
@@ -3443,69 +3785,81 @@ ITT_STUB(LIBITTAPI, int, event_end, (__itt_event event))
  * @enum __itt_av_data_type
  * @brief Defines types of arrays data (for C/C++ intrinsic types)
  */
-typedef enum
-{
-    __itt_e_first = 0,
-    __itt_e_char = 0,  /* 1-byte integer */
-    __itt_e_uchar,     /* 1-byte unsigned integer */
-    __itt_e_int16,     /* 2-byte integer */
-    __itt_e_uint16,    /* 2-byte unsigned integer  */
-    __itt_e_int32,     /* 4-byte integer */
-    __itt_e_uint32,    /* 4-byte unsigned integer */
-    __itt_e_int64,     /* 8-byte integer */
-    __itt_e_uint64,    /* 8-byte unsigned integer */
-    __itt_e_float,     /* 4-byte floating */
-    __itt_e_double,    /* 8-byte floating */
-    __itt_e_last = __itt_e_double
+typedef enum {
+  __itt_e_first = 0,
+  __itt_e_char = 0, /* 1-byte integer */
+  __itt_e_uchar, /* 1-byte unsigned integer */
+  __itt_e_int16, /* 2-byte integer */
+  __itt_e_uint16, /* 2-byte unsigned integer  */
+  __itt_e_int32, /* 4-byte integer */
+  __itt_e_uint32, /* 4-byte unsigned integer */
+  __itt_e_int64, /* 8-byte integer */
+  __itt_e_uint64, /* 8-byte unsigned integer */
+  __itt_e_float, /* 4-byte floating */
+  __itt_e_double, /* 8-byte floating */
+  __itt_e_last = __itt_e_double
 } __itt_av_data_type;
 
 /**
  * @brief Save an array data to a file.
- * Output format is defined by the file extension. The csv and bmp formats are supported (bmp - for 2-dimensional array only).
+ * Output format is defined by the file extension. The csv and bmp formats are
+ * supported (bmp - for 2-dimensional array only).
  * @param[in] data - pointer to the array data
  * @param[in] rank - the rank of the array
- * @param[in] dimensions - pointer to an array of integers, which specifies the array dimensions.
- * The size of dimensions must be equal to the rank
- * @param[in] type - the type of the array, specified as one of the __itt_av_data_type values (for intrinsic types)
- * @param[in] filePath - the file path; the output format is defined by the file extension
- * @param[in] columnOrder - defines how the array is stored in the linear memory.
- * It should be 1 for column-major order (e.g. in FORTRAN) or 0 - for row-major order (e.g. in C).
- */
-
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-int ITTAPI __itt_av_saveA(void *data, int rank, const int *dimensions, int type, const char *filePath, int columnOrder);
-int ITTAPI __itt_av_saveW(void *data, int rank, const int *dimensions, int type, const wchar_t *filePath, int columnOrder);
+ * @param[in] dimensions - pointer to an array of integers, which specifies the
+ * array dimensions. The size of dimensions must be equal to the rank
+ * @param[in] type - the type of the array, specified as one of the
+ * __itt_av_data_type values (for intrinsic types)
+ * @param[in] filePath - the file path; the output format is defined by the file
+ * extension
+ * @param[in] columnOrder - defines how the array is stored in the linear
+ * memory. It should be 1 for column-major order (e.g. in FORTRAN) or 0 - for
+ * row-major order (e.g. in C).
+ */
+
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+int ITTAPI __itt_av_saveA(void *data, int rank, const int *dimensions, int type,
+                          const char *filePath, int columnOrder);
+int ITTAPI __itt_av_saveW(void *data, int rank, const int *dimensions, int type,
+                          const wchar_t *filePath, int columnOrder);
 #if defined(UNICODE) || defined(_UNICODE)
-#  define __itt_av_save     __itt_av_saveW
-#  define __itt_av_save_ptr __itt_av_saveW_ptr
+#define __itt_av_save __itt_av_saveW
+#define __itt_av_save_ptr __itt_av_saveW_ptr
 #else /* UNICODE */
-#  define __itt_av_save     __itt_av_saveA
-#  define __itt_av_save_ptr __itt_av_saveA_ptr
+#define __itt_av_save __itt_av_saveA
+#define __itt_av_save_ptr __itt_av_saveA_ptr
 #endif /* UNICODE */
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-int ITTAPI __itt_av_save(void *data, int rank, const int *dimensions, int type, const char *filePath, int columnOrder);
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+int ITTAPI __itt_av_save(void *data, int rank, const int *dimensions, int type,
+                         const char *filePath, int columnOrder);
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUB(ITTAPI, int, av_saveA, (void *data, int rank, const int *dimensions, int type, const char *filePath, int columnOrder))
-ITT_STUB(ITTAPI, int, av_saveW, (void *data, int rank, const int *dimensions, int type, const wchar_t *filePath, int columnOrder))
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-ITT_STUB(ITTAPI, int, av_save,  (void *data, int rank, const int *dimensions, int type, const char *filePath, int columnOrder))
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUB(ITTAPI, int, av_saveA,
+         (void *data, int rank, const int *dimensions, int type,
+          const char *filePath, int columnOrder))
+ITT_STUB(ITTAPI, int, av_saveW,
+         (void *data, int rank, const int *dimensions, int type,
+          const wchar_t *filePath, int columnOrder))
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+ITT_STUB(ITTAPI, int, av_save,
+         (void *data, int rank, const int *dimensions, int type,
+          const char *filePath, int columnOrder))
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-#define __itt_av_saveA     ITTNOTIFY_DATA(av_saveA)
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define __itt_av_saveA ITTNOTIFY_DATA(av_saveA)
 #define __itt_av_saveA_ptr ITTNOTIFY_NAME(av_saveA)
-#define __itt_av_saveW     ITTNOTIFY_DATA(av_saveW)
+#define __itt_av_saveW ITTNOTIFY_DATA(av_saveW)
 #define __itt_av_saveW_ptr ITTNOTIFY_NAME(av_saveW)
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_av_save     ITTNOTIFY_DATA(av_save)
+#define __itt_av_save ITTNOTIFY_DATA(av_save)
 #define __itt_av_save_ptr ITTNOTIFY_NAME(av_save)
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_ITTNOTIFY_API */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_av_saveA(name)
 #define __itt_av_saveA_ptr 0
 #define __itt_av_saveW(name)
@@ -3515,8 +3869,8 @@ ITT_STUB(ITTAPI, int, av_save,  (void *data, int rank, const int *dimensions, in
 #define __itt_av_save_ptr 0
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_MACRO_BODY */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_av_saveA_ptr 0
 #define __itt_av_saveW_ptr 0
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
@@ -3531,13 +3885,13 @@ void ITTAPI __itt_enable_attach(void);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(ITTAPI, void, enable_attach, (void))
-#define __itt_enable_attach     ITTNOTIFY_VOID(enable_attach)
+#define __itt_enable_attach ITTNOTIFY_VOID(enable_attach)
 #define __itt_enable_attach_ptr ITTNOTIFY_NAME(enable_attach)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_enable_attach()
 #define __itt_enable_attach_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_enable_attach_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -3555,40 +3909,46 @@ ITT_STUBV(ITTAPI, void, enable_attach, (void))
  * @param[in] end_addr - relocated module end address
  * @param[in] path - file system path to the module
  */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-void ITTAPI __itt_module_loadA(void *start_addr, void *end_addr, const char *path);
-void ITTAPI __itt_module_loadW(void *start_addr, void *end_addr, const wchar_t *path);
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+void ITTAPI __itt_module_loadA(void *start_addr, void *end_addr,
+                               const char *path);
+void ITTAPI __itt_module_loadW(void *start_addr, void *end_addr,
+                               const wchar_t *path);
 #if defined(UNICODE) || defined(_UNICODE)
-#  define __itt_module_load     __itt_module_loadW
-#  define __itt_module_load_ptr __itt_module_loadW_ptr
+#define __itt_module_load __itt_module_loadW
+#define __itt_module_load_ptr __itt_module_loadW_ptr
 #else /* UNICODE */
-#  define __itt_module_load     __itt_module_loadA
-#  define __itt_module_load_ptr __itt_module_loadA_ptr
+#define __itt_module_load __itt_module_loadA
+#define __itt_module_load_ptr __itt_module_loadA_ptr
 #endif /* UNICODE */
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-void ITTAPI __itt_module_load(void *start_addr, void *end_addr, const char *path);
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+void ITTAPI __itt_module_load(void *start_addr, void *end_addr,
+                              const char *path);
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUB(ITTAPI, void, module_loadA, (void *start_addr, void *end_addr, const char *path))
-ITT_STUB(ITTAPI, void, module_loadW, (void *start_addr, void *end_addr, const wchar_t *path))
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-ITT_STUB(ITTAPI, void, module_load,  (void *start_addr, void *end_addr, const char *path))
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUB(ITTAPI, void, module_loadA,
+         (void *start_addr, void *end_addr, const char *path))
+ITT_STUB(ITTAPI, void, module_loadW,
+         (void *start_addr, void *end_addr, const wchar_t *path))
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+ITT_STUB(ITTAPI, void, module_load,
+         (void *start_addr, void *end_addr, const char *path))
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-#define __itt_module_loadA     ITTNOTIFY_VOID(module_loadA)
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define __itt_module_loadA ITTNOTIFY_VOID(module_loadA)
 #define __itt_module_loadA_ptr ITTNOTIFY_NAME(module_loadA)
-#define __itt_module_loadW     ITTNOTIFY_VOID(module_loadW)
+#define __itt_module_loadW ITTNOTIFY_VOID(module_loadW)
 #define __itt_module_loadW_ptr ITTNOTIFY_NAME(module_loadW)
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_module_load     ITTNOTIFY_VOID(module_load)
+#define __itt_module_load ITTNOTIFY_VOID(module_load)
 #define __itt_module_load_ptr ITTNOTIFY_NAME(module_load)
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_ITTNOTIFY_API */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_module_loadA(start_addr, end_addr, path)
 #define __itt_module_loadA_ptr 0
 #define __itt_module_loadW(start_addr, end_addr, path)
@@ -3598,18 +3958,16 @@ ITT_STUB(ITTAPI, void, module_load,  (void *start_addr, void *end_addr, const ch
 #define __itt_module_load_ptr 0
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_MACRO_BODY */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_module_loadA_ptr 0
 #define __itt_module_loadW_ptr 0
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_module_load_ptr  0
+#define __itt_module_load_ptr 0
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
-
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
@@ -3629,43 +3987,62 @@ extern "C" {
  * @ingroup clockdomain
  * @brief Begin an overlapped task instance.
  * @param[in] domain The domain for this task
- * @param[in] clock_domain The clock domain controlling the execution of this call.
+ * @param[in] clock_domain The clock domain controlling the execution of this
+ * call.
  * @param[in] timestamp The user defined timestamp.
- * @param[in] taskid The identifier for this task instance, *cannot* be __itt_null.
+ * @param[in] taskid The identifier for this task instance, *cannot* be
+ * __itt_null.
  * @param[in] parentid The parent of this task, or __itt_null.
  * @param[in] name The name of this task.
  */
-void ITTAPI __itt_task_begin_overlapped_ex(const __itt_domain* domain, __itt_clock_domain* clock_domain, unsigned long long timestamp, __itt_id taskid, __itt_id parentid, __itt_string_handle* name);
+void ITTAPI __itt_task_begin_overlapped_ex(const __itt_domain *domain,
+                                           __itt_clock_domain *clock_domain,
+                                           unsigned long long timestamp,
+                                           __itt_id taskid, __itt_id parentid,
+                                           __itt_string_handle *name);
 
 /**
  * @ingroup clockdomain
  * @brief End an overlapped task instance.
  * @param[in] domain The domain for this task
- * @param[in] clock_domain The clock domain controlling the execution of this call.
+ * @param[in] clock_domain The clock domain controlling the execution of this
+ * call.
  * @param[in] timestamp The user defined timestamp.
  * @param[in] taskid Explicit ID of finished task
  */
-void ITTAPI __itt_task_end_overlapped_ex(const __itt_domain* domain, __itt_clock_domain* clock_domain, unsigned long long timestamp, __itt_id taskid);
+void ITTAPI __itt_task_end_overlapped_ex(const __itt_domain *domain,
+                                         __itt_clock_domain *clock_domain,
+                                         unsigned long long timestamp,
+                                         __itt_id taskid);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, task_begin_overlapped_ex,       (const __itt_domain* domain, __itt_clock_domain* clock_domain, unsigned long long timestamp, __itt_id taskid, __itt_id parentid, __itt_string_handle* name))
-ITT_STUBV(ITTAPI, void, task_end_overlapped_ex,         (const __itt_domain* domain, __itt_clock_domain* clock_domain, unsigned long long timestamp, __itt_id taskid))
-#define __itt_task_begin_overlapped_ex(d,x,y,z,a,b)     ITTNOTIFY_VOID_D5(task_begin_overlapped_ex,d,x,y,z,a,b)
-#define __itt_task_begin_overlapped_ex_ptr              ITTNOTIFY_NAME(task_begin_overlapped_ex)
-#define __itt_task_end_overlapped_ex(d,x,y,z)           ITTNOTIFY_VOID_D3(task_end_overlapped_ex,d,x,y,z)
-#define __itt_task_end_overlapped_ex_ptr                ITTNOTIFY_NAME(task_end_overlapped_ex)
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#define __itt_task_begin_overlapped_ex(domain,clock_domain,timestamp,taskid,parentid,name)
-#define __itt_task_begin_overlapped_ex_ptr      0
-#define __itt_task_end_overlapped_ex(domain,clock_domain,timestamp,taskid)
-#define __itt_task_end_overlapped_ex_ptr        0
+ITT_STUBV(ITTAPI, void, task_begin_overlapped_ex,
+          (const __itt_domain *domain, __itt_clock_domain *clock_domain,
+           unsigned long long timestamp, __itt_id taskid, __itt_id parentid,
+           __itt_string_handle *name))
+ITT_STUBV(ITTAPI, void, task_end_overlapped_ex,
+          (const __itt_domain *domain, __itt_clock_domain *clock_domain,
+           unsigned long long timestamp, __itt_id taskid))
+#define __itt_task_begin_overlapped_ex(d, x, y, z, a, b)                       \
+  ITTNOTIFY_VOID_D5(task_begin_overlapped_ex, d, x, y, z, a, b)
+#define __itt_task_begin_overlapped_ex_ptr                                     \
+  ITTNOTIFY_NAME(task_begin_overlapped_ex)
+#define __itt_task_end_overlapped_ex(d, x, y, z)                               \
+  ITTNOTIFY_VOID_D3(task_end_overlapped_ex, d, x, y, z)
+#define __itt_task_end_overlapped_ex_ptr ITTNOTIFY_NAME(task_end_overlapped_ex)
+#else /* INTEL_NO_ITTNOTIFY_API */
+#define __itt_task_begin_overlapped_ex(domain, clock_domain, timestamp,        \
+                                       taskid, parentid, name)
+#define __itt_task_begin_overlapped_ex_ptr 0
+#define __itt_task_end_overlapped_ex(domain, clock_domain, timestamp, taskid)
+#define __itt_task_end_overlapped_ex_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#define __itt_task_begin_overlapped_ex_ptr      0
-#define __itt_task_end_overlapped_ptr           0
-#define __itt_task_end_overlapped_ex_ptr        0
+#else /* INTEL_NO_MACRO_BODY */
+#define __itt_task_begin_overlapped_ex_ptr 0
+#define __itt_task_end_overlapped_ptr 0
+#define __itt_task_end_overlapped_ex_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
@@ -3682,19 +4059,20 @@ ITT_STUBV(ITTAPI, void, task_end_overlapped_ex,         (const __itt_domain* dom
 typedef int __itt_mark_type;
 
 /**
- * @brief Creates a user mark type with the specified name using char or Unicode string.
+ * @brief Creates a user mark type with the specified name using char or Unicode
+ * string.
  * @param[in] name - name of mark to create
  * @return Returns a handle to the mark type
  */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-__itt_mark_type ITTAPI __itt_mark_createA(const char    *name);
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+__itt_mark_type ITTAPI __itt_mark_createA(const char *name);
 __itt_mark_type ITTAPI __itt_mark_createW(const wchar_t *name);
 #if defined(UNICODE) || defined(_UNICODE)
-#  define __itt_mark_create     __itt_mark_createW
-#  define __itt_mark_create_ptr __itt_mark_createW_ptr
+#define __itt_mark_create __itt_mark_createW
+#define __itt_mark_create_ptr __itt_mark_createW_ptr
 #else /* UNICODE */
-#  define __itt_mark_create     __itt_mark_createA
-#  define __itt_mark_create_ptr __itt_mark_createA_ptr
+#define __itt_mark_create __itt_mark_createA
+#define __itt_mark_create_ptr __itt_mark_createA_ptr
 #endif /* UNICODE */
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 __itt_mark_type ITTAPI __itt_mark_create(const char *name);
@@ -3703,63 +4081,68 @@ __itt_mark_type ITTAPI __itt_mark_create(const char *name);
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUB(ITTAPI, __itt_mark_type, mark_createA, (const char    *name))
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUB(ITTAPI, __itt_mark_type, mark_createA, (const char *name))
 ITT_STUB(ITTAPI, __itt_mark_type, mark_createW, (const wchar_t *name))
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-ITT_STUB(ITTAPI, __itt_mark_type, mark_create,  (const char *name))
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+ITT_STUB(ITTAPI, __itt_mark_type, mark_create, (const char *name))
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-#define __itt_mark_createA     ITTNOTIFY_DATA(mark_createA)
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define __itt_mark_createA ITTNOTIFY_DATA(mark_createA)
 #define __itt_mark_createA_ptr ITTNOTIFY_NAME(mark_createA)
-#define __itt_mark_createW     ITTNOTIFY_DATA(mark_createW)
+#define __itt_mark_createW ITTNOTIFY_DATA(mark_createW)
 #define __itt_mark_createW_ptr ITTNOTIFY_NAME(mark_createW)
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_mark_create      ITTNOTIFY_DATA(mark_create)
-#define __itt_mark_create_ptr  ITTNOTIFY_NAME(mark_create)
+#define __itt_mark_create ITTNOTIFY_DATA(mark_create)
+#define __itt_mark_create_ptr ITTNOTIFY_NAME(mark_create)
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_ITTNOTIFY_API */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_mark_createA(name) (__itt_mark_type)0
 #define __itt_mark_createA_ptr 0
 #define __itt_mark_createW(name) (__itt_mark_type)0
 #define __itt_mark_createW_ptr 0
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_mark_create(name)  (__itt_mark_type)0
-#define __itt_mark_create_ptr  0
+#define __itt_mark_create(name) (__itt_mark_type)0
+#define __itt_mark_create_ptr 0
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_MACRO_BODY */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_mark_createA_ptr 0
 #define __itt_mark_createW_ptr 0
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_mark_create_ptr  0
+#define __itt_mark_create_ptr 0
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
 /**
- * @brief Creates a "discrete" user mark type of the specified type and an optional parameter using char or Unicode string.
+ * @brief Creates a "discrete" user mark type of the specified type and an
+ * optional parameter using char or Unicode string.
  *
- * - The mark of "discrete" type is placed to collection results in case of success. It appears in overtime view(s) as a special tick sign.
- * - The call is "synchronous" - function returns after mark is actually added to results.
- * - This function is useful, for example, to mark 
diff erent phases of application
- *   (beginning of the next mark automatically meand end of current region).
- * - Can be used together with "continuous" marks (see below) at the same collection session
+ * - The mark of "discrete" type is placed to collection results in case of
+ * success. It appears in overtime view(s) as a special tick sign.
+ * - The call is "synchronous" - function returns after mark is actually added
+ * to results.
+ * - This function is useful, for example, to mark 
diff erent phases of
+ * application (beginning of the next mark automatically meand end of current
+ * region).
+ * - Can be used together with "continuous" marks (see below) at the same
+ * collection session
  * @param[in] mt - mark, created by __itt_mark_create(const char* name) function
  * @param[in] parameter - string parameter of mark
  * @return Returns zero value in case of success, non-zero value otherwise.
  */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-int ITTAPI __itt_markA(__itt_mark_type mt, const char    *parameter);
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+int ITTAPI __itt_markA(__itt_mark_type mt, const char *parameter);
 int ITTAPI __itt_markW(__itt_mark_type mt, const wchar_t *parameter);
 #if defined(UNICODE) || defined(_UNICODE)
-#  define __itt_mark     __itt_markW
-#  define __itt_mark_ptr __itt_markW_ptr
+#define __itt_mark __itt_markW
+#define __itt_mark_ptr __itt_markW_ptr
 #else /* UNICODE  */
-#  define __itt_mark     __itt_markA
-#  define __itt_mark_ptr __itt_markA_ptr
+#define __itt_mark __itt_markA
+#define __itt_mark_ptr __itt_markA_ptr
 #endif /* UNICODE */
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 int ITTAPI __itt_mark(__itt_mark_type mt, const char *parameter);
@@ -3768,56 +4151,56 @@ int ITTAPI __itt_mark(__itt_mark_type mt, const char *parameter);
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUB(ITTAPI, int, markA, (__itt_mark_type mt, const char    *parameter))
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUB(ITTAPI, int, markA, (__itt_mark_type mt, const char *parameter))
 ITT_STUB(ITTAPI, int, markW, (__itt_mark_type mt, const wchar_t *parameter))
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-ITT_STUB(ITTAPI, int, mark,  (__itt_mark_type mt, const char *parameter))
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+ITT_STUB(ITTAPI, int, mark, (__itt_mark_type mt, const char *parameter))
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-#define __itt_markA     ITTNOTIFY_DATA(markA)
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define __itt_markA ITTNOTIFY_DATA(markA)
 #define __itt_markA_ptr ITTNOTIFY_NAME(markA)
-#define __itt_markW     ITTNOTIFY_DATA(markW)
+#define __itt_markW ITTNOTIFY_DATA(markW)
 #define __itt_markW_ptr ITTNOTIFY_NAME(markW)
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_mark      ITTNOTIFY_DATA(mark)
-#define __itt_mark_ptr  ITTNOTIFY_NAME(mark)
+#define __itt_mark ITTNOTIFY_DATA(mark)
+#define __itt_mark_ptr ITTNOTIFY_NAME(mark)
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_ITTNOTIFY_API */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_markA(mt, parameter) (int)0
 #define __itt_markA_ptr 0
 #define __itt_markW(mt, parameter) (int)0
 #define __itt_markW_ptr 0
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_mark(mt, parameter)  (int)0
-#define __itt_mark_ptr  0
+#define __itt_mark(mt, parameter) (int)0
+#define __itt_mark_ptr 0
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_MACRO_BODY */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_markA_ptr 0
 #define __itt_markW_ptr 0
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_mark_ptr  0
+#define __itt_mark_ptr 0
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
 /**
- * @brief Use this if necessary to create a "discrete" user event type (mark) for process
- * rather then for one thread
+ * @brief Use this if necessary to create a "discrete" user event type (mark)
+ * for process rather then for one thread
  * @see int __itt_mark(__itt_mark_type mt, const char* parameter);
  */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-int ITTAPI __itt_mark_globalA(__itt_mark_type mt, const char    *parameter);
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+int ITTAPI __itt_mark_globalA(__itt_mark_type mt, const char *parameter);
 int ITTAPI __itt_mark_globalW(__itt_mark_type mt, const wchar_t *parameter);
 #if defined(UNICODE) || defined(_UNICODE)
-#  define __itt_mark_global     __itt_mark_globalW
-#  define __itt_mark_global_ptr __itt_mark_globalW_ptr
+#define __itt_mark_global __itt_mark_globalW
+#define __itt_mark_global_ptr __itt_mark_globalW_ptr
 #else /* UNICODE  */
-#  define __itt_mark_global     __itt_mark_globalA
-#  define __itt_mark_global_ptr __itt_mark_globalA_ptr
+#define __itt_mark_global __itt_mark_globalA
+#define __itt_mark_global_ptr __itt_mark_globalA_ptr
 #endif /* UNICODE */
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 int ITTAPI __itt_mark_global(__itt_mark_type mt, const char *parameter);
@@ -3826,38 +4209,39 @@ int ITTAPI __itt_mark_global(__itt_mark_type mt, const char *parameter);
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUB(ITTAPI, int, mark_globalA, (__itt_mark_type mt, const char    *parameter))
-ITT_STUB(ITTAPI, int, mark_globalW, (__itt_mark_type mt, const wchar_t *parameter))
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-ITT_STUB(ITTAPI, int, mark_global,  (__itt_mark_type mt, const char *parameter))
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUB(ITTAPI, int, mark_globalA, (__itt_mark_type mt, const char *parameter))
+ITT_STUB(ITTAPI, int, mark_globalW,
+         (__itt_mark_type mt, const wchar_t *parameter))
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+ITT_STUB(ITTAPI, int, mark_global, (__itt_mark_type mt, const char *parameter))
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-#define __itt_mark_globalA     ITTNOTIFY_DATA(mark_globalA)
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define __itt_mark_globalA ITTNOTIFY_DATA(mark_globalA)
 #define __itt_mark_globalA_ptr ITTNOTIFY_NAME(mark_globalA)
-#define __itt_mark_globalW     ITTNOTIFY_DATA(mark_globalW)
+#define __itt_mark_globalW ITTNOTIFY_DATA(mark_globalW)
 #define __itt_mark_globalW_ptr ITTNOTIFY_NAME(mark_globalW)
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_mark_global      ITTNOTIFY_DATA(mark_global)
-#define __itt_mark_global_ptr  ITTNOTIFY_NAME(mark_global)
+#define __itt_mark_global ITTNOTIFY_DATA(mark_global)
+#define __itt_mark_global_ptr ITTNOTIFY_NAME(mark_global)
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_ITTNOTIFY_API */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_mark_globalA(mt, parameter) (int)0
 #define __itt_mark_globalA_ptr 0
 #define __itt_mark_globalW(mt, parameter) (int)0
 #define __itt_mark_globalW_ptr 0
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_mark_global(mt, parameter)  (int)0
-#define __itt_mark_global_ptr  0
+#define __itt_mark_global(mt, parameter) (int)0
+#define __itt_mark_global_ptr 0
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_MACRO_BODY */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_mark_globalA_ptr 0
 #define __itt_mark_globalW_ptr 0
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_mark_global_ptr  0
+#define __itt_mark_global_ptr 0
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -3883,13 +4267,13 @@ int ITTAPI __itt_mark_off(__itt_mark_type mt);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUB(ITTAPI, int, mark_off, (__itt_mark_type mt))
-#define __itt_mark_off     ITTNOTIFY_DATA(mark_off)
+#define __itt_mark_off ITTNOTIFY_DATA(mark_off)
 #define __itt_mark_off_ptr ITTNOTIFY_NAME(mark_off)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_mark_off(mt) (int)0
 #define __itt_mark_off_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_mark_off_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -3904,13 +4288,13 @@ int ITTAPI __itt_mark_global_off(__itt_mark_type mt);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUB(ITTAPI, int, mark_global_off, (__itt_mark_type mt))
-#define __itt_mark_global_off     ITTNOTIFY_DATA(mark_global_off)
+#define __itt_mark_global_off ITTNOTIFY_DATA(mark_global_off)
 #define __itt_mark_global_off_ptr ITTNOTIFY_NAME(mark_global_off)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_mark_global_off(mt) (int)0
 #define __itt_mark_global_off_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_mark_global_off_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -3923,7 +4307,6 @@ ITT_STUB(ITTAPI, int, mark_global_off, (__itt_mark_type mt))
  * @{
  */
 
-
 /**
  * @defgroup stitch Stack Stitching
  * @ingroup internal
@@ -3936,8 +4319,9 @@ ITT_STUB(ITTAPI, int, mark_global_off, (__itt_mark_type mt))
 typedef struct ___itt_caller *__itt_caller;
 
 /**
- * @brief Create the stitch point e.g. a point in call stack where other stacks should be stitched to.
- * The function returns a unique identifier which is used to match the cut points with corresponding stitch points.
+ * @brief Create the stitch point e.g. a point in call stack where other stacks
+ * should be stitched to. The function returns a unique identifier which is used
+ * to match the cut points with corresponding stitch points.
  */
 __itt_caller ITTAPI __itt_stack_caller_create(void);
 
@@ -3945,19 +4329,20 @@ __itt_caller ITTAPI __itt_stack_caller_create(void);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUB(ITTAPI, __itt_caller, stack_caller_create, (void))
-#define __itt_stack_caller_create     ITTNOTIFY_DATA(stack_caller_create)
+#define __itt_stack_caller_create ITTNOTIFY_DATA(stack_caller_create)
 #define __itt_stack_caller_create_ptr ITTNOTIFY_NAME(stack_caller_create)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_stack_caller_create() (__itt_caller)0
 #define __itt_stack_caller_create_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_stack_caller_create_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
 /**
- * @brief Destroy the information about stitch point identified by the pointer previously returned by __itt_stack_caller_create()
+ * @brief Destroy the information about stitch point identified by the pointer
+ * previously returned by __itt_stack_caller_create()
  */
 void ITTAPI __itt_stack_caller_destroy(__itt_caller id);
 
@@ -3965,20 +4350,21 @@ void ITTAPI __itt_stack_caller_destroy(__itt_caller id);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(ITTAPI, void, stack_caller_destroy, (__itt_caller id))
-#define __itt_stack_caller_destroy     ITTNOTIFY_VOID(stack_caller_destroy)
+#define __itt_stack_caller_destroy ITTNOTIFY_VOID(stack_caller_destroy)
 #define __itt_stack_caller_destroy_ptr ITTNOTIFY_NAME(stack_caller_destroy)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_stack_caller_destroy(id)
 #define __itt_stack_caller_destroy_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_stack_caller_destroy_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
 /**
- * @brief Sets the cut point. Stack from each event which occurs after this call will be cut
- * at the same stack level the function was called and stitched to the corresponding stitch point.
+ * @brief Sets the cut point. Stack from each event which occurs after this call
+ * will be cut at the same stack level the function was called and stitched to
+ * the corresponding stitch point.
  */
 void ITTAPI __itt_stack_callee_enter(__itt_caller id);
 
@@ -3986,19 +4372,20 @@ void ITTAPI __itt_stack_callee_enter(__itt_caller id);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(ITTAPI, void, stack_callee_enter, (__itt_caller id))
-#define __itt_stack_callee_enter     ITTNOTIFY_VOID(stack_callee_enter)
+#define __itt_stack_callee_enter ITTNOTIFY_VOID(stack_callee_enter)
 #define __itt_stack_callee_enter_ptr ITTNOTIFY_NAME(stack_callee_enter)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_stack_callee_enter(id)
 #define __itt_stack_callee_enter_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_stack_callee_enter_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
 /**
- * @brief This function eliminates the cut point which was set by latest __itt_stack_callee_enter().
+ * @brief This function eliminates the cut point which was set by latest
+ * __itt_stack_callee_enter().
  */
 void ITTAPI __itt_stack_callee_leave(__itt_caller id);
 
@@ -4006,45 +4393,48 @@ void ITTAPI __itt_stack_callee_leave(__itt_caller id);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(ITTAPI, void, stack_callee_leave, (__itt_caller id))
-#define __itt_stack_callee_leave     ITTNOTIFY_VOID(stack_callee_leave)
+#define __itt_stack_callee_leave ITTNOTIFY_VOID(stack_callee_leave)
 #define __itt_stack_callee_leave_ptr ITTNOTIFY_NAME(stack_callee_leave)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_stack_callee_leave(id)
 #define __itt_stack_callee_leave_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_stack_callee_leave_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
 /** @} stitch group */
 
-/* ***************************************************************************************************************************** */
+/* *****************************************************************************************************************************
+ */
 
 #include <stdarg.h>
 
 /** @cond exclude_from_documentation */
-typedef enum __itt_error_code
-{
-    __itt_error_success       = 0, /*!< no error */
-    __itt_error_no_module     = 1, /*!< module can't be loaded */
-    /* %1$s -- library name; win: %2$d -- system error code; unx: %2$s -- system error message. */
-    __itt_error_no_symbol     = 2, /*!< symbol not found */
-    /* %1$s -- library name, %2$s -- symbol name. */
-    __itt_error_unknown_group = 3, /*!< unknown group specified */
-    /* %1$s -- env var name, %2$s -- group name. */
-    __itt_error_cant_read_env = 4, /*!< GetEnvironmentVariable() failed */
-    /* %1$s -- env var name, %2$d -- system error. */
-    __itt_error_env_too_long  = 5, /*!< variable value too long */
-    /* %1$s -- env var name, %2$d -- actual length of the var, %3$d -- max allowed length. */
-    __itt_error_system        = 6  /*!< pthread_mutexattr_init or pthread_mutex_init failed */
-    /* %1$s -- function name, %2$d -- errno. */
+typedef enum __itt_error_code {
+  __itt_error_success = 0, /*!< no error */
+  __itt_error_no_module = 1, /*!< module can't be loaded */
+  /* %1$s -- library name; win: %2$d -- system error code; unx: %2$s -- system
+     error message. */
+  __itt_error_no_symbol = 2, /*!< symbol not found */
+  /* %1$s -- library name, %2$s -- symbol name. */
+  __itt_error_unknown_group = 3, /*!< unknown group specified */
+  /* %1$s -- env var name, %2$s -- group name. */
+  __itt_error_cant_read_env = 4, /*!< GetEnvironmentVariable() failed */
+  /* %1$s -- env var name, %2$d -- system error. */
+  __itt_error_env_too_long = 5, /*!< variable value too long */
+  /* %1$s -- env var name, %2$d -- actual length of the var, %3$d -- max allowed
+     length. */
+  __itt_error_system =
+      6 /*!< pthread_mutexattr_init or pthread_mutex_init failed */
+  /* %1$s -- function name, %2$d -- errno. */
 } __itt_error_code;
 
-typedef void (__itt_error_handler_t)(__itt_error_code code, va_list);
-__itt_error_handler_t* __itt_set_error_handler(__itt_error_handler_t*);
+typedef void(__itt_error_handler_t)(__itt_error_code code, va_list);
+__itt_error_handler_t *__itt_set_error_handler(__itt_error_handler_t *);
 
-const char* ITTAPI __itt_api_version(void);
+const char *ITTAPI __itt_api_version(void);
 /** @endcond */
 
 /** @cond exclude_from_documentation */
@@ -4054,14 +4444,14 @@ const char* ITTAPI __itt_api_version(void);
 void __itt_error_handler(__itt_error_code code, va_list args);
 extern const int ITTNOTIFY_NAME(err);
 #define __itt_err ITTNOTIFY_NAME(err)
-ITT_STUB(ITTAPI, const char*, api_version, (void))
-#define __itt_api_version     ITTNOTIFY_DATA(api_version)
+ITT_STUB(ITTAPI, const char *, api_version, (void))
+#define __itt_api_version ITTNOTIFY_DATA(api_version)
 #define __itt_api_version_ptr ITTNOTIFY_NAME(api_version)
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#define __itt_api_version()   (const char*)0
+#else /* INTEL_NO_ITTNOTIFY_API */
+#define __itt_api_version() (const char *)0
 #define __itt_api_version_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_api_version_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */

diff  --git a/openmp/runtime/src/thirdparty/ittnotify/ittnotify_config.h b/openmp/runtime/src/thirdparty/ittnotify/ittnotify_config.h
index f231e70d181f..a49236b14885 100644
--- a/openmp/runtime/src/thirdparty/ittnotify/ittnotify_config.h
+++ b/openmp/runtime/src/thirdparty/ittnotify/ittnotify_config.h
@@ -12,59 +12,59 @@
 
 /** @cond exclude_from_documentation */
 #ifndef ITT_OS_WIN
-#  define ITT_OS_WIN   1
+#define ITT_OS_WIN 1
 #endif /* ITT_OS_WIN */
 
 #ifndef ITT_OS_LINUX
-#  define ITT_OS_LINUX 2
+#define ITT_OS_LINUX 2
 #endif /* ITT_OS_LINUX */
 
 #ifndef ITT_OS_MAC
-#  define ITT_OS_MAC   3
+#define ITT_OS_MAC 3
 #endif /* ITT_OS_MAC */
 
 #ifndef ITT_OS_FREEBSD
-#  define ITT_OS_FREEBSD   4
+#define ITT_OS_FREEBSD 4
 #endif /* ITT_OS_FREEBSD */
 
 #ifndef ITT_OS
-#  if defined WIN32 || defined _WIN32
-#    define ITT_OS ITT_OS_WIN
-#  elif defined( __APPLE__ ) && defined( __MACH__ )
-#    define ITT_OS ITT_OS_MAC
-#  elif defined( __FreeBSD__ )
-#    define ITT_OS ITT_OS_FREEBSD
-#  else
-#    define ITT_OS ITT_OS_LINUX
-#  endif
+#if defined WIN32 || defined _WIN32
+#define ITT_OS ITT_OS_WIN
+#elif defined(__APPLE__) && defined(__MACH__)
+#define ITT_OS ITT_OS_MAC
+#elif defined(__FreeBSD__)
+#define ITT_OS ITT_OS_FREEBSD
+#else
+#define ITT_OS ITT_OS_LINUX
+#endif
 #endif /* ITT_OS */
 
 #ifndef ITT_PLATFORM_WIN
-#  define ITT_PLATFORM_WIN 1
+#define ITT_PLATFORM_WIN 1
 #endif /* ITT_PLATFORM_WIN */
 
 #ifndef ITT_PLATFORM_POSIX
-#  define ITT_PLATFORM_POSIX 2
+#define ITT_PLATFORM_POSIX 2
 #endif /* ITT_PLATFORM_POSIX */
 
 #ifndef ITT_PLATFORM_MAC
-#  define ITT_PLATFORM_MAC 3
+#define ITT_PLATFORM_MAC 3
 #endif /* ITT_PLATFORM_MAC */
 
 #ifndef ITT_PLATFORM_FREEBSD
-#  define ITT_PLATFORM_FREEBSD 4
+#define ITT_PLATFORM_FREEBSD 4
 #endif /* ITT_PLATFORM_FREEBSD */
 
 #ifndef ITT_PLATFORM
-#  if ITT_OS==ITT_OS_WIN
-#    define ITT_PLATFORM ITT_PLATFORM_WIN
-#  elif ITT_OS==ITT_OS_MAC
-#    define ITT_PLATFORM ITT_PLATFORM_MAC
-#  elif ITT_OS==ITT_OS_FREEBSD
-#    define ITT_PLATFORM ITT_PLATFORM_FREEBSD
-#  else
-#    define ITT_PLATFORM ITT_PLATFORM_POSIX
-#  endif
+#if ITT_OS == ITT_OS_WIN
+#define ITT_PLATFORM ITT_PLATFORM_WIN
+#elif ITT_OS == ITT_OS_MAC
+#define ITT_PLATFORM ITT_PLATFORM_MAC
+#elif ITT_OS == ITT_OS_FREEBSD
+#define ITT_PLATFORM ITT_PLATFORM_FREEBSD
+#else
+#define ITT_PLATFORM ITT_PLATFORM_POSIX
+#endif
 #endif /* ITT_PLATFORM */
 
 #if defined(_UNICODE) && !defined(UNICODE)
@@ -72,9 +72,9 @@
 #endif
 
 #include <stddef.h>
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #include <tchar.h>
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #include <stdint.h>
 #if defined(UNICODE) || defined(_UNICODE)
 #include <wchar.h>
@@ -82,152 +82,156 @@
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
 #ifndef ITTAPI_CDECL
-#  if ITT_PLATFORM==ITT_PLATFORM_WIN
-#    define ITTAPI_CDECL __cdecl
-#  else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#    if defined _M_IX86 || defined __i386__
-#      define ITTAPI_CDECL __attribute__ ((cdecl))
-#    else  /* _M_IX86 || __i386__ */
-#      define ITTAPI_CDECL /* actual only on x86 platform */
-#    endif /* _M_IX86 || __i386__ */
-#  endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define ITTAPI_CDECL __cdecl
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#if defined _M_IX86 || defined __i386__
+#define ITTAPI_CDECL __attribute__((cdecl))
+#else /* _M_IX86 || __i386__ */
+#define ITTAPI_CDECL /* actual only on x86 platform */
+#endif /* _M_IX86 || __i386__ */
+#endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* ITTAPI_CDECL */
 
 #ifndef STDCALL
-#  if ITT_PLATFORM==ITT_PLATFORM_WIN
-#    define STDCALL __stdcall
-#  else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#    if defined _M_IX86 || defined __i386__
-#      define STDCALL __attribute__ ((stdcall))
-#    else  /* _M_IX86 || __i386__ */
-#      define STDCALL /* supported only on x86 platform */
-#    endif /* _M_IX86 || __i386__ */
-#  endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define STDCALL __stdcall
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#if defined _M_IX86 || defined __i386__
+#define STDCALL __attribute__((stdcall))
+#else /* _M_IX86 || __i386__ */
+#define STDCALL /* supported only on x86 platform */
+#endif /* _M_IX86 || __i386__ */
+#endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* STDCALL */
 
-#define ITTAPI    ITTAPI_CDECL
+#define ITTAPI ITTAPI_CDECL
 #define LIBITTAPI ITTAPI_CDECL
 
 /* TODO: Temporary for compatibility! */
-#define ITTAPI_CALL    ITTAPI_CDECL
+#define ITTAPI_CALL ITTAPI_CDECL
 #define LIBITTAPI_CALL ITTAPI_CDECL
 
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 /* use __forceinline (VC++ specific) */
-#define ITT_INLINE           __forceinline
+#define ITT_INLINE __forceinline
 #define ITT_INLINE_ATTRIBUTE /* nothing */
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 /*
  * Generally, functions are not inlined unless optimization is specified.
  * For functions declared inline, this attribute inlines the function even
  * if no optimization level was specified.
  */
 #ifdef __STRICT_ANSI__
-#define ITT_INLINE           static
+#define ITT_INLINE static
 #define ITT_INLINE_ATTRIBUTE __attribute__((unused))
-#else  /* __STRICT_ANSI__ */
-#define ITT_INLINE           static inline
+#else /* __STRICT_ANSI__ */
+#define ITT_INLINE static inline
 #define ITT_INLINE_ATTRIBUTE __attribute__((always_inline, unused))
 #endif /* __STRICT_ANSI__ */
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 /** @endcond */
 
 #ifndef ITT_ARCH_IA32
-#  define ITT_ARCH_IA32  1
+#define ITT_ARCH_IA32 1
 #endif /* ITT_ARCH_IA32 */
 
 #ifndef ITT_ARCH_IA32E
-#  define ITT_ARCH_IA32E 2
+#define ITT_ARCH_IA32E 2
 #endif /* ITT_ARCH_IA32E */
 
 /* Was there a magical reason we didn't have 3 here before? */
 #ifndef ITT_ARCH_AARCH64
-#  define ITT_ARCH_AARCH64  3
+#define ITT_ARCH_AARCH64 3
 #endif /* ITT_ARCH_AARCH64 */
 
 #ifndef ITT_ARCH_ARM
-#  define ITT_ARCH_ARM  4
+#define ITT_ARCH_ARM 4
 #endif /* ITT_ARCH_ARM */
 
 #ifndef ITT_ARCH_PPC64
-#  define ITT_ARCH_PPC64  5
+#define ITT_ARCH_PPC64 5
 #endif /* ITT_ARCH_PPC64 */
 
 #ifndef ITT_ARCH_MIPS
-#  define ITT_ARCH_MIPS  6
+#define ITT_ARCH_MIPS 6
 #endif /* ITT_ARCH_MIPS */
 
 #ifndef ITT_ARCH_MIPS64
-#  define ITT_ARCH_MIPS64  6
+#define ITT_ARCH_MIPS64 6
 #endif /* ITT_ARCH_MIPS64 */
 
 #ifndef ITT_ARCH_RISCV64
-#  define ITT_ARCH_RISCV64  7
+#define ITT_ARCH_RISCV64 7
 #endif /* ITT_ARCH_RISCV64 */
 
 #ifndef ITT_ARCH
-#  if defined _M_IX86 || defined __i386__
-#    define ITT_ARCH ITT_ARCH_IA32
-#  elif defined _M_X64 || defined _M_AMD64 || defined __x86_64__
-#    define ITT_ARCH ITT_ARCH_IA32E
-#  elif defined _M_IA64 || defined __ia64__
-#    define ITT_ARCH ITT_ARCH_IA64
-#  elif defined _M_ARM || defined __arm__
-#    define ITT_ARCH ITT_ARCH_ARM
-#  elif defined __powerpc64__
-#    define ITT_ARCH ITT_ARCH_PPC64
-#  elif defined __aarch64__
-#    define ITT_ARCH ITT_ARCH_AARCH64
-#  elif defined __mips__ && !defined __mips64
-#    define ITT_ARCH ITT_ARCH_MIPS
-#  elif defined __mips__ && defined __mips64
-#    define ITT_ARCH ITT_ARCH_MIPS64
-#  elif defined __riscv && __riscv_xlen == 64
-#    define ITT_ARCH ITT_ARCH_RISCV64
-#  endif
+#if defined _M_IX86 || defined __i386__
+#define ITT_ARCH ITT_ARCH_IA32
+#elif defined _M_X64 || defined _M_AMD64 || defined __x86_64__
+#define ITT_ARCH ITT_ARCH_IA32E
+#elif defined _M_IA64 || defined __ia64__
+#define ITT_ARCH ITT_ARCH_IA64
+#elif defined _M_ARM || defined __arm__
+#define ITT_ARCH ITT_ARCH_ARM
+#elif defined __powerpc64__
+#define ITT_ARCH ITT_ARCH_PPC64
+#elif defined __aarch64__
+#define ITT_ARCH ITT_ARCH_AARCH64
+#elif defined __mips__ && !defined __mips64
+#define ITT_ARCH ITT_ARCH_MIPS
+#elif defined __mips__ && defined __mips64
+#define ITT_ARCH ITT_ARCH_MIPS64
+#elif defined __riscv && __riscv_xlen == 64
+#define ITT_ARCH ITT_ARCH_RISCV64
+#endif
 #endif
 
 #ifdef __cplusplus
-#  define ITT_EXTERN_C extern "C"
-#  define ITT_EXTERN_C_BEGIN extern "C" {
-#  define ITT_EXTERN_C_END }
+#define ITT_EXTERN_C extern "C"
+#define ITT_EXTERN_C_BEGIN extern "C" {
+#define ITT_EXTERN_C_END }
 #else
-#  define ITT_EXTERN_C /* nothing */
-#  define ITT_EXTERN_C_BEGIN /* nothing */
-#  define ITT_EXTERN_C_END /* nothing */
+#define ITT_EXTERN_C /* nothing */
+#define ITT_EXTERN_C_BEGIN /* nothing */
+#define ITT_EXTERN_C_END /* nothing */
 #endif /* __cplusplus */
 
 #define ITT_TO_STR_AUX(x) #x
-#define ITT_TO_STR(x)     ITT_TO_STR_AUX(x)
+#define ITT_TO_STR(x) ITT_TO_STR_AUX(x)
 
-#define __ITT_BUILD_ASSERT(expr, suffix) do { \
-    static char __itt_build_check_##suffix[(expr) ? 1 : -1]; \
-    __itt_build_check_##suffix[0] = 0; \
-} while(0)
-#define _ITT_BUILD_ASSERT(expr, suffix)  __ITT_BUILD_ASSERT((expr), suffix)
-#define ITT_BUILD_ASSERT(expr)           _ITT_BUILD_ASSERT((expr), __LINE__)
+#define __ITT_BUILD_ASSERT(expr, suffix)                                       \
+  do {                                                                         \
+    static char __itt_build_check_##suffix[(expr) ? 1 : -1];                   \
+    __itt_build_check_##suffix[0] = 0;                                         \
+  } while (0)
+#define _ITT_BUILD_ASSERT(expr, suffix) __ITT_BUILD_ASSERT((expr), suffix)
+#define ITT_BUILD_ASSERT(expr) _ITT_BUILD_ASSERT((expr), __LINE__)
 
-#define ITT_MAGIC { 0xED, 0xAB, 0xAB, 0xEC, 0x0D, 0xEE, 0xDA, 0x30 }
+#define ITT_MAGIC                                                              \
+  { 0xED, 0xAB, 0xAB, 0xEC, 0x0D, 0xEE, 0xDA, 0x30 }
 
 /* Replace with snapshot date YYYYMMDD for promotion build. */
-#define API_VERSION_BUILD    20151119
+#define API_VERSION_BUILD 20151119
 
 #ifndef API_VERSION_NUM
 #define API_VERSION_NUM 0.0.0
 #endif /* API_VERSION_NUM */
 
-#define API_VERSION "ITT-API-Version " ITT_TO_STR(API_VERSION_NUM) \
-                                " (" ITT_TO_STR(API_VERSION_BUILD) ")"
+#define API_VERSION                                                            \
+  "ITT-API-Version " ITT_TO_STR(API_VERSION_NUM) " (" ITT_TO_STR(              \
+      API_VERSION_BUILD) ")"
 
 /* OS communication functions */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #include <windows.h>
-typedef HMODULE           lib_t;
-typedef DWORD             TIDT;
-typedef CRITICAL_SECTION  mutex_t;
-#define MUTEX_INITIALIZER { 0 }
+typedef HMODULE lib_t;
+typedef DWORD TIDT;
+typedef CRITICAL_SECTION mutex_t;
+#define MUTEX_INITIALIZER                                                      \
+  { 0 }
 #define strong_alias(name, aliasname) /* empty for Windows */
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #include <dlfcn.h>
 #if defined(UNICODE) || defined(_UNICODE)
 #include <wchar.h>
@@ -236,38 +240,39 @@ typedef CRITICAL_SECTION  mutex_t;
 #define _GNU_SOURCE 1 /* need for PTHREAD_MUTEX_RECURSIVE */
 #endif /* _GNU_SOURCE */
 #ifndef __USE_UNIX98
-#define __USE_UNIX98 1 /* need for PTHREAD_MUTEX_RECURSIVE, on SLES11.1 with gcc 4.3.4 wherein pthread.h missing dependency on __USE_XOPEN2K8 */
+#define __USE_UNIX98                                                           \
+  1 /* need for PTHREAD_MUTEX_RECURSIVE, on SLES11.1 with gcc 4.3.4 wherein    \
+       pthread.h missing dependency on __USE_XOPEN2K8 */
 #endif /*__USE_UNIX98*/
 #include <pthread.h>
-typedef void*             lib_t;
-typedef pthread_t         TIDT;
-typedef pthread_mutex_t   mutex_t;
+typedef void *lib_t;
+typedef pthread_t TIDT;
+typedef pthread_mutex_t mutex_t;
 #define MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
-#define _strong_alias(name, aliasname) \
-            extern __typeof (name) aliasname __attribute__ ((alias (#name)));
+#define _strong_alias(name, aliasname)                                         \
+  extern __typeof(name) aliasname __attribute__((alias(#name)));
 #define strong_alias(name, aliasname) _strong_alias(name, aliasname)
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_get_proc(lib, name) GetProcAddress(lib, name)
-#define __itt_mutex_init(mutex)   InitializeCriticalSection(mutex)
-#define __itt_mutex_lock(mutex)   EnterCriticalSection(mutex)
+#define __itt_mutex_init(mutex) InitializeCriticalSection(mutex)
+#define __itt_mutex_lock(mutex) EnterCriticalSection(mutex)
 #define __itt_mutex_unlock(mutex) LeaveCriticalSection(mutex)
-#define __itt_load_lib(name)      LoadLibraryA(name)
-#define __itt_unload_lib(handle)  FreeLibrary(handle)
-#define __itt_system_error()      (int)GetLastError()
-#define __itt_fstrcmp(s1, s2)     lstrcmpA(s1, s2)
-#define __itt_fstrnlen(s, l)      strnlen_s(s, l)
+#define __itt_load_lib(name) LoadLibraryA(name)
+#define __itt_unload_lib(handle) FreeLibrary(handle)
+#define __itt_system_error() (int)GetLastError()
+#define __itt_fstrcmp(s1, s2) lstrcmpA(s1, s2)
+#define __itt_fstrnlen(s, l) strnlen_s(s, l)
 #define __itt_fstrcpyn(s1, b, s2, l) strncpy_s(s1, b, s2, l)
-#define __itt_fstrdup(s)          _strdup(s)
-#define __itt_thread_id()         GetCurrentThreadId()
-#define __itt_thread_yield()      SwitchToThread()
+#define __itt_fstrdup(s) _strdup(s)
+#define __itt_thread_id() GetCurrentThreadId()
+#define __itt_thread_yield() SwitchToThread()
 #ifndef ITT_SIMPLE_INIT
 ITT_INLINE long
-__itt_interlocked_increment(volatile long* ptr) ITT_INLINE_ATTRIBUTE;
-ITT_INLINE long __itt_interlocked_increment(volatile long* ptr)
-{
-    return InterlockedIncrement(ptr);
+__itt_interlocked_increment(volatile long *ptr) ITT_INLINE_ATTRIBUTE;
+ITT_INLINE long __itt_interlocked_increment(volatile long *ptr) {
+  return InterlockedIncrement(ptr);
 }
 #endif /* ITT_SIMPLE_INIT */
 
@@ -276,38 +281,39 @@ ITT_INLINE long __itt_interlocked_increment(volatile long* ptr)
 
 #else /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
 #define __itt_get_proc(lib, name) dlsym(lib, name)
-#define __itt_mutex_init(mutex)   {\
-    pthread_mutexattr_t mutex_attr;                                         \
-    int error_code = pthread_mutexattr_init(&mutex_attr);                   \
-    if (error_code)                                                         \
-        __itt_report_error(__itt_error_system, "pthread_mutexattr_init",    \
-                           error_code);                                     \
-    error_code = pthread_mutexattr_settype(&mutex_attr,                     \
-                                           PTHREAD_MUTEX_RECURSIVE);        \
-    if (error_code)                                                         \
-        __itt_report_error(__itt_error_system, "pthread_mutexattr_settype", \
-                           error_code);                                     \
-    error_code = pthread_mutex_init(mutex, &mutex_attr);                    \
-    if (error_code)                                                         \
-        __itt_report_error(__itt_error_system, "pthread_mutex_init",        \
-                           error_code);                                     \
-    error_code = pthread_mutexattr_destroy(&mutex_attr);                    \
-    if (error_code)                                                         \
-        __itt_report_error(__itt_error_system, "pthread_mutexattr_destroy", \
-                           error_code);                                     \
-}
-#define __itt_mutex_lock(mutex)   pthread_mutex_lock(mutex)
+#define __itt_mutex_init(mutex)                                                \
+  {                                                                            \
+    pthread_mutexattr_t mutex_attr;                                            \
+    int error_code = pthread_mutexattr_init(&mutex_attr);                      \
+    if (error_code)                                                            \
+      __itt_report_error(__itt_error_system, "pthread_mutexattr_init",         \
+                         error_code);                                          \
+    error_code =                                                               \
+        pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE);       \
+    if (error_code)                                                            \
+      __itt_report_error(__itt_error_system, "pthread_mutexattr_settype",      \
+                         error_code);                                          \
+    error_code = pthread_mutex_init(mutex, &mutex_attr);                       \
+    if (error_code)                                                            \
+      __itt_report_error(__itt_error_system, "pthread_mutex_init",             \
+                         error_code);                                          \
+    error_code = pthread_mutexattr_destroy(&mutex_attr);                       \
+    if (error_code)                                                            \
+      __itt_report_error(__itt_error_system, "pthread_mutexattr_destroy",      \
+                         error_code);                                          \
+  }
+#define __itt_mutex_lock(mutex) pthread_mutex_lock(mutex)
 #define __itt_mutex_unlock(mutex) pthread_mutex_unlock(mutex)
-#define __itt_load_lib(name)      dlopen(name, RTLD_LAZY)
-#define __itt_unload_lib(handle)  dlclose(handle)
-#define __itt_system_error()      errno
-#define __itt_fstrcmp(s1, s2)     strcmp(s1, s2)
+#define __itt_load_lib(name) dlopen(name, RTLD_LAZY)
+#define __itt_unload_lib(handle) dlclose(handle)
+#define __itt_system_error() errno
+#define __itt_fstrcmp(s1, s2) strcmp(s1, s2)
 
 /* makes customer code define safe APIs for SDL_STRNLEN_S and SDL_STRNCPY_S */
 #ifdef SDL_STRNLEN_S
-#define __itt_fstrnlen(s, l)      SDL_STRNLEN_S(s, l)
+#define __itt_fstrnlen(s, l) SDL_STRNLEN_S(s, l)
 #else
-#define __itt_fstrnlen(s, l)      strlen(s)
+#define __itt_fstrnlen(s, l) strlen(s)
 #endif /* SDL_STRNLEN_S */
 #ifdef SDL_STRNCPY_S
 #define __itt_fstrcpyn(s1, b, s2, l) SDL_STRNCPY_S(s1, b, s2, l)
@@ -315,26 +321,26 @@ ITT_INLINE long __itt_interlocked_increment(volatile long* ptr)
 #define __itt_fstrcpyn(s1, b, s2, l) strncpy(s1, s2, l)
 #endif /* SDL_STRNCPY_S */
 
-#define __itt_fstrdup(s)          strdup(s)
-#define __itt_thread_id()         pthread_self()
-#define __itt_thread_yield()      sched_yield()
-#if ITT_ARCH==ITT_ARCH_IA64
+#define __itt_fstrdup(s) strdup(s)
+#define __itt_thread_id() pthread_self()
+#define __itt_thread_yield() sched_yield()
+#if ITT_ARCH == ITT_ARCH_IA64
 #ifdef __INTEL_COMPILER
 #define __TBB_machine_fetchadd4(addr, val) __fetchadd4_acq((void *)addr, val)
-#else  /* __INTEL_COMPILER */
+#else /* __INTEL_COMPILER */
 /* TODO: Add Support for not Intel compilers for IA-64 architecture */
 #endif /* __INTEL_COMPILER */
-#elif ITT_ARCH==ITT_ARCH_IA32 || ITT_ARCH==ITT_ARCH_IA32E /* ITT_ARCH!=ITT_ARCH_IA64 */
-ITT_INLINE long
-__TBB_machine_fetchadd4(volatile void* ptr, long addend) ITT_INLINE_ATTRIBUTE;
-ITT_INLINE long __TBB_machine_fetchadd4(volatile void* ptr, long addend)
-{
-    long result;
-    __asm__ __volatile__("lock\nxadd %0,%1"
-                          : "=r"(result),"=m"(*(volatile int*)ptr)
-                          : "0"(addend), "m"(*(volatile int*)ptr)
-                          : "memory");
-    return result;
+#elif ITT_ARCH == ITT_ARCH_IA32 ||                                             \
+    ITT_ARCH == ITT_ARCH_IA32E /* ITT_ARCH!=ITT_ARCH_IA64 */
+ITT_INLINE long __TBB_machine_fetchadd4(volatile void *ptr,
+                                        long addend) ITT_INLINE_ATTRIBUTE;
+ITT_INLINE long __TBB_machine_fetchadd4(volatile void *ptr, long addend) {
+  long result;
+  __asm__ __volatile__("lock\nxadd %0,%1"
+                       : "=r"(result), "=m"(*(volatile int *)ptr)
+                       : "0"(addend), "m"(*(volatile int *)ptr)
+                       : "memory");
+  return result;
 }
 #elif ITT_ARCH == ITT_ARCH_ARM || ITT_ARCH == ITT_ARCH_PPC64 ||                \
     ITT_ARCH == ITT_ARCH_AARCH64 || ITT_ARCH == ITT_ARCH_MIPS ||               \
@@ -343,253 +349,259 @@ ITT_INLINE long __TBB_machine_fetchadd4(volatile void* ptr, long addend)
 #endif /* ITT_ARCH==ITT_ARCH_IA64 */
 #ifndef ITT_SIMPLE_INIT
 ITT_INLINE long
-__itt_interlocked_increment(volatile long* ptr) ITT_INLINE_ATTRIBUTE;
-ITT_INLINE long __itt_interlocked_increment(volatile long* ptr)
-{
-    return __TBB_machine_fetchadd4(ptr, 1) + 1L;
+__itt_interlocked_increment(volatile long *ptr) ITT_INLINE_ATTRIBUTE;
+ITT_INLINE long __itt_interlocked_increment(volatile long *ptr) {
+  return __TBB_machine_fetchadd4(ptr, 1) + 1L;
 }
 #endif /* ITT_SIMPLE_INIT */
 
-void* dlopen(const char*, int) __attribute__((weak));
-void* dlsym(void*, const char*) __attribute__((weak));
-int dlclose(void*) __attribute__((weak));
+void *dlopen(const char *, int) __attribute__((weak));
+void *dlsym(void *, const char *) __attribute__((weak));
+int dlclose(void *) __attribute__((weak));
 #define DL_SYMBOLS (dlopen && dlsym && dlclose)
 
-int pthread_mutex_init(pthread_mutex_t*, const pthread_mutexattr_t*) __attribute__((weak));
-int pthread_mutex_lock(pthread_mutex_t*) __attribute__((weak));
-int pthread_mutex_unlock(pthread_mutex_t*) __attribute__((weak));
-int pthread_mutex_destroy(pthread_mutex_t*) __attribute__((weak));
-int pthread_mutexattr_init(pthread_mutexattr_t*) __attribute__((weak));
-int pthread_mutexattr_settype(pthread_mutexattr_t*, int) __attribute__((weak));
-int pthread_mutexattr_destroy(pthread_mutexattr_t*) __attribute__((weak));
+int pthread_mutex_init(pthread_mutex_t *, const pthread_mutexattr_t *)
+    __attribute__((weak));
+int pthread_mutex_lock(pthread_mutex_t *) __attribute__((weak));
+int pthread_mutex_unlock(pthread_mutex_t *) __attribute__((weak));
+int pthread_mutex_destroy(pthread_mutex_t *) __attribute__((weak));
+int pthread_mutexattr_init(pthread_mutexattr_t *) __attribute__((weak));
+int pthread_mutexattr_settype(pthread_mutexattr_t *, int) __attribute__((weak));
+int pthread_mutexattr_destroy(pthread_mutexattr_t *) __attribute__((weak));
 pthread_t pthread_self(void) __attribute__((weak));
-#define PTHREAD_SYMBOLS (pthread_mutex_init && pthread_mutex_lock && pthread_mutex_unlock && pthread_mutex_destroy && pthread_mutexattr_init && pthread_mutexattr_settype && pthread_mutexattr_destroy && pthread_self)
+#define PTHREAD_SYMBOLS                                                        \
+  (pthread_mutex_init && pthread_mutex_lock && pthread_mutex_unlock &&         \
+   pthread_mutex_destroy && pthread_mutexattr_init &&                          \
+   pthread_mutexattr_settype && pthread_mutexattr_destroy && pthread_self)
 
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
 typedef enum {
-    __itt_collection_normal = 0,
-    __itt_collection_paused = 1
+  __itt_collection_normal = 0,
+  __itt_collection_paused = 1
 } __itt_collection_state;
 
 typedef enum {
-    __itt_thread_normal  = 0,
-    __itt_thread_ignored = 1
+  __itt_thread_normal = 0,
+  __itt_thread_ignored = 1
 } __itt_thread_state;
 
 #pragma pack(push, 8)
 
-typedef struct ___itt_thread_info
-{
-    const char* nameA; /*!< Copy of original name in ASCII. */
+typedef struct ___itt_thread_info {
+  const char *nameA; /*!< Copy of original name in ASCII. */
 #if defined(UNICODE) || defined(_UNICODE)
-    const wchar_t* nameW; /*!< Copy of original name in UNICODE. */
-#else  /* UNICODE || _UNICODE */
-    void* nameW;
+  const wchar_t *nameW; /*!< Copy of original name in UNICODE. */
+#else /* UNICODE || _UNICODE */
+  void *nameW;
 #endif /* UNICODE || _UNICODE */
-    TIDT               tid;
-    __itt_thread_state state;   /*!< Thread state (paused or normal) */
-    int                extra1;  /*!< Reserved to the runtime */
-    void*              extra2;  /*!< Reserved to the runtime */
-    struct ___itt_thread_info* next;
+  TIDT tid;
+  __itt_thread_state state; /*!< Thread state (paused or normal) */
+  int extra1; /*!< Reserved to the runtime */
+  void *extra2; /*!< Reserved to the runtime */
+  struct ___itt_thread_info *next;
 } __itt_thread_info;
 
 #include "ittnotify_types.h" /* For __itt_group_id definition */
 
-typedef struct ___itt_api_info_20101001
-{
-    const char*    name;
-    void**         func_ptr;
-    void*          init_func;
-    __itt_group_id group;
-}  __itt_api_info_20101001;
-
-typedef struct ___itt_api_info
-{
-    const char*    name;
-    void**         func_ptr;
-    void*          init_func;
-    void*          null_func;
-    __itt_group_id group;
-}  __itt_api_info;
-
-typedef struct __itt_counter_info
-{
-    const char* nameA;  /*!< Copy of original name in ASCII. */
+typedef struct ___itt_api_info_20101001 {
+  const char *name;
+  void **func_ptr;
+  void *init_func;
+  __itt_group_id group;
+} __itt_api_info_20101001;
+
+typedef struct ___itt_api_info {
+  const char *name;
+  void **func_ptr;
+  void *init_func;
+  void *null_func;
+  __itt_group_id group;
+} __itt_api_info;
+
+typedef struct __itt_counter_info {
+  const char *nameA; /*!< Copy of original name in ASCII. */
 #if defined(UNICODE) || defined(_UNICODE)
-    const wchar_t* nameW; /*!< Copy of original name in UNICODE. */
-#else  /* UNICODE || _UNICODE */
-    void* nameW;
+  const wchar_t *nameW; /*!< Copy of original name in UNICODE. */
+#else /* UNICODE || _UNICODE */
+  void *nameW;
 #endif /* UNICODE || _UNICODE */
-    const char* domainA;  /*!< Copy of original name in ASCII. */
+  const char *domainA; /*!< Copy of original name in ASCII. */
 #if defined(UNICODE) || defined(_UNICODE)
-    const wchar_t* domainW; /*!< Copy of original name in UNICODE. */
-#else  /* UNICODE || _UNICODE */
-    void* domainW;
+  const wchar_t *domainW; /*!< Copy of original name in UNICODE. */
+#else /* UNICODE || _UNICODE */
+  void *domainW;
 #endif /* UNICODE || _UNICODE */
-    int type;
-    long index;
-    int   extra1; /*!< Reserved to the runtime */
-    void* extra2; /*!< Reserved to the runtime */
-    struct __itt_counter_info* next;
-}  __itt_counter_info_t;
+  int type;
+  long index;
+  int extra1; /*!< Reserved to the runtime */
+  void *extra2; /*!< Reserved to the runtime */
+  struct __itt_counter_info *next;
+} __itt_counter_info_t;
 
 struct ___itt_domain;
 struct ___itt_string_handle;
 
-typedef struct ___itt_global
-{
-    unsigned char          magic[8];
-    unsigned long          version_major;
-    unsigned long          version_minor;
-    unsigned long          version_build;
-    volatile long          api_initialized;
-    volatile long          mutex_initialized;
-    volatile long          atomic_counter;
-    mutex_t                mutex;
-    lib_t                  lib;
-    void*                  error_handler;
-    const char**           dll_path_ptr;
-    __itt_api_info*        api_list_ptr;
-    struct ___itt_global*  next;
-    /* Joinable structures below */
-    __itt_thread_info*     thread_list;
-    struct ___itt_domain*  domain_list;
-    struct ___itt_string_handle* string_list;
-    __itt_collection_state state;
-    __itt_counter_info_t* counter_list;
+typedef struct ___itt_global {
+  unsigned char magic[8];
+  unsigned long version_major;
+  unsigned long version_minor;
+  unsigned long version_build;
+  volatile long api_initialized;
+  volatile long mutex_initialized;
+  volatile long atomic_counter;
+  mutex_t mutex;
+  lib_t lib;
+  void *error_handler;
+  const char **dll_path_ptr;
+  __itt_api_info *api_list_ptr;
+  struct ___itt_global *next;
+  /* Joinable structures below */
+  __itt_thread_info *thread_list;
+  struct ___itt_domain *domain_list;
+  struct ___itt_string_handle *string_list;
+  __itt_collection_state state;
+  __itt_counter_info_t *counter_list;
 } __itt_global;
 
 #pragma pack(pop)
 
-#define NEW_THREAD_INFO_W(gptr,h,h_tail,t,s,n) { \
-    h = (__itt_thread_info*)malloc(sizeof(__itt_thread_info)); \
-    if (h != NULL) { \
-        h->tid    = t; \
-        h->nameA  = NULL; \
-        h->nameW  = n ? _wcsdup(n) : NULL; \
-        h->state  = s; \
-        h->extra1 = 0;    /* reserved */ \
-        h->extra2 = NULL; /* reserved */ \
-        h->next   = NULL; \
-        if (h_tail == NULL) \
-            (gptr)->thread_list = h; \
-        else \
-            h_tail->next = h; \
-    } \
-}
-
-#define NEW_THREAD_INFO_A(gptr,h,h_tail,t,s,n) { \
-    h = (__itt_thread_info*)malloc(sizeof(__itt_thread_info)); \
-    if (h != NULL) { \
-        h->tid    = t; \
-        h->nameA  = n ? __itt_fstrdup(n) : NULL; \
-        h->nameW  = NULL; \
-        h->state  = s; \
-        h->extra1 = 0;    /* reserved */ \
-        h->extra2 = NULL; /* reserved */ \
-        h->next   = NULL; \
-        if (h_tail == NULL) \
-            (gptr)->thread_list = h; \
-        else \
-            h_tail->next = h; \
-    } \
-}
-
-#define NEW_DOMAIN_W(gptr,h,h_tail,name) { \
-    h = (__itt_domain*)malloc(sizeof(__itt_domain)); \
-    if (h != NULL) { \
-        h->flags  = 1;    /* domain is enabled by default */ \
-        h->nameA  = NULL; \
-        h->nameW  = name ? _wcsdup(name) : NULL; \
-        h->extra1 = 0;    /* reserved */ \
-        h->extra2 = NULL; /* reserved */ \
-        h->next   = NULL; \
-        if (h_tail == NULL) \
-            (gptr)->domain_list = h; \
-        else \
-            h_tail->next = h; \
-    } \
-}
-
-#define NEW_DOMAIN_A(gptr,h,h_tail,name) { \
-    h = (__itt_domain*)malloc(sizeof(__itt_domain)); \
-    if (h != NULL) { \
-        h->flags  = 1;    /* domain is enabled by default */ \
-        h->nameA  = name ? __itt_fstrdup(name) : NULL; \
-        h->nameW  = NULL; \
-        h->extra1 = 0;    /* reserved */ \
-        h->extra2 = NULL; /* reserved */ \
-        h->next   = NULL; \
-        if (h_tail == NULL) \
-            (gptr)->domain_list = h; \
-        else \
-            h_tail->next = h; \
-    } \
-}
-
-#define NEW_STRING_HANDLE_W(gptr,h,h_tail,name) { \
-    h = (__itt_string_handle*)malloc(sizeof(__itt_string_handle)); \
-    if (h != NULL) { \
-        h->strA   = NULL; \
-        h->strW   = name ? _wcsdup(name) : NULL; \
-        h->extra1 = 0;    /* reserved */ \
-        h->extra2 = NULL; /* reserved */ \
-        h->next   = NULL; \
-        if (h_tail == NULL) \
-            (gptr)->string_list = h; \
-        else \
-            h_tail->next = h; \
-    } \
-}
-
-#define NEW_STRING_HANDLE_A(gptr,h,h_tail,name) { \
-    h = (__itt_string_handle*)malloc(sizeof(__itt_string_handle)); \
-    if (h != NULL) { \
-        h->strA   = name ? __itt_fstrdup(name) : NULL; \
-        h->strW   = NULL; \
-        h->extra1 = 0;    /* reserved */ \
-        h->extra2 = NULL; /* reserved */ \
-        h->next   = NULL; \
-        if (h_tail == NULL) \
-            (gptr)->string_list = h; \
-        else \
-            h_tail->next = h; \
-    } \
-}
-
-#define NEW_COUNTER_W(gptr,h,h_tail,name,domain,type) { \
-    h = (__itt_counter_info_t*)malloc(sizeof(__itt_counter_info_t)); \
-    if (h != NULL) { \
-        h->nameA   = NULL; \
-        h->nameW   = name ? _wcsdup(name) : NULL; \
-        h->domainA   = NULL; \
-        h->domainW   = name ? _wcsdup(domain) : NULL; \
-        h->type = type; \
-        h->index = 0; \
-        h->next   = NULL; \
-        if (h_tail == NULL) \
-            (gptr)->counter_list = h; \
-        else \
-            h_tail->next = h; \
-    } \
-}
-
-#define NEW_COUNTER_A(gptr,h,h_tail,name,domain,type) { \
-    h = (__itt_counter_info_t*)malloc(sizeof(__itt_counter_info_t)); \
-    if (h != NULL) { \
-        h->nameA   = name ? __itt_fstrdup(name) : NULL; \
-        h->nameW   = NULL; \
-        h->domainA   = domain ? __itt_fstrdup(domain) : NULL; \
-        h->domainW   = NULL; \
-        h->type = type; \
-        h->index = 0; \
-        h->next   = NULL; \
-        if (h_tail == NULL) \
-            (gptr)->counter_list = h; \
-        else \
-            h_tail->next = h; \
-    } \
-}
+#define NEW_THREAD_INFO_W(gptr, h, h_tail, t, s, n)                            \
+  {                                                                            \
+    h = (__itt_thread_info *)malloc(sizeof(__itt_thread_info));                \
+    if (h != NULL) {                                                           \
+      h->tid = t;                                                              \
+      h->nameA = NULL;                                                         \
+      h->nameW = n ? _wcsdup(n) : NULL;                                        \
+      h->state = s;                                                            \
+      h->extra1 = 0; /* reserved */                                            \
+      h->extra2 = NULL; /* reserved */                                         \
+      h->next = NULL;                                                          \
+      if (h_tail == NULL)                                                      \
+        (gptr)->thread_list = h;                                               \
+      else                                                                     \
+        h_tail->next = h;                                                      \
+    }                                                                          \
+  }
+
+#define NEW_THREAD_INFO_A(gptr, h, h_tail, t, s, n)                            \
+  {                                                                            \
+    h = (__itt_thread_info *)malloc(sizeof(__itt_thread_info));                \
+    if (h != NULL) {                                                           \
+      h->tid = t;                                                              \
+      h->nameA = n ? __itt_fstrdup(n) : NULL;                                  \
+      h->nameW = NULL;                                                         \
+      h->state = s;                                                            \
+      h->extra1 = 0; /* reserved */                                            \
+      h->extra2 = NULL; /* reserved */                                         \
+      h->next = NULL;                                                          \
+      if (h_tail == NULL)                                                      \
+        (gptr)->thread_list = h;                                               \
+      else                                                                     \
+        h_tail->next = h;                                                      \
+    }                                                                          \
+  }
+
+#define NEW_DOMAIN_W(gptr, h, h_tail, name)                                    \
+  {                                                                            \
+    h = (__itt_domain *)malloc(sizeof(__itt_domain));                          \
+    if (h != NULL) {                                                           \
+      h->flags = 1; /* domain is enabled by default */                         \
+      h->nameA = NULL;                                                         \
+      h->nameW = name ? _wcsdup(name) : NULL;                                  \
+      h->extra1 = 0; /* reserved */                                            \
+      h->extra2 = NULL; /* reserved */                                         \
+      h->next = NULL;                                                          \
+      if (h_tail == NULL)                                                      \
+        (gptr)->domain_list = h;                                               \
+      else                                                                     \
+        h_tail->next = h;                                                      \
+    }                                                                          \
+  }
+
+#define NEW_DOMAIN_A(gptr, h, h_tail, name)                                    \
+  {                                                                            \
+    h = (__itt_domain *)malloc(sizeof(__itt_domain));                          \
+    if (h != NULL) {                                                           \
+      h->flags = 1; /* domain is enabled by default */                         \
+      h->nameA = name ? __itt_fstrdup(name) : NULL;                            \
+      h->nameW = NULL;                                                         \
+      h->extra1 = 0; /* reserved */                                            \
+      h->extra2 = NULL; /* reserved */                                         \
+      h->next = NULL;                                                          \
+      if (h_tail == NULL)                                                      \
+        (gptr)->domain_list = h;                                               \
+      else                                                                     \
+        h_tail->next = h;                                                      \
+    }                                                                          \
+  }
+
+#define NEW_STRING_HANDLE_W(gptr, h, h_tail, name)                             \
+  {                                                                            \
+    h = (__itt_string_handle *)malloc(sizeof(__itt_string_handle));            \
+    if (h != NULL) {                                                           \
+      h->strA = NULL;                                                          \
+      h->strW = name ? _wcsdup(name) : NULL;                                   \
+      h->extra1 = 0; /* reserved */                                            \
+      h->extra2 = NULL; /* reserved */                                         \
+      h->next = NULL;                                                          \
+      if (h_tail == NULL)                                                      \
+        (gptr)->string_list = h;                                               \
+      else                                                                     \
+        h_tail->next = h;                                                      \
+    }                                                                          \
+  }
+
+#define NEW_STRING_HANDLE_A(gptr, h, h_tail, name)                             \
+  {                                                                            \
+    h = (__itt_string_handle *)malloc(sizeof(__itt_string_handle));            \
+    if (h != NULL) {                                                           \
+      h->strA = name ? __itt_fstrdup(name) : NULL;                             \
+      h->strW = NULL;                                                          \
+      h->extra1 = 0; /* reserved */                                            \
+      h->extra2 = NULL; /* reserved */                                         \
+      h->next = NULL;                                                          \
+      if (h_tail == NULL)                                                      \
+        (gptr)->string_list = h;                                               \
+      else                                                                     \
+        h_tail->next = h;                                                      \
+    }                                                                          \
+  }
+
+#define NEW_COUNTER_W(gptr, h, h_tail, name, domain, type)                     \
+  {                                                                            \
+    h = (__itt_counter_info_t *)malloc(sizeof(__itt_counter_info_t));          \
+    if (h != NULL) {                                                           \
+      h->nameA = NULL;                                                         \
+      h->nameW = name ? _wcsdup(name) : NULL;                                  \
+      h->domainA = NULL;                                                       \
+      h->domainW = name ? _wcsdup(domain) : NULL;                              \
+      h->type = type;                                                          \
+      h->index = 0;                                                            \
+      h->next = NULL;                                                          \
+      if (h_tail == NULL)                                                      \
+        (gptr)->counter_list = h;                                              \
+      else                                                                     \
+        h_tail->next = h;                                                      \
+    }                                                                          \
+  }
+
+#define NEW_COUNTER_A(gptr, h, h_tail, name, domain, type)                     \
+  {                                                                            \
+    h = (__itt_counter_info_t *)malloc(sizeof(__itt_counter_info_t));          \
+    if (h != NULL) {                                                           \
+      h->nameA = name ? __itt_fstrdup(name) : NULL;                            \
+      h->nameW = NULL;                                                         \
+      h->domainA = domain ? __itt_fstrdup(domain) : NULL;                      \
+      h->domainW = NULL;                                                       \
+      h->type = type;                                                          \
+      h->index = 0;                                                            \
+      h->next = NULL;                                                          \
+      if (h_tail == NULL)                                                      \
+        (gptr)->counter_list = h;                                              \
+      else                                                                     \
+        h_tail->next = h;                                                      \
+    }                                                                          \
+  }
 
 #endif /* _ITTNOTIFY_CONFIG_H_ */

diff  --git a/openmp/runtime/src/thirdparty/ittnotify/ittnotify_static.cpp b/openmp/runtime/src/thirdparty/ittnotify/ittnotify_static.cpp
index 4936b9baaf80..eae3c7615cd7 100644
--- a/openmp/runtime/src/thirdparty/ittnotify/ittnotify_static.cpp
+++ b/openmp/runtime/src/thirdparty/ittnotify/ittnotify_static.cpp
@@ -11,7 +11,7 @@
 #include "kmp_os.h"
 #include "ittnotify_config.h"
 
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #if defined(__MINGW32__)
 #include <limits.h>
 #else
@@ -38,14 +38,14 @@
 
 static const char api_version[] = API_VERSION "\0\n@(#) $Revision: 481659 $\n";
 
-#define _N_(n) ITT_JOIN(INTEL_ITTNOTIFY_PREFIX,n)
+#define _N_(n) ITT_JOIN(INTEL_ITTNOTIFY_PREFIX, n)
 
-#if ITT_OS==ITT_OS_WIN
-static const char* ittnotify_lib_name = "libittnotify.dll";
-#elif ITT_OS==ITT_OS_LINUX || ITT_OS==ITT_OS_FREEBSD
-static const char* ittnotify_lib_name = "libittnotify.so";
-#elif ITT_OS==ITT_OS_MAC
-static const char* ittnotify_lib_name = "libittnotify.dylib";
+#if ITT_OS == ITT_OS_WIN
+static const char *ittnotify_lib_name = "libittnotify.dll";
+#elif ITT_OS == ITT_OS_LINUX || ITT_OS == ITT_OS_FREEBSD
+static const char *ittnotify_lib_name = "libittnotify.so";
+#elif ITT_OS == ITT_OS_MAC
+static const char *ittnotify_lib_name = "libittnotify.dylib";
 #else
 #error Unsupported or unknown OS.
 #endif
@@ -60,26 +60,34 @@ static const char* ittnotify_lib_name = "libittnotify.dylib";
 #include <linux/limits.h>
 
 #ifdef ITT_ANDROID_LOG
-    #define ITT_ANDROID_LOG_TAG   "INTEL_VTUNE_USERAPI"
-    #define ITT_ANDROID_LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, ITT_ANDROID_LOG_TAG, __VA_ARGS__))
-    #define ITT_ANDROID_LOGW(...) ((void)__android_log_print(ANDROID_LOG_WARN, ITT_ANDROID_LOG_TAG, __VA_ARGS__))
-    #define ITT_ANDROID_LOGE(...) ((void)__android_log_print(ANDROID_LOG_ERROR,ITT_ANDROID_LOG_TAG, __VA_ARGS__))
-    #define ITT_ANDROID_LOGD(...) ((void)__android_log_print(ANDROID_LOG_DEBUG,ITT_ANDROID_LOG_TAG, __VA_ARGS__))
+#define ITT_ANDROID_LOG_TAG "INTEL_VTUNE_USERAPI"
+#define ITT_ANDROID_LOGI(...)                                                  \
+  ((void)__android_log_print(ANDROID_LOG_INFO, ITT_ANDROID_LOG_TAG,            \
+                             __VA_ARGS__))
+#define ITT_ANDROID_LOGW(...)                                                  \
+  ((void)__android_log_print(ANDROID_LOG_WARN, ITT_ANDROID_LOG_TAG,            \
+                             __VA_ARGS__))
+#define ITT_ANDROID_LOGE(...)                                                  \
+  ((void)__android_log_print(ANDROID_LOG_ERROR, ITT_ANDROID_LOG_TAG,           \
+                             __VA_ARGS__))
+#define ITT_ANDROID_LOGD(...)                                                  \
+  ((void)__android_log_print(ANDROID_LOG_DEBUG, ITT_ANDROID_LOG_TAG,           \
+                             __VA_ARGS__))
 #else
-    #define ITT_ANDROID_LOGI(...)
-    #define ITT_ANDROID_LOGW(...)
-    #define ITT_ANDROID_LOGE(...)
-    #define ITT_ANDROID_LOGD(...)
+#define ITT_ANDROID_LOGI(...)
+#define ITT_ANDROID_LOGW(...)
+#define ITT_ANDROID_LOGE(...)
+#define ITT_ANDROID_LOGD(...)
 #endif
 
 /* default location of userapi collector on Android */
-#define ANDROID_ITTNOTIFY_DEFAULT_PATH_MASK(x)  "/data/data/com.intel.vtune/perfrun/lib" \
-                                                #x "/runtime/libittnotify.so"
+#define ANDROID_ITTNOTIFY_DEFAULT_PATH_MASK(x)                                 \
+  "/data/data/com.intel.vtune/perfrun/lib" #x "/runtime/libittnotify.so"
 
-#if ITT_ARCH==ITT_ARCH_IA32 || ITT_ARCH==ITT_ARCH_ARM
-#define ANDROID_ITTNOTIFY_DEFAULT_PATH  ANDROID_ITTNOTIFY_DEFAULT_PATH_MASK(32)
+#if ITT_ARCH == ITT_ARCH_IA32 || ITT_ARCH == ITT_ARCH_ARM
+#define ANDROID_ITTNOTIFY_DEFAULT_PATH ANDROID_ITTNOTIFY_DEFAULT_PATH_MASK(32)
 #else
-#define ANDROID_ITTNOTIFY_DEFAULT_PATH  ANDROID_ITTNOTIFY_DEFAULT_PATH_MASK(64)
+#define ANDROID_ITTNOTIFY_DEFAULT_PATH ANDROID_ITTNOTIFY_DEFAULT_PATH_MASK(64)
 #endif
 
 #endif
@@ -88,94 +96,99 @@ static const char* ittnotify_lib_name = "libittnotify.dylib";
 #define PATH_MAX 4096
 #endif
 
-
 #ifndef LIB_VAR_NAME
-#if ITT_ARCH==ITT_ARCH_IA32 || ITT_ARCH==ITT_ARCH_ARM || ITT_ARCH==ITT_ARCH_MIPS
+#if ITT_ARCH == ITT_ARCH_IA32 || ITT_ARCH == ITT_ARCH_ARM ||                   \
+    ITT_ARCH == ITT_ARCH_MIPS
 #define LIB_VAR_NAME INTEL_LIBITTNOTIFY32
 #else
 #define LIB_VAR_NAME INTEL_LIBITTNOTIFY64
 #endif
 #endif /* LIB_VAR_NAME */
 
-#define ITT_MUTEX_INIT_AND_LOCK(p) {                                 \
-    if (PTHREAD_SYMBOLS)                                             \
-    {                                                                \
-        if (!p.mutex_initialized)                                    \
-        {                                                            \
-            if (__itt_interlocked_increment(&p.atomic_counter) == 1) \
-            {                                                        \
-                __itt_mutex_init(&p.mutex);                          \
-                p.mutex_initialized = 1;                             \
-            }                                                        \
-            else                                                     \
-                while (!p.mutex_initialized)                         \
-                    __itt_thread_yield();                            \
-        }                                                            \
-        __itt_mutex_lock(&p.mutex);                                  \
-    }                                                                \
-}
-
-typedef int (__itt_init_ittlib_t)(const char*, __itt_group_id);
+#define ITT_MUTEX_INIT_AND_LOCK(p)                                             \
+  {                                                                            \
+    if (PTHREAD_SYMBOLS) {                                                     \
+      if (!p.mutex_initialized) {                                              \
+        if (__itt_interlocked_increment(&p.atomic_counter) == 1) {             \
+          __itt_mutex_init(&p.mutex);                                          \
+          p.mutex_initialized = 1;                                             \
+        } else                                                                 \
+          while (!p.mutex_initialized)                                         \
+            __itt_thread_yield();                                              \
+      }                                                                        \
+      __itt_mutex_lock(&p.mutex);                                              \
+    }                                                                          \
+  }
+
+typedef int(__itt_init_ittlib_t)(const char *, __itt_group_id);
 
 /* this define used to control initialization function name. */
 #ifndef __itt_init_ittlib_name
-ITT_EXTERN_C int _N_(init_ittlib)(const char*, __itt_group_id);
-static __itt_init_ittlib_t* __itt_init_ittlib_ptr = _N_(init_ittlib);
+ITT_EXTERN_C int _N_(init_ittlib)(const char *, __itt_group_id);
+static __itt_init_ittlib_t *__itt_init_ittlib_ptr = _N_(init_ittlib);
 #define __itt_init_ittlib_name __itt_init_ittlib_ptr
 #endif /* __itt_init_ittlib_name */
 
-typedef void (__itt_fini_ittlib_t)(void);
+typedef void(__itt_fini_ittlib_t)(void);
 
 /* this define used to control finalization function name. */
 #ifndef __itt_fini_ittlib_name
 ITT_EXTERN_C void _N_(fini_ittlib)(void);
-static __itt_fini_ittlib_t* __itt_fini_ittlib_ptr = _N_(fini_ittlib);
+static __itt_fini_ittlib_t *__itt_fini_ittlib_ptr = _N_(fini_ittlib);
 #define __itt_fini_ittlib_name __itt_fini_ittlib_ptr
 #endif /* __itt_fini_ittlib_name */
 
 /* building pointers to imported funcs */
 #undef ITT_STUBV
 #undef ITT_STUB
-#define ITT_STUB(api,type,name,args,params,ptr,group,format)   \
-static type api ITT_VERSIONIZE(ITT_JOIN(_N_(name),_init)) args;\
-typedef type api ITT_JOIN(_N_(name),_t) args;                  \
-ITT_EXTERN_C_BEGIN ITT_JOIN(_N_(name),_t)* ITTNOTIFY_NAME(name) = ITT_VERSIONIZE(ITT_JOIN(_N_(name),_init)); ITT_EXTERN_C_END \
-static type api ITT_VERSIONIZE(ITT_JOIN(_N_(name),_init)) args \
-{                                                              \
-    __itt_init_ittlib_name(NULL, __itt_group_all);             \
-    if (ITTNOTIFY_NAME(name) && ITTNOTIFY_NAME(name) != ITT_VERSIONIZE(ITT_JOIN(_N_(name),_init))) \
-        return ITTNOTIFY_NAME(name) params;                    \
-    else                                                       \
-        return (type)0;                                        \
-}
-
-#define ITT_STUBV(api,type,name,args,params,ptr,group,format)  \
-static type api ITT_VERSIONIZE(ITT_JOIN(_N_(name),_init)) args;\
-typedef type api ITT_JOIN(_N_(name),_t) args;                  \
-ITT_EXTERN_C_BEGIN ITT_JOIN(_N_(name),_t)* ITTNOTIFY_NAME(name) = ITT_VERSIONIZE(ITT_JOIN(_N_(name),_init)); ITT_EXTERN_C_END \
-static type api ITT_VERSIONIZE(ITT_JOIN(_N_(name),_init)) args \
-{                                                              \
-    __itt_init_ittlib_name(NULL, __itt_group_all);             \
-    if (ITTNOTIFY_NAME(name) && ITTNOTIFY_NAME(name) != ITT_VERSIONIZE(ITT_JOIN(_N_(name),_init))) \
-        ITTNOTIFY_NAME(name) params;                           \
-    else                                                       \
-        return;                                                \
-}
+#define ITT_STUB(api, type, name, args, params, ptr, group, format)            \
+  static type api ITT_VERSIONIZE(ITT_JOIN(_N_(name), _init)) args;             \
+  typedef type api ITT_JOIN(_N_(name), _t) args;                               \
+  ITT_EXTERN_C_BEGIN ITT_JOIN(_N_(name), _t) * ITTNOTIFY_NAME(name) =          \
+      ITT_VERSIONIZE(ITT_JOIN(_N_(name), _init));                              \
+  ITT_EXTERN_C_END                                                             \
+  static type api ITT_VERSIONIZE(ITT_JOIN(_N_(name), _init)) args {            \
+    __itt_init_ittlib_name(NULL, __itt_group_all);                             \
+    if (ITTNOTIFY_NAME(name) &&                                                \
+        ITTNOTIFY_NAME(name) != ITT_VERSIONIZE(ITT_JOIN(_N_(name), _init)))    \
+      return ITTNOTIFY_NAME(name) params;                                      \
+    else                                                                       \
+      return (type)0;                                                          \
+  }
+
+#define ITT_STUBV(api, type, name, args, params, ptr, group, format)           \
+  static type api ITT_VERSIONIZE(ITT_JOIN(_N_(name), _init)) args;             \
+  typedef type api ITT_JOIN(_N_(name), _t) args;                               \
+  ITT_EXTERN_C_BEGIN ITT_JOIN(_N_(name), _t) * ITTNOTIFY_NAME(name) =          \
+      ITT_VERSIONIZE(ITT_JOIN(_N_(name), _init));                              \
+  ITT_EXTERN_C_END                                                             \
+  static type api ITT_VERSIONIZE(ITT_JOIN(_N_(name), _init)) args {            \
+    __itt_init_ittlib_name(NULL, __itt_group_all);                             \
+    if (ITTNOTIFY_NAME(name) &&                                                \
+        ITTNOTIFY_NAME(name) != ITT_VERSIONIZE(ITT_JOIN(_N_(name), _init)))    \
+      ITTNOTIFY_NAME(name) params;                                             \
+    else                                                                       \
+      return;                                                                  \
+  }
 
 #undef __ITT_INTERNAL_INIT
 #include "ittnotify_static.h"
 
 #undef ITT_STUB
 #undef ITT_STUBV
-#define ITT_STUB(api,type,name,args,params,ptr,group,format)   \
-static type api ITT_VERSIONIZE(ITT_JOIN(_N_(name),_init)) args;\
-typedef type api ITT_JOIN(_N_(name),_t) args;                  \
-ITT_EXTERN_C_BEGIN ITT_JOIN(_N_(name),_t)* ITTNOTIFY_NAME(name) = ITT_VERSIONIZE(ITT_JOIN(_N_(name),_init)); ITT_EXTERN_C_END
-
-#define ITT_STUBV(api,type,name,args,params,ptr,group,format)  \
-static type api ITT_VERSIONIZE(ITT_JOIN(_N_(name),_init)) args;\
-typedef type api ITT_JOIN(_N_(name),_t) args;                  \
-ITT_EXTERN_C_BEGIN ITT_JOIN(_N_(name),_t)* ITTNOTIFY_NAME(name) = ITT_VERSIONIZE(ITT_JOIN(_N_(name),_init)); ITT_EXTERN_C_END
+#define ITT_STUB(api, type, name, args, params, ptr, group, format)            \
+  static type api ITT_VERSIONIZE(ITT_JOIN(_N_(name), _init)) args;             \
+  typedef type api ITT_JOIN(_N_(name), _t) args;                               \
+  ITT_EXTERN_C_BEGIN ITT_JOIN(_N_(name), _t) * ITTNOTIFY_NAME(name) =          \
+      ITT_VERSIONIZE(ITT_JOIN(_N_(name), _init));                              \
+  ITT_EXTERN_C_END
+
+#define ITT_STUBV(api, type, name, args, params, ptr, group, format)           \
+  static type api ITT_VERSIONIZE(ITT_JOIN(_N_(name), _init)) args;             \
+  typedef type api ITT_JOIN(_N_(name), _t) args;                               \
+  ITT_EXTERN_C_BEGIN ITT_JOIN(_N_(name), _t) * ITTNOTIFY_NAME(name) =          \
+      ITT_VERSIONIZE(ITT_JOIN(_N_(name), _init));                              \
+  ITT_EXTERN_C_END
 
 #define __ITT_INTERNAL_INIT
 #include "ittnotify_static.h"
@@ -185,31 +198,44 @@ ITT_GROUP_LIST(group_list);
 
 #pragma pack(push, 8)
 
-typedef struct ___itt_group_alias
-{
-    const char*    env_var;
-    __itt_group_id groups;
+typedef struct ___itt_group_alias {
+  const char *env_var;
+  __itt_group_id groups;
 } __itt_group_alias;
 
 static __itt_group_alias group_alias[] = {
-    { "KMP_FOR_TPROFILE", (__itt_group_id)(__itt_group_control | __itt_group_thread | __itt_group_sync  | __itt_group_mark) },
-    { "KMP_FOR_TCHECK",   (__itt_group_id)(__itt_group_control | __itt_group_thread | __itt_group_sync  | __itt_group_fsync | __itt_group_mark | __itt_group_suppress) },
-    { NULL,               (__itt_group_none) },
-    { api_version,        (__itt_group_none) } /* !!! Just to avoid unused code elimination !!! */
+    {"KMP_FOR_TPROFILE",
+     (__itt_group_id)(__itt_group_control | __itt_group_thread |
+                      __itt_group_sync | __itt_group_mark)},
+    {"KMP_FOR_TCHECK",
+     (__itt_group_id)(__itt_group_control | __itt_group_thread |
+                      __itt_group_sync | __itt_group_fsync | __itt_group_mark |
+                      __itt_group_suppress)},
+    {NULL, (__itt_group_none)},
+    {api_version,
+     (__itt_group_none)} /* !!! Just to avoid unused code elimination !!! */
 };
 
 #pragma pack(pop)
 
-#if ITT_PLATFORM==ITT_PLATFORM_WIN && KMP_MSVC_COMPAT
+// clang-format off
+#if ITT_PLATFORM == ITT_PLATFORM_WIN && KMP_MSVC_COMPAT
 #pragma warning(push)
-#pragma warning(disable: 4054) /* warning C4054: 'type cast' : from function pointer 'XXX' to data pointer 'void *' */
+#pragma warning(disable: 4054) /* warning C4054: 'type cast' : from function
+                                  pointer 'XXX' to data pointer 'void *' */
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+// clang-format onĂ¥
 
 static __itt_api_info api_list[] = {
 /* Define functions with static implementation */
 #undef ITT_STUB
 #undef ITT_STUBV
-#define ITT_STUB(api,type,name,args,params,nameindll,group,format) { ITT_TO_STR(ITT_JOIN(__itt_,nameindll)), (void**)(void*)&ITTNOTIFY_NAME(name), (void*)(size_t)&ITT_VERSIONIZE(ITT_JOIN(_N_(name),_init)), (void*)(size_t)&ITT_VERSIONIZE(ITT_JOIN(_N_(name),_init)), (__itt_group_id)(group)},
+#define ITT_STUB(api, type, name, args, params, nameindll, group, format)      \
+  {ITT_TO_STR(ITT_JOIN(__itt_, nameindll)),                                    \
+   (void **)(void *)&ITTNOTIFY_NAME(name),                                     \
+   (void *)(size_t)&ITT_VERSIONIZE(ITT_JOIN(_N_(name), _init)),                \
+   (void *)(size_t)&ITT_VERSIONIZE(ITT_JOIN(_N_(name), _init)),                \
+   (__itt_group_id)(group)},
 #define ITT_STUBV ITT_STUB
 #define __ITT_INTERNAL_INIT
 #include "ittnotify_static.h"
@@ -217,38 +243,43 @@ static __itt_api_info api_list[] = {
 /* Define functions without static implementation */
 #undef ITT_STUB
 #undef ITT_STUBV
-#define ITT_STUB(api,type,name,args,params,nameindll,group,format) {ITT_TO_STR(ITT_JOIN(__itt_,nameindll)), (void**)(void*)&ITTNOTIFY_NAME(name), (void*)(size_t)&ITT_VERSIONIZE(ITT_JOIN(_N_(name),_init)), NULL, (__itt_group_id)(group)},
+#define ITT_STUB(api, type, name, args, params, nameindll, group, format)      \
+  {ITT_TO_STR(ITT_JOIN(__itt_, nameindll)),                                    \
+   (void **)(void *)&ITTNOTIFY_NAME(name),                                     \
+   (void *)(size_t)&ITT_VERSIONIZE(ITT_JOIN(_N_(name), _init)), NULL,          \
+   (__itt_group_id)(group)},
 #define ITT_STUBV ITT_STUB
 #include "ittnotify_static.h"
-    {NULL, NULL, NULL, NULL, __itt_group_none}
-};
+    {NULL, NULL, NULL, NULL, __itt_group_none}};
 
-#if ITT_PLATFORM==ITT_PLATFORM_WIN && KMP_MSVC_COMPAT
+#if ITT_PLATFORM == ITT_PLATFORM_WIN && KMP_MSVC_COMPAT
 #pragma warning(pop)
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
 /* static part descriptor which handles. all notification api attributes. */
 __itt_global _N_(_ittapi_global) = {
-    ITT_MAGIC,                                     /* identification info */
-    ITT_MAJOR, ITT_MINOR, API_VERSION_BUILD,       /* version info */
-    0,                                             /* api_initialized */
-    0,                                             /* mutex_initialized */
-    0,                                             /* atomic_counter */
-    MUTEX_INITIALIZER,                             /* mutex */
-    NULL,                                          /* dynamic library handle */
-    NULL,                                          /* error_handler */
-    NULL,                                          /* dll_path_ptr */
-    (__itt_api_info*)&api_list,                    /* api_list_ptr */
-    NULL,                                          /* next __itt_global */
-    NULL,                                          /* thread_list */
-    NULL,                                          /* domain_list */
-    NULL,                                          /* string_list */
-    __itt_collection_normal,                       /* collection state */
-    NULL                                          /* counter_list */
+    ITT_MAGIC, /* identification info */
+    ITT_MAJOR,
+    ITT_MINOR,
+    API_VERSION_BUILD, /* version info */
+    0, /* api_initialized */
+    0, /* mutex_initialized */
+    0, /* atomic_counter */
+    MUTEX_INITIALIZER, /* mutex */
+    NULL, /* dynamic library handle */
+    NULL, /* error_handler */
+    NULL, /* dll_path_ptr */
+    (__itt_api_info *)&api_list, /* api_list_ptr */
+    NULL, /* next __itt_global */
+    NULL, /* thread_list */
+    NULL, /* domain_list */
+    NULL, /* string_list */
+    __itt_collection_normal, /* collection state */
+    NULL /* counter_list */
 };
 
-typedef void (__itt_api_init_t)(__itt_global*, __itt_group_id);
-typedef void (__itt_api_fini_t)(__itt_global*);
+typedef void(__itt_api_init_t)(__itt_global *, __itt_group_id);
+typedef void(__itt_api_fini_t)(__itt_global *);
 
 /* ========================================================================= */
 
@@ -256,508 +287,526 @@ typedef void (__itt_api_fini_t)(__itt_global*);
 ITT_EXTERN_C void _N_(error_handler)(__itt_error_code, va_list args);
 #endif /* ITT_NOTIFY_EXT_REPORT */
 
-#if ITT_PLATFORM==ITT_PLATFORM_WIN && KMP_MSVC_COMPAT
+// clang-format off
+#if ITT_PLATFORM == ITT_PLATFORM_WIN && KMP_MSVC_COMPAT
 #pragma warning(push)
-#pragma warning(disable: 4055) /* warning C4055: 'type cast' : from data pointer 'void *' to function pointer 'XXX' */
+#pragma warning(disable: 4055) /* warning C4055: 'type cast' : from data pointer
+                                  'void *' to function pointer 'XXX' */
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-
-static void __itt_report_error(unsigned code_arg, ...)
-{
-    va_list args;
-    va_start(args, code_arg);
-
-    // We use unsigned for the code argument and explicitly cast it here to the
-    // right enumerator because variadic functions are not compatible with
-    // default promotions.
-    __itt_error_code code = (__itt_error_code)code_arg;
-
-    if (_N_(_ittapi_global).error_handler != NULL)
-    {
-        __itt_error_handler_t* handler = (__itt_error_handler_t*)(size_t)_N_(_ittapi_global).error_handler;
-        handler(code, args);
-    }
+// clang-format on
+
+static void __itt_report_error(unsigned code_arg, ...) {
+  va_list args;
+  va_start(args, code_arg);
+
+  // We use unsigned for the code argument and explicitly cast it here to the
+  // right enumerator because variadic functions are not compatible with
+  // default promotions.
+  __itt_error_code code = (__itt_error_code)code_arg;
+
+  if (_N_(_ittapi_global).error_handler != NULL) {
+    __itt_error_handler_t *handler =
+        (__itt_error_handler_t *)(size_t)_N_(_ittapi_global).error_handler;
+    handler(code, args);
+  }
 #ifdef ITT_NOTIFY_EXT_REPORT
-    _N_(error_handler)(code, args);
+  _N_(error_handler)(code, args);
 #endif /* ITT_NOTIFY_EXT_REPORT */
-    va_end(args);
+  va_end(args);
 }
 
-#if ITT_PLATFORM==ITT_PLATFORM_WIN && KMP_MSVC_COMPAT
+#if ITT_PLATFORM == ITT_PLATFORM_WIN && KMP_MSVC_COMPAT
 #pragma warning(pop)
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-static __itt_domain* ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(domain_createW),_init))(const wchar_t* name)
-{
-    __itt_domain *h_tail = NULL, *h = NULL;
-
-    if (name == NULL)
-    {
-        return NULL;
-    }
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+static __itt_domain *ITTAPI
+ITT_VERSIONIZE(ITT_JOIN(_N_(domain_createW), _init))(const wchar_t *name) {
+  __itt_domain *h_tail = NULL, *h = NULL;
 
-    ITT_MUTEX_INIT_AND_LOCK(_N_(_ittapi_global));
-    if (_N_(_ittapi_global).api_initialized)
-    {
-        if (ITTNOTIFY_NAME(domain_createW) && ITTNOTIFY_NAME(domain_createW) != ITT_VERSIONIZE(ITT_JOIN(_N_(domain_createW),_init)))
-        {
-            __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
-            return ITTNOTIFY_NAME(domain_createW)(name);
-        }
-    }
-    for (h_tail = NULL, h = _N_(_ittapi_global).domain_list; h != NULL; h_tail = h, h = h->next)
-    {
-        if (h->nameW != NULL && !wcscmp(h->nameW, name)) break;
-    }
-    if (h == NULL)
-    {
-        NEW_DOMAIN_W(&_N_(_ittapi_global),h,h_tail,name);
+  if (name == NULL) {
+    return NULL;
+  }
+
+  ITT_MUTEX_INIT_AND_LOCK(_N_(_ittapi_global));
+  if (_N_(_ittapi_global).api_initialized) {
+    if (ITTNOTIFY_NAME(domain_createW) &&
+        ITTNOTIFY_NAME(domain_createW) !=
+            ITT_VERSIONIZE(ITT_JOIN(_N_(domain_createW), _init))) {
+      __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+      return ITTNOTIFY_NAME(domain_createW)(name);
     }
-    if (PTHREAD_SYMBOLS) __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
-    return h;
+  }
+  for (h_tail = NULL, h = _N_(_ittapi_global).domain_list; h != NULL;
+       h_tail = h, h = h->next) {
+    if (h->nameW != NULL && !wcscmp(h->nameW, name))
+      break;
+  }
+  if (h == NULL) {
+    NEW_DOMAIN_W(&_N_(_ittapi_global), h, h_tail, name);
+  }
+  if (PTHREAD_SYMBOLS)
+    __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+  return h;
 }
 
-static __itt_domain* ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(domain_createA),_init))(const char* name)
-#else  /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
-static __itt_domain* ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(domain_create),_init))(const char* name)
+static __itt_domain *ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(domain_createA),
+                                                    _init))(const char *name)
+#else /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
+static __itt_domain *ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(domain_create),
+                                                    _init))(const char *name)
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 {
-    __itt_domain *h_tail = NULL, *h = NULL;
+  __itt_domain *h_tail = NULL, *h = NULL;
 
-    if (name == NULL)
-    {
-        return NULL;
+  if (name == NULL) {
+    return NULL;
+  }
+
+  ITT_MUTEX_INIT_AND_LOCK(_N_(_ittapi_global));
+  if (_N_(_ittapi_global).api_initialized) {
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+    if (ITTNOTIFY_NAME(domain_createA) &&
+        ITTNOTIFY_NAME(domain_createA) !=
+            ITT_VERSIONIZE(ITT_JOIN(_N_(domain_createA), _init))) {
+      __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+      return ITTNOTIFY_NAME(domain_createA)(name);
     }
-
-    ITT_MUTEX_INIT_AND_LOCK(_N_(_ittapi_global));
-    if (_N_(_ittapi_global).api_initialized)
-    {
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-        if (ITTNOTIFY_NAME(domain_createA) && ITTNOTIFY_NAME(domain_createA) != ITT_VERSIONIZE(ITT_JOIN(_N_(domain_createA),_init)))
-        {
-            __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
-            return ITTNOTIFY_NAME(domain_createA)(name);
-        }
 #else
-        if (ITTNOTIFY_NAME(domain_create) && ITTNOTIFY_NAME(domain_create) != ITT_VERSIONIZE(ITT_JOIN(_N_(domain_create),_init)))
-        {
-            if (PTHREAD_SYMBOLS) __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
-            return ITTNOTIFY_NAME(domain_create)(name);
-        }
-#endif
-    }
-    for (h_tail = NULL, h = _N_(_ittapi_global).domain_list; h != NULL; h_tail = h, h = h->next)
-    {
-        if (h->nameA != NULL && !__itt_fstrcmp(h->nameA, name)) break;
-    }
-    if (h == NULL)
-    {
-        NEW_DOMAIN_A(&_N_(_ittapi_global),h,h_tail,name);
+    if (ITTNOTIFY_NAME(domain_create) &&
+        ITTNOTIFY_NAME(domain_create) !=
+            ITT_VERSIONIZE(ITT_JOIN(_N_(domain_create), _init))) {
+      if (PTHREAD_SYMBOLS)
+        __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+      return ITTNOTIFY_NAME(domain_create)(name);
     }
-    if (PTHREAD_SYMBOLS) __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
-    return h;
+#endif
+  }
+  for (h_tail = NULL, h = _N_(_ittapi_global).domain_list; h != NULL;
+       h_tail = h, h = h->next) {
+    if (h->nameA != NULL && !__itt_fstrcmp(h->nameA, name))
+      break;
+  }
+  if (h == NULL) {
+    NEW_DOMAIN_A(&_N_(_ittapi_global), h, h_tail, name);
+  }
+  if (PTHREAD_SYMBOLS)
+    __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+  return h;
 }
 
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-static __itt_string_handle* ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(string_handle_createW),_init))(const wchar_t* name)
-{
-    __itt_string_handle *h_tail = NULL, *h = NULL;
-
-    if (name == NULL)
-    {
-        return NULL;
-    }
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+static __itt_string_handle *ITTAPI ITT_VERSIONIZE(
+    ITT_JOIN(_N_(string_handle_createW), _init))(const wchar_t *name) {
+  __itt_string_handle *h_tail = NULL, *h = NULL;
 
-    ITT_MUTEX_INIT_AND_LOCK(_N_(_ittapi_global));
-    if (_N_(_ittapi_global).api_initialized)
-    {
-        if (ITTNOTIFY_NAME(string_handle_createW) && ITTNOTIFY_NAME(string_handle_createW) != ITT_VERSIONIZE(ITT_JOIN(_N_(string_handle_createW),_init)))
-        {
-            __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
-            return ITTNOTIFY_NAME(string_handle_createW)(name);
-        }
-    }
-    for (h_tail = NULL, h = _N_(_ittapi_global).string_list; h != NULL; h_tail = h, h = h->next)
-    {
-        if (h->strW != NULL && !wcscmp(h->strW, name)) break;
-    }
-    if (h == NULL)
-    {
-        NEW_STRING_HANDLE_W(&_N_(_ittapi_global),h,h_tail,name);
+  if (name == NULL) {
+    return NULL;
+  }
+
+  ITT_MUTEX_INIT_AND_LOCK(_N_(_ittapi_global));
+  if (_N_(_ittapi_global).api_initialized) {
+    if (ITTNOTIFY_NAME(string_handle_createW) &&
+        ITTNOTIFY_NAME(string_handle_createW) !=
+            ITT_VERSIONIZE(ITT_JOIN(_N_(string_handle_createW), _init))) {
+      __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+      return ITTNOTIFY_NAME(string_handle_createW)(name);
     }
-    __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
-    return h;
+  }
+  for (h_tail = NULL, h = _N_(_ittapi_global).string_list; h != NULL;
+       h_tail = h, h = h->next) {
+    if (h->strW != NULL && !wcscmp(h->strW, name))
+      break;
+  }
+  if (h == NULL) {
+    NEW_STRING_HANDLE_W(&_N_(_ittapi_global), h, h_tail, name);
+  }
+  __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+  return h;
 }
 
-static __itt_string_handle* ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(string_handle_createA),_init))(const char* name)
-#else  /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
-static __itt_string_handle* ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(string_handle_create),_init))(const char* name)
+static __itt_string_handle *ITTAPI
+ITT_VERSIONIZE(ITT_JOIN(_N_(string_handle_createA), _init))(const char *name)
+#else /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
+static __itt_string_handle *ITTAPI
+ITT_VERSIONIZE(ITT_JOIN(_N_(string_handle_create), _init))(const char *name)
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 {
-    __itt_string_handle *h_tail = NULL, *h = NULL;
+  __itt_string_handle *h_tail = NULL, *h = NULL;
 
-    if (name == NULL)
-    {
-        return NULL;
+  if (name == NULL) {
+    return NULL;
+  }
+
+  ITT_MUTEX_INIT_AND_LOCK(_N_(_ittapi_global));
+  if (_N_(_ittapi_global).api_initialized) {
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+    if (ITTNOTIFY_NAME(string_handle_createA) &&
+        ITTNOTIFY_NAME(string_handle_createA) !=
+            ITT_VERSIONIZE(ITT_JOIN(_N_(string_handle_createA), _init))) {
+      __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+      return ITTNOTIFY_NAME(string_handle_createA)(name);
     }
-
-    ITT_MUTEX_INIT_AND_LOCK(_N_(_ittapi_global));
-    if (_N_(_ittapi_global).api_initialized)
-    {
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-        if (ITTNOTIFY_NAME(string_handle_createA) && ITTNOTIFY_NAME(string_handle_createA) != ITT_VERSIONIZE(ITT_JOIN(_N_(string_handle_createA),_init)))
-        {
-            __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
-            return ITTNOTIFY_NAME(string_handle_createA)(name);
-        }
 #else
-        if (ITTNOTIFY_NAME(string_handle_create) && ITTNOTIFY_NAME(string_handle_create) != ITT_VERSIONIZE(ITT_JOIN(_N_(string_handle_create),_init)))
-        {
-            if (PTHREAD_SYMBOLS) __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
-            return ITTNOTIFY_NAME(string_handle_create)(name);
-        }
-#endif
-    }
-    for (h_tail = NULL, h = _N_(_ittapi_global).string_list; h != NULL; h_tail = h, h = h->next)
-    {
-        if (h->strA != NULL && !__itt_fstrcmp(h->strA, name)) break;
+    if (ITTNOTIFY_NAME(string_handle_create) &&
+        ITTNOTIFY_NAME(string_handle_create) !=
+            ITT_VERSIONIZE(ITT_JOIN(_N_(string_handle_create), _init))) {
+      if (PTHREAD_SYMBOLS)
+        __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+      return ITTNOTIFY_NAME(string_handle_create)(name);
     }
-    if (h == NULL)
-    {
-        NEW_STRING_HANDLE_A(&_N_(_ittapi_global),h,h_tail,name);
-    }
-    if (PTHREAD_SYMBOLS) __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
-    return h;
+#endif
+  }
+  for (h_tail = NULL, h = _N_(_ittapi_global).string_list; h != NULL;
+       h_tail = h, h = h->next) {
+    if (h->strA != NULL && !__itt_fstrcmp(h->strA, name))
+      break;
+  }
+  if (h == NULL) {
+    NEW_STRING_HANDLE_A(&_N_(_ittapi_global), h, h_tail, name);
+  }
+  if (PTHREAD_SYMBOLS)
+    __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+  return h;
 }
 
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-static __itt_counter ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(counter_createW),_init))(const wchar_t *name, const wchar_t *domain)
-{
-    __itt_counter_info_t *h_tail = NULL, *h = NULL;
-    __itt_metadata_type type = __itt_metadata_u64;
-
-    if (name == NULL)
-    {
-        return NULL;
-    }
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+static __itt_counter ITTAPI ITT_VERSIONIZE(ITT_JOIN(
+    _N_(counter_createW), _init))(const wchar_t *name, const wchar_t *domain) {
+  __itt_counter_info_t *h_tail = NULL, *h = NULL;
+  __itt_metadata_type type = __itt_metadata_u64;
 
-    ITT_MUTEX_INIT_AND_LOCK(_N_(_ittapi_global));
-    if (_N_(_ittapi_global).api_initialized)
-    {
-        if (ITTNOTIFY_NAME(counter_createW) && ITTNOTIFY_NAME(counter_createW) != ITT_VERSIONIZE(ITT_JOIN(_N_(counter_createW),_init)))
-        {
-            __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
-            return ITTNOTIFY_NAME(counter_createW)(name, domain);
-        }
-    }
-    for (h_tail = NULL, h = _N_(_ittapi_global).counter_list; h != NULL; h_tail = h, h = h->next)
-    {
-        if (h->nameW != NULL  && h->type == type && !wcscmp(h->nameW, name) && ((h->domainW == NULL && domain == NULL) ||
-            (h->domainW != NULL && domain != NULL && !wcscmp(h->domainW, domain)))) break;
-
-    }
-    if (h == NULL)
-    {
-        NEW_COUNTER_W(&_N_(_ittapi_global),h,h_tail,name,domain,type);
+  if (name == NULL) {
+    return NULL;
+  }
+
+  ITT_MUTEX_INIT_AND_LOCK(_N_(_ittapi_global));
+  if (_N_(_ittapi_global).api_initialized) {
+    if (ITTNOTIFY_NAME(counter_createW) &&
+        ITTNOTIFY_NAME(counter_createW) !=
+            ITT_VERSIONIZE(ITT_JOIN(_N_(counter_createW), _init))) {
+      __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+      return ITTNOTIFY_NAME(counter_createW)(name, domain);
     }
-    __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
-    return (__itt_counter)h;
+  }
+  for (h_tail = NULL, h = _N_(_ittapi_global).counter_list; h != NULL;
+       h_tail = h, h = h->next) {
+    if (h->nameW != NULL && h->type == type && !wcscmp(h->nameW, name) &&
+        ((h->domainW == NULL && domain == NULL) ||
+         (h->domainW != NULL && domain != NULL && !wcscmp(h->domainW, domain))))
+      break;
+  }
+  if (h == NULL) {
+    NEW_COUNTER_W(&_N_(_ittapi_global), h, h_tail, name, domain, type);
+  }
+  __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+  return (__itt_counter)h;
 }
 
-static __itt_counter ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(counter_createA),_init))(const char *name, const char *domain)
-#else  /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
-static __itt_counter ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(counter_create),_init))(const char *name, const char *domain)
+static __itt_counter ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(counter_createA),
+                                                    _init))(const char *name,
+                                                            const char *domain)
+#else /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
+static __itt_counter ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(counter_create),
+                                                    _init))(const char *name,
+                                                            const char *domain)
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 {
-    __itt_counter_info_t *h_tail = NULL, *h = NULL;
-    __itt_metadata_type type = __itt_metadata_u64;
+  __itt_counter_info_t *h_tail = NULL, *h = NULL;
+  __itt_metadata_type type = __itt_metadata_u64;
 
-    if (name == NULL)
-    {
-        return NULL;
+  if (name == NULL) {
+    return NULL;
+  }
+
+  ITT_MUTEX_INIT_AND_LOCK(_N_(_ittapi_global));
+  if (_N_(_ittapi_global).api_initialized) {
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+    if (ITTNOTIFY_NAME(counter_createA) &&
+        ITTNOTIFY_NAME(counter_createA) !=
+            ITT_VERSIONIZE(ITT_JOIN(_N_(counter_createA), _init))) {
+      __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+      return ITTNOTIFY_NAME(counter_createA)(name, domain);
     }
-
-    ITT_MUTEX_INIT_AND_LOCK(_N_(_ittapi_global));
-    if (_N_(_ittapi_global).api_initialized)
-    {
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-        if (ITTNOTIFY_NAME(counter_createA) && ITTNOTIFY_NAME(counter_createA) != ITT_VERSIONIZE(ITT_JOIN(_N_(counter_createA),_init)))
-        {
-            __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
-            return ITTNOTIFY_NAME(counter_createA)(name, domain);
-        }
 #else
-        if (ITTNOTIFY_NAME(counter_create) && ITTNOTIFY_NAME(counter_create) != ITT_VERSIONIZE(ITT_JOIN(_N_(counter_create),_init)))
-        {
-            if (PTHREAD_SYMBOLS) __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
-            return ITTNOTIFY_NAME(counter_create)(name, domain);
-        }
-#endif
+    if (ITTNOTIFY_NAME(counter_create) &&
+        ITTNOTIFY_NAME(counter_create) !=
+            ITT_VERSIONIZE(ITT_JOIN(_N_(counter_create), _init))) {
+      if (PTHREAD_SYMBOLS)
+        __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+      return ITTNOTIFY_NAME(counter_create)(name, domain);
     }
-    for (h_tail = NULL, h = _N_(_ittapi_global).counter_list; h != NULL; h_tail = h, h = h->next)
-    {
-        if (h->nameA != NULL  && h->type == type && !__itt_fstrcmp(h->nameA, name) && ((h->domainA == NULL && domain == NULL) ||
-            (h->domainA != NULL && domain != NULL && !__itt_fstrcmp(h->domainA, domain)))) break;
-    }
-    if (h == NULL)
-    {
-       NEW_COUNTER_A(&_N_(_ittapi_global),h,h_tail,name,domain,type);
-    }
-    if (PTHREAD_SYMBOLS) __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
-    return (__itt_counter)h;
+#endif
+  }
+  for (h_tail = NULL, h = _N_(_ittapi_global).counter_list; h != NULL;
+       h_tail = h, h = h->next) {
+    if (h->nameA != NULL && h->type == type && !__itt_fstrcmp(h->nameA, name) &&
+        ((h->domainA == NULL && domain == NULL) ||
+         (h->domainA != NULL && domain != NULL &&
+          !__itt_fstrcmp(h->domainA, domain))))
+      break;
+  }
+  if (h == NULL) {
+    NEW_COUNTER_A(&_N_(_ittapi_global), h, h_tail, name, domain, type);
+  }
+  if (PTHREAD_SYMBOLS)
+    __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+  return (__itt_counter)h;
 }
 
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-static __itt_counter ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(counter_create_typedW),_init))(const wchar_t *name, const wchar_t *domain, __itt_metadata_type type)
-{
-    __itt_counter_info_t *h_tail = NULL, *h = NULL;
-
-    if (name == NULL)
-    {
-        return NULL;
-    }
-
-    ITT_MUTEX_INIT_AND_LOCK(_N_(_ittapi_global));
-    if (_N_(_ittapi_global).api_initialized)
-    {
-        if (ITTNOTIFY_NAME(counter_create_typedW) && ITTNOTIFY_NAME(counter_create_typedW) != ITT_VERSIONIZE(ITT_JOIN(_N_(counter_create_typedW),_init)))
-        {
-            __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
-            return ITTNOTIFY_NAME(counter_create_typedW)(name, domain, type);
-        }
-    }
-    for (h_tail = NULL, h = _N_(_ittapi_global).counter_list; h != NULL; h_tail = h, h = h->next)
-    {
-        if (h->nameW != NULL  && h->type == type && !wcscmp(h->nameW, name) && ((h->domainW == NULL && domain == NULL) ||
-            (h->domainW != NULL && domain != NULL && !wcscmp(h->domainW, domain)))) break;
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+static __itt_counter ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(counter_create_typedW),
+                                                    _init))(
+    const wchar_t *name, const wchar_t *domain, __itt_metadata_type type) {
+  __itt_counter_info_t *h_tail = NULL, *h = NULL;
 
+  if (name == NULL) {
+    return NULL;
+  }
+
+  ITT_MUTEX_INIT_AND_LOCK(_N_(_ittapi_global));
+  if (_N_(_ittapi_global).api_initialized) {
+    if (ITTNOTIFY_NAME(counter_create_typedW) &&
+        ITTNOTIFY_NAME(counter_create_typedW) !=
+            ITT_VERSIONIZE(ITT_JOIN(_N_(counter_create_typedW), _init))) {
+      __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+      return ITTNOTIFY_NAME(counter_create_typedW)(name, domain, type);
     }
-    if (h == NULL)
-    {
-        NEW_COUNTER_W(&_N_(_ittapi_global),h,h_tail,name,domain,type);
-    }
-    __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
-    return (__itt_counter)h;
+  }
+  for (h_tail = NULL, h = _N_(_ittapi_global).counter_list; h != NULL;
+       h_tail = h, h = h->next) {
+    if (h->nameW != NULL && h->type == type && !wcscmp(h->nameW, name) &&
+        ((h->domainW == NULL && domain == NULL) ||
+         (h->domainW != NULL && domain != NULL && !wcscmp(h->domainW, domain))))
+      break;
+  }
+  if (h == NULL) {
+    NEW_COUNTER_W(&_N_(_ittapi_global), h, h_tail, name, domain, type);
+  }
+  __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+  return (__itt_counter)h;
 }
 
-static __itt_counter ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(counter_create_typedA),_init))(const char *name, const char *domain, __itt_metadata_type type)
-#else  /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
-static __itt_counter ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(counter_create_typed),_init))(const char *name, const char *domain, __itt_metadata_type type)
+static __itt_counter ITTAPI ITT_VERSIONIZE(ITT_JOIN(
+    _N_(counter_create_typedA), _init))(const char *name, const char *domain,
+                                        __itt_metadata_type type)
+#else /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
+static __itt_counter ITTAPI ITT_VERSIONIZE(ITT_JOIN(
+    _N_(counter_create_typed), _init))(const char *name, const char *domain,
+                                       __itt_metadata_type type)
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 {
-    __itt_counter_info_t *h_tail = NULL, *h = NULL;
+  __itt_counter_info_t *h_tail = NULL, *h = NULL;
 
-    if (name == NULL)
-    {
-        return NULL;
+  if (name == NULL) {
+    return NULL;
+  }
+
+  ITT_MUTEX_INIT_AND_LOCK(_N_(_ittapi_global));
+  if (_N_(_ittapi_global).api_initialized) {
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+    if (ITTNOTIFY_NAME(counter_create_typedA) &&
+        ITTNOTIFY_NAME(counter_create_typedA) !=
+            ITT_VERSIONIZE(ITT_JOIN(_N_(counter_create_typedA), _init))) {
+      __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+      return ITTNOTIFY_NAME(counter_create_typedA)(name, domain, type);
     }
-
-    ITT_MUTEX_INIT_AND_LOCK(_N_(_ittapi_global));
-    if (_N_(_ittapi_global).api_initialized)
-    {
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-        if (ITTNOTIFY_NAME(counter_create_typedA) && ITTNOTIFY_NAME(counter_create_typedA) != ITT_VERSIONIZE(ITT_JOIN(_N_(counter_create_typedA),_init)))
-        {
-            __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
-            return ITTNOTIFY_NAME(counter_create_typedA)(name, domain, type);
-        }
 #else
-        if (ITTNOTIFY_NAME(counter_create_typed) && ITTNOTIFY_NAME(counter_create_typed) != ITT_VERSIONIZE(ITT_JOIN(_N_(counter_create_typed),_init)))
-        {
-            if (PTHREAD_SYMBOLS) __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
-            return ITTNOTIFY_NAME(counter_create_typed)(name, domain, type);
-        }
-#endif
-    }
-    for (h_tail = NULL, h = _N_(_ittapi_global).counter_list; h != NULL; h_tail = h, h = h->next)
-    {
-        if (h->nameA != NULL  && h->type == type && !__itt_fstrcmp(h->nameA, name) && ((h->domainA == NULL && domain == NULL) ||
-            (h->domainA != NULL && domain != NULL && !__itt_fstrcmp(h->domainA, domain)))) break;
+    if (ITTNOTIFY_NAME(counter_create_typed) &&
+        ITTNOTIFY_NAME(counter_create_typed) !=
+            ITT_VERSIONIZE(ITT_JOIN(_N_(counter_create_typed), _init))) {
+      if (PTHREAD_SYMBOLS)
+        __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+      return ITTNOTIFY_NAME(counter_create_typed)(name, domain, type);
     }
-    if (h == NULL)
-    {
-       NEW_COUNTER_A(&_N_(_ittapi_global),h,h_tail,name,domain,type);
-    }
-    if (PTHREAD_SYMBOLS) __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
-    return (__itt_counter)h;
+#endif
+  }
+  for (h_tail = NULL, h = _N_(_ittapi_global).counter_list; h != NULL;
+       h_tail = h, h = h->next) {
+    if (h->nameA != NULL && h->type == type && !__itt_fstrcmp(h->nameA, name) &&
+        ((h->domainA == NULL && domain == NULL) ||
+         (h->domainA != NULL && domain != NULL &&
+          !__itt_fstrcmp(h->domainA, domain))))
+      break;
+  }
+  if (h == NULL) {
+    NEW_COUNTER_A(&_N_(_ittapi_global), h, h_tail, name, domain, type);
+  }
+  if (PTHREAD_SYMBOLS)
+    __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+  return (__itt_counter)h;
 }
 
 /* -------------------------------------------------------------------------- */
 
-static void ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(pause),_init))(void)
-{
-    if (!_N_(_ittapi_global).api_initialized && _N_(_ittapi_global).thread_list == NULL)
-    {
-        __itt_init_ittlib_name(NULL, __itt_group_all);
-    }
-    if (ITTNOTIFY_NAME(pause) && ITTNOTIFY_NAME(pause) != ITT_VERSIONIZE(ITT_JOIN(_N_(pause),_init)))
-    {
-        ITTNOTIFY_NAME(pause)();
-    }
-    else
-    {
-        _N_(_ittapi_global).state = __itt_collection_paused;
-    }
+static void ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(pause), _init))(void) {
+  if (!_N_(_ittapi_global).api_initialized &&
+      _N_(_ittapi_global).thread_list == NULL) {
+    __itt_init_ittlib_name(NULL, __itt_group_all);
+  }
+  if (ITTNOTIFY_NAME(pause) &&
+      ITTNOTIFY_NAME(pause) != ITT_VERSIONIZE(ITT_JOIN(_N_(pause), _init))) {
+    ITTNOTIFY_NAME(pause)();
+  } else {
+    _N_(_ittapi_global).state = __itt_collection_paused;
+  }
 }
 
-static void ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(resume),_init))(void)
-{
-    if (!_N_(_ittapi_global).api_initialized && _N_(_ittapi_global).thread_list == NULL)
-    {
-        __itt_init_ittlib_name(NULL, __itt_group_all);
-    }
-    if (ITTNOTIFY_NAME(resume) && ITTNOTIFY_NAME(resume) != ITT_VERSIONIZE(ITT_JOIN(_N_(resume),_init)))
-    {
-        ITTNOTIFY_NAME(resume)();
-    }
-    else
-    {
-        _N_(_ittapi_global).state = __itt_collection_normal;
-    }
+static void ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(resume), _init))(void) {
+  if (!_N_(_ittapi_global).api_initialized &&
+      _N_(_ittapi_global).thread_list == NULL) {
+    __itt_init_ittlib_name(NULL, __itt_group_all);
+  }
+  if (ITTNOTIFY_NAME(resume) &&
+      ITTNOTIFY_NAME(resume) != ITT_VERSIONIZE(ITT_JOIN(_N_(resume), _init))) {
+    ITTNOTIFY_NAME(resume)();
+  } else {
+    _N_(_ittapi_global).state = __itt_collection_normal;
+  }
 }
 
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-static void ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(thread_set_nameW),_init))(const wchar_t* name)
-{
-    if (!_N_(_ittapi_global).api_initialized && _N_(_ittapi_global).thread_list == NULL)
-    {
-        __itt_init_ittlib_name(NULL, __itt_group_all);
-    }
-    if (ITTNOTIFY_NAME(thread_set_nameW) && ITTNOTIFY_NAME(thread_set_nameW) != ITT_VERSIONIZE(ITT_JOIN(_N_(thread_set_nameW),_init)))
-    {
-        ITTNOTIFY_NAME(thread_set_nameW)(name);
-    }
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+static void ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(thread_set_nameW),
+                                           _init))(const wchar_t *name) {
+  if (!_N_(_ittapi_global).api_initialized &&
+      _N_(_ittapi_global).thread_list == NULL) {
+    __itt_init_ittlib_name(NULL, __itt_group_all);
+  }
+  if (ITTNOTIFY_NAME(thread_set_nameW) &&
+      ITTNOTIFY_NAME(thread_set_nameW) !=
+          ITT_VERSIONIZE(ITT_JOIN(_N_(thread_set_nameW), _init))) {
+    ITTNOTIFY_NAME(thread_set_nameW)(name);
+  }
 }
 
-static int ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(thr_name_setW),_init))(const wchar_t* name, int namelen)
-{
-    (void)namelen;
-    ITT_VERSIONIZE(ITT_JOIN(_N_(thread_set_nameW),_init))(name);
-    return 0;
+static int ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(thr_name_setW),
+                                          _init))(const wchar_t *name,
+                                                  int namelen) {
+  (void)namelen;
+  ITT_VERSIONIZE(ITT_JOIN(_N_(thread_set_nameW), _init))(name);
+  return 0;
 }
 
-static void ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(thread_set_nameA),_init))(const char* name)
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-static void ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(thread_set_name),_init))(const char* name)
+static void ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(thread_set_nameA),
+                                           _init))(const char *name)
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+static void ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(thread_set_name),
+                                           _init))(const char *name)
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 {
-    if (!_N_(_ittapi_global).api_initialized && _N_(_ittapi_global).thread_list == NULL)
-    {
-        __itt_init_ittlib_name(NULL, __itt_group_all);
-    }
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-    if (ITTNOTIFY_NAME(thread_set_nameA) && ITTNOTIFY_NAME(thread_set_nameA) != ITT_VERSIONIZE(ITT_JOIN(_N_(thread_set_nameA),_init)))
-    {
-        ITTNOTIFY_NAME(thread_set_nameA)(name);
-    }
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-    if (ITTNOTIFY_NAME(thread_set_name) && ITTNOTIFY_NAME(thread_set_name) != ITT_VERSIONIZE(ITT_JOIN(_N_(thread_set_name),_init)))
-    {
-        ITTNOTIFY_NAME(thread_set_name)(name);
-    }
+  if (!_N_(_ittapi_global).api_initialized &&
+      _N_(_ittapi_global).thread_list == NULL) {
+    __itt_init_ittlib_name(NULL, __itt_group_all);
+  }
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+  if (ITTNOTIFY_NAME(thread_set_nameA) &&
+      ITTNOTIFY_NAME(thread_set_nameA) !=
+          ITT_VERSIONIZE(ITT_JOIN(_N_(thread_set_nameA), _init))) {
+    ITTNOTIFY_NAME(thread_set_nameA)(name);
+  }
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+  if (ITTNOTIFY_NAME(thread_set_name) &&
+      ITTNOTIFY_NAME(thread_set_name) !=
+          ITT_VERSIONIZE(ITT_JOIN(_N_(thread_set_name), _init))) {
+    ITTNOTIFY_NAME(thread_set_name)(name);
+  }
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 }
 
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-static int ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(thr_name_setA),_init))(const char* name, int namelen)
-{
-    (void)namelen;
-    ITT_VERSIONIZE(ITT_JOIN(_N_(thread_set_nameA),_init))(name);
-    return 0;
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+static int ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(thr_name_setA),
+                                          _init))(const char *name,
+                                                  int namelen) {
+  (void)namelen;
+  ITT_VERSIONIZE(ITT_JOIN(_N_(thread_set_nameA), _init))(name);
+  return 0;
 }
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-static int ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(thr_name_set),_init))(const char* name, int namelen)
-{
-    (void)namelen;
-    ITT_VERSIONIZE(ITT_JOIN(_N_(thread_set_name),_init))(name);
-    return 0;
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+static int ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(thr_name_set),
+                                          _init))(const char *name,
+                                                  int namelen) {
+  (void)namelen;
+  ITT_VERSIONIZE(ITT_JOIN(_N_(thread_set_name), _init))(name);
+  return 0;
 }
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
-static void ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(thread_ignore),_init))(void)
-{
-    if (!_N_(_ittapi_global).api_initialized && _N_(_ittapi_global).thread_list == NULL)
-    {
-        __itt_init_ittlib_name(NULL, __itt_group_all);
-    }
-    if (ITTNOTIFY_NAME(thread_ignore) && ITTNOTIFY_NAME(thread_ignore) != ITT_VERSIONIZE(ITT_JOIN(_N_(thread_ignore),_init)))
-    {
-        ITTNOTIFY_NAME(thread_ignore)();
-    }
+static void ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(thread_ignore), _init))(void) {
+  if (!_N_(_ittapi_global).api_initialized &&
+      _N_(_ittapi_global).thread_list == NULL) {
+    __itt_init_ittlib_name(NULL, __itt_group_all);
+  }
+  if (ITTNOTIFY_NAME(thread_ignore) &&
+      ITTNOTIFY_NAME(thread_ignore) !=
+          ITT_VERSIONIZE(ITT_JOIN(_N_(thread_ignore), _init))) {
+    ITTNOTIFY_NAME(thread_ignore)();
+  }
 }
 
-static void ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(thr_ignore),_init))(void)
-{
-    ITT_VERSIONIZE(ITT_JOIN(_N_(thread_ignore),_init))();
+static void ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(thr_ignore), _init))(void) {
+  ITT_VERSIONIZE(ITT_JOIN(_N_(thread_ignore), _init))();
 }
 
-static void ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(enable_attach),_init))(void)
-{
+static void ITTAPI ITT_VERSIONIZE(ITT_JOIN(_N_(enable_attach), _init))(void) {
 #ifdef __ANDROID__
-    /*
-     * if LIB_VAR_NAME env variable were set before then stay previous value
-     * else set default path
-    */
-    setenv(ITT_TO_STR(LIB_VAR_NAME), ANDROID_ITTNOTIFY_DEFAULT_PATH, 0);
+  /*
+   * if LIB_VAR_NAME env variable were set before then stay previous value
+   * else set default path
+   */
+  setenv(ITT_TO_STR(LIB_VAR_NAME), ANDROID_ITTNOTIFY_DEFAULT_PATH, 0);
 #endif
 }
 
 /* -------------------------------------------------------------------------- */
 
-static const char* __itt_fsplit(const char* s, const char* sep, const char** out, int* len)
-{
-    int i;
-    int j;
-
-    if (!s || !sep || !out || !len)
-        return NULL;
+static const char *__itt_fsplit(const char *s, const char *sep,
+                                const char **out, int *len) {
+  int i;
+  int j;
 
-    for (i = 0; s[i]; i++)
-    {
-        int b = 0;
-        for (j = 0; sep[j]; j++)
-            if (s[i] == sep[j])
-            {
-                b = 1;
-                break;
-            }
-        if (!b)
-            break;
-    }
-
-    if (!s[i])
-        return NULL;
-
-    *len = 0;
-    *out = &s[i];
-
-    for (; s[i]; i++, (*len)++)
-    {
-        int b = 0;
-        for (j = 0; sep[j]; j++)
-            if (s[i] == sep[j])
-            {
-                b = 1;
-                break;
-            }
-        if (b)
-            break;
-    }
+  if (!s || !sep || !out || !len)
+    return NULL;
 
-    for (; s[i]; i++)
-    {
-        int b = 0;
-        for (j = 0; sep[j]; j++)
-            if (s[i] == sep[j])
-            {
-                b = 1;
-                break;
-            }
-        if (!b)
-            break;
-    }
+  for (i = 0; s[i]; i++) {
+    int b = 0;
+    for (j = 0; sep[j]; j++)
+      if (s[i] == sep[j]) {
+        b = 1;
+        break;
+      }
+    if (!b)
+      break;
+  }
+
+  if (!s[i])
+    return NULL;
 
-    return &s[i];
+  *len = 0;
+  *out = &s[i];
+
+  for (; s[i]; i++, (*len)++) {
+    int b = 0;
+    for (j = 0; sep[j]; j++)
+      if (s[i] == sep[j]) {
+        b = 1;
+        break;
+      }
+    if (b)
+      break;
+  }
+
+  for (; s[i]; i++) {
+    int b = 0;
+    for (j = 0; sep[j]; j++)
+      if (s[i] == sep[j]) {
+        b = 1;
+        break;
+      }
+    if (!b)
+      break;
+  }
+
+  return &s[i];
 }
 
 /* This function return value of env variable that placed into static buffer.
@@ -765,238 +814,213 @@ static const char* __itt_fsplit(const char* s, const char* sep, const char** out
  * This was done to avoid dynamic allocation for few calls.
  * Actually we need this function only four times.
  */
-static const char* __itt_get_env_var(const char* name)
-{
+static const char *__itt_get_env_var(const char *name) {
 #define MAX_ENV_VALUE_SIZE 4086
-    static char  env_buff[MAX_ENV_VALUE_SIZE];
-    static char* env_value = (char*)env_buff;
-
-    if (name != NULL)
-    {
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-        size_t max_len = MAX_ENV_VALUE_SIZE - (size_t)(env_value - env_buff);
-        DWORD rc = GetEnvironmentVariableA(name, env_value, (DWORD)max_len);
-        if (rc >= max_len)
-            __itt_report_error(__itt_error_env_too_long, name, (size_t)rc - 1, (size_t)(max_len - 1));
-        else if (rc > 0)
-        {
-            const char* ret = (const char*)env_value;
-            env_value += rc + 1;
-            return ret;
-        }
-        else
-        {
-            /* If environment variable is empty, GetEnvironmentVariables()
-             * returns zero (number of characters (not including terminating null),
-             * and GetLastError() returns ERROR_SUCCESS. */
-            DWORD err = GetLastError();
-            if (err == ERROR_SUCCESS)
-                return env_value;
-
-            if (err != ERROR_ENVVAR_NOT_FOUND)
-                __itt_report_error(__itt_error_cant_read_env, name, (int)err);
-        }
-#else  /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
-        char* env = getenv(name);
-        if (env != NULL)
-        {
-            size_t len = __itt_fstrnlen(env, MAX_ENV_VALUE_SIZE);
-            size_t max_len = MAX_ENV_VALUE_SIZE - (size_t)(env_value - env_buff);
-            if (len < max_len)
-            {
-                const char* ret = (const char*)env_value;
-                __itt_fstrcpyn(env_value, max_len, env, len + 1);
-                env_value += len + 1;
-                return ret;
-            } else
-                __itt_report_error(__itt_error_env_too_long, name, (size_t)len, (size_t)(max_len - 1));
-        }
-#endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+  static char env_buff[MAX_ENV_VALUE_SIZE];
+  static char *env_value = (char *)env_buff;
+
+  if (name != NULL) {
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+    size_t max_len = MAX_ENV_VALUE_SIZE - (size_t)(env_value - env_buff);
+    DWORD rc = GetEnvironmentVariableA(name, env_value, (DWORD)max_len);
+    if (rc >= max_len)
+      __itt_report_error(__itt_error_env_too_long, name, (size_t)rc - 1,
+                         (size_t)(max_len - 1));
+    else if (rc > 0) {
+      const char *ret = (const char *)env_value;
+      env_value += rc + 1;
+      return ret;
+    } else {
+      /* If environment variable is empty, GetEnvironmentVariables()
+       * returns zero (number of characters (not including terminating null),
+       * and GetLastError() returns ERROR_SUCCESS. */
+      DWORD err = GetLastError();
+      if (err == ERROR_SUCCESS)
+        return env_value;
+
+      if (err != ERROR_ENVVAR_NOT_FOUND)
+        __itt_report_error(__itt_error_cant_read_env, name, (int)err);
     }
-    return NULL;
+#else /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
+    char *env = getenv(name);
+    if (env != NULL) {
+      size_t len = __itt_fstrnlen(env, MAX_ENV_VALUE_SIZE);
+      size_t max_len = MAX_ENV_VALUE_SIZE - (size_t)(env_value - env_buff);
+      if (len < max_len) {
+        const char *ret = (const char *)env_value;
+        __itt_fstrcpyn(env_value, max_len, env, len + 1);
+        env_value += len + 1;
+        return ret;
+      } else
+        __itt_report_error(__itt_error_env_too_long, name, (size_t)len,
+                           (size_t)(max_len - 1));
+    }
+#endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+  }
+  return NULL;
 }
 
-static const char* __itt_get_lib_name(void)
-{
-    const char* lib_name = __itt_get_env_var(ITT_TO_STR(LIB_VAR_NAME));
+static const char *__itt_get_lib_name(void) {
+  const char *lib_name = __itt_get_env_var(ITT_TO_STR(LIB_VAR_NAME));
 
 #ifdef __ANDROID__
-    if (lib_name == NULL)
-    {
+  if (lib_name == NULL) {
 
-#if ITT_ARCH==ITT_ARCH_IA32 || ITT_ARCH==ITT_ARCH_ARM
-        const char* const marker_filename = "com.intel.itt.collector_lib_32";
+#if ITT_ARCH == ITT_ARCH_IA32 || ITT_ARCH == ITT_ARCH_ARM
+    const char *const marker_filename = "com.intel.itt.collector_lib_32";
 #else
-        const char* const marker_filename = "com.intel.itt.collector_lib_64";
+    const char *const marker_filename = "com.intel.itt.collector_lib_64";
 #endif
 
-        char system_wide_marker_filename[PATH_MAX] = {0};
-        int itt_marker_file_fd = -1;
-        ssize_t res = 0;
-
-        res = snprintf(system_wide_marker_filename, PATH_MAX - 1, "%s%s", "/data/local/tmp/", marker_filename);
-        if (res < 0)
-        {
-            ITT_ANDROID_LOGE("Unable to concatenate marker file string.");
-            return lib_name;
-        }
-        itt_marker_file_fd = open(system_wide_marker_filename, O_RDONLY);
-
-        if (itt_marker_file_fd == -1)
-        {
-            const pid_t my_pid = getpid();
-            char cmdline_path[PATH_MAX] = {0};
-            char package_name[PATH_MAX] = {0};
-            char app_sandbox_file[PATH_MAX] = {0};
-            int cmdline_fd = 0;
-
-            ITT_ANDROID_LOGI("Unable to open system-wide marker file.");
-            res = snprintf(cmdline_path, PATH_MAX - 1, "/proc/%d/cmdline", my_pid);
-            if (res < 0)
-            {
-                ITT_ANDROID_LOGE("Unable to get cmdline path string.");
-                return lib_name;
-            }
+    char system_wide_marker_filename[PATH_MAX] = {0};
+    int itt_marker_file_fd = -1;
+    ssize_t res = 0;
 
-            ITT_ANDROID_LOGI("CMD file: %s\n", cmdline_path);
-            cmdline_fd = open(cmdline_path, O_RDONLY);
-            if (cmdline_fd == -1)
-            {
-                ITT_ANDROID_LOGE("Unable to open %s file!", cmdline_path);
-                return lib_name;
-            }
-            res = read(cmdline_fd, package_name, PATH_MAX - 1);
-            if (res == -1)
-            {
-                ITT_ANDROID_LOGE("Unable to read %s file!", cmdline_path);
-                res = close(cmdline_fd);
-                if (res == -1)
-                {
-                    ITT_ANDROID_LOGE("Unable to close %s file!", cmdline_path);
-                }
-                return lib_name;
-            }
-            res = close(cmdline_fd);
-            if (res == -1)
-            {
-                ITT_ANDROID_LOGE("Unable to close %s file!", cmdline_path);
-                return lib_name;
-            }
-            ITT_ANDROID_LOGI("Package name: %s\n", package_name);
-            res = snprintf(app_sandbox_file, PATH_MAX - 1, "/data/data/%s/%s", package_name, marker_filename);
-            if (res < 0)
-            {
-                ITT_ANDROID_LOGE("Unable to concatenate marker file string.");
-                return lib_name;
-            }
-
-            ITT_ANDROID_LOGI("Lib marker file name: %s\n", app_sandbox_file);
-            itt_marker_file_fd = open(app_sandbox_file, O_RDONLY);
-            if (itt_marker_file_fd == -1)
-            {
-                ITT_ANDROID_LOGE("Unable to open app marker file!");
-                return lib_name;
-            }
+    res = snprintf(system_wide_marker_filename, PATH_MAX - 1, "%s%s",
+                   "/data/local/tmp/", marker_filename);
+    if (res < 0) {
+      ITT_ANDROID_LOGE("Unable to concatenate marker file string.");
+      return lib_name;
+    }
+    itt_marker_file_fd = open(system_wide_marker_filename, O_RDONLY);
+
+    if (itt_marker_file_fd == -1) {
+      const pid_t my_pid = getpid();
+      char cmdline_path[PATH_MAX] = {0};
+      char package_name[PATH_MAX] = {0};
+      char app_sandbox_file[PATH_MAX] = {0};
+      int cmdline_fd = 0;
+
+      ITT_ANDROID_LOGI("Unable to open system-wide marker file.");
+      res = snprintf(cmdline_path, PATH_MAX - 1, "/proc/%d/cmdline", my_pid);
+      if (res < 0) {
+        ITT_ANDROID_LOGE("Unable to get cmdline path string.");
+        return lib_name;
+      }
+
+      ITT_ANDROID_LOGI("CMD file: %s\n", cmdline_path);
+      cmdline_fd = open(cmdline_path, O_RDONLY);
+      if (cmdline_fd == -1) {
+        ITT_ANDROID_LOGE("Unable to open %s file!", cmdline_path);
+        return lib_name;
+      }
+      res = read(cmdline_fd, package_name, PATH_MAX - 1);
+      if (res == -1) {
+        ITT_ANDROID_LOGE("Unable to read %s file!", cmdline_path);
+        res = close(cmdline_fd);
+        if (res == -1) {
+          ITT_ANDROID_LOGE("Unable to close %s file!", cmdline_path);
         }
+        return lib_name;
+      }
+      res = close(cmdline_fd);
+      if (res == -1) {
+        ITT_ANDROID_LOGE("Unable to close %s file!", cmdline_path);
+        return lib_name;
+      }
+      ITT_ANDROID_LOGI("Package name: %s\n", package_name);
+      res = snprintf(app_sandbox_file, PATH_MAX - 1, "/data/data/%s/%s",
+                     package_name, marker_filename);
+      if (res < 0) {
+        ITT_ANDROID_LOGE("Unable to concatenate marker file string.");
+        return lib_name;
+      }
+
+      ITT_ANDROID_LOGI("Lib marker file name: %s\n", app_sandbox_file);
+      itt_marker_file_fd = open(app_sandbox_file, O_RDONLY);
+      if (itt_marker_file_fd == -1) {
+        ITT_ANDROID_LOGE("Unable to open app marker file!");
+        return lib_name;
+      }
+    }
 
-        {
-            char itt_lib_name[PATH_MAX] = {0};
-
-            res = read(itt_marker_file_fd, itt_lib_name, PATH_MAX - 1);
-            if (res == -1)
-            {
-                ITT_ANDROID_LOGE("Unable to read %s file!", itt_marker_file_fd);
-                res = close(itt_marker_file_fd);
-                if (res == -1)
-                {
-                    ITT_ANDROID_LOGE("Unable to close %s file!", itt_marker_file_fd);
-                }
-                return lib_name;
-            }
-            ITT_ANDROID_LOGI("ITT Lib path: %s", itt_lib_name);
-            res = close(itt_marker_file_fd);
-            if (res == -1)
-            {
-                ITT_ANDROID_LOGE("Unable to close %s file!", itt_marker_file_fd);
-                return lib_name;
-            }
-            ITT_ANDROID_LOGI("Set env %s to %s", ITT_TO_STR(LIB_VAR_NAME), itt_lib_name);
-            res = setenv(ITT_TO_STR(LIB_VAR_NAME), itt_lib_name, 0);
-            if (res == -1)
-            {
-                ITT_ANDROID_LOGE("Unable to set env var!");
-                return lib_name;
-            }
-            lib_name = __itt_get_env_var(ITT_TO_STR(LIB_VAR_NAME));
-            ITT_ANDROID_LOGI("ITT Lib path from env: %s", lib_name);
+    {
+      char itt_lib_name[PATH_MAX] = {0};
+
+      res = read(itt_marker_file_fd, itt_lib_name, PATH_MAX - 1);
+      if (res == -1) {
+        ITT_ANDROID_LOGE("Unable to read %s file!", itt_marker_file_fd);
+        res = close(itt_marker_file_fd);
+        if (res == -1) {
+          ITT_ANDROID_LOGE("Unable to close %s file!", itt_marker_file_fd);
         }
+        return lib_name;
+      }
+      ITT_ANDROID_LOGI("ITT Lib path: %s", itt_lib_name);
+      res = close(itt_marker_file_fd);
+      if (res == -1) {
+        ITT_ANDROID_LOGE("Unable to close %s file!", itt_marker_file_fd);
+        return lib_name;
+      }
+      ITT_ANDROID_LOGI("Set env %s to %s", ITT_TO_STR(LIB_VAR_NAME),
+                       itt_lib_name);
+      res = setenv(ITT_TO_STR(LIB_VAR_NAME), itt_lib_name, 0);
+      if (res == -1) {
+        ITT_ANDROID_LOGE("Unable to set env var!");
+        return lib_name;
+      }
+      lib_name = __itt_get_env_var(ITT_TO_STR(LIB_VAR_NAME));
+      ITT_ANDROID_LOGI("ITT Lib path from env: %s", lib_name);
     }
+  }
 #endif
 
-    return lib_name;
+  return lib_name;
 }
 
 /* Avoid clashes with std::min, reported by tbb team */
-#define __itt_min(a,b) (a) < (b) ? (a) : (b)
-
-static __itt_group_id __itt_get_groups(void)
-{
-    int i;
-    __itt_group_id res = __itt_group_none;
-    const char* var_name  = "INTEL_ITTNOTIFY_GROUPS";
-    const char* group_str = __itt_get_env_var(var_name);
-
-    if (group_str != NULL)
-    {
-        int len;
-        char gr[255];
-        const char* chunk;
-        while ((group_str = __itt_fsplit(group_str, ",; ", &chunk, &len)) != NULL)
-        {
-            int min_len = __itt_min(len, (int)(sizeof(gr) - 1));
-            __itt_fstrcpyn(gr, sizeof(gr) - 1, chunk,  min_len);
-            gr[min_len] = 0;
-
-            for (i = 0; group_list[i].name != NULL; i++)
-            {
-                if (!__itt_fstrcmp(gr, group_list[i].name))
-                {
-                    res = (__itt_group_id)(res | group_list[i].id);
-                    break;
-                }
-            }
+#define __itt_min(a, b) (a) < (b) ? (a) : (b)
+
+static __itt_group_id __itt_get_groups(void) {
+  int i;
+  __itt_group_id res = __itt_group_none;
+  const char *var_name = "INTEL_ITTNOTIFY_GROUPS";
+  const char *group_str = __itt_get_env_var(var_name);
+
+  if (group_str != NULL) {
+    int len;
+    char gr[255];
+    const char *chunk;
+    while ((group_str = __itt_fsplit(group_str, ",; ", &chunk, &len)) != NULL) {
+      int min_len = __itt_min(len, (int)(sizeof(gr) - 1));
+      __itt_fstrcpyn(gr, sizeof(gr) - 1, chunk, min_len);
+      gr[min_len] = 0;
+
+      for (i = 0; group_list[i].name != NULL; i++) {
+        if (!__itt_fstrcmp(gr, group_list[i].name)) {
+          res = (__itt_group_id)(res | group_list[i].id);
+          break;
         }
-        /* TODO: !!! Workaround for bug with warning for unknown group !!!
-         * Should be fixed in new initialization scheme.
-         * Now the following groups should be set always. */
-        for (i = 0; group_list[i].id != __itt_group_none; i++)
-            if (group_list[i].id != __itt_group_all &&
-                group_list[i].id > __itt_group_splitter_min &&
-                group_list[i].id < __itt_group_splitter_max)
-                res = (__itt_group_id)(res | group_list[i].id);
-        return res;
+      }
     }
-    else
-    {
-        for (i = 0; group_alias[i].env_var != NULL; i++)
-            if (__itt_get_env_var(group_alias[i].env_var) != NULL)
-                return group_alias[i].groups;
-    }
-
+    /* TODO: !!! Workaround for bug with warning for unknown group !!!
+     * Should be fixed in new initialization scheme.
+     * Now the following groups should be set always. */
+    for (i = 0; group_list[i].id != __itt_group_none; i++)
+      if (group_list[i].id != __itt_group_all &&
+          group_list[i].id > __itt_group_splitter_min &&
+          group_list[i].id < __itt_group_splitter_max)
+        res = (__itt_group_id)(res | group_list[i].id);
     return res;
+  } else {
+    for (i = 0; group_alias[i].env_var != NULL; i++)
+      if (__itt_get_env_var(group_alias[i].env_var) != NULL)
+        return group_alias[i].groups;
+  }
+
+  return res;
 }
 
 #undef __itt_min
 
-static int __itt_lib_version(lib_t lib)
-{
-    if (lib == NULL)
-        return 0;
-    if (__itt_get_proc(lib, "__itt_api_init"))
-        return 2;
-    if (__itt_get_proc(lib, "__itt_api_version"))
-        return 1;
+static int __itt_lib_version(lib_t lib) {
+  if (lib == NULL)
     return 0;
+  if (__itt_get_proc(lib, "__itt_api_init"))
+    return 2;
+  if (__itt_get_proc(lib, "__itt_api_version"))
+    return 1;
+  return 0;
 }
 
 /* It's not used right now! Comment it out to avoid warnings.
@@ -1005,197 +1029,206 @@ static void __itt_reinit_all_pointers(void)
     int i;
     // Fill all pointers with initial stubs
     for (i = 0; _N_(_ittapi_global).api_list_ptr[i].name != NULL; i++)
-        *_N_(_ittapi_global).api_list_ptr[i].func_ptr = _N_(_ittapi_global).api_list_ptr[i].init_func;
+        *_N_(_ittapi_global).api_list_ptr[i].func_ptr =
+_N_(_ittapi_global).api_list_ptr[i].init_func;
 }
 */
 
-static void __itt_nullify_all_pointers(void)
-{
-    int i;
-    /* Nullify all pointers except domain_create, string_handle_create  and counter_create */
-    for (i = 0; _N_(_ittapi_global).api_list_ptr[i].name != NULL; i++)
-        *_N_(_ittapi_global).api_list_ptr[i].func_ptr = _N_(_ittapi_global).api_list_ptr[i].null_func;
+static void __itt_nullify_all_pointers(void) {
+  int i;
+  /* Nullify all pointers except domain_create, string_handle_create  and
+   * counter_create */
+  for (i = 0; _N_(_ittapi_global).api_list_ptr[i].name != NULL; i++)
+    *_N_(_ittapi_global).api_list_ptr[i].func_ptr =
+        _N_(_ittapi_global).api_list_ptr[i].null_func;
 }
 
-#if ITT_PLATFORM==ITT_PLATFORM_WIN && KMP_MSVC_COMPAT
+// clang-format off
+#if ITT_PLATFORM == ITT_PLATFORM_WIN && KMP_MSVC_COMPAT
 #pragma warning(push)
-#pragma warning(disable: 4054) /* warning C4054: 'type cast' : from function pointer 'XXX' to data pointer 'void *' */
-#pragma warning(disable: 4055) /* warning C4055: 'type cast' : from data pointer 'void *' to function pointer 'XXX' */
+#pragma warning(disable: 4054) /* warning C4054: 'type cast' : from function
+                                  pointer 'XXX' to data pointer 'void *' */
+#pragma warning(disable: 4055) /* warning C4055: 'type cast' : from data pointer
+                                  'void *' to function pointer 'XXX' */
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+// clang-format on
 
-ITT_EXTERN_C void _N_(fini_ittlib)(void)
-{
-    __itt_api_fini_t* __itt_api_fini_ptr = NULL;
-    static volatile TIDT current_thread = 0;
+ITT_EXTERN_C void _N_(fini_ittlib)(void) {
+  __itt_api_fini_t *__itt_api_fini_ptr = NULL;
+  static volatile TIDT current_thread = 0;
 
-    if (_N_(_ittapi_global).api_initialized)
-    {
-        ITT_MUTEX_INIT_AND_LOCK(_N_(_ittapi_global));
-        if (_N_(_ittapi_global).api_initialized)
-        {
-            if (current_thread == 0)
-            {
-                if (PTHREAD_SYMBOLS) current_thread = __itt_thread_id();
-                if (_N_(_ittapi_global).lib != NULL)
-                {
-                    __itt_api_fini_ptr = (__itt_api_fini_t*)(size_t)__itt_get_proc(_N_(_ittapi_global).lib, "__itt_api_fini");
-                }
-                if (__itt_api_fini_ptr)
-                {
-                    __itt_api_fini_ptr(&_N_(_ittapi_global));
-                }
-
-                __itt_nullify_all_pointers();
-
- /* TODO: !!! not safe !!! don't support unload so far.
-  *             if (_N_(_ittapi_global).lib != NULL)
-  *                 __itt_unload_lib(_N_(_ittapi_global).lib);
-  *             _N_(_ittapi_global).lib = NULL;
-  */
-                _N_(_ittapi_global).api_initialized = 0;
-                current_thread = 0;
-            }
+  if (_N_(_ittapi_global).api_initialized) {
+    ITT_MUTEX_INIT_AND_LOCK(_N_(_ittapi_global));
+    if (_N_(_ittapi_global).api_initialized) {
+      if (current_thread == 0) {
+        if (PTHREAD_SYMBOLS)
+          current_thread = __itt_thread_id();
+        if (_N_(_ittapi_global).lib != NULL) {
+          __itt_api_fini_ptr = (__itt_api_fini_t *)(size_t)__itt_get_proc(
+              _N_(_ittapi_global).lib, "__itt_api_fini");
         }
-        if (PTHREAD_SYMBOLS) __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+        if (__itt_api_fini_ptr) {
+          __itt_api_fini_ptr(&_N_(_ittapi_global));
+        }
+
+        __itt_nullify_all_pointers();
+
+        /* TODO: !!! not safe !!! don't support unload so far.
+         *             if (_N_(_ittapi_global).lib != NULL)
+         *                 __itt_unload_lib(_N_(_ittapi_global).lib);
+         *             _N_(_ittapi_global).lib = NULL;
+         */
+        _N_(_ittapi_global).api_initialized = 0;
+        current_thread = 0;
+      }
     }
+    if (PTHREAD_SYMBOLS)
+      __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+  }
 }
 
-ITT_EXTERN_C int _N_(init_ittlib)(const char* lib_name, __itt_group_id init_groups)
-{
-    int i;
-    __itt_group_id groups;
+ITT_EXTERN_C int _N_(init_ittlib)(const char *lib_name,
+                                  __itt_group_id init_groups) {
+  int i;
+  __itt_group_id groups;
 #ifdef ITT_COMPLETE_GROUP
-    __itt_group_id zero_group = __itt_group_none;
+  __itt_group_id zero_group = __itt_group_none;
 #endif /* ITT_COMPLETE_GROUP */
-    static volatile TIDT current_thread = 0;
+  static volatile TIDT current_thread = 0;
 
-    if (!_N_(_ittapi_global).api_initialized)
-    {
+  if (!_N_(_ittapi_global).api_initialized) {
 #ifndef ITT_SIMPLE_INIT
-        ITT_MUTEX_INIT_AND_LOCK(_N_(_ittapi_global));
+    ITT_MUTEX_INIT_AND_LOCK(_N_(_ittapi_global));
 #endif /* ITT_SIMPLE_INIT */
 
-        if (!_N_(_ittapi_global).api_initialized)
-        {
-            if (current_thread == 0)
-            {
-                if (PTHREAD_SYMBOLS) current_thread = __itt_thread_id();
-                if (lib_name == NULL)
-                {
-                    lib_name = __itt_get_lib_name();
-                }
-                groups = __itt_get_groups();
-                if (DL_SYMBOLS && (groups != __itt_group_none || lib_name != NULL))
-                {
-                    _N_(_ittapi_global).lib = __itt_load_lib((lib_name == NULL) ? ittnotify_lib_name : lib_name);
-
-                    if (_N_(_ittapi_global).lib != NULL)
-                    {
-                        __itt_api_init_t* __itt_api_init_ptr;
-                        int lib_version = __itt_lib_version(_N_(_ittapi_global).lib);
-
-                        switch (lib_version) {
-                        case 0:
-                            groups = __itt_group_legacy;
-                            KMP_FALLTHROUGH();
-                        case 1:
-                            /* Fill all pointers from dynamic library */
-                            for (i = 0; _N_(_ittapi_global).api_list_ptr[i].name != NULL; i++)
-                            {
-                                if (_N_(_ittapi_global).api_list_ptr[i].group & groups & init_groups)
-                                {
-                                    *_N_(_ittapi_global).api_list_ptr[i].func_ptr = (void*)__itt_get_proc(_N_(_ittapi_global).lib, _N_(_ittapi_global).api_list_ptr[i].name);
-                                    if (*_N_(_ittapi_global).api_list_ptr[i].func_ptr == NULL)
-                                    {
-                                        /* Restore pointers for function with static implementation */
-                                        *_N_(_ittapi_global).api_list_ptr[i].func_ptr = _N_(_ittapi_global).api_list_ptr[i].null_func;
-                                        __itt_report_error(__itt_error_no_symbol, lib_name, _N_(_ittapi_global).api_list_ptr[i].name);
+    if (!_N_(_ittapi_global).api_initialized) {
+      if (current_thread == 0) {
+        if (PTHREAD_SYMBOLS)
+          current_thread = __itt_thread_id();
+        if (lib_name == NULL) {
+          lib_name = __itt_get_lib_name();
+        }
+        groups = __itt_get_groups();
+        if (DL_SYMBOLS && (groups != __itt_group_none || lib_name != NULL)) {
+          _N_(_ittapi_global).lib = __itt_load_lib(
+              (lib_name == NULL) ? ittnotify_lib_name : lib_name);
+
+          if (_N_(_ittapi_global).lib != NULL) {
+            __itt_api_init_t *__itt_api_init_ptr;
+            int lib_version = __itt_lib_version(_N_(_ittapi_global).lib);
+
+            switch (lib_version) {
+            case 0:
+              groups = __itt_group_legacy;
+              KMP_FALLTHROUGH();
+            case 1:
+              /* Fill all pointers from dynamic library */
+              for (i = 0; _N_(_ittapi_global).api_list_ptr[i].name != NULL;
+                   i++) {
+                if (_N_(_ittapi_global).api_list_ptr[i].group & groups &
+                    init_groups) {
+                  *_N_(_ittapi_global).api_list_ptr[i].func_ptr =
+                      (void *)__itt_get_proc(
+                          _N_(_ittapi_global).lib,
+                          _N_(_ittapi_global).api_list_ptr[i].name);
+                  if (*_N_(_ittapi_global).api_list_ptr[i].func_ptr == NULL) {
+                    /* Restore pointers for function with static implementation
+                     */
+                    *_N_(_ittapi_global).api_list_ptr[i].func_ptr =
+                        _N_(_ittapi_global).api_list_ptr[i].null_func;
+                    __itt_report_error(
+                        __itt_error_no_symbol, lib_name,
+                        _N_(_ittapi_global).api_list_ptr[i].name);
 #ifdef ITT_COMPLETE_GROUP
-                                        zero_group = (__itt_group_id)(zero_group | _N_(_ittapi_global).api_list_ptr[i].group);
+                    zero_group = (__itt_group_id)(
+                        zero_group | _N_(_ittapi_global).api_list_ptr[i].group);
 #endif /* ITT_COMPLETE_GROUP */
-                                    }
-                                }
-                                else
-                                    *_N_(_ittapi_global).api_list_ptr[i].func_ptr = _N_(_ittapi_global).api_list_ptr[i].null_func;
-                            }
-
-                            if (groups == __itt_group_legacy)
-                            {
-                                /* Compatibility with legacy tools */
-                                ITTNOTIFY_NAME(thread_ignore)  = ITTNOTIFY_NAME(thr_ignore);
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-                                ITTNOTIFY_NAME(sync_createA)   = ITTNOTIFY_NAME(sync_set_nameA);
-                                ITTNOTIFY_NAME(sync_createW)   = ITTNOTIFY_NAME(sync_set_nameW);
-#else  /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
-                                ITTNOTIFY_NAME(sync_create)    = ITTNOTIFY_NAME(sync_set_name);
+                  }
+                } else
+                  *_N_(_ittapi_global).api_list_ptr[i].func_ptr =
+                      _N_(_ittapi_global).api_list_ptr[i].null_func;
+              }
+
+              if (groups == __itt_group_legacy) {
+                /* Compatibility with legacy tools */
+                ITTNOTIFY_NAME(thread_ignore) = ITTNOTIFY_NAME(thr_ignore);
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+                ITTNOTIFY_NAME(sync_createA) = ITTNOTIFY_NAME(sync_set_nameA);
+                ITTNOTIFY_NAME(sync_createW) = ITTNOTIFY_NAME(sync_set_nameW);
+#else /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
+                ITTNOTIFY_NAME(sync_create) = ITTNOTIFY_NAME(sync_set_name);
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-                                ITTNOTIFY_NAME(sync_prepare)   = ITTNOTIFY_NAME(notify_sync_prepare);
-                                ITTNOTIFY_NAME(sync_cancel)    = ITTNOTIFY_NAME(notify_sync_cancel);
-                                ITTNOTIFY_NAME(sync_acquired)  = ITTNOTIFY_NAME(notify_sync_acquired);
-                                ITTNOTIFY_NAME(sync_releasing) = ITTNOTIFY_NAME(notify_sync_releasing);
-                            }
+                ITTNOTIFY_NAME(sync_prepare) =
+                    ITTNOTIFY_NAME(notify_sync_prepare);
+                ITTNOTIFY_NAME(sync_cancel) =
+                    ITTNOTIFY_NAME(notify_sync_cancel);
+                ITTNOTIFY_NAME(sync_acquired) =
+                    ITTNOTIFY_NAME(notify_sync_acquired);
+                ITTNOTIFY_NAME(sync_releasing) =
+                    ITTNOTIFY_NAME(notify_sync_releasing);
+              }
 
 #ifdef ITT_COMPLETE_GROUP
-                            for (i = 0; _N_(_ittapi_global).api_list_ptr[i].name != NULL; i++)
-                                if (_N_(_ittapi_global).api_list_ptr[i].group & zero_group)
-                                    *_N_(_ittapi_global).api_list_ptr[i].func_ptr = _N_(_ittapi_global).api_list_ptr[i].null_func;
+              for (i = 0; _N_(_ittapi_global).api_list_ptr[i].name != NULL; i++)
+                if (_N_(_ittapi_global).api_list_ptr[i].group & zero_group)
+                  *_N_(_ittapi_global).api_list_ptr[i].func_ptr =
+                      _N_(_ittapi_global).api_list_ptr[i].null_func;
 #endif /* ITT_COMPLETE_GROUP */
-                            break;
-                        case 2:
-                            __itt_api_init_ptr = (__itt_api_init_t*)(size_t)__itt_get_proc(_N_(_ittapi_global).lib, "__itt_api_init");
-                            if (__itt_api_init_ptr)
-                                __itt_api_init_ptr(&_N_(_ittapi_global), init_groups);
-                            break;
-                        }
-                    }
-                    else
-                    {
-                        __itt_nullify_all_pointers();
-
-                        __itt_report_error(__itt_error_no_module, lib_name,
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-                            __itt_system_error()
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-                            dlerror()
-#endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-                        );
-                    }
-                }
-                else
-                {
-                    __itt_nullify_all_pointers();
-                }
-                _N_(_ittapi_global).api_initialized = 1;
-                current_thread = 0;
-                /* !!! Just to avoid unused code elimination !!! */
-                if (__itt_fini_ittlib_ptr == _N_(fini_ittlib)) current_thread = 0;
+              break;
+            case 2:
+              __itt_api_init_ptr = (__itt_api_init_t *)(size_t)__itt_get_proc(
+                  _N_(_ittapi_global).lib, "__itt_api_init");
+              if (__itt_api_init_ptr)
+                __itt_api_init_ptr(&_N_(_ittapi_global), init_groups);
+              break;
             }
+          } else {
+            __itt_nullify_all_pointers();
+
+            __itt_report_error(__itt_error_no_module, lib_name,
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+                               __itt_system_error()
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+                               dlerror()
+#endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+            );
+          }
+        } else {
+          __itt_nullify_all_pointers();
         }
+        _N_(_ittapi_global).api_initialized = 1;
+        current_thread = 0;
+        /* !!! Just to avoid unused code elimination !!! */
+        if (__itt_fini_ittlib_ptr == _N_(fini_ittlib))
+          current_thread = 0;
+      }
+    }
 
 #ifndef ITT_SIMPLE_INIT
-        if (PTHREAD_SYMBOLS) __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
+    if (PTHREAD_SYMBOLS)
+      __itt_mutex_unlock(&_N_(_ittapi_global).mutex);
 #endif /* ITT_SIMPLE_INIT */
+  }
+
+  /* Evaluating if any function ptr is non empty and it's in init_groups */
+  for (i = 0; _N_(_ittapi_global).api_list_ptr[i].name != NULL; i++) {
+    if (*_N_(_ittapi_global).api_list_ptr[i].func_ptr !=
+            _N_(_ittapi_global).api_list_ptr[i].null_func &&
+        _N_(_ittapi_global).api_list_ptr[i].group & init_groups) {
+      return 1;
     }
-
-    /* Evaluating if any function ptr is non empty and it's in init_groups */
-    for (i = 0; _N_(_ittapi_global).api_list_ptr[i].name != NULL; i++)
-    {
-        if (*_N_(_ittapi_global).api_list_ptr[i].func_ptr != _N_(_ittapi_global).api_list_ptr[i].null_func &&
-            _N_(_ittapi_global).api_list_ptr[i].group & init_groups)
-        {
-            return 1;
-        }
-    }
-    return 0;
+  }
+  return 0;
 }
 
-ITT_EXTERN_C __itt_error_handler_t* _N_(set_error_handler)(__itt_error_handler_t* handler)
-{
-    __itt_error_handler_t* prev = (__itt_error_handler_t*)(size_t)_N_(_ittapi_global).error_handler;
-    _N_(_ittapi_global).error_handler = (void*)(size_t)handler;
-    return prev;
+ITT_EXTERN_C __itt_error_handler_t *
+_N_(set_error_handler)(__itt_error_handler_t *handler) {
+  __itt_error_handler_t *prev =
+      (__itt_error_handler_t *)(size_t)_N_(_ittapi_global).error_handler;
+  _N_(_ittapi_global).error_handler = (void *)(size_t)handler;
+  return prev;
 }
 
-#if ITT_PLATFORM==ITT_PLATFORM_WIN && KMP_MSVC_COMPAT
+#if ITT_PLATFORM == ITT_PLATFORM_WIN && KMP_MSVC_COMPAT
 #pragma warning(pop)
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */

diff  --git a/openmp/runtime/src/thirdparty/ittnotify/ittnotify_static.h b/openmp/runtime/src/thirdparty/ittnotify/ittnotify_static.h
index a2022263003d..cb884a8b3a1c 100644
--- a/openmp/runtime/src/thirdparty/ittnotify/ittnotify_static.h
+++ b/openmp/runtime/src/thirdparty/ittnotify/ittnotify_static.h
@@ -7,335 +7,752 @@
 //
 //===----------------------------------------------------------------------===//
 
-
 #include "ittnotify_config.h"
 
 #ifndef ITT_FORMAT_DEFINED
-#  ifndef ITT_FORMAT
-#    define ITT_FORMAT
-#  endif /* ITT_FORMAT */
-#  ifndef ITT_NO_PARAMS
-#    define ITT_NO_PARAMS
-#  endif /* ITT_NO_PARAMS */
+#ifndef ITT_FORMAT
+#define ITT_FORMAT
+#endif /* ITT_FORMAT */
+#ifndef ITT_NO_PARAMS
+#define ITT_NO_PARAMS
+#endif /* ITT_NO_PARAMS */
 #endif /* ITT_FORMAT_DEFINED */
 
 /*
  * parameters for macro expected:
- * ITT_STUB(api, type, func_name, arguments, params, func_name_in_dll, group, printf_fmt)
+ * ITT_STUB(api, type, func_name, arguments, params, func_name_in_dll, group,
+ * printf_fmt)
  */
 #ifdef __ITT_INTERNAL_INIT
 
 #ifndef __ITT_INTERNAL_BODY
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUB(ITTAPI, __itt_domain*, domain_createA, (const char    *name), (ITT_FORMAT name), domain_createA, __itt_group_structure, "\"%s\"")
-ITT_STUB(ITTAPI, __itt_domain*, domain_createW, (const wchar_t *name), (ITT_FORMAT name), domain_createW, __itt_group_structure, "\"%S\"")
-#else  /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
-ITT_STUB(ITTAPI, __itt_domain*, domain_create,  (const char    *name), (ITT_FORMAT name), domain_create,  __itt_group_structure, "\"%s\"")
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUB(ITTAPI, __itt_domain *, domain_createA, (const char *name),
+         (ITT_FORMAT name), domain_createA, __itt_group_structure, "\"%s\"")
+ITT_STUB(ITTAPI, __itt_domain *, domain_createW, (const wchar_t *name),
+         (ITT_FORMAT name), domain_createW, __itt_group_structure, "\"%S\"")
+#else /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
+ITT_STUB(ITTAPI, __itt_domain *, domain_create, (const char *name),
+         (ITT_FORMAT name), domain_create, __itt_group_structure, "\"%s\"")
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUB(ITTAPI, __itt_string_handle*, string_handle_createA, (const char    *name), (ITT_FORMAT name), string_handle_createA, __itt_group_structure, "\"%s\"")
-ITT_STUB(ITTAPI, __itt_string_handle*, string_handle_createW, (const wchar_t *name), (ITT_FORMAT name), string_handle_createW, __itt_group_structure, "\"%S\"")
-#else  /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
-ITT_STUB(ITTAPI, __itt_string_handle*, string_handle_create,  (const char    *name), (ITT_FORMAT name), string_handle_create,  __itt_group_structure, "\"%s\"")
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUB(ITTAPI, __itt_string_handle *, string_handle_createA,
+         (const char *name), (ITT_FORMAT name), string_handle_createA,
+         __itt_group_structure, "\"%s\"")
+ITT_STUB(ITTAPI, __itt_string_handle *, string_handle_createW,
+         (const wchar_t *name), (ITT_FORMAT name), string_handle_createW,
+         __itt_group_structure, "\"%S\"")
+#else /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
+ITT_STUB(ITTAPI, __itt_string_handle *, string_handle_create,
+         (const char *name), (ITT_FORMAT name), string_handle_create,
+         __itt_group_structure, "\"%s\"")
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUB(ITTAPI, __itt_counter, counter_createA, (const char    *name, const char    *domain), (ITT_FORMAT name, domain), counter_createA, __itt_group_counter, "\"%s\", \"%s\"")
-ITT_STUB(ITTAPI, __itt_counter, counter_createW, (const wchar_t *name, const wchar_t *domain), (ITT_FORMAT name, domain), counter_createW, __itt_group_counter, "\"%s\", \"%s\"")
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-ITT_STUB(ITTAPI, __itt_counter, counter_create,  (const char    *name, const char    *domain), (ITT_FORMAT name, domain), counter_create,  __itt_group_counter, "\"%s\", \"%s\"")
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUB(ITTAPI, __itt_counter, counter_createA,
+         (const char *name, const char *domain), (ITT_FORMAT name, domain),
+         counter_createA, __itt_group_counter, "\"%s\", \"%s\"")
+ITT_STUB(ITTAPI, __itt_counter, counter_createW,
+         (const wchar_t *name, const wchar_t *domain),
+         (ITT_FORMAT name, domain), counter_createW, __itt_group_counter,
+         "\"%s\", \"%s\"")
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+ITT_STUB(ITTAPI, __itt_counter, counter_create,
+         (const char *name, const char *domain), (ITT_FORMAT name, domain),
+         counter_create, __itt_group_counter, "\"%s\", \"%s\"")
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUB(ITTAPI, __itt_counter, counter_create_typedA, (const char    *name, const char    *domain, __itt_metadata_type type), (ITT_FORMAT name, domain, type), counter_create_typedA, __itt_group_counter, "\"%s\", \"%s\", %d")
-ITT_STUB(ITTAPI, __itt_counter, counter_create_typedW, (const wchar_t *name, const wchar_t *domain, __itt_metadata_type type), (ITT_FORMAT name, domain, type), counter_create_typedW, __itt_group_counter, "\"%s\", \"%s\", %d")
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-ITT_STUB(ITTAPI, __itt_counter, counter_create_typed,  (const char    *name, const char    *domain, __itt_metadata_type type), (ITT_FORMAT name, domain, type), counter_create_typed,  __itt_group_counter, "\"%s\", \"%s\", %d")
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUB(ITTAPI, __itt_counter, counter_create_typedA,
+         (const char *name, const char *domain, __itt_metadata_type type),
+         (ITT_FORMAT name, domain, type), counter_create_typedA,
+         __itt_group_counter, "\"%s\", \"%s\", %d")
+ITT_STUB(ITTAPI, __itt_counter, counter_create_typedW,
+         (const wchar_t *name, const wchar_t *domain, __itt_metadata_type type),
+         (ITT_FORMAT name, domain, type), counter_create_typedW,
+         __itt_group_counter, "\"%s\", \"%s\", %d")
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+ITT_STUB(ITTAPI, __itt_counter, counter_create_typed,
+         (const char *name, const char *domain, __itt_metadata_type type),
+         (ITT_FORMAT name, domain, type), counter_create_typed,
+         __itt_group_counter, "\"%s\", \"%s\", %d")
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
-
-ITT_STUBV(ITTAPI, void, pause,  (void), (ITT_NO_PARAMS), pause,  __itt_group_control | __itt_group_legacy, "no args")
-ITT_STUBV(ITTAPI, void, resume, (void), (ITT_NO_PARAMS), resume, __itt_group_control | __itt_group_legacy, "no args")
-
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUBV(ITTAPI, void, thread_set_nameA, (const char    *name), (ITT_FORMAT name), thread_set_nameA, __itt_group_thread, "\"%s\"")
-ITT_STUBV(ITTAPI, void, thread_set_nameW, (const wchar_t *name), (ITT_FORMAT name), thread_set_nameW, __itt_group_thread, "\"%S\"")
-#else  /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
-ITT_STUBV(ITTAPI, void, thread_set_name,  (const char    *name), (ITT_FORMAT name), thread_set_name,  __itt_group_thread, "\"%s\"")
+ITT_STUBV(ITTAPI, void, pause, (void), (ITT_NO_PARAMS), pause,
+          __itt_group_control | __itt_group_legacy, "no args")
+ITT_STUBV(ITTAPI, void, resume, (void), (ITT_NO_PARAMS), resume,
+          __itt_group_control | __itt_group_legacy, "no args")
+
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUBV(ITTAPI, void, thread_set_nameA, (const char *name), (ITT_FORMAT name),
+          thread_set_nameA, __itt_group_thread, "\"%s\"")
+ITT_STUBV(ITTAPI, void, thread_set_nameW, (const wchar_t *name),
+          (ITT_FORMAT name), thread_set_nameW, __itt_group_thread, "\"%S\"")
+#else /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
+ITT_STUBV(ITTAPI, void, thread_set_name, (const char *name), (ITT_FORMAT name),
+          thread_set_name, __itt_group_thread, "\"%s\"")
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-ITT_STUBV(ITTAPI, void, thread_ignore, (void), (ITT_NO_PARAMS), thread_ignore, __itt_group_thread, "no args")
-
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUB(LIBITTAPI, int,  thr_name_setA, (const char    *name, int namelen), (ITT_FORMAT name, namelen), thr_name_setA, __itt_group_thread | __itt_group_legacy, "\"%s\", %d")
-ITT_STUB(LIBITTAPI, int,  thr_name_setW, (const wchar_t *name, int namelen), (ITT_FORMAT name, namelen), thr_name_setW, __itt_group_thread | __itt_group_legacy, "\"%S\", %d")
-#else  /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
-ITT_STUB(LIBITTAPI, int,  thr_name_set,  (const char    *name, int namelen), (ITT_FORMAT name, namelen), thr_name_set,  __itt_group_thread | __itt_group_legacy, "\"%s\", %d")
+ITT_STUBV(ITTAPI, void, thread_ignore, (void), (ITT_NO_PARAMS), thread_ignore,
+          __itt_group_thread, "no args")
+
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUB(LIBITTAPI, int, thr_name_setA, (const char *name, int namelen),
+         (ITT_FORMAT name, namelen), thr_name_setA,
+         __itt_group_thread | __itt_group_legacy, "\"%s\", %d")
+ITT_STUB(LIBITTAPI, int, thr_name_setW, (const wchar_t *name, int namelen),
+         (ITT_FORMAT name, namelen), thr_name_setW,
+         __itt_group_thread | __itt_group_legacy, "\"%S\", %d")
+#else /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
+ITT_STUB(LIBITTAPI, int, thr_name_set, (const char *name, int namelen),
+         (ITT_FORMAT name, namelen), thr_name_set,
+         __itt_group_thread | __itt_group_legacy, "\"%s\", %d")
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-ITT_STUBV(LIBITTAPI, void, thr_ignore,   (void),                             (ITT_NO_PARAMS),            thr_ignore,    __itt_group_thread | __itt_group_legacy, "no args")
+ITT_STUBV(LIBITTAPI, void, thr_ignore, (void), (ITT_NO_PARAMS), thr_ignore,
+          __itt_group_thread | __itt_group_legacy, "no args")
 #endif /* __ITT_INTERNAL_BODY */
 
-ITT_STUBV(ITTAPI, void, enable_attach, (void), (ITT_NO_PARAMS), enable_attach, __itt_group_all, "no args")
-
-#else  /* __ITT_INTERNAL_INIT */
-
-ITT_STUBV(ITTAPI, void, detach, (void), (ITT_NO_PARAMS), detach, __itt_group_control | __itt_group_legacy, "no args")
-
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUBV(ITTAPI, void, sync_createA, (void *addr, const char    *objtype, const char    *objname, int attribute), (ITT_FORMAT addr, objtype, objname, attribute), sync_createA, __itt_group_sync | __itt_group_fsync, "%p, \"%s\", \"%s\", %x")
-ITT_STUBV(ITTAPI, void, sync_createW, (void *addr, const wchar_t *objtype, const wchar_t *objname, int attribute), (ITT_FORMAT addr, objtype, objname, attribute), sync_createW, __itt_group_sync | __itt_group_fsync, "%p, \"%S\", \"%S\", %x")
-ITT_STUBV(ITTAPI, void, sync_renameA, (void *addr, const char    *name), (ITT_FORMAT addr, name), sync_renameA, __itt_group_sync | __itt_group_fsync, "%p, \"%s\"")
-ITT_STUBV(ITTAPI, void, sync_renameW, (void *addr, const wchar_t *name), (ITT_FORMAT addr, name), sync_renameW, __itt_group_sync | __itt_group_fsync, "%p, \"%S\"")
-#else  /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
-ITT_STUBV(ITTAPI, void, sync_create,  (void *addr, const char    *objtype, const char    *objname, int attribute), (ITT_FORMAT addr, objtype, objname, attribute), sync_create,  __itt_group_sync | __itt_group_fsync, "%p, \"%s\", \"%s\", %x")
-ITT_STUBV(ITTAPI, void, sync_rename,  (void *addr, const char    *name), (ITT_FORMAT addr, name), sync_rename,  __itt_group_sync | __itt_group_fsync, "%p, \"%s\"")
+ITT_STUBV(ITTAPI, void, enable_attach, (void), (ITT_NO_PARAMS), enable_attach,
+          __itt_group_all, "no args")
+
+#else /* __ITT_INTERNAL_INIT */
+
+ITT_STUBV(ITTAPI, void, detach, (void), (ITT_NO_PARAMS), detach,
+          __itt_group_control | __itt_group_legacy, "no args")
+
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUBV(ITTAPI, void, sync_createA,
+          (void *addr, const char *objtype, const char *objname, int attribute),
+          (ITT_FORMAT addr, objtype, objname, attribute), sync_createA,
+          __itt_group_sync | __itt_group_fsync, "%p, \"%s\", \"%s\", %x")
+ITT_STUBV(ITTAPI, void, sync_createW,
+          (void *addr, const wchar_t *objtype, const wchar_t *objname,
+           int attribute),
+          (ITT_FORMAT addr, objtype, objname, attribute), sync_createW,
+          __itt_group_sync | __itt_group_fsync, "%p, \"%S\", \"%S\", %x")
+ITT_STUBV(ITTAPI, void, sync_renameA, (void *addr, const char *name),
+          (ITT_FORMAT addr, name), sync_renameA,
+          __itt_group_sync | __itt_group_fsync, "%p, \"%s\"")
+ITT_STUBV(ITTAPI, void, sync_renameW, (void *addr, const wchar_t *name),
+          (ITT_FORMAT addr, name), sync_renameW,
+          __itt_group_sync | __itt_group_fsync, "%p, \"%S\"")
+#else /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
+ITT_STUBV(ITTAPI, void, sync_create,
+          (void *addr, const char *objtype, const char *objname, int attribute),
+          (ITT_FORMAT addr, objtype, objname, attribute), sync_create,
+          __itt_group_sync | __itt_group_fsync, "%p, \"%s\", \"%s\", %x")
+ITT_STUBV(ITTAPI, void, sync_rename, (void *addr, const char *name),
+          (ITT_FORMAT addr, name), sync_rename,
+          __itt_group_sync | __itt_group_fsync, "%p, \"%s\"")
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-ITT_STUBV(ITTAPI, void, sync_destroy,    (void *addr), (ITT_FORMAT addr), sync_destroy,   __itt_group_sync | __itt_group_fsync, "%p")
-
-ITT_STUBV(ITTAPI, void, sync_prepare,    (void* addr), (ITT_FORMAT addr), sync_prepare,   __itt_group_sync,  "%p")
-ITT_STUBV(ITTAPI, void, sync_cancel,     (void *addr), (ITT_FORMAT addr), sync_cancel,    __itt_group_sync,  "%p")
-ITT_STUBV(ITTAPI, void, sync_acquired,   (void *addr), (ITT_FORMAT addr), sync_acquired,  __itt_group_sync,  "%p")
-ITT_STUBV(ITTAPI, void, sync_releasing,  (void* addr), (ITT_FORMAT addr), sync_releasing, __itt_group_sync,  "%p")
-
-ITT_STUBV(ITTAPI, void, suppress_push,       (unsigned int mask),                             (ITT_FORMAT mask), suppress_push,  __itt_group_suppress,  "%p")
-ITT_STUBV(ITTAPI, void, suppress_pop,        (void),                                          (ITT_NO_PARAMS),   suppress_pop,   __itt_group_suppress,  "no args")
-ITT_STUBV(ITTAPI, void, suppress_mark_range, (__itt_suppress_mode_t mode, unsigned int mask, void * address, size_t size),(ITT_FORMAT mode, mask, address, size), suppress_mark_range, __itt_group_suppress, "%d, %p, %p, %d")
-ITT_STUBV(ITTAPI, void, suppress_clear_range,(__itt_suppress_mode_t mode, unsigned int mask, void * address, size_t size),(ITT_FORMAT mode, mask, address, size), suppress_clear_range,__itt_group_suppress, "%d, %p, %p, %d")
-
-ITT_STUBV(ITTAPI, void, fsync_prepare,   (void* addr), (ITT_FORMAT addr), sync_prepare,   __itt_group_fsync, "%p")
-ITT_STUBV(ITTAPI, void, fsync_cancel,    (void *addr), (ITT_FORMAT addr), sync_cancel,    __itt_group_fsync, "%p")
-ITT_STUBV(ITTAPI, void, fsync_acquired,  (void *addr), (ITT_FORMAT addr), sync_acquired,  __itt_group_fsync, "%p")
-ITT_STUBV(ITTAPI, void, fsync_releasing, (void* addr), (ITT_FORMAT addr), sync_releasing, __itt_group_fsync, "%p")
-
-ITT_STUBV(ITTAPI, void, model_site_begin,          (__itt_model_site *site, __itt_model_site_instance *instance, const char *name), (ITT_FORMAT site, instance, name), model_site_begin, __itt_group_model, "%p, %p, \"%s\"")
-ITT_STUBV(ITTAPI, void, model_site_end,            (__itt_model_site *site, __itt_model_site_instance *instance),                   (ITT_FORMAT site, instance),       model_site_end,   __itt_group_model, "%p, %p")
-ITT_STUBV(ITTAPI, void, model_task_begin,          (__itt_model_task *task, __itt_model_task_instance *instance, const char *name), (ITT_FORMAT task, instance, name), model_task_begin, __itt_group_model, "%p, %p, \"%s\"")
-ITT_STUBV(ITTAPI, void, model_task_end,            (__itt_model_task *task, __itt_model_task_instance *instance),                   (ITT_FORMAT task, instance),       model_task_end,   __itt_group_model, "%p, %p")
-ITT_STUBV(ITTAPI, void, model_lock_acquire,        (void *lock), (ITT_FORMAT lock), model_lock_acquire, __itt_group_model, "%p")
-ITT_STUBV(ITTAPI, void, model_lock_release,        (void *lock), (ITT_FORMAT lock), model_lock_release, __itt_group_model, "%p")
-ITT_STUBV(ITTAPI, void, model_record_allocation,   (void *addr, size_t size), (ITT_FORMAT addr, size), model_record_allocation,   __itt_group_model, "%p, %d")
-ITT_STUBV(ITTAPI, void, model_record_deallocation, (void *addr),              (ITT_FORMAT addr),       model_record_deallocation, __itt_group_model, "%p")
-ITT_STUBV(ITTAPI, void, model_induction_uses,      (void* addr, size_t size), (ITT_FORMAT addr, size), model_induction_uses,      __itt_group_model, "%p, %d")
-ITT_STUBV(ITTAPI, void, model_reduction_uses,      (void* addr, size_t size), (ITT_FORMAT addr, size), model_reduction_uses,      __itt_group_model, "%p, %d")
-ITT_STUBV(ITTAPI, void, model_observe_uses,        (void* addr, size_t size), (ITT_FORMAT addr, size), model_observe_uses,        __itt_group_model, "%p, %d")
-ITT_STUBV(ITTAPI, void, model_clear_uses,          (void* addr),              (ITT_FORMAT addr),       model_clear_uses,          __itt_group_model, "%p")
+ITT_STUBV(ITTAPI, void, sync_destroy, (void *addr), (ITT_FORMAT addr),
+          sync_destroy, __itt_group_sync | __itt_group_fsync, "%p")
+
+ITT_STUBV(ITTAPI, void, sync_prepare, (void *addr), (ITT_FORMAT addr),
+          sync_prepare, __itt_group_sync, "%p")
+ITT_STUBV(ITTAPI, void, sync_cancel, (void *addr), (ITT_FORMAT addr),
+          sync_cancel, __itt_group_sync, "%p")
+ITT_STUBV(ITTAPI, void, sync_acquired, (void *addr), (ITT_FORMAT addr),
+          sync_acquired, __itt_group_sync, "%p")
+ITT_STUBV(ITTAPI, void, sync_releasing, (void *addr), (ITT_FORMAT addr),
+          sync_releasing, __itt_group_sync, "%p")
+
+ITT_STUBV(ITTAPI, void, suppress_push, (unsigned int mask), (ITT_FORMAT mask),
+          suppress_push, __itt_group_suppress, "%p")
+ITT_STUBV(ITTAPI, void, suppress_pop, (void), (ITT_NO_PARAMS), suppress_pop,
+          __itt_group_suppress, "no args")
+ITT_STUBV(ITTAPI, void, suppress_mark_range,
+          (__itt_suppress_mode_t mode, unsigned int mask, void *address,
+           size_t size),
+          (ITT_FORMAT mode, mask, address, size), suppress_mark_range,
+          __itt_group_suppress, "%d, %p, %p, %d")
+ITT_STUBV(ITTAPI, void, suppress_clear_range,
+          (__itt_suppress_mode_t mode, unsigned int mask, void *address,
+           size_t size),
+          (ITT_FORMAT mode, mask, address, size), suppress_clear_range,
+          __itt_group_suppress, "%d, %p, %p, %d")
+
+ITT_STUBV(ITTAPI, void, fsync_prepare, (void *addr), (ITT_FORMAT addr),
+          sync_prepare, __itt_group_fsync, "%p")
+ITT_STUBV(ITTAPI, void, fsync_cancel, (void *addr), (ITT_FORMAT addr),
+          sync_cancel, __itt_group_fsync, "%p")
+ITT_STUBV(ITTAPI, void, fsync_acquired, (void *addr), (ITT_FORMAT addr),
+          sync_acquired, __itt_group_fsync, "%p")
+ITT_STUBV(ITTAPI, void, fsync_releasing, (void *addr), (ITT_FORMAT addr),
+          sync_releasing, __itt_group_fsync, "%p")
+
+ITT_STUBV(ITTAPI, void, model_site_begin,
+          (__itt_model_site * site, __itt_model_site_instance *instance,
+           const char *name),
+          (ITT_FORMAT site, instance, name), model_site_begin,
+          __itt_group_model, "%p, %p, \"%s\"")
+ITT_STUBV(ITTAPI, void, model_site_end,
+          (__itt_model_site * site, __itt_model_site_instance *instance),
+          (ITT_FORMAT site, instance), model_site_end, __itt_group_model,
+          "%p, %p")
+ITT_STUBV(ITTAPI, void, model_task_begin,
+          (__itt_model_task * task, __itt_model_task_instance *instance,
+           const char *name),
+          (ITT_FORMAT task, instance, name), model_task_begin,
+          __itt_group_model, "%p, %p, \"%s\"")
+ITT_STUBV(ITTAPI, void, model_task_end,
+          (__itt_model_task * task, __itt_model_task_instance *instance),
+          (ITT_FORMAT task, instance), model_task_end, __itt_group_model,
+          "%p, %p")
+ITT_STUBV(ITTAPI, void, model_lock_acquire, (void *lock), (ITT_FORMAT lock),
+          model_lock_acquire, __itt_group_model, "%p")
+ITT_STUBV(ITTAPI, void, model_lock_release, (void *lock), (ITT_FORMAT lock),
+          model_lock_release, __itt_group_model, "%p")
+ITT_STUBV(ITTAPI, void, model_record_allocation, (void *addr, size_t size),
+          (ITT_FORMAT addr, size), model_record_allocation, __itt_group_model,
+          "%p, %d")
+ITT_STUBV(ITTAPI, void, model_record_deallocation, (void *addr),
+          (ITT_FORMAT addr), model_record_deallocation, __itt_group_model, "%p")
+ITT_STUBV(ITTAPI, void, model_induction_uses, (void *addr, size_t size),
+          (ITT_FORMAT addr, size), model_induction_uses, __itt_group_model,
+          "%p, %d")
+ITT_STUBV(ITTAPI, void, model_reduction_uses, (void *addr, size_t size),
+          (ITT_FORMAT addr, size), model_reduction_uses, __itt_group_model,
+          "%p, %d")
+ITT_STUBV(ITTAPI, void, model_observe_uses, (void *addr, size_t size),
+          (ITT_FORMAT addr, size), model_observe_uses, __itt_group_model,
+          "%p, %d")
+ITT_STUBV(ITTAPI, void, model_clear_uses, (void *addr), (ITT_FORMAT addr),
+          model_clear_uses, __itt_group_model, "%p")
 
 #ifndef __ITT_INTERNAL_BODY
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUBV(ITTAPI, void, model_site_beginW,         (const wchar_t *name),     (ITT_FORMAT name),       model_site_beginW,         __itt_group_model, "\"%s\"")
-ITT_STUBV(ITTAPI, void, model_task_beginW,         (const wchar_t *name),     (ITT_FORMAT name),       model_task_beginW,         __itt_group_model, "\"%s\"")
-ITT_STUBV(ITTAPI, void, model_iteration_taskW,     (const wchar_t *name),     (ITT_FORMAT name),       model_iteration_taskW,     __itt_group_model, "\"%s\"")
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUBV(ITTAPI, void, model_site_beginW, (const wchar_t *name),
+          (ITT_FORMAT name), model_site_beginW, __itt_group_model, "\"%s\"")
+ITT_STUBV(ITTAPI, void, model_task_beginW, (const wchar_t *name),
+          (ITT_FORMAT name), model_task_beginW, __itt_group_model, "\"%s\"")
+ITT_STUBV(ITTAPI, void, model_iteration_taskW, (const wchar_t *name),
+          (ITT_FORMAT name), model_iteration_taskW, __itt_group_model, "\"%s\"")
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-ITT_STUBV(ITTAPI, void, model_site_beginA,         (const char *name),        (ITT_FORMAT name),       model_site_beginA,         __itt_group_model, "\"%s\"")
-ITT_STUBV(ITTAPI, void, model_site_beginAL,        (const char *name, size_t len), (ITT_FORMAT name, len), model_site_beginAL,    __itt_group_model, "\"%s\", %d")
-ITT_STUBV(ITTAPI, void, model_task_beginA,         (const char *name),        (ITT_FORMAT name),       model_task_beginA,         __itt_group_model, "\"%s\"")
-ITT_STUBV(ITTAPI, void, model_task_beginAL,        (const char *name, size_t len), (ITT_FORMAT name, len), model_task_beginAL,    __itt_group_model, "\"%s\", %d")
-ITT_STUBV(ITTAPI, void, model_iteration_taskA,     (const char *name),        (ITT_FORMAT name),       model_iteration_taskA,     __itt_group_model, "\"%s\"")
-ITT_STUBV(ITTAPI, void, model_iteration_taskAL,    (const char *name, size_t len), (ITT_FORMAT name, len), model_iteration_taskAL, __itt_group_model, "\"%s\", %d")
-ITT_STUBV(ITTAPI, void, model_site_end_2,          (void),                    (ITT_NO_PARAMS),         model_site_end_2,          __itt_group_model, "no args")
-ITT_STUBV(ITTAPI, void, model_task_end_2,          (void),                    (ITT_NO_PARAMS),         model_task_end_2,          __itt_group_model, "no args")
-ITT_STUBV(ITTAPI, void, model_lock_acquire_2,      (void *lock),              (ITT_FORMAT lock),       model_lock_acquire_2,      __itt_group_model, "%p")
-ITT_STUBV(ITTAPI, void, model_lock_release_2,      (void *lock),              (ITT_FORMAT lock),       model_lock_release_2,      __itt_group_model, "%p")
-ITT_STUBV(ITTAPI, void, model_aggregate_task,      (size_t count),            (ITT_FORMAT count),      model_aggregate_task,      __itt_group_model, "%d")
-ITT_STUBV(ITTAPI, void, model_disable_push,        (__itt_model_disable x),   (ITT_FORMAT x),          model_disable_push,        __itt_group_model, "%p")
-ITT_STUBV(ITTAPI, void, model_disable_pop,         (void),                    (ITT_NO_PARAMS),         model_disable_pop,         __itt_group_model, "no args")
+ITT_STUBV(ITTAPI, void, model_site_beginA, (const char *name),
+          (ITT_FORMAT name), model_site_beginA, __itt_group_model, "\"%s\"")
+ITT_STUBV(ITTAPI, void, model_site_beginAL, (const char *name, size_t len),
+          (ITT_FORMAT name, len), model_site_beginAL, __itt_group_model,
+          "\"%s\", %d")
+ITT_STUBV(ITTAPI, void, model_task_beginA, (const char *name),
+          (ITT_FORMAT name), model_task_beginA, __itt_group_model, "\"%s\"")
+ITT_STUBV(ITTAPI, void, model_task_beginAL, (const char *name, size_t len),
+          (ITT_FORMAT name, len), model_task_beginAL, __itt_group_model,
+          "\"%s\", %d")
+ITT_STUBV(ITTAPI, void, model_iteration_taskA, (const char *name),
+          (ITT_FORMAT name), model_iteration_taskA, __itt_group_model, "\"%s\"")
+ITT_STUBV(ITTAPI, void, model_iteration_taskAL, (const char *name, size_t len),
+          (ITT_FORMAT name, len), model_iteration_taskAL, __itt_group_model,
+          "\"%s\", %d")
+ITT_STUBV(ITTAPI, void, model_site_end_2, (void), (ITT_NO_PARAMS),
+          model_site_end_2, __itt_group_model, "no args")
+ITT_STUBV(ITTAPI, void, model_task_end_2, (void), (ITT_NO_PARAMS),
+          model_task_end_2, __itt_group_model, "no args")
+ITT_STUBV(ITTAPI, void, model_lock_acquire_2, (void *lock), (ITT_FORMAT lock),
+          model_lock_acquire_2, __itt_group_model, "%p")
+ITT_STUBV(ITTAPI, void, model_lock_release_2, (void *lock), (ITT_FORMAT lock),
+          model_lock_release_2, __itt_group_model, "%p")
+ITT_STUBV(ITTAPI, void, model_aggregate_task, (size_t count),
+          (ITT_FORMAT count), model_aggregate_task, __itt_group_model, "%d")
+ITT_STUBV(ITTAPI, void, model_disable_push, (__itt_model_disable x),
+          (ITT_FORMAT x), model_disable_push, __itt_group_model, "%p")
+ITT_STUBV(ITTAPI, void, model_disable_pop, (void), (ITT_NO_PARAMS),
+          model_disable_pop, __itt_group_model, "no args")
 #endif /* __ITT_INTERNAL_BODY */
 
 #ifndef __ITT_INTERNAL_BODY
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUB(ITTAPI, __itt_heap_function, heap_function_createA, (const char    *name, const char    *domain), (ITT_FORMAT name, domain), heap_function_createA, __itt_group_heap, "\"%s\", \"%s\"")
-ITT_STUB(ITTAPI, __itt_heap_function, heap_function_createW, (const wchar_t *name, const wchar_t *domain), (ITT_FORMAT name, domain), heap_function_createW, __itt_group_heap, "\"%s\", \"%s\"")
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-ITT_STUB(ITTAPI, __itt_heap_function, heap_function_create,  (const char    *name, const char    *domain), (ITT_FORMAT name, domain), heap_function_create,  __itt_group_heap, "\"%s\", \"%s\"")
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUB(ITTAPI, __itt_heap_function, heap_function_createA,
+         (const char *name, const char *domain), (ITT_FORMAT name, domain),
+         heap_function_createA, __itt_group_heap, "\"%s\", \"%s\"")
+ITT_STUB(ITTAPI, __itt_heap_function, heap_function_createW,
+         (const wchar_t *name, const wchar_t *domain),
+         (ITT_FORMAT name, domain), heap_function_createW, __itt_group_heap,
+         "\"%s\", \"%s\"")
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+ITT_STUB(ITTAPI, __itt_heap_function, heap_function_create,
+         (const char *name, const char *domain), (ITT_FORMAT name, domain),
+         heap_function_create, __itt_group_heap, "\"%s\", \"%s\"")
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* __ITT_INTERNAL_BODY */
-ITT_STUBV(ITTAPI, void, heap_allocate_begin,   (__itt_heap_function h, size_t size, int initialized),             (ITT_FORMAT h, size, initialized),       heap_allocate_begin, __itt_group_heap, "%p, %lu, %d")
-ITT_STUBV(ITTAPI, void, heap_allocate_end,     (__itt_heap_function h, void** addr, size_t size, int initialized), (ITT_FORMAT h, addr, size, initialized), heap_allocate_end,   __itt_group_heap, "%p, %p, %lu, %d")
-ITT_STUBV(ITTAPI, void, heap_free_begin,       (__itt_heap_function h, void*  addr), (ITT_FORMAT h, addr), heap_free_begin, __itt_group_heap, "%p, %p")
-ITT_STUBV(ITTAPI, void, heap_free_end,         (__itt_heap_function h, void*  addr), (ITT_FORMAT h, addr), heap_free_end,   __itt_group_heap, "%p, %p")
-ITT_STUBV(ITTAPI, void, heap_reallocate_begin, (__itt_heap_function h, void*  addr, size_t new_size, int initialized),                  (ITT_FORMAT h, addr, new_size, initialized),           heap_reallocate_begin, __itt_group_heap, "%p, %p, %lu, %d")
-ITT_STUBV(ITTAPI, void, heap_reallocate_end,   (__itt_heap_function h, void*  addr, void** new_addr, size_t new_size, int initialized), (ITT_FORMAT h, addr, new_addr, new_size, initialized), heap_reallocate_end,   __itt_group_heap, "%p, %p, %p, %lu, %d")
-ITT_STUBV(ITTAPI, void, heap_internal_access_begin, (void), (ITT_NO_PARAMS), heap_internal_access_begin, __itt_group_heap, "no args")
-ITT_STUBV(ITTAPI, void, heap_internal_access_end,   (void), (ITT_NO_PARAMS), heap_internal_access_end,   __itt_group_heap, "no args")
-ITT_STUBV(ITTAPI, void, heap_record_memory_growth_begin, (void), (ITT_NO_PARAMS), heap_record_memory_growth_begin, __itt_group_heap, "no args")
-ITT_STUBV(ITTAPI, void, heap_record_memory_growth_end,   (void), (ITT_NO_PARAMS), heap_record_memory_growth_end,   __itt_group_heap, "no args")
-ITT_STUBV(ITTAPI, void, heap_reset_detection, (unsigned int reset_mask),  (ITT_FORMAT reset_mask), heap_reset_detection, __itt_group_heap, "%u")
-ITT_STUBV(ITTAPI, void, heap_record,          (unsigned int record_mask), (ITT_FORMAT record_mask),  heap_record,        __itt_group_heap, "%u")
-
-ITT_STUBV(ITTAPI, void, id_create,  (const __itt_domain *domain, __itt_id id), (ITT_FORMAT domain, id), id_create,  __itt_group_structure, "%p, %lu")
-ITT_STUBV(ITTAPI, void, id_destroy, (const __itt_domain *domain, __itt_id id), (ITT_FORMAT domain, id), id_destroy, __itt_group_structure, "%p, %lu")
-
-ITT_STUB(ITTAPI, __itt_timestamp, get_timestamp, (void), (ITT_NO_PARAMS), get_timestamp,  __itt_group_structure, "no args")
-
-ITT_STUBV(ITTAPI, void, region_begin, (const __itt_domain *domain, __itt_id id, __itt_id parent, __itt_string_handle *name), (ITT_FORMAT domain, id, parent, name), region_begin, __itt_group_structure, "%p, %lu, %lu, %p")
-ITT_STUBV(ITTAPI, void, region_end,   (const __itt_domain *domain, __itt_id id),                                             (ITT_FORMAT domain, id),               region_end,   __itt_group_structure, "%p, %lu")
+ITT_STUBV(ITTAPI, void, heap_allocate_begin,
+          (__itt_heap_function h, size_t size, int initialized),
+          (ITT_FORMAT h, size, initialized), heap_allocate_begin,
+          __itt_group_heap, "%p, %lu, %d")
+ITT_STUBV(ITTAPI, void, heap_allocate_end,
+          (__itt_heap_function h, void **addr, size_t size, int initialized),
+          (ITT_FORMAT h, addr, size, initialized), heap_allocate_end,
+          __itt_group_heap, "%p, %p, %lu, %d")
+ITT_STUBV(ITTAPI, void, heap_free_begin, (__itt_heap_function h, void *addr),
+          (ITT_FORMAT h, addr), heap_free_begin, __itt_group_heap, "%p, %p")
+ITT_STUBV(ITTAPI, void, heap_free_end, (__itt_heap_function h, void *addr),
+          (ITT_FORMAT h, addr), heap_free_end, __itt_group_heap, "%p, %p")
+ITT_STUBV(ITTAPI, void, heap_reallocate_begin,
+          (__itt_heap_function h, void *addr, size_t new_size, int initialized),
+          (ITT_FORMAT h, addr, new_size, initialized), heap_reallocate_begin,
+          __itt_group_heap, "%p, %p, %lu, %d")
+ITT_STUBV(ITTAPI, void, heap_reallocate_end,
+          (__itt_heap_function h, void *addr, void **new_addr, size_t new_size,
+           int initialized),
+          (ITT_FORMAT h, addr, new_addr, new_size, initialized),
+          heap_reallocate_end, __itt_group_heap, "%p, %p, %p, %lu, %d")
+ITT_STUBV(ITTAPI, void, heap_internal_access_begin, (void), (ITT_NO_PARAMS),
+          heap_internal_access_begin, __itt_group_heap, "no args")
+ITT_STUBV(ITTAPI, void, heap_internal_access_end, (void), (ITT_NO_PARAMS),
+          heap_internal_access_end, __itt_group_heap, "no args")
+ITT_STUBV(ITTAPI, void, heap_record_memory_growth_begin, (void),
+          (ITT_NO_PARAMS), heap_record_memory_growth_begin, __itt_group_heap,
+          "no args")
+ITT_STUBV(ITTAPI, void, heap_record_memory_growth_end, (void), (ITT_NO_PARAMS),
+          heap_record_memory_growth_end, __itt_group_heap, "no args")
+ITT_STUBV(ITTAPI, void, heap_reset_detection, (unsigned int reset_mask),
+          (ITT_FORMAT reset_mask), heap_reset_detection, __itt_group_heap, "%u")
+ITT_STUBV(ITTAPI, void, heap_record, (unsigned int record_mask),
+          (ITT_FORMAT record_mask), heap_record, __itt_group_heap, "%u")
+
+ITT_STUBV(ITTAPI, void, id_create, (const __itt_domain *domain, __itt_id id),
+          (ITT_FORMAT domain, id), id_create, __itt_group_structure, "%p, %lu")
+ITT_STUBV(ITTAPI, void, id_destroy, (const __itt_domain *domain, __itt_id id),
+          (ITT_FORMAT domain, id), id_destroy, __itt_group_structure, "%p, %lu")
+
+ITT_STUB(ITTAPI, __itt_timestamp, get_timestamp, (void), (ITT_NO_PARAMS),
+         get_timestamp, __itt_group_structure, "no args")
+
+ITT_STUBV(ITTAPI, void, region_begin,
+          (const __itt_domain *domain, __itt_id id, __itt_id parent,
+           __itt_string_handle *name),
+          (ITT_FORMAT domain, id, parent, name), region_begin,
+          __itt_group_structure, "%p, %lu, %lu, %p")
+ITT_STUBV(ITTAPI, void, region_end, (const __itt_domain *domain, __itt_id id),
+          (ITT_FORMAT domain, id), region_end, __itt_group_structure, "%p, %lu")
 
 #ifndef __ITT_INTERNAL_BODY
-ITT_STUBV(ITTAPI, void, frame_begin_v3,  (const __itt_domain *domain, __itt_id *id),                                             (ITT_FORMAT domain, id),             frame_begin_v3,  __itt_group_structure, "%p, %p")
-ITT_STUBV(ITTAPI, void, frame_end_v3,    (const __itt_domain *domain, __itt_id *id),                                             (ITT_FORMAT domain, id),             frame_end_v3,    __itt_group_structure, "%p, %p")
-ITT_STUBV(ITTAPI, void, frame_submit_v3, (const __itt_domain *domain, __itt_id *id, __itt_timestamp begin, __itt_timestamp end), (ITT_FORMAT domain, id, begin, end), frame_submit_v3, __itt_group_structure, "%p, %p, %lu, %lu")
+ITT_STUBV(ITTAPI, void, frame_begin_v3,
+          (const __itt_domain *domain, __itt_id *id), (ITT_FORMAT domain, id),
+          frame_begin_v3, __itt_group_structure, "%p, %p")
+ITT_STUBV(ITTAPI, void, frame_end_v3,
+          (const __itt_domain *domain, __itt_id *id), (ITT_FORMAT domain, id),
+          frame_end_v3, __itt_group_structure, "%p, %p")
+ITT_STUBV(ITTAPI, void, frame_submit_v3,
+          (const __itt_domain *domain, __itt_id *id, __itt_timestamp begin,
+           __itt_timestamp end),
+          (ITT_FORMAT domain, id, begin, end), frame_submit_v3,
+          __itt_group_structure, "%p, %p, %lu, %lu")
 #endif /* __ITT_INTERNAL_BODY */
 
-ITT_STUBV(ITTAPI, void, task_group,   (const __itt_domain *domain, __itt_id id, __itt_id parent, __itt_string_handle *name), (ITT_FORMAT domain, id, parent, name), task_group,  __itt_group_structure, "%p, %lu, %lu, %p")
-
-ITT_STUBV(ITTAPI, void, task_begin,    (const __itt_domain *domain, __itt_id id, __itt_id parent, __itt_string_handle *name), (ITT_FORMAT domain, id, parent, name), task_begin,    __itt_group_structure, "%p, %lu, %lu, %p")
-ITT_STUBV(ITTAPI, void, task_begin_fn, (const __itt_domain *domain, __itt_id id, __itt_id parent, void* fn),                  (ITT_FORMAT domain, id, parent, fn),   task_begin_fn, __itt_group_structure, "%p, %lu, %lu, %p")
-ITT_STUBV(ITTAPI, void, task_end,      (const __itt_domain *domain),                                                          (ITT_FORMAT domain),                   task_end,      __itt_group_structure, "%p")
-
-ITT_STUBV(ITTAPI, void, counter_inc_v3,       (const __itt_domain *domain, __itt_string_handle *name),                           (ITT_FORMAT domain, name),        counter_inc_v3,       __itt_group_structure, "%p, %p")
-ITT_STUBV(ITTAPI, void, counter_inc_delta_v3, (const __itt_domain *domain, __itt_string_handle *name, unsigned long long value), (ITT_FORMAT domain, name, value), counter_inc_delta_v3, __itt_group_structure, "%p, %p, %lu")
-ITT_STUBV(ITTAPI, void, counter_dec_v3,       (const __itt_domain *domain, __itt_string_handle *name),                           (ITT_FORMAT domain, name),        counter_dec_v3,       __itt_group_structure, "%p, %p")
-ITT_STUBV(ITTAPI, void, counter_dec_delta_v3, (const __itt_domain *domain, __itt_string_handle *name, unsigned long long value), (ITT_FORMAT domain, name, value), counter_dec_delta_v3, __itt_group_structure, "%p, %p, %lu")
-
-ITT_STUBV(ITTAPI, void, marker, (const __itt_domain *domain, __itt_id id, __itt_string_handle *name, __itt_scope scope), (ITT_FORMAT domain, id, name, scope), marker, __itt_group_structure, "%p, %lu, %p, %d")
-
-ITT_STUBV(ITTAPI, void, metadata_add,      (const __itt_domain *domain, __itt_id id, __itt_string_handle *key, __itt_metadata_type type, size_t count, void *data), (ITT_FORMAT domain, id, key, type, count, data), metadata_add, __itt_group_structure, "%p, %lu, %p, %d, %lu, %p")
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUBV(ITTAPI, void, metadata_str_addA, (const __itt_domain *domain, __itt_id id, __itt_string_handle *key, const char* data, size_t length),    (ITT_FORMAT domain, id, key, data, length), metadata_str_addA, __itt_group_structure, "%p, %lu, %p, %p, %lu")
-ITT_STUBV(ITTAPI, void, metadata_str_addW, (const __itt_domain *domain, __itt_id id, __itt_string_handle *key, const wchar_t* data, size_t length), (ITT_FORMAT domain, id, key, data, length), metadata_str_addW, __itt_group_structure, "%p, %lu, %p, %p, %lu")
-#else  /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
-ITT_STUBV(ITTAPI, void, metadata_str_add,  (const __itt_domain *domain, __itt_id id, __itt_string_handle *key, const char* data, size_t length),    (ITT_FORMAT domain, id, key, data, length), metadata_str_add,  __itt_group_structure, "%p, %lu, %p, %p, %lu")
+ITT_STUBV(ITTAPI, void, task_group,
+          (const __itt_domain *domain, __itt_id id, __itt_id parent,
+           __itt_string_handle *name),
+          (ITT_FORMAT domain, id, parent, name), task_group,
+          __itt_group_structure, "%p, %lu, %lu, %p")
+
+ITT_STUBV(ITTAPI, void, task_begin,
+          (const __itt_domain *domain, __itt_id id, __itt_id parent,
+           __itt_string_handle *name),
+          (ITT_FORMAT domain, id, parent, name), task_begin,
+          __itt_group_structure, "%p, %lu, %lu, %p")
+ITT_STUBV(ITTAPI, void, task_begin_fn,
+          (const __itt_domain *domain, __itt_id id, __itt_id parent, void *fn),
+          (ITT_FORMAT domain, id, parent, fn), task_begin_fn,
+          __itt_group_structure, "%p, %lu, %lu, %p")
+ITT_STUBV(ITTAPI, void, task_end, (const __itt_domain *domain),
+          (ITT_FORMAT domain), task_end, __itt_group_structure, "%p")
+
+ITT_STUBV(ITTAPI, void, counter_inc_v3,
+          (const __itt_domain *domain, __itt_string_handle *name),
+          (ITT_FORMAT domain, name), counter_inc_v3, __itt_group_structure,
+          "%p, %p")
+ITT_STUBV(ITTAPI, void, counter_inc_delta_v3,
+          (const __itt_domain *domain, __itt_string_handle *name,
+           unsigned long long value),
+          (ITT_FORMAT domain, name, value), counter_inc_delta_v3,
+          __itt_group_structure, "%p, %p, %lu")
+ITT_STUBV(ITTAPI, void, counter_dec_v3,
+          (const __itt_domain *domain, __itt_string_handle *name),
+          (ITT_FORMAT domain, name), counter_dec_v3, __itt_group_structure,
+          "%p, %p")
+ITT_STUBV(ITTAPI, void, counter_dec_delta_v3,
+          (const __itt_domain *domain, __itt_string_handle *name,
+           unsigned long long value),
+          (ITT_FORMAT domain, name, value), counter_dec_delta_v3,
+          __itt_group_structure, "%p, %p, %lu")
+
+ITT_STUBV(ITTAPI, void, marker,
+          (const __itt_domain *domain, __itt_id id, __itt_string_handle *name,
+           __itt_scope scope),
+          (ITT_FORMAT domain, id, name, scope), marker, __itt_group_structure,
+          "%p, %lu, %p, %d")
+
+ITT_STUBV(ITTAPI, void, metadata_add,
+          (const __itt_domain *domain, __itt_id id, __itt_string_handle *key,
+           __itt_metadata_type type, size_t count, void *data),
+          (ITT_FORMAT domain, id, key, type, count, data), metadata_add,
+          __itt_group_structure, "%p, %lu, %p, %d, %lu, %p")
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUBV(ITTAPI, void, metadata_str_addA,
+          (const __itt_domain *domain, __itt_id id, __itt_string_handle *key,
+           const char *data, size_t length),
+          (ITT_FORMAT domain, id, key, data, length), metadata_str_addA,
+          __itt_group_structure, "%p, %lu, %p, %p, %lu")
+ITT_STUBV(ITTAPI, void, metadata_str_addW,
+          (const __itt_domain *domain, __itt_id id, __itt_string_handle *key,
+           const wchar_t *data, size_t length),
+          (ITT_FORMAT domain, id, key, data, length), metadata_str_addW,
+          __itt_group_structure, "%p, %lu, %p, %p, %lu")
+#else /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
+ITT_STUBV(ITTAPI, void, metadata_str_add,
+          (const __itt_domain *domain, __itt_id id, __itt_string_handle *key,
+           const char *data, size_t length),
+          (ITT_FORMAT domain, id, key, data, length), metadata_str_add,
+          __itt_group_structure, "%p, %lu, %p, %p, %lu")
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
-ITT_STUBV(ITTAPI, void, relation_add_to_current, (const __itt_domain *domain, __itt_relation relation, __itt_id tail),                (ITT_FORMAT domain, relation, tail),       relation_add_to_current, __itt_group_structure, "%p, %lu, %p")
-ITT_STUBV(ITTAPI, void, relation_add,            (const __itt_domain *domain, __itt_id head, __itt_relation relation, __itt_id tail), (ITT_FORMAT domain, head, relation, tail), relation_add,            __itt_group_structure, "%p, %p, %lu, %p")
+ITT_STUBV(ITTAPI, void, relation_add_to_current,
+          (const __itt_domain *domain, __itt_relation relation, __itt_id tail),
+          (ITT_FORMAT domain, relation, tail), relation_add_to_current,
+          __itt_group_structure, "%p, %lu, %p")
+ITT_STUBV(ITTAPI, void, relation_add,
+          (const __itt_domain *domain, __itt_id head, __itt_relation relation,
+           __itt_id tail),
+          (ITT_FORMAT domain, head, relation, tail), relation_add,
+          __itt_group_structure, "%p, %p, %lu, %p")
 
 #ifndef __ITT_INTERNAL_BODY
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUB(LIBITTAPI, __itt_event, event_createA, (const char    *name, int namelen), (ITT_FORMAT name, namelen), event_createA, __itt_group_mark | __itt_group_legacy, "\"%s\", %d")
-ITT_STUB(LIBITTAPI, __itt_event, event_createW, (const wchar_t *name, int namelen), (ITT_FORMAT name, namelen), event_createW, __itt_group_mark | __itt_group_legacy, "\"%S\", %d")
-#else  /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
-ITT_STUB(LIBITTAPI, __itt_event, event_create,  (const char    *name, int namelen), (ITT_FORMAT name, namelen), event_create,  __itt_group_mark | __itt_group_legacy, "\"%s\", %d")
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUB(LIBITTAPI, __itt_event, event_createA, (const char *name, int namelen),
+         (ITT_FORMAT name, namelen), event_createA,
+         __itt_group_mark | __itt_group_legacy, "\"%s\", %d")
+ITT_STUB(LIBITTAPI, __itt_event, event_createW,
+         (const wchar_t *name, int namelen), (ITT_FORMAT name, namelen),
+         event_createW, __itt_group_mark | __itt_group_legacy, "\"%S\", %d")
+#else /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
+ITT_STUB(LIBITTAPI, __itt_event, event_create, (const char *name, int namelen),
+         (ITT_FORMAT name, namelen), event_create,
+         __itt_group_mark | __itt_group_legacy, "\"%s\", %d")
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-ITT_STUB(LIBITTAPI, int,  event_start,          (__itt_event event),                (ITT_FORMAT event),         event_start,   __itt_group_mark | __itt_group_legacy, "%d")
-ITT_STUB(LIBITTAPI, int,  event_end,            (__itt_event event),                (ITT_FORMAT event),         event_end,     __itt_group_mark | __itt_group_legacy, "%d")
+ITT_STUB(LIBITTAPI, int, event_start, (__itt_event event), (ITT_FORMAT event),
+         event_start, __itt_group_mark | __itt_group_legacy, "%d")
+ITT_STUB(LIBITTAPI, int, event_end, (__itt_event event), (ITT_FORMAT event),
+         event_end, __itt_group_mark | __itt_group_legacy, "%d")
 #endif /* __ITT_INTERNAL_BODY */
 
 #ifndef __ITT_INTERNAL_BODY
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUBV(ITTAPI, void, sync_set_nameA, (void *addr, const char    *objtype, const char    *objname, int attribute), (ITT_FORMAT addr, objtype, objname, attribute), sync_set_nameA, __itt_group_sync | __itt_group_fsync | __itt_group_legacy, "%p, \"%s\", \"%s\", %x")
-ITT_STUBV(ITTAPI, void, sync_set_nameW, (void *addr, const wchar_t *objtype, const wchar_t *objname, int attribute), (ITT_FORMAT addr, objtype, objname, attribute), sync_set_nameW, __itt_group_sync | __itt_group_fsync | __itt_group_legacy, "%p, \"%S\", \"%S\", %x")
-#else  /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
-ITT_STUBV(ITTAPI, void, sync_set_name,  (void *addr, const char    *objtype, const char    *objname, int attribute), (ITT_FORMAT addr, objtype, objname, attribute), sync_set_name,  __itt_group_sync | __itt_group_fsync | __itt_group_legacy, "p, \"%s\", \"%s\", %x")
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUBV(ITTAPI, void, sync_set_nameA,
+          (void *addr, const char *objtype, const char *objname, int attribute),
+          (ITT_FORMAT addr, objtype, objname, attribute), sync_set_nameA,
+          __itt_group_sync | __itt_group_fsync | __itt_group_legacy,
+          "%p, \"%s\", \"%s\", %x")
+ITT_STUBV(ITTAPI, void, sync_set_nameW,
+          (void *addr, const wchar_t *objtype, const wchar_t *objname,
+           int attribute),
+          (ITT_FORMAT addr, objtype, objname, attribute), sync_set_nameW,
+          __itt_group_sync | __itt_group_fsync | __itt_group_legacy,
+          "%p, \"%S\", \"%S\", %x")
+#else /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
+ITT_STUBV(ITTAPI, void, sync_set_name,
+          (void *addr, const char *objtype, const char *objname, int attribute),
+          (ITT_FORMAT addr, objtype, objname, attribute), sync_set_name,
+          __itt_group_sync | __itt_group_fsync | __itt_group_legacy,
+          "p, \"%s\", \"%s\", %x")
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUB(LIBITTAPI, int, notify_sync_nameA, (void *p, const char    *objtype, int typelen, const char    *objname, int namelen, int attribute), (ITT_FORMAT p, objtype, typelen, objname, namelen, attribute), notify_sync_nameA, __itt_group_sync | __itt_group_fsync | __itt_group_legacy, "%p, \"%s\", %d, \"%s\", %d, %x")
-ITT_STUB(LIBITTAPI, int, notify_sync_nameW, (void *p, const wchar_t *objtype, int typelen, const wchar_t *objname, int namelen, int attribute), (ITT_FORMAT p, objtype, typelen, objname, namelen, attribute), notify_sync_nameW, __itt_group_sync | __itt_group_fsync | __itt_group_legacy, "%p, \"%S\", %d, \"%S\", %d, %x")
-#else  /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
-ITT_STUB(LIBITTAPI, int, notify_sync_name,  (void *p, const char    *objtype, int typelen, const char    *objname, int namelen, int attribute), (ITT_FORMAT p, objtype, typelen, objname, namelen, attribute), notify_sync_name,  __itt_group_sync | __itt_group_fsync | __itt_group_legacy, "%p, \"%s\", %d, \"%s\", %d, %x")
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUB(LIBITTAPI, int, notify_sync_nameA,
+         (void *p, const char *objtype, int typelen, const char *objname,
+          int namelen, int attribute),
+         (ITT_FORMAT p, objtype, typelen, objname, namelen, attribute),
+         notify_sync_nameA,
+         __itt_group_sync | __itt_group_fsync | __itt_group_legacy,
+         "%p, \"%s\", %d, \"%s\", %d, %x")
+ITT_STUB(LIBITTAPI, int, notify_sync_nameW,
+         (void *p, const wchar_t *objtype, int typelen, const wchar_t *objname,
+          int namelen, int attribute),
+         (ITT_FORMAT p, objtype, typelen, objname, namelen, attribute),
+         notify_sync_nameW,
+         __itt_group_sync | __itt_group_fsync | __itt_group_legacy,
+         "%p, \"%S\", %d, \"%S\", %d, %x")
+#else /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
+ITT_STUB(LIBITTAPI, int, notify_sync_name,
+         (void *p, const char *objtype, int typelen, const char *objname,
+          int namelen, int attribute),
+         (ITT_FORMAT p, objtype, typelen, objname, namelen, attribute),
+         notify_sync_name,
+         __itt_group_sync | __itt_group_fsync | __itt_group_legacy,
+         "%p, \"%s\", %d, \"%s\", %d, %x")
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
-ITT_STUBV(LIBITTAPI, void, notify_sync_prepare,   (void *p), (ITT_FORMAT p), notify_sync_prepare,   __itt_group_sync | __itt_group_fsync | __itt_group_legacy, "%p")
-ITT_STUBV(LIBITTAPI, void, notify_sync_cancel,    (void *p), (ITT_FORMAT p), notify_sync_cancel,    __itt_group_sync | __itt_group_fsync | __itt_group_legacy, "%p")
-ITT_STUBV(LIBITTAPI, void, notify_sync_acquired,  (void *p), (ITT_FORMAT p), notify_sync_acquired,  __itt_group_sync | __itt_group_fsync | __itt_group_legacy, "%p")
-ITT_STUBV(LIBITTAPI, void, notify_sync_releasing, (void *p), (ITT_FORMAT p), notify_sync_releasing, __itt_group_sync | __itt_group_fsync | __itt_group_legacy, "%p")
+ITT_STUBV(LIBITTAPI, void, notify_sync_prepare, (void *p), (ITT_FORMAT p),
+          notify_sync_prepare,
+          __itt_group_sync | __itt_group_fsync | __itt_group_legacy, "%p")
+ITT_STUBV(LIBITTAPI, void, notify_sync_cancel, (void *p), (ITT_FORMAT p),
+          notify_sync_cancel,
+          __itt_group_sync | __itt_group_fsync | __itt_group_legacy, "%p")
+ITT_STUBV(LIBITTAPI, void, notify_sync_acquired, (void *p), (ITT_FORMAT p),
+          notify_sync_acquired,
+          __itt_group_sync | __itt_group_fsync | __itt_group_legacy, "%p")
+ITT_STUBV(LIBITTAPI, void, notify_sync_releasing, (void *p), (ITT_FORMAT p),
+          notify_sync_releasing,
+          __itt_group_sync | __itt_group_fsync | __itt_group_legacy, "%p")
 #endif /* __ITT_INTERNAL_BODY */
 
-ITT_STUBV(LIBITTAPI, void, memory_read,   (void *addr, size_t size), (ITT_FORMAT addr, size), memory_read,   __itt_group_legacy, "%p, %lu")
-ITT_STUBV(LIBITTAPI, void, memory_write,  (void *addr, size_t size), (ITT_FORMAT addr, size), memory_write,  __itt_group_legacy, "%p, %lu")
-ITT_STUBV(LIBITTAPI, void, memory_update, (void *addr, size_t size), (ITT_FORMAT addr, size), memory_update, __itt_group_legacy, "%p, %lu")
-
-ITT_STUB(LIBITTAPI, __itt_state_t,     state_get,    (void),                                    (ITT_NO_PARAMS),   state_get,    __itt_group_legacy, "no args")
-ITT_STUB(LIBITTAPI, __itt_state_t,     state_set,    (__itt_state_t s),                         (ITT_FORMAT s),    state_set,    __itt_group_legacy, "%d")
-ITT_STUB(LIBITTAPI, __itt_obj_state_t, obj_mode_set, (__itt_obj_prop_t p, __itt_obj_state_t s), (ITT_FORMAT p, s), obj_mode_set, __itt_group_legacy, "%d, %d")
-ITT_STUB(LIBITTAPI, __itt_thr_state_t, thr_mode_set, (__itt_thr_prop_t p, __itt_thr_state_t s), (ITT_FORMAT p, s), thr_mode_set, __itt_group_legacy, "%d, %d")
+ITT_STUBV(LIBITTAPI, void, memory_read, (void *addr, size_t size),
+          (ITT_FORMAT addr, size), memory_read, __itt_group_legacy, "%p, %lu")
+ITT_STUBV(LIBITTAPI, void, memory_write, (void *addr, size_t size),
+          (ITT_FORMAT addr, size), memory_write, __itt_group_legacy, "%p, %lu")
+ITT_STUBV(LIBITTAPI, void, memory_update, (void *addr, size_t size),
+          (ITT_FORMAT addr, size), memory_update, __itt_group_legacy, "%p, %lu")
+
+ITT_STUB(LIBITTAPI, __itt_state_t, state_get, (void), (ITT_NO_PARAMS),
+         state_get, __itt_group_legacy, "no args")
+ITT_STUB(LIBITTAPI, __itt_state_t, state_set, (__itt_state_t s), (ITT_FORMAT s),
+         state_set, __itt_group_legacy, "%d")
+ITT_STUB(LIBITTAPI, __itt_obj_state_t, obj_mode_set,
+         (__itt_obj_prop_t p, __itt_obj_state_t s), (ITT_FORMAT p, s),
+         obj_mode_set, __itt_group_legacy, "%d, %d")
+ITT_STUB(LIBITTAPI, __itt_thr_state_t, thr_mode_set,
+         (__itt_thr_prop_t p, __itt_thr_state_t s), (ITT_FORMAT p, s),
+         thr_mode_set, __itt_group_legacy, "%d, %d")
 
 #ifndef __ITT_INTERNAL_BODY
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUB(ITTAPI, __itt_frame, frame_createA, (const char    *domain), (ITT_FORMAT domain), frame_createA, __itt_group_frame, "\"%s\"")
-ITT_STUB(ITTAPI, __itt_frame, frame_createW, (const wchar_t *domain), (ITT_FORMAT domain), frame_createW, __itt_group_frame, "\"%s\"")
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-ITT_STUB(ITTAPI, __itt_frame, frame_create,  (const char    *domain), (ITT_FORMAT domain), frame_create,  __itt_group_frame, "\"%s\"")
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUB(ITTAPI, __itt_frame, frame_createA, (const char *domain),
+         (ITT_FORMAT domain), frame_createA, __itt_group_frame, "\"%s\"")
+ITT_STUB(ITTAPI, __itt_frame, frame_createW, (const wchar_t *domain),
+         (ITT_FORMAT domain), frame_createW, __itt_group_frame, "\"%s\"")
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+ITT_STUB(ITTAPI, __itt_frame, frame_create, (const char *domain),
+         (ITT_FORMAT domain), frame_create, __itt_group_frame, "\"%s\"")
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* __ITT_INTERNAL_BODY */
-ITT_STUBV(ITTAPI, void, frame_begin,         (__itt_frame frame),     (ITT_FORMAT frame),  frame_begin,   __itt_group_frame, "%p")
-ITT_STUBV(ITTAPI, void, frame_end,           (__itt_frame frame),     (ITT_FORMAT frame),  frame_end,     __itt_group_frame, "%p")
-
-ITT_STUBV(ITTAPI, void, counter_destroy,      (__itt_counter id),                                                                                  (ITT_FORMAT id),        counter_destroy,   __itt_group_counter, "%p")
-ITT_STUBV(ITTAPI, void, counter_inc,          (__itt_counter id),                                                                                  (ITT_FORMAT id),        counter_inc,       __itt_group_counter, "%p")
-ITT_STUBV(ITTAPI, void, counter_inc_delta,    (__itt_counter id, unsigned long long value),                                                        (ITT_FORMAT id, value), counter_inc_delta, __itt_group_counter, "%p, %lu")
-ITT_STUBV(ITTAPI, void, counter_dec,          (__itt_counter id),                                                                                  (ITT_FORMAT id),        counter_dec,       __itt_group_counter, "%p")
-ITT_STUBV(ITTAPI, void, counter_dec_delta,    (__itt_counter id, unsigned long long value),                                                        (ITT_FORMAT id, value), counter_dec_delta, __itt_group_counter, "%p, %lu")
-ITT_STUBV(ITTAPI, void, counter_set_value,    (__itt_counter id, void *value_ptr),                                                                 (ITT_FORMAT id, value_ptr),                          counter_set_value,    __itt_group_counter, "%p, %p")
-ITT_STUBV(ITTAPI, void, counter_set_value_ex, (__itt_counter id, __itt_clock_domain *clock_domain, unsigned long long timestamp, void *value_ptr), (ITT_FORMAT id, clock_domain, timestamp, value_ptr), counter_set_value_ex, __itt_group_counter, "%p, %p, %llu, %p")
+ITT_STUBV(ITTAPI, void, frame_begin, (__itt_frame frame), (ITT_FORMAT frame),
+          frame_begin, __itt_group_frame, "%p")
+ITT_STUBV(ITTAPI, void, frame_end, (__itt_frame frame), (ITT_FORMAT frame),
+          frame_end, __itt_group_frame, "%p")
+
+ITT_STUBV(ITTAPI, void, counter_destroy, (__itt_counter id), (ITT_FORMAT id),
+          counter_destroy, __itt_group_counter, "%p")
+ITT_STUBV(ITTAPI, void, counter_inc, (__itt_counter id), (ITT_FORMAT id),
+          counter_inc, __itt_group_counter, "%p")
+ITT_STUBV(ITTAPI, void, counter_inc_delta,
+          (__itt_counter id, unsigned long long value), (ITT_FORMAT id, value),
+          counter_inc_delta, __itt_group_counter, "%p, %lu")
+ITT_STUBV(ITTAPI, void, counter_dec, (__itt_counter id), (ITT_FORMAT id),
+          counter_dec, __itt_group_counter, "%p")
+ITT_STUBV(ITTAPI, void, counter_dec_delta,
+          (__itt_counter id, unsigned long long value), (ITT_FORMAT id, value),
+          counter_dec_delta, __itt_group_counter, "%p, %lu")
+ITT_STUBV(ITTAPI, void, counter_set_value, (__itt_counter id, void *value_ptr),
+          (ITT_FORMAT id, value_ptr), counter_set_value, __itt_group_counter,
+          "%p, %p")
+ITT_STUBV(ITTAPI, void, counter_set_value_ex,
+          (__itt_counter id, __itt_clock_domain *clock_domain,
+           unsigned long long timestamp, void *value_ptr),
+          (ITT_FORMAT id, clock_domain, timestamp, value_ptr),
+          counter_set_value_ex, __itt_group_counter, "%p, %p, %llu, %p")
 
 #ifndef __ITT_INTERNAL_BODY
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUB(ITTAPI, __itt_mark_type, mark_createA, (const char    *name), (ITT_FORMAT name), mark_createA, __itt_group_mark, "\"%s\"")
-ITT_STUB(ITTAPI, __itt_mark_type, mark_createW, (const wchar_t *name), (ITT_FORMAT name), mark_createW, __itt_group_mark, "\"%S\"")
-#else  /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
-ITT_STUB(ITTAPI, __itt_mark_type, mark_create,  (const char    *name), (ITT_FORMAT name), mark_create,  __itt_group_mark, "\"%s\"")
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUB(ITTAPI, __itt_mark_type, mark_createA, (const char *name),
+         (ITT_FORMAT name), mark_createA, __itt_group_mark, "\"%s\"")
+ITT_STUB(ITTAPI, __itt_mark_type, mark_createW, (const wchar_t *name),
+         (ITT_FORMAT name), mark_createW, __itt_group_mark, "\"%S\"")
+#else /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
+ITT_STUB(ITTAPI, __itt_mark_type, mark_create, (const char *name),
+         (ITT_FORMAT name), mark_create, __itt_group_mark, "\"%s\"")
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* __ITT_INTERNAL_BODY */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUB(ITTAPI, int,  markA,        (__itt_mark_type mt, const char    *parameter), (ITT_FORMAT mt, parameter), markA, __itt_group_mark, "%d, \"%s\"")
-ITT_STUB(ITTAPI, int,  markW,        (__itt_mark_type mt, const wchar_t *parameter), (ITT_FORMAT mt, parameter), markW, __itt_group_mark, "%d, \"%S\"")
-#else  /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
-ITT_STUB(ITTAPI, int,  mark,         (__itt_mark_type mt, const char    *parameter), (ITT_FORMAT mt, parameter), mark,  __itt_group_mark, "%d, \"%s\"")
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUB(ITTAPI, int, markA, (__itt_mark_type mt, const char *parameter),
+         (ITT_FORMAT mt, parameter), markA, __itt_group_mark, "%d, \"%s\"")
+ITT_STUB(ITTAPI, int, markW, (__itt_mark_type mt, const wchar_t *parameter),
+         (ITT_FORMAT mt, parameter), markW, __itt_group_mark, "%d, \"%S\"")
+#else /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
+ITT_STUB(ITTAPI, int, mark, (__itt_mark_type mt, const char *parameter),
+         (ITT_FORMAT mt, parameter), mark, __itt_group_mark, "%d, \"%s\"")
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-ITT_STUB(ITTAPI, int,  mark_off, (__itt_mark_type mt), (ITT_FORMAT mt), mark_off, __itt_group_mark, "%d")
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUB(ITTAPI, int,  mark_globalA, (__itt_mark_type mt, const char    *parameter), (ITT_FORMAT mt, parameter), mark_globalA, __itt_group_mark, "%d, \"%s\"")
-ITT_STUB(ITTAPI, int,  mark_globalW, (__itt_mark_type mt, const wchar_t *parameter), (ITT_FORMAT mt, parameter), mark_globalW, __itt_group_mark, "%d, \"%S\"")
-#else  /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
-ITT_STUB(ITTAPI, int,  mark_global,  (__itt_mark_type mt, const char    *parameter), (ITT_FORMAT mt, parameter), mark_global,  __itt_group_mark, "%d, \"%S\"")
+ITT_STUB(ITTAPI, int, mark_off, (__itt_mark_type mt), (ITT_FORMAT mt), mark_off,
+         __itt_group_mark, "%d")
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUB(ITTAPI, int, mark_globalA, (__itt_mark_type mt, const char *parameter),
+         (ITT_FORMAT mt, parameter), mark_globalA, __itt_group_mark,
+         "%d, \"%s\"")
+ITT_STUB(ITTAPI, int, mark_globalW,
+         (__itt_mark_type mt, const wchar_t *parameter),
+         (ITT_FORMAT mt, parameter), mark_globalW, __itt_group_mark,
+         "%d, \"%S\"")
+#else /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
+ITT_STUB(ITTAPI, int, mark_global, (__itt_mark_type mt, const char *parameter),
+         (ITT_FORMAT mt, parameter), mark_global, __itt_group_mark,
+         "%d, \"%S\"")
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-ITT_STUB(ITTAPI, int,  mark_global_off, (__itt_mark_type mt),                        (ITT_FORMAT mt),            mark_global_off, __itt_group_mark, "%d")
+ITT_STUB(ITTAPI, int, mark_global_off, (__itt_mark_type mt), (ITT_FORMAT mt),
+         mark_global_off, __itt_group_mark, "%d")
 
 #ifndef __ITT_INTERNAL_BODY
-ITT_STUB(ITTAPI, __itt_caller, stack_caller_create, (void), (ITT_NO_PARAMS), stack_caller_create,  __itt_group_stitch, "no args")
+ITT_STUB(ITTAPI, __itt_caller, stack_caller_create, (void), (ITT_NO_PARAMS),
+         stack_caller_create, __itt_group_stitch, "no args")
 #endif /* __ITT_INTERNAL_BODY */
-ITT_STUBV(ITTAPI, void, stack_caller_destroy, (__itt_caller id), (ITT_FORMAT id), stack_caller_destroy, __itt_group_stitch, "%p")
-ITT_STUBV(ITTAPI, void, stack_callee_enter,   (__itt_caller id), (ITT_FORMAT id), stack_callee_enter,   __itt_group_stitch, "%p")
-ITT_STUBV(ITTAPI, void, stack_callee_leave,   (__itt_caller id), (ITT_FORMAT id), stack_callee_leave,   __itt_group_stitch, "%p")
-
-ITT_STUB(ITTAPI,  __itt_clock_domain*, clock_domain_create, (__itt_get_clock_info_fn fn, void* fn_data), (ITT_FORMAT fn, fn_data), clock_domain_create, __itt_group_structure, "%p, %p")
-ITT_STUBV(ITTAPI, void,                clock_domain_reset,  (void),                                      (ITT_NO_PARAMS),          clock_domain_reset,  __itt_group_structure, "no args")
-ITT_STUBV(ITTAPI, void, id_create_ex,  (const __itt_domain *domain, __itt_clock_domain* clock_domain, unsigned long long timestamp, __itt_id id), (ITT_FORMAT domain, clock_domain, timestamp, id), id_create_ex,  __itt_group_structure, "%p, %p, %lu, %lu")
-ITT_STUBV(ITTAPI, void, id_destroy_ex, (const __itt_domain *domain, __itt_clock_domain* clock_domain, unsigned long long timestamp, __itt_id id), (ITT_FORMAT domain, clock_domain, timestamp, id), id_destroy_ex, __itt_group_structure, "%p, %p, %lu, %lu")
-ITT_STUBV(ITTAPI, void, task_begin_ex,    (const __itt_domain *domain, __itt_clock_domain* clock_domain, unsigned long long timestamp, __itt_id id, __itt_id parentid, __itt_string_handle *name), (ITT_FORMAT domain, clock_domain, timestamp, id, parentid, name), task_begin_ex, __itt_group_structure, "%p, %p, %lu, %lu, %lu, %p")
-ITT_STUBV(ITTAPI, void, task_begin_fn_ex, (const __itt_domain *domain, __itt_clock_domain* clock_domain, unsigned long long timestamp, __itt_id id, __itt_id parentid, void* fn),                  (ITT_FORMAT domain, clock_domain, timestamp, id, parentid, fn), task_begin_fn_ex, __itt_group_structure, "%p, %p, %lu, %lu, %lu, %p")
-ITT_STUBV(ITTAPI, void, task_end_ex,      (const __itt_domain *domain, __itt_clock_domain* clock_domain, unsigned long long timestamp),                                                            (ITT_FORMAT domain, clock_domain, timestamp), task_end_ex, __itt_group_structure, "%p, %p, %lu")
-ITT_STUBV(ITTAPI, void, task_begin_overlapped,       (const __itt_domain *domain, __itt_id id, __itt_id parent, __itt_string_handle *name),                                                                   (ITT_FORMAT domain, id, parent, name), task_begin_overlapped, __itt_group_structure, "%p, %lu, %lu, %p")
-ITT_STUBV(ITTAPI, void, task_begin_overlapped_ex,    (const __itt_domain *domain, __itt_clock_domain* clock_domain, unsigned long long timestamp, __itt_id id, __itt_id parentid, __itt_string_handle *name), (ITT_FORMAT domain, clock_domain, timestamp, id, parentid, name), task_begin_overlapped_ex, __itt_group_structure, "%p, %p, %lu, %lu, %lu, %p")
-ITT_STUBV(ITTAPI, void, task_end_overlapped, (const __itt_domain *domain, __itt_id id),                                                                                                                       (ITT_FORMAT domain, id), task_end_overlapped, __itt_group_structure, "%p, %lu")
-ITT_STUBV(ITTAPI, void, task_end_overlapped_ex, (const __itt_domain *domain, __itt_clock_domain* clock_domain, unsigned long long timestamp, __itt_id id),                                                    (ITT_FORMAT domain, clock_domain, timestamp, id), task_end_overlapped_ex, __itt_group_structure, "%p, %p, %lu, %lu")
-ITT_STUBV(ITTAPI, void, marker_ex, (const __itt_domain *domain, __itt_clock_domain* clock_domain, unsigned long long timestamp, __itt_id id, __itt_string_handle *name, __itt_scope scope), (ITT_FORMAT domain, clock_domain, timestamp, id, name, scope), marker_ex, __itt_group_structure, "%p, %p, %lu, %lu, %p, %d")
-ITT_STUBV(ITTAPI, void, metadata_add_with_scope, (const __itt_domain *domain, __itt_scope scope, __itt_string_handle *key, __itt_metadata_type type, size_t count, void *data), (ITT_FORMAT domain, scope, key, type, count, data), metadata_add_with_scope, __itt_group_structure, "%p, %d, %p, %d, %lu, %p")
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUBV(ITTAPI, void, metadata_str_add_with_scopeA, (const __itt_domain *domain, __itt_scope scope, __itt_string_handle *key, const char *data, size_t length),    (ITT_FORMAT domain, scope, key, data, length), metadata_str_add_with_scopeA, __itt_group_structure, "%p, %d, %p, %p, %lu")
-ITT_STUBV(ITTAPI, void, metadata_str_add_with_scopeW, (const __itt_domain *domain, __itt_scope scope, __itt_string_handle *key, const wchar_t *data, size_t length), (ITT_FORMAT domain, scope, key, data, length), metadata_str_add_with_scopeW, __itt_group_structure, "%p, %d, %p, %p, %lu")
-#else  /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
-ITT_STUBV(ITTAPI, void, metadata_str_add_with_scope,  (const __itt_domain *domain, __itt_scope scope, __itt_string_handle *key, const char *data, size_t length),    (ITT_FORMAT domain, scope, key, data, length), metadata_str_add_with_scope,  __itt_group_structure, "%p, %d, %p, %p, %lu")
+ITT_STUBV(ITTAPI, void, stack_caller_destroy, (__itt_caller id),
+          (ITT_FORMAT id), stack_caller_destroy, __itt_group_stitch, "%p")
+ITT_STUBV(ITTAPI, void, stack_callee_enter, (__itt_caller id), (ITT_FORMAT id),
+          stack_callee_enter, __itt_group_stitch, "%p")
+ITT_STUBV(ITTAPI, void, stack_callee_leave, (__itt_caller id), (ITT_FORMAT id),
+          stack_callee_leave, __itt_group_stitch, "%p")
+
+ITT_STUB(ITTAPI, __itt_clock_domain *, clock_domain_create,
+         (__itt_get_clock_info_fn fn, void *fn_data), (ITT_FORMAT fn, fn_data),
+         clock_domain_create, __itt_group_structure, "%p, %p")
+ITT_STUBV(ITTAPI, void, clock_domain_reset, (void), (ITT_NO_PARAMS),
+          clock_domain_reset, __itt_group_structure, "no args")
+ITT_STUBV(ITTAPI, void, id_create_ex,
+          (const __itt_domain *domain, __itt_clock_domain *clock_domain,
+           unsigned long long timestamp, __itt_id id),
+          (ITT_FORMAT domain, clock_domain, timestamp, id), id_create_ex,
+          __itt_group_structure, "%p, %p, %lu, %lu")
+ITT_STUBV(ITTAPI, void, id_destroy_ex,
+          (const __itt_domain *domain, __itt_clock_domain *clock_domain,
+           unsigned long long timestamp, __itt_id id),
+          (ITT_FORMAT domain, clock_domain, timestamp, id), id_destroy_ex,
+          __itt_group_structure, "%p, %p, %lu, %lu")
+ITT_STUBV(ITTAPI, void, task_begin_ex,
+          (const __itt_domain *domain, __itt_clock_domain *clock_domain,
+           unsigned long long timestamp, __itt_id id, __itt_id parentid,
+           __itt_string_handle *name),
+          (ITT_FORMAT domain, clock_domain, timestamp, id, parentid, name),
+          task_begin_ex, __itt_group_structure, "%p, %p, %lu, %lu, %lu, %p")
+ITT_STUBV(ITTAPI, void, task_begin_fn_ex,
+          (const __itt_domain *domain, __itt_clock_domain *clock_domain,
+           unsigned long long timestamp, __itt_id id, __itt_id parentid,
+           void *fn),
+          (ITT_FORMAT domain, clock_domain, timestamp, id, parentid, fn),
+          task_begin_fn_ex, __itt_group_structure, "%p, %p, %lu, %lu, %lu, %p")
+ITT_STUBV(ITTAPI, void, task_end_ex,
+          (const __itt_domain *domain, __itt_clock_domain *clock_domain,
+           unsigned long long timestamp),
+          (ITT_FORMAT domain, clock_domain, timestamp), task_end_ex,
+          __itt_group_structure, "%p, %p, %lu")
+ITT_STUBV(ITTAPI, void, task_begin_overlapped,
+          (const __itt_domain *domain, __itt_id id, __itt_id parent,
+           __itt_string_handle *name),
+          (ITT_FORMAT domain, id, parent, name), task_begin_overlapped,
+          __itt_group_structure, "%p, %lu, %lu, %p")
+ITT_STUBV(ITTAPI, void, task_begin_overlapped_ex,
+          (const __itt_domain *domain, __itt_clock_domain *clock_domain,
+           unsigned long long timestamp, __itt_id id, __itt_id parentid,
+           __itt_string_handle *name),
+          (ITT_FORMAT domain, clock_domain, timestamp, id, parentid, name),
+          task_begin_overlapped_ex, __itt_group_structure,
+          "%p, %p, %lu, %lu, %lu, %p")
+ITT_STUBV(ITTAPI, void, task_end_overlapped,
+          (const __itt_domain *domain, __itt_id id), (ITT_FORMAT domain, id),
+          task_end_overlapped, __itt_group_structure, "%p, %lu")
+ITT_STUBV(ITTAPI, void, task_end_overlapped_ex,
+          (const __itt_domain *domain, __itt_clock_domain *clock_domain,
+           unsigned long long timestamp, __itt_id id),
+          (ITT_FORMAT domain, clock_domain, timestamp, id),
+          task_end_overlapped_ex, __itt_group_structure, "%p, %p, %lu, %lu")
+ITT_STUBV(ITTAPI, void, marker_ex,
+          (const __itt_domain *domain, __itt_clock_domain *clock_domain,
+           unsigned long long timestamp, __itt_id id, __itt_string_handle *name,
+           __itt_scope scope),
+          (ITT_FORMAT domain, clock_domain, timestamp, id, name, scope),
+          marker_ex, __itt_group_structure, "%p, %p, %lu, %lu, %p, %d")
+ITT_STUBV(ITTAPI, void, metadata_add_with_scope,
+          (const __itt_domain *domain, __itt_scope scope,
+           __itt_string_handle *key, __itt_metadata_type type, size_t count,
+           void *data),
+          (ITT_FORMAT domain, scope, key, type, count, data),
+          metadata_add_with_scope, __itt_group_structure,
+          "%p, %d, %p, %d, %lu, %p")
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUBV(ITTAPI, void, metadata_str_add_with_scopeA,
+          (const __itt_domain *domain, __itt_scope scope,
+           __itt_string_handle *key, const char *data, size_t length),
+          (ITT_FORMAT domain, scope, key, data, length),
+          metadata_str_add_with_scopeA, __itt_group_structure,
+          "%p, %d, %p, %p, %lu")
+ITT_STUBV(ITTAPI, void, metadata_str_add_with_scopeW,
+          (const __itt_domain *domain, __itt_scope scope,
+           __itt_string_handle *key, const wchar_t *data, size_t length),
+          (ITT_FORMAT domain, scope, key, data, length),
+          metadata_str_add_with_scopeW, __itt_group_structure,
+          "%p, %d, %p, %p, %lu")
+#else /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
+ITT_STUBV(ITTAPI, void, metadata_str_add_with_scope,
+          (const __itt_domain *domain, __itt_scope scope,
+           __itt_string_handle *key, const char *data, size_t length),
+          (ITT_FORMAT domain, scope, key, data, length),
+          metadata_str_add_with_scope, __itt_group_structure,
+          "%p, %d, %p, %p, %lu")
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-ITT_STUBV(ITTAPI, void, relation_add_to_current_ex, (const __itt_domain *domain, __itt_clock_domain* clock_domain, unsigned long long timestamp, __itt_relation relation, __itt_id tail),                (ITT_FORMAT domain, clock_domain, timestamp, relation, tail),       relation_add_to_current_ex, __itt_group_structure, "%p, %p, %lu, %d, %lu")
-ITT_STUBV(ITTAPI, void, relation_add_ex,            (const __itt_domain *domain, __itt_clock_domain* clock_domain, unsigned long long timestamp, __itt_id head, __itt_relation relation, __itt_id tail), (ITT_FORMAT domain, clock_domain, timestamp, head, relation, tail), relation_add_ex,            __itt_group_structure, "%p, %p, %lu, %lu, %d, %lu")
-ITT_STUB(ITTAPI,  __itt_track_group*, track_group_create, (__itt_string_handle* name, __itt_track_group_type track_group_type),                    (ITT_FORMAT name, track_group_type),        track_group_create, __itt_group_structure, "%p, %d")
-ITT_STUB(ITTAPI,  __itt_track*,       track_create,       (__itt_track_group* track_group,__itt_string_handle* name, __itt_track_type track_type), (ITT_FORMAT track_group, name, track_type), track_create,       __itt_group_structure, "%p, %p, %d")
-ITT_STUBV(ITTAPI, void,               set_track,          (__itt_track *track),                                                                    (ITT_FORMAT track),                         set_track,          __itt_group_structure, "%p")
+ITT_STUBV(ITTAPI, void, relation_add_to_current_ex,
+          (const __itt_domain *domain, __itt_clock_domain *clock_domain,
+           unsigned long long timestamp, __itt_relation relation,
+           __itt_id tail),
+          (ITT_FORMAT domain, clock_domain, timestamp, relation, tail),
+          relation_add_to_current_ex, __itt_group_structure,
+          "%p, %p, %lu, %d, %lu")
+ITT_STUBV(ITTAPI, void, relation_add_ex,
+          (const __itt_domain *domain, __itt_clock_domain *clock_domain,
+           unsigned long long timestamp, __itt_id head, __itt_relation relation,
+           __itt_id tail),
+          (ITT_FORMAT domain, clock_domain, timestamp, head, relation, tail),
+          relation_add_ex, __itt_group_structure, "%p, %p, %lu, %lu, %d, %lu")
+ITT_STUB(ITTAPI, __itt_track_group *, track_group_create,
+         (__itt_string_handle * name, __itt_track_group_type track_group_type),
+         (ITT_FORMAT name, track_group_type), track_group_create,
+         __itt_group_structure, "%p, %d")
+ITT_STUB(ITTAPI, __itt_track *, track_create,
+         (__itt_track_group * track_group, __itt_string_handle *name,
+          __itt_track_type track_type),
+         (ITT_FORMAT track_group, name, track_type), track_create,
+         __itt_group_structure, "%p, %p, %d")
+ITT_STUBV(ITTAPI, void, set_track, (__itt_track * track), (ITT_FORMAT track),
+          set_track, __itt_group_structure, "%p")
 
 #ifndef __ITT_INTERNAL_BODY
-ITT_STUB(ITTAPI, const char*, api_version, (void), (ITT_NO_PARAMS), api_version, __itt_group_all & ~__itt_group_legacy, "no args")
+ITT_STUB(ITTAPI, const char *, api_version, (void), (ITT_NO_PARAMS),
+         api_version, __itt_group_all & ~__itt_group_legacy, "no args")
 #endif /* __ITT_INTERNAL_BODY */
 
 #ifndef __ITT_INTERNAL_BODY
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUB(ITTAPI, int, av_saveA, (void *data, int rank, const int *dimensions, int type, const char *filePath, int columnOrder), (ITT_FORMAT data, rank, dimensions, type, filePath, columnOrder), av_saveA, __itt_group_arrays, "%p, %d, %p, %d, \"%s\", %d")
-ITT_STUB(ITTAPI, int, av_saveW, (void *data, int rank, const int *dimensions, int type, const wchar_t *filePath, int columnOrder), (ITT_FORMAT data, rank, dimensions, type, filePath, columnOrder), av_saveW, __itt_group_arrays, "%p, %d, %p, %d, \"%S\", %d")
-#else  /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
-ITT_STUB(ITTAPI, int, av_save,  (void *data, int rank, const int *dimensions, int type, const char *filePath, int columnOrder), (ITT_FORMAT data, rank, dimensions, type, filePath, columnOrder), av_save,  __itt_group_arrays, "%p, %d, %p, %d, \"%s\", %d")
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUB(ITTAPI, int, av_saveA,
+         (void *data, int rank, const int *dimensions, int type,
+          const char *filePath, int columnOrder),
+         (ITT_FORMAT data, rank, dimensions, type, filePath, columnOrder),
+         av_saveA, __itt_group_arrays, "%p, %d, %p, %d, \"%s\", %d")
+ITT_STUB(ITTAPI, int, av_saveW,
+         (void *data, int rank, const int *dimensions, int type,
+          const wchar_t *filePath, int columnOrder),
+         (ITT_FORMAT data, rank, dimensions, type, filePath, columnOrder),
+         av_saveW, __itt_group_arrays, "%p, %d, %p, %d, \"%S\", %d")
+#else /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
+ITT_STUB(ITTAPI, int, av_save,
+         (void *data, int rank, const int *dimensions, int type,
+          const char *filePath, int columnOrder),
+         (ITT_FORMAT data, rank, dimensions, type, filePath, columnOrder),
+         av_save, __itt_group_arrays, "%p, %d, %p, %d, \"%s\", %d")
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* __ITT_INTERNAL_BODY */
 
 #ifndef __ITT_INTERNAL_BODY
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUBV(ITTAPI, void, module_loadA, (void *start_addr, void* end_addr, const char *path), (ITT_FORMAT start_addr, end_addr, path), module_loadA, __itt_group_none, "%p, %p, %p")
-ITT_STUBV(ITTAPI, void, module_loadW, (void *start_addr, void* end_addr, const wchar_t *path), (ITT_FORMAT start_addr, end_addr, path), module_loadW, __itt_group_none, "%p, %p, %p")
-#else  /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
-ITT_STUBV(ITTAPI, void, module_load, (void *start_addr, void *end_addr, const char *path), (ITT_FORMAT start_addr, end_addr, path), module_load, __itt_group_none, "%p, %p, %p")
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUBV(ITTAPI, void, module_loadA,
+          (void *start_addr, void *end_addr, const char *path),
+          (ITT_FORMAT start_addr, end_addr, path), module_loadA,
+          __itt_group_none, "%p, %p, %p")
+ITT_STUBV(ITTAPI, void, module_loadW,
+          (void *start_addr, void *end_addr, const wchar_t *path),
+          (ITT_FORMAT start_addr, end_addr, path), module_loadW,
+          __itt_group_none, "%p, %p, %p")
+#else /* ITT_PLATFORM!=ITT_PLATFORM_WIN */
+ITT_STUBV(ITTAPI, void, module_load,
+          (void *start_addr, void *end_addr, const char *path),
+          (ITT_FORMAT start_addr, end_addr, path), module_load,
+          __itt_group_none, "%p, %p, %p")
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* __ITT_INTERNAL_BODY */
 
-
 #endif /* __ITT_INTERNAL_INIT */

diff  --git a/openmp/runtime/src/thirdparty/ittnotify/ittnotify_types.h b/openmp/runtime/src/thirdparty/ittnotify/ittnotify_types.h
index 88181612b23b..66afd8c7d183 100644
--- a/openmp/runtime/src/thirdparty/ittnotify/ittnotify_types.h
+++ b/openmp/runtime/src/thirdparty/ittnotify/ittnotify_types.h
@@ -7,61 +7,56 @@
 //
 //===----------------------------------------------------------------------===//
 
-
 #ifndef _ITTNOTIFY_TYPES_H_
 #define _ITTNOTIFY_TYPES_H_
 
-typedef enum ___itt_group_id
-{
-    __itt_group_none      = 0,
-    __itt_group_legacy    = 1<<0,
-    __itt_group_control   = 1<<1,
-    __itt_group_thread    = 1<<2,
-    __itt_group_mark      = 1<<3,
-    __itt_group_sync      = 1<<4,
-    __itt_group_fsync     = 1<<5,
-    __itt_group_jit       = 1<<6,
-    __itt_group_model     = 1<<7,
-    __itt_group_splitter_min = 1<<7,
-    __itt_group_counter   = 1<<8,
-    __itt_group_frame     = 1<<9,
-    __itt_group_stitch    = 1<<10,
-    __itt_group_heap      = 1<<11,
-    __itt_group_splitter_max = 1<<12,
-    __itt_group_structure = 1<<12,
-    __itt_group_suppress = 1<<13,
-    __itt_group_arrays    = 1<<14,
-    __itt_group_all       = -1
+typedef enum ___itt_group_id {
+  __itt_group_none = 0,
+  __itt_group_legacy = 1 << 0,
+  __itt_group_control = 1 << 1,
+  __itt_group_thread = 1 << 2,
+  __itt_group_mark = 1 << 3,
+  __itt_group_sync = 1 << 4,
+  __itt_group_fsync = 1 << 5,
+  __itt_group_jit = 1 << 6,
+  __itt_group_model = 1 << 7,
+  __itt_group_splitter_min = 1 << 7,
+  __itt_group_counter = 1 << 8,
+  __itt_group_frame = 1 << 9,
+  __itt_group_stitch = 1 << 10,
+  __itt_group_heap = 1 << 11,
+  __itt_group_splitter_max = 1 << 12,
+  __itt_group_structure = 1 << 12,
+  __itt_group_suppress = 1 << 13,
+  __itt_group_arrays = 1 << 14,
+  __itt_group_all = -1
 } __itt_group_id;
 
 #pragma pack(push, 8)
 
-typedef struct ___itt_group_list
-{
-    __itt_group_id id;
-    const char*    name;
+typedef struct ___itt_group_list {
+  __itt_group_id id;
+  const char *name;
 } __itt_group_list;
 
 #pragma pack(pop)
 
-#define ITT_GROUP_LIST(varname) \
-    static __itt_group_list varname[] = {       \
-        { __itt_group_all,       "all"       }, \
-        { __itt_group_control,   "control"   }, \
-        { __itt_group_thread,    "thread"    }, \
-        { __itt_group_mark,      "mark"      }, \
-        { __itt_group_sync,      "sync"      }, \
-        { __itt_group_fsync,     "fsync"     }, \
-        { __itt_group_jit,       "jit"       }, \
-        { __itt_group_model,     "model"     }, \
-        { __itt_group_counter,   "counter"   }, \
-        { __itt_group_frame,     "frame"     }, \
-        { __itt_group_stitch,    "stitch"    }, \
-        { __itt_group_heap,      "heap"      }, \
-        { __itt_group_structure, "structure" }, \
-        { __itt_group_suppress,  "suppress"  }, \
-        { __itt_group_arrays,    "arrays"    }, \
-        { __itt_group_none,      NULL        }  \
-    }
+#define ITT_GROUP_LIST(varname)                                                \
+  static __itt_group_list varname[] = {{__itt_group_all, "all"},               \
+                                       {__itt_group_control, "control"},       \
+                                       {__itt_group_thread, "thread"},         \
+                                       {__itt_group_mark, "mark"},             \
+                                       {__itt_group_sync, "sync"},             \
+                                       {__itt_group_fsync, "fsync"},           \
+                                       {__itt_group_jit, "jit"},               \
+                                       {__itt_group_model, "model"},           \
+                                       {__itt_group_counter, "counter"},       \
+                                       {__itt_group_frame, "frame"},           \
+                                       {__itt_group_stitch, "stitch"},         \
+                                       {__itt_group_heap, "heap"},             \
+                                       {__itt_group_structure, "structure"},   \
+                                       {__itt_group_suppress, "suppress"},     \
+                                       {__itt_group_arrays, "arrays"},         \
+                                       {__itt_group_none, NULL}}
 
 #endif /* _ITTNOTIFY_TYPES_H_ */

diff  --git a/openmp/runtime/src/thirdparty/ittnotify/legacy/ittnotify.h b/openmp/runtime/src/thirdparty/ittnotify/legacy/ittnotify.h
index a4061e168d1d..384a55881e1f 100644
--- a/openmp/runtime/src/thirdparty/ittnotify/legacy/ittnotify.h
+++ b/openmp/runtime/src/thirdparty/ittnotify/legacy/ittnotify.h
@@ -17,59 +17,59 @@
 
 /** @cond exclude_from_documentation */
 #ifndef ITT_OS_WIN
-#  define ITT_OS_WIN   1
+#define ITT_OS_WIN 1
 #endif /* ITT_OS_WIN */
 
 #ifndef ITT_OS_LINUX
-#  define ITT_OS_LINUX 2
+#define ITT_OS_LINUX 2
 #endif /* ITT_OS_LINUX */
 
 #ifndef ITT_OS_MAC
-#  define ITT_OS_MAC   3
+#define ITT_OS_MAC 3
 #endif /* ITT_OS_MAC */
 
 #ifndef ITT_OS_FREEBSD
-#  define ITT_OS_FREEBSD   4
+#define ITT_OS_FREEBSD 4
 #endif /* ITT_OS_FREEBSD */
 
 #ifndef ITT_OS
-#  if defined WIN32 || defined _WIN32
-#    define ITT_OS ITT_OS_WIN
-#  elif defined( __APPLE__ ) && defined( __MACH__ )
-#    define ITT_OS ITT_OS_MAC
-#  elif defined( __FreeBSD__ )
-#    define ITT_OS ITT_OS_FREEBSD
-#  else
-#    define ITT_OS ITT_OS_LINUX
-#  endif
+#if defined WIN32 || defined _WIN32
+#define ITT_OS ITT_OS_WIN
+#elif defined(__APPLE__) && defined(__MACH__)
+#define ITT_OS ITT_OS_MAC
+#elif defined(__FreeBSD__)
+#define ITT_OS ITT_OS_FREEBSD
+#else
+#define ITT_OS ITT_OS_LINUX
+#endif
 #endif /* ITT_OS */
 
 #ifndef ITT_PLATFORM_WIN
-#  define ITT_PLATFORM_WIN 1
+#define ITT_PLATFORM_WIN 1
 #endif /* ITT_PLATFORM_WIN */
 
 #ifndef ITT_PLATFORM_POSIX
-#  define ITT_PLATFORM_POSIX 2
+#define ITT_PLATFORM_POSIX 2
 #endif /* ITT_PLATFORM_POSIX */
 
 #ifndef ITT_PLATFORM_MAC
-#  define ITT_PLATFORM_MAC 3
+#define ITT_PLATFORM_MAC 3
 #endif /* ITT_PLATFORM_MAC */
 
 #ifndef ITT_PLATFORM_FREEBSD
-#  define ITT_PLATFORM_FREEBSD 4
+#define ITT_PLATFORM_FREEBSD 4
 #endif /* ITT_PLATFORM_FREEBSD */
 
 #ifndef ITT_PLATFORM
-#  if ITT_OS==ITT_OS_WIN
-#    define ITT_PLATFORM ITT_PLATFORM_WIN
-#  elif ITT_OS==ITT_OS_MAC
-#    define ITT_PLATFORM ITT_PLATFORM_MAC
-#  elif ITT_OS==ITT_OS_FREEBSD
-#    define ITT_PLATFORM ITT_PLATFORM_FREEBSD
-#  else
-#    define ITT_PLATFORM ITT_PLATFORM_POSIX
-#  endif
+#if ITT_OS == ITT_OS_WIN
+#define ITT_PLATFORM ITT_PLATFORM_WIN
+#elif ITT_OS == ITT_OS_MAC
+#define ITT_PLATFORM ITT_PLATFORM_MAC
+#elif ITT_OS == ITT_OS_FREEBSD
+#define ITT_PLATFORM ITT_PLATFORM_FREEBSD
+#else
+#define ITT_PLATFORM ITT_PLATFORM_POSIX
+#endif
 #endif /* ITT_PLATFORM */
 
 #if defined(_UNICODE) && !defined(UNICODE)
@@ -77,9 +77,9 @@
 #endif
 
 #include <stddef.h>
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #include <tchar.h>
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #include <stdint.h>
 #if defined(UNICODE) || defined(_UNICODE)
 #include <wchar.h>
@@ -87,51 +87,51 @@
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
 #ifndef ITTAPI_CDECL
-#  if ITT_PLATFORM==ITT_PLATFORM_WIN
-#    define ITTAPI_CDECL __cdecl
-#  else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#    if defined _M_IX86 || defined __i386__
-#      define ITTAPI_CDECL __attribute__ ((cdecl))
-#    else  /* _M_IX86 || __i386__ */
-#      define ITTAPI_CDECL /* actual only on x86 platform */
-#    endif /* _M_IX86 || __i386__ */
-#  endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define ITTAPI_CDECL __cdecl
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#if defined _M_IX86 || defined __i386__
+#define ITTAPI_CDECL __attribute__((cdecl))
+#else /* _M_IX86 || __i386__ */
+#define ITTAPI_CDECL /* actual only on x86 platform */
+#endif /* _M_IX86 || __i386__ */
+#endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* ITTAPI_CDECL */
 
 #ifndef STDCALL
-#  if ITT_PLATFORM==ITT_PLATFORM_WIN
-#    define STDCALL __stdcall
-#  else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#    if defined _M_IX86 || defined __i386__
-#      define STDCALL __attribute__ ((stdcall))
-#    else  /* _M_IX86 || __i386__ */
-#      define STDCALL /* supported only on x86 platform */
-#    endif /* _M_IX86 || __i386__ */
-#  endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define STDCALL __stdcall
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#if defined _M_IX86 || defined __i386__
+#define STDCALL __attribute__((stdcall))
+#else /* _M_IX86 || __i386__ */
+#define STDCALL /* supported only on x86 platform */
+#endif /* _M_IX86 || __i386__ */
+#endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* STDCALL */
 
-#define ITTAPI    ITTAPI_CDECL
+#define ITTAPI ITTAPI_CDECL
 #define LIBITTAPI ITTAPI_CDECL
 
 /* TODO: Temporary for compatibility! */
-#define ITTAPI_CALL    ITTAPI_CDECL
+#define ITTAPI_CALL ITTAPI_CDECL
 #define LIBITTAPI_CALL ITTAPI_CDECL
 
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 /* use __forceinline (VC++ specific) */
-#define ITT_INLINE           __forceinline
+#define ITT_INLINE __forceinline
 #define ITT_INLINE_ATTRIBUTE /* nothing */
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 /*
  * Generally, functions are not inlined unless optimization is specified.
  * For functions declared inline, this attribute inlines the function even
  * if no optimization level was specified.
  */
 #ifdef __STRICT_ANSI__
-#define ITT_INLINE           static
+#define ITT_INLINE static
 #define ITT_INLINE_ATTRIBUTE __attribute__((unused))
-#else  /* __STRICT_ANSI__ */
-#define ITT_INLINE           static inline
+#else /* __STRICT_ANSI__ */
+#define ITT_INLINE static inline
 #define ITT_INLINE_ATTRIBUTE __attribute__((always_inline, unused))
 #endif /* __STRICT_ANSI__ */
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
@@ -139,8 +139,8 @@
 
 /** @cond exclude_from_documentation */
 /* Helper macro for joining tokens */
-#define ITT_JOIN_AUX(p,n) p##n
-#define ITT_JOIN(p,n)     ITT_JOIN_AUX(p,n)
+#define ITT_JOIN_AUX(p, n) p##n
+#define ITT_JOIN(p, n) ITT_JOIN_AUX(p, n)
 
 #ifdef ITT_MAJOR
 #undef ITT_MAJOR
@@ -148,43 +148,75 @@
 #ifdef ITT_MINOR
 #undef ITT_MINOR
 #endif
-#define ITT_MAJOR     3
-#define ITT_MINOR     0
+#define ITT_MAJOR 3
+#define ITT_MINOR 0
 
 /* Standard versioning of a token with major and minor version numbers */
-#define ITT_VERSIONIZE(x)    \
-    ITT_JOIN(x,              \
-    ITT_JOIN(_,              \
-    ITT_JOIN(ITT_MAJOR,      \
-    ITT_JOIN(_, ITT_MINOR))))
+#define ITT_VERSIONIZE(x)                                                      \
+  ITT_JOIN(x, ITT_JOIN(_, ITT_JOIN(ITT_MAJOR, ITT_JOIN(_, ITT_MINOR))))
 
 #ifndef INTEL_ITTNOTIFY_PREFIX
-#  define INTEL_ITTNOTIFY_PREFIX __itt_
+#define INTEL_ITTNOTIFY_PREFIX __itt_
 #endif /* INTEL_ITTNOTIFY_PREFIX */
 #ifndef INTEL_ITTNOTIFY_POSTFIX
-#  define INTEL_ITTNOTIFY_POSTFIX _ptr_
+#define INTEL_ITTNOTIFY_POSTFIX _ptr_
 #endif /* INTEL_ITTNOTIFY_POSTFIX */
 
-#define ITTNOTIFY_NAME_AUX(n) ITT_JOIN(INTEL_ITTNOTIFY_PREFIX,n)
-#define ITTNOTIFY_NAME(n)     ITT_VERSIONIZE(ITTNOTIFY_NAME_AUX(ITT_JOIN(n,INTEL_ITTNOTIFY_POSTFIX)))
+#define ITTNOTIFY_NAME_AUX(n) ITT_JOIN(INTEL_ITTNOTIFY_PREFIX, n)
+#define ITTNOTIFY_NAME(n)                                                      \
+  ITT_VERSIONIZE(ITTNOTIFY_NAME_AUX(ITT_JOIN(n, INTEL_ITTNOTIFY_POSTFIX)))
 
 #define ITTNOTIFY_VOID(n) (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)
-#define ITTNOTIFY_DATA(n) (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)
-
-#define ITTNOTIFY_VOID_D0(n,d)       (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d)
-#define ITTNOTIFY_VOID_D1(n,d,x)     (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x)
-#define ITTNOTIFY_VOID_D2(n,d,x,y)   (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x,y)
-#define ITTNOTIFY_VOID_D3(n,d,x,y,z) (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x,y,z)
-#define ITTNOTIFY_VOID_D4(n,d,x,y,z,a)     (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x,y,z,a)
-#define ITTNOTIFY_VOID_D5(n,d,x,y,z,a,b)   (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x,y,z,a,b)
-#define ITTNOTIFY_VOID_D6(n,d,x,y,z,a,b,c) (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x,y,z,a,b,c)
-#define ITTNOTIFY_DATA_D0(n,d)       (!(d)->flags) ?       0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d)
-#define ITTNOTIFY_DATA_D1(n,d,x)     (!(d)->flags) ?       0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x)
-#define ITTNOTIFY_DATA_D2(n,d,x,y)   (!(d)->flags) ?       0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x,y)
-#define ITTNOTIFY_DATA_D3(n,d,x,y,z) (!(d)->flags) ?       0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x,y,z)
-#define ITTNOTIFY_DATA_D4(n,d,x,y,z,a)     (!(d)->flags) ? 0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x,y,z,a)
-#define ITTNOTIFY_DATA_D5(n,d,x,y,z,a,b)   (!(d)->flags) ? 0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x,y,z,a,b)
-#define ITTNOTIFY_DATA_D6(n,d,x,y,z,a,b,c) (!(d)->flags) ? 0 : (!ITTNOTIFY_NAME(n)) ?       0 : ITTNOTIFY_NAME(n)(d,x,y,z,a,b,c)
+#define ITTNOTIFY_DATA(n) (!ITTNOTIFY_NAME(n)) ? 0 : ITTNOTIFY_NAME(n)
+
+#define ITTNOTIFY_VOID_D0(n, d)                                                \
+  (!(d)->flags)          ? (void)0                                             \
+  : (!ITTNOTIFY_NAME(n)) ? (void)0                                             \
+                         : ITTNOTIFY_NAME(n)(d)
+#define ITTNOTIFY_VOID_D1(n, d, x)                                             \
+  (!(d)->flags)          ? (void)0                                             \
+  : (!ITTNOTIFY_NAME(n)) ? (void)0                                             \
+                         : ITTNOTIFY_NAME(n)(d, x)
+#define ITTNOTIFY_VOID_D2(n, d, x, y)                                          \
+  (!(d)->flags)          ? (void)0                                             \
+  : (!ITTNOTIFY_NAME(n)) ? (void)0                                             \
+                         : ITTNOTIFY_NAME(n)(d, x, y)
+#define ITTNOTIFY_VOID_D3(n, d, x, y, z)                                       \
+  (!(d)->flags)          ? (void)0                                             \
+  : (!ITTNOTIFY_NAME(n)) ? (void)0                                             \
+                         : ITTNOTIFY_NAME(n)(d, x, y, z)
+#define ITTNOTIFY_VOID_D4(n, d, x, y, z, a)                                    \
+  (!(d)->flags)          ? (void)0                                             \
+  : (!ITTNOTIFY_NAME(n)) ? (void)0                                             \
+                         : ITTNOTIFY_NAME(n)(d, x, y, z, a)
+#define ITTNOTIFY_VOID_D5(n, d, x, y, z, a, b)                                 \
+  (!(d)->flags)          ? (void)0                                             \
+  : (!ITTNOTIFY_NAME(n)) ? (void)0                                             \
+                         : ITTNOTIFY_NAME(n)(d, x, y, z, a, b)
+#define ITTNOTIFY_VOID_D6(n, d, x, y, z, a, b, c)                              \
+  (!(d)->flags)          ? (void)0                                             \
+  : (!ITTNOTIFY_NAME(n)) ? (void)0                                             \
+                         : ITTNOTIFY_NAME(n)(d, x, y, z, a, b, c)
+#define ITTNOTIFY_DATA_D0(n, d)                                                \
+  (!(d)->flags) ? 0 : (!ITTNOTIFY_NAME(n)) ? 0 : ITTNOTIFY_NAME(n)(d)
+#define ITTNOTIFY_DATA_D1(n, d, x)                                             \
+  (!(d)->flags) ? 0 : (!ITTNOTIFY_NAME(n)) ? 0 : ITTNOTIFY_NAME(n)(d, x)
+#define ITTNOTIFY_DATA_D2(n, d, x, y)                                          \
+  (!(d)->flags) ? 0 : (!ITTNOTIFY_NAME(n)) ? 0 : ITTNOTIFY_NAME(n)(d, x, y)
+#define ITTNOTIFY_DATA_D3(n, d, x, y, z)                                       \
+  (!(d)->flags) ? 0 : (!ITTNOTIFY_NAME(n)) ? 0 : ITTNOTIFY_NAME(n)(d, x, y, z)
+#define ITTNOTIFY_DATA_D4(n, d, x, y, z, a)                                    \
+  (!(d)->flags)          ? 0                                                   \
+  : (!ITTNOTIFY_NAME(n)) ? 0                                                   \
+                         : ITTNOTIFY_NAME(n)(d, x, y, z, a)
+#define ITTNOTIFY_DATA_D5(n, d, x, y, z, a, b)                                 \
+  (!(d)->flags)          ? 0                                                   \
+  : (!ITTNOTIFY_NAME(n)) ? 0                                                   \
+                         : ITTNOTIFY_NAME(n)(d, x, y, z, a, b)
+#define ITTNOTIFY_DATA_D6(n, d, x, y, z, a, b, c)                              \
+  (!(d)->flags)          ? 0                                                   \
+  : (!ITTNOTIFY_NAME(n)) ? 0                                                   \
+                         : ITTNOTIFY_NAME(n)(d, x, y, z, a, b, c)
 
 #ifdef ITT_STUB
 #undef ITT_STUB
@@ -192,9 +224,9 @@
 #ifdef ITT_STUBV
 #undef ITT_STUBV
 #endif
-#define ITT_STUBV(api,type,name,args)                             \
-    typedef type (api* ITT_JOIN(ITTNOTIFY_NAME(name),_t)) args;   \
-    extern ITT_JOIN(ITTNOTIFY_NAME(name),_t) ITTNOTIFY_NAME(name);
+#define ITT_STUBV(api, type, name, args)                                       \
+  typedef type(api *ITT_JOIN(ITTNOTIFY_NAME(name), _t)) args;                  \
+  extern ITT_JOIN(ITTNOTIFY_NAME(name), _t) ITTNOTIFY_NAME(name);
 #define ITT_STUB ITT_STUBV
 /** @endcond */
 
@@ -211,9 +243,11 @@ extern "C" {
 /**
  * @defgroup legacy_control Collection Control
  * @ingroup legacy
- * General behavior: application continues to run, but no profiling information is being collected
+ * General behavior: application continues to run, but no profiling information
+ * is being collected
  *
- * Pausing occurs not only for the current thread but for all process as well as spawned processes
+ * Pausing occurs not only for the current thread but for all process as well as
+ * spawned processes
  * - Intel(R) Parallel Inspector and Intel(R) Inspector XE:
  *   - Does not analyze or report errors that involve memory access.
  *   - Other errors are reported as usual. Pausing data collection in
@@ -240,25 +274,25 @@ void ITTAPI __itt_detach(void);
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUBV(ITTAPI, void, pause,   (void))
-ITT_STUBV(ITTAPI, void, resume,  (void))
-ITT_STUBV(ITTAPI, void, detach,  (void))
-#define __itt_pause      ITTNOTIFY_VOID(pause)
-#define __itt_pause_ptr  ITTNOTIFY_NAME(pause)
-#define __itt_resume     ITTNOTIFY_VOID(resume)
+ITT_STUBV(ITTAPI, void, pause, (void))
+ITT_STUBV(ITTAPI, void, resume, (void))
+ITT_STUBV(ITTAPI, void, detach, (void))
+#define __itt_pause ITTNOTIFY_VOID(pause)
+#define __itt_pause_ptr ITTNOTIFY_NAME(pause)
+#define __itt_resume ITTNOTIFY_VOID(resume)
 #define __itt_resume_ptr ITTNOTIFY_NAME(resume)
-#define __itt_detach     ITTNOTIFY_VOID(detach)
+#define __itt_detach ITTNOTIFY_VOID(detach)
 #define __itt_detach_ptr ITTNOTIFY_NAME(detach)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_pause()
-#define __itt_pause_ptr  0
+#define __itt_pause_ptr 0
 #define __itt_resume()
 #define __itt_resume_ptr 0
 #define __itt_detach()
 #define __itt_detach_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#define __itt_pause_ptr  0
+#else /* INTEL_NO_MACRO_BODY */
+#define __itt_pause_ptr 0
 #define __itt_resume_ptr 0
 #define __itt_detach_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
@@ -276,17 +310,18 @@ ITT_STUBV(ITTAPI, void, detach,  (void))
 /**
  * @deprecated Legacy API
  * @brief Set name to be associated with thread in analysis GUI.
- * @return __itt_err upon failure (name or namelen being null,name and namelen mismatched)
+ * @return __itt_err upon failure (name or namelen being null,name and namelen
+ * mismatched)
  */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-int LIBITTAPI __itt_thr_name_setA(const char    *name, int namelen);
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+int LIBITTAPI __itt_thr_name_setA(const char *name, int namelen);
 int LIBITTAPI __itt_thr_name_setW(const wchar_t *name, int namelen);
 #if defined(UNICODE) || defined(_UNICODE)
-#  define __itt_thr_name_set     __itt_thr_name_setW
-#  define __itt_thr_name_set_ptr __itt_thr_name_setW_ptr
+#define __itt_thr_name_set __itt_thr_name_setW
+#define __itt_thr_name_set_ptr __itt_thr_name_setW_ptr
 #else
-#  define __itt_thr_name_set     __itt_thr_name_setA
-#  define __itt_thr_name_set_ptr __itt_thr_name_setA_ptr
+#define __itt_thr_name_set __itt_thr_name_setA
+#define __itt_thr_name_set_ptr __itt_thr_name_setA_ptr
 #endif /* UNICODE */
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 int LIBITTAPI __itt_thr_name_set(const char *name, int namelen);
@@ -295,23 +330,23 @@ int LIBITTAPI __itt_thr_name_set(const char *name, int namelen);
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUB(LIBITTAPI, int, thr_name_setA, (const char    *name, int namelen))
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUB(LIBITTAPI, int, thr_name_setA, (const char *name, int namelen))
 ITT_STUB(LIBITTAPI, int, thr_name_setW, (const wchar_t *name, int namelen))
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-ITT_STUB(LIBITTAPI, int, thr_name_set,  (const char    *name, int namelen))
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+ITT_STUB(LIBITTAPI, int, thr_name_set, (const char *name, int namelen))
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-#define __itt_thr_name_setA     ITTNOTIFY_DATA(thr_name_setA)
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define __itt_thr_name_setA ITTNOTIFY_DATA(thr_name_setA)
 #define __itt_thr_name_setA_ptr ITTNOTIFY_NAME(thr_name_setA)
-#define __itt_thr_name_setW     ITTNOTIFY_DATA(thr_name_setW)
+#define __itt_thr_name_setW ITTNOTIFY_DATA(thr_name_setW)
 #define __itt_thr_name_setW_ptr ITTNOTIFY_NAME(thr_name_setW)
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_thr_name_set     ITTNOTIFY_DATA(thr_name_set)
+#define __itt_thr_name_set ITTNOTIFY_DATA(thr_name_set)
 #define __itt_thr_name_set_ptr ITTNOTIFY_NAME(thr_name_set)
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_ITTNOTIFY_API */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_thr_name_setA(name, namelen)
 #define __itt_thr_name_setA_ptr 0
 #define __itt_thr_name_setW(name, namelen)
@@ -321,8 +356,8 @@ ITT_STUB(LIBITTAPI, int, thr_name_set,  (const char    *name, int namelen))
 #define __itt_thr_name_set_ptr 0
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_MACRO_BODY */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_thr_name_setA_ptr 0
 #define __itt_thr_name_setW_ptr 0
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
@@ -333,7 +368,8 @@ ITT_STUB(LIBITTAPI, int, thr_name_set,  (const char    *name, int namelen))
 
 /**
  * @deprecated Legacy API
- * @brief Mark current thread as ignored from this point on, for the duration of its existence.
+ * @brief Mark current thread as ignored from this point on, for the duration of
+ * its existence.
  */
 void LIBITTAPI __itt_thr_ignore(void);
 
@@ -341,13 +377,13 @@ void LIBITTAPI __itt_thr_ignore(void);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(LIBITTAPI, void, thr_ignore, (void))
-#define __itt_thr_ignore     ITTNOTIFY_VOID(thr_ignore)
+#define __itt_thr_ignore ITTNOTIFY_VOID(thr_ignore)
 #define __itt_thr_ignore_ptr ITTNOTIFY_NAME(thr_ignore)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_thr_ignore()
 #define __itt_thr_ignore_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_thr_ignore_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -370,55 +406,64 @@ ITT_STUBV(LIBITTAPI, void, thr_ignore, (void))
  * @hideinitializer
  * @brief possible value of attribute argument for sync object type
  */
-#define __itt_attr_mutex   2
+#define __itt_attr_mutex 2
 
 /**
  * @deprecated Legacy API
  * @brief Assign a name to a sync object using char or Unicode string
- * @param[in] addr    - pointer to the sync object. You should use a real pointer to your object
- *                      to make sure that the values don't clash with other object addresses
- * @param[in] objtype - null-terminated object type string. If NULL is passed, the object will
- *                      be assumed to be of generic "User Synchronization" type
- * @param[in] objname - null-terminated object name string. If NULL, no name will be assigned
- *                      to the object -- you can use the __itt_sync_rename call later to assign
- *                      the name
- * @param[in] attribute - one of [#__itt_attr_barrier, #__itt_attr_mutex] values which defines the
- *                      exact semantics of how prepare/acquired/releasing calls work.
- */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-void ITTAPI __itt_sync_set_nameA(void *addr, const char    *objtype, const char    *objname, int attribute);
-void ITTAPI __itt_sync_set_nameW(void *addr, const wchar_t *objtype, const wchar_t *objname, int attribute);
+ * @param[in] addr    - pointer to the sync object. You should use a real
+ * pointer to your object to make sure that the values don't clash with other
+ * object addresses
+ * @param[in] objtype - null-terminated object type string. If NULL is passed,
+ * the object will be assumed to be of generic "User Synchronization" type
+ * @param[in] objname - null-terminated object name string. If NULL, no name
+ * will be assigned to the object -- you can use the __itt_sync_rename call
+ * later to assign the name
+ * @param[in] attribute - one of [#__itt_attr_barrier, #__itt_attr_mutex] values
+ * which defines the exact semantics of how prepare/acquired/releasing calls
+ * work.
+ */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+void ITTAPI __itt_sync_set_nameA(void *addr, const char *objtype,
+                                 const char *objname, int attribute);
+void ITTAPI __itt_sync_set_nameW(void *addr, const wchar_t *objtype,
+                                 const wchar_t *objname, int attribute);
 #if defined(UNICODE) || defined(_UNICODE)
-#  define __itt_sync_set_name     __itt_sync_set_nameW
-#  define __itt_sync_set_name_ptr __itt_sync_set_nameW_ptr
+#define __itt_sync_set_name __itt_sync_set_nameW
+#define __itt_sync_set_name_ptr __itt_sync_set_nameW_ptr
 #else /* UNICODE */
-#  define __itt_sync_set_name     __itt_sync_set_nameA
-#  define __itt_sync_set_name_ptr __itt_sync_set_nameA_ptr
+#define __itt_sync_set_name __itt_sync_set_nameA
+#define __itt_sync_set_name_ptr __itt_sync_set_nameA_ptr
 #endif /* UNICODE */
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-void ITTAPI __itt_sync_set_name(void *addr, const char* objtype, const char* objname, int attribute);
+void ITTAPI __itt_sync_set_name(void *addr, const char *objtype,
+                                const char *objname, int attribute);
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUBV(ITTAPI, void, sync_set_nameA, (void *addr, const char    *objtype, const char    *objname, int attribute))
-ITT_STUBV(ITTAPI, void, sync_set_nameW, (void *addr, const wchar_t *objtype, const wchar_t *objname, int attribute))
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-ITT_STUBV(ITTAPI, void, sync_set_name,  (void *addr, const char    *objtype, const char    *objname, int attribute))
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUBV(ITTAPI, void, sync_set_nameA,
+          (void *addr, const char *objtype, const char *objname, int attribute))
+ITT_STUBV(ITTAPI, void, sync_set_nameW,
+          (void *addr, const wchar_t *objtype, const wchar_t *objname,
+           int attribute))
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+ITT_STUBV(ITTAPI, void, sync_set_name,
+          (void *addr, const char *objtype, const char *objname, int attribute))
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-#define __itt_sync_set_nameA     ITTNOTIFY_VOID(sync_set_nameA)
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define __itt_sync_set_nameA ITTNOTIFY_VOID(sync_set_nameA)
 #define __itt_sync_set_nameA_ptr ITTNOTIFY_NAME(sync_set_nameA)
-#define __itt_sync_set_nameW     ITTNOTIFY_VOID(sync_set_nameW)
+#define __itt_sync_set_nameW ITTNOTIFY_VOID(sync_set_nameW)
 #define __itt_sync_set_nameW_ptr ITTNOTIFY_NAME(sync_set_nameW)
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_sync_set_name     ITTNOTIFY_VOID(sync_set_name)
+#define __itt_sync_set_name ITTNOTIFY_VOID(sync_set_name)
 #define __itt_sync_set_name_ptr ITTNOTIFY_NAME(sync_set_name)
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_ITTNOTIFY_API */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_sync_set_nameA(addr, objtype, objname, attribute)
 #define __itt_sync_set_nameA_ptr 0
 #define __itt_sync_set_nameW(addr, objtype, objname, attribute)
@@ -428,8 +473,8 @@ ITT_STUBV(ITTAPI, void, sync_set_name,  (void *addr, const char    *objtype, con
 #define __itt_sync_set_name_ptr 0
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_MACRO_BODY */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_sync_set_nameA_ptr 0
 #define __itt_sync_set_nameW_ptr 0
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
@@ -441,61 +486,80 @@ ITT_STUBV(ITTAPI, void, sync_set_name,  (void *addr, const char    *objtype, con
 /**
  * @deprecated Legacy API
  * @brief Assign a name and type to a sync object using char or Unicode string
- * @param[in] addr -      pointer to the sync object. You should use a real pointer to your object
- *                        to make sure that the values don't clash with other object addresses
- * @param[in] objtype -   null-terminated object type string. If NULL is passed, the object will
- *                        be assumed to be of generic "User Synchronization" type
- * @param[in] objname -   null-terminated object name string. If NULL, no name will be assigned
- *                        to the object -- you can use the __itt_sync_rename call later to assign
- *                        the name
- * @param[in] typelen, namelen -   a length of string for appropriate objtype and objname parameter
- * @param[in] attribute - one of [#__itt_attr_barrier, #__itt_attr_mutex] values which defines the
- *                        exact semantics of how prepare/acquired/releasing calls work.
- * @return __itt_err upon failure (name or namelen being null,name and namelen mismatched)
- */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-int LIBITTAPI __itt_notify_sync_nameA(void *addr, const char    *objtype, int typelen, const char    *objname, int namelen, int attribute);
-int LIBITTAPI __itt_notify_sync_nameW(void *addr, const wchar_t *objtype, int typelen, const wchar_t *objname, int namelen, int attribute);
+ * @param[in] addr -      pointer to the sync object. You should use a real
+ * pointer to your object to make sure that the values don't clash with other
+ * object addresses
+ * @param[in] objtype -   null-terminated object type string. If NULL is passed,
+ * the object will be assumed to be of generic "User Synchronization" type
+ * @param[in] objname -   null-terminated object name string. If NULL, no name
+ * will be assigned to the object -- you can use the __itt_sync_rename call
+ * later to assign the name
+ * @param[in] typelen, namelen -   a length of string for appropriate objtype
+ * and objname parameter
+ * @param[in] attribute - one of [#__itt_attr_barrier, #__itt_attr_mutex] values
+ * which defines the exact semantics of how prepare/acquired/releasing calls
+ * work.
+ * @return __itt_err upon failure (name or namelen being null,name and namelen
+ * mismatched)
+ */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+int LIBITTAPI __itt_notify_sync_nameA(void *addr, const char *objtype,
+                                      int typelen, const char *objname,
+                                      int namelen, int attribute);
+int LIBITTAPI __itt_notify_sync_nameW(void *addr, const wchar_t *objtype,
+                                      int typelen, const wchar_t *objname,
+                                      int namelen, int attribute);
 #if defined(UNICODE) || defined(_UNICODE)
-#  define __itt_notify_sync_name __itt_notify_sync_nameW
+#define __itt_notify_sync_name __itt_notify_sync_nameW
 #else
-#  define __itt_notify_sync_name __itt_notify_sync_nameA
+#define __itt_notify_sync_name __itt_notify_sync_nameA
 #endif
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-int LIBITTAPI __itt_notify_sync_name(void *addr, const char *objtype, int typelen, const char *objname, int namelen, int attribute);
+int LIBITTAPI __itt_notify_sync_name(void *addr, const char *objtype,
+                                     int typelen, const char *objname,
+                                     int namelen, int attribute);
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUB(LIBITTAPI, int, notify_sync_nameA, (void *addr, const char    *objtype, int typelen, const char    *objname, int namelen, int attribute))
-ITT_STUB(LIBITTAPI, int, notify_sync_nameW, (void *addr, const wchar_t *objtype, int typelen, const wchar_t *objname, int namelen, int attribute))
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-ITT_STUB(LIBITTAPI, int, notify_sync_name,  (void *addr, const char    *objtype, int typelen, const char    *objname, int namelen, int attribute))
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUB(LIBITTAPI, int, notify_sync_nameA,
+         (void *addr, const char *objtype, int typelen, const char *objname,
+          int namelen, int attribute))
+ITT_STUB(LIBITTAPI, int, notify_sync_nameW,
+         (void *addr, const wchar_t *objtype, int typelen,
+          const wchar_t *objname, int namelen, int attribute))
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+ITT_STUB(LIBITTAPI, int, notify_sync_name,
+         (void *addr, const char *objtype, int typelen, const char *objname,
+          int namelen, int attribute))
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-#define __itt_notify_sync_nameA     ITTNOTIFY_DATA(notify_sync_nameA)
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define __itt_notify_sync_nameA ITTNOTIFY_DATA(notify_sync_nameA)
 #define __itt_notify_sync_nameA_ptr ITTNOTIFY_NAME(notify_sync_nameA)
-#define __itt_notify_sync_nameW     ITTNOTIFY_DATA(notify_sync_nameW)
+#define __itt_notify_sync_nameW ITTNOTIFY_DATA(notify_sync_nameW)
 #define __itt_notify_sync_nameW_ptr ITTNOTIFY_NAME(notify_sync_nameW)
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_notify_sync_name     ITTNOTIFY_DATA(notify_sync_name)
+#define __itt_notify_sync_name ITTNOTIFY_DATA(notify_sync_name)
 #define __itt_notify_sync_name_ptr ITTNOTIFY_NAME(notify_sync_name)
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-#define __itt_notify_sync_nameA(addr, objtype, typelen, objname, namelen, attribute)
+#else /* INTEL_NO_ITTNOTIFY_API */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define __itt_notify_sync_nameA(addr, objtype, typelen, objname, namelen,      \
+                                attribute)
 #define __itt_notify_sync_nameA_ptr 0
-#define __itt_notify_sync_nameW(addr, objtype, typelen, objname, namelen, attribute)
+#define __itt_notify_sync_nameW(addr, objtype, typelen, objname, namelen,      \
+                                attribute)
 #define __itt_notify_sync_nameW_ptr 0
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_notify_sync_name(addr, objtype, typelen, objname, namelen, attribute)
+#define __itt_notify_sync_name(addr, objtype, typelen, objname, namelen,       \
+                               attribute)
 #define __itt_notify_sync_name_ptr 0
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_MACRO_BODY */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_notify_sync_nameA_ptr 0
 #define __itt_notify_sync_nameW_ptr 0
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
@@ -508,19 +572,19 @@ ITT_STUB(LIBITTAPI, int, notify_sync_name,  (void *addr, const char    *objtype,
  * @deprecated Legacy API
  * @brief Enter spin loop on user-defined sync object
  */
-void LIBITTAPI __itt_notify_sync_prepare(void* addr);
+void LIBITTAPI __itt_notify_sync_prepare(void *addr);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(LIBITTAPI, void, notify_sync_prepare, (void *addr))
-#define __itt_notify_sync_prepare     ITTNOTIFY_VOID(notify_sync_prepare)
+#define __itt_notify_sync_prepare ITTNOTIFY_VOID(notify_sync_prepare)
 #define __itt_notify_sync_prepare_ptr ITTNOTIFY_NAME(notify_sync_prepare)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_notify_sync_prepare(addr)
 #define __itt_notify_sync_prepare_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_notify_sync_prepare_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -535,13 +599,13 @@ void LIBITTAPI __itt_notify_sync_cancel(void *addr);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(LIBITTAPI, void, notify_sync_cancel, (void *addr))
-#define __itt_notify_sync_cancel     ITTNOTIFY_VOID(notify_sync_cancel)
+#define __itt_notify_sync_cancel ITTNOTIFY_VOID(notify_sync_cancel)
 #define __itt_notify_sync_cancel_ptr ITTNOTIFY_NAME(notify_sync_cancel)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_notify_sync_cancel(addr)
 #define __itt_notify_sync_cancel_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_notify_sync_cancel_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -556,34 +620,35 @@ void LIBITTAPI __itt_notify_sync_acquired(void *addr);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(LIBITTAPI, void, notify_sync_acquired, (void *addr))
-#define __itt_notify_sync_acquired     ITTNOTIFY_VOID(notify_sync_acquired)
+#define __itt_notify_sync_acquired ITTNOTIFY_VOID(notify_sync_acquired)
 #define __itt_notify_sync_acquired_ptr ITTNOTIFY_NAME(notify_sync_acquired)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_notify_sync_acquired(addr)
 #define __itt_notify_sync_acquired_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_notify_sync_acquired_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
 /**
  * @deprecated Legacy API
- * @brief Start sync object releasing code. Is called before the lock release call.
+ * @brief Start sync object releasing code. Is called before the lock release
+ * call.
  */
-void LIBITTAPI __itt_notify_sync_releasing(void* addr);
+void LIBITTAPI __itt_notify_sync_releasing(void *addr);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(LIBITTAPI, void, notify_sync_releasing, (void *addr))
-#define __itt_notify_sync_releasing     ITTNOTIFY_VOID(notify_sync_releasing)
+#define __itt_notify_sync_releasing ITTNOTIFY_VOID(notify_sync_releasing)
 #define __itt_notify_sync_releasing_ptr ITTNOTIFY_NAME(notify_sync_releasing)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_notify_sync_releasing(addr)
 #define __itt_notify_sync_releasing_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_notify_sync_releasing_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -602,65 +667,68 @@ typedef int __itt_event;
 
 /**
  * @brief Create an event notification
- * @note name or namelen being null/name and namelen not matching, user event feature not enabled
+ * @note name or namelen being null/name and namelen not matching, user event
+ * feature not enabled
  * @return non-zero event identifier upon success and __itt_err otherwise
  */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-__itt_event LIBITTAPI __itt_event_createA(const char    *name, int namelen);
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+__itt_event LIBITTAPI __itt_event_createA(const char *name, int namelen);
 __itt_event LIBITTAPI __itt_event_createW(const wchar_t *name, int namelen);
 #if defined(UNICODE) || defined(_UNICODE)
-#  define __itt_event_create     __itt_event_createW
-#  define __itt_event_create_ptr __itt_event_createW_ptr
+#define __itt_event_create __itt_event_createW
+#define __itt_event_create_ptr __itt_event_createW_ptr
 #else
-#  define __itt_event_create     __itt_event_createA
-#  define __itt_event_create_ptr __itt_event_createA_ptr
+#define __itt_event_create __itt_event_createA
+#define __itt_event_create_ptr __itt_event_createA_ptr
 #endif /* UNICODE */
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 __itt_event LIBITTAPI __itt_event_create(const char *name, int namelen);
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUB(LIBITTAPI, __itt_event, event_createA, (const char    *name, int namelen))
-ITT_STUB(LIBITTAPI, __itt_event, event_createW, (const wchar_t *name, int namelen))
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-ITT_STUB(LIBITTAPI, __itt_event, event_create,  (const char *name, int namelen))
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUB(LIBITTAPI, __itt_event, event_createA, (const char *name, int namelen))
+ITT_STUB(LIBITTAPI, __itt_event, event_createW,
+         (const wchar_t *name, int namelen))
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+ITT_STUB(LIBITTAPI, __itt_event, event_create, (const char *name, int namelen))
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-#define __itt_event_createA     ITTNOTIFY_DATA(event_createA)
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define __itt_event_createA ITTNOTIFY_DATA(event_createA)
 #define __itt_event_createA_ptr ITTNOTIFY_NAME(event_createA)
-#define __itt_event_createW     ITTNOTIFY_DATA(event_createW)
+#define __itt_event_createW ITTNOTIFY_DATA(event_createW)
 #define __itt_event_createW_ptr ITTNOTIFY_NAME(event_createW)
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_event_create      ITTNOTIFY_DATA(event_create)
-#define __itt_event_create_ptr  ITTNOTIFY_NAME(event_create)
+#define __itt_event_create ITTNOTIFY_DATA(event_create)
+#define __itt_event_create_ptr ITTNOTIFY_NAME(event_create)
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_ITTNOTIFY_API */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_event_createA(name, namelen) (__itt_event)0
 #define __itt_event_createA_ptr 0
 #define __itt_event_createW(name, namelen) (__itt_event)0
 #define __itt_event_createW_ptr 0
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_event_create(name, namelen)  (__itt_event)0
-#define __itt_event_create_ptr  0
+#define __itt_event_create(name, namelen) (__itt_event)0
+#define __itt_event_create_ptr 0
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_MACRO_BODY */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_event_createA_ptr 0
 #define __itt_event_createW_ptr 0
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_event_create_ptr  0
+#define __itt_event_create_ptr 0
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 
 /**
  * @brief Record an event occurrence.
- * @return __itt_err upon failure (invalid event id/user event feature not enabled)
+ * @return __itt_err upon failure (invalid event id/user event feature not
+ * enabled)
  */
 int LIBITTAPI __itt_event_start(__itt_event event);
 
@@ -668,13 +736,13 @@ int LIBITTAPI __itt_event_start(__itt_event event);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUB(LIBITTAPI, int, event_start, (__itt_event event))
-#define __itt_event_start     ITTNOTIFY_DATA(event_start)
+#define __itt_event_start ITTNOTIFY_DATA(event_start)
 #define __itt_event_start_ptr ITTNOTIFY_NAME(event_start)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_event_start(event) (int)0
 #define __itt_event_start_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_event_start_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -682,7 +750,8 @@ ITT_STUB(LIBITTAPI, int, event_start, (__itt_event event))
 /**
  * @brief Record an event end occurrence.
  * @note It is optional if events do not have durations.
- * @return __itt_err upon failure (invalid event id/user event feature not enabled)
+ * @return __itt_err upon failure (invalid event id/user event feature not
+ * enabled)
  */
 int LIBITTAPI __itt_event_end(__itt_event event);
 
@@ -690,13 +759,13 @@ int LIBITTAPI __itt_event_end(__itt_event event);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUB(LIBITTAPI, int, event_end, (__itt_event event))
-#define __itt_event_end     ITTNOTIFY_DATA(event_end)
+#define __itt_event_end ITTNOTIFY_DATA(event_end)
 #define __itt_event_end_ptr ITTNOTIFY_NAME(event_end)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_event_end(event) (int)0
 #define __itt_event_end_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_event_end_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -718,13 +787,13 @@ void LIBITTAPI __itt_memory_read(void *addr, size_t size);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(LIBITTAPI, void, memory_read, (void *addr, size_t size))
-#define __itt_memory_read     ITTNOTIFY_VOID(memory_read)
+#define __itt_memory_read ITTNOTIFY_VOID(memory_read)
 #define __itt_memory_read_ptr ITTNOTIFY_NAME(memory_read)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_memory_read(addr, size)
 #define __itt_memory_read_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_memory_read_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -739,13 +808,13 @@ void LIBITTAPI __itt_memory_write(void *addr, size_t size);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(LIBITTAPI, void, memory_write, (void *addr, size_t size))
-#define __itt_memory_write     ITTNOTIFY_VOID(memory_write)
+#define __itt_memory_write ITTNOTIFY_VOID(memory_write)
 #define __itt_memory_write_ptr ITTNOTIFY_NAME(memory_write)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_memory_write(addr, size)
 #define __itt_memory_write_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_memory_write_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -760,13 +829,13 @@ void LIBITTAPI __itt_memory_update(void *address, size_t size);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(LIBITTAPI, void, memory_update, (void *addr, size_t size))
-#define __itt_memory_update     ITTNOTIFY_VOID(memory_update)
+#define __itt_memory_update ITTNOTIFY_VOID(memory_update)
 #define __itt_memory_update_ptr ITTNOTIFY_NAME(memory_update)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_memory_update(addr, size)
 #define __itt_memory_update_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_memory_update_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -782,27 +851,25 @@ typedef int __itt_state_t;
 
 /** @cond exclude_from_documentation */
 typedef enum __itt_obj_state {
-    __itt_obj_state_err = 0,
-    __itt_obj_state_clr = 1,
-    __itt_obj_state_set = 2,
-    __itt_obj_state_use = 3
+  __itt_obj_state_err = 0,
+  __itt_obj_state_clr = 1,
+  __itt_obj_state_set = 2,
+  __itt_obj_state_use = 3
 } __itt_obj_state_t;
 
 typedef enum __itt_thr_state {
-    __itt_thr_state_err = 0,
-    __itt_thr_state_clr = 1,
-    __itt_thr_state_set = 2
+  __itt_thr_state_err = 0,
+  __itt_thr_state_clr = 1,
+  __itt_thr_state_set = 2
 } __itt_thr_state_t;
 
 typedef enum __itt_obj_prop {
-    __itt_obj_prop_watch    = 1,
-    __itt_obj_prop_ignore   = 2,
-    __itt_obj_prop_sharable = 3
+  __itt_obj_prop_watch = 1,
+  __itt_obj_prop_ignore = 2,
+  __itt_obj_prop_sharable = 3
 } __itt_obj_prop_t;
 
-typedef enum __itt_thr_prop {
-    __itt_thr_prop_quiet = 1
-} __itt_thr_prop_t;
+typedef enum __itt_thr_prop { __itt_thr_prop_quiet = 1 } __itt_thr_prop_t;
 /** @endcond */
 
 /**
@@ -815,13 +882,13 @@ __itt_state_t LIBITTAPI __itt_state_get(void);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUB(ITTAPI, __itt_state_t, state_get, (void))
-#define __itt_state_get     ITTNOTIFY_DATA(state_get)
+#define __itt_state_get ITTNOTIFY_DATA(state_get)
 #define __itt_state_get_ptr ITTNOTIFY_NAME(state_get)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_state_get(void) (__itt_state_t)0
 #define __itt_state_get_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_state_get_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -836,13 +903,13 @@ __itt_state_t LIBITTAPI __itt_state_set(__itt_state_t s);
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUB(ITTAPI, __itt_state_t, state_set, (__itt_state_t s))
-#define __itt_state_set     ITTNOTIFY_DATA(state_set)
+#define __itt_state_set ITTNOTIFY_DATA(state_set)
 #define __itt_state_set_ptr ITTNOTIFY_NAME(state_set)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_state_set(s) (__itt_state_t)0
 #define __itt_state_set_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_state_set_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -851,19 +918,21 @@ ITT_STUB(ITTAPI, __itt_state_t, state_set, (__itt_state_t s))
  * @deprecated Legacy API
  * @brief managing thread and object modes
  */
-__itt_thr_state_t LIBITTAPI __itt_thr_mode_set(__itt_thr_prop_t p, __itt_thr_state_t s);
+__itt_thr_state_t LIBITTAPI __itt_thr_mode_set(__itt_thr_prop_t p,
+                                               __itt_thr_state_t s);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUB(ITTAPI, __itt_thr_state_t, thr_mode_set, (__itt_thr_prop_t p, __itt_thr_state_t s))
-#define __itt_thr_mode_set     ITTNOTIFY_DATA(thr_mode_set)
+ITT_STUB(ITTAPI, __itt_thr_state_t, thr_mode_set,
+         (__itt_thr_prop_t p, __itt_thr_state_t s))
+#define __itt_thr_mode_set ITTNOTIFY_DATA(thr_mode_set)
 #define __itt_thr_mode_set_ptr ITTNOTIFY_NAME(thr_mode_set)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_thr_mode_set(p, s) (__itt_thr_state_t)0
 #define __itt_thr_mode_set_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_thr_mode_set_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -872,19 +941,21 @@ ITT_STUB(ITTAPI, __itt_thr_state_t, thr_mode_set, (__itt_thr_prop_t p, __itt_thr
  * @deprecated Legacy API
  * @brief managing thread and object modes
  */
-__itt_obj_state_t LIBITTAPI __itt_obj_mode_set(__itt_obj_prop_t p, __itt_obj_state_t s);
+__itt_obj_state_t LIBITTAPI __itt_obj_mode_set(__itt_obj_prop_t p,
+                                               __itt_obj_state_t s);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-ITT_STUB(ITTAPI, __itt_obj_state_t, obj_mode_set, (__itt_obj_prop_t p, __itt_obj_state_t s))
-#define __itt_obj_mode_set     ITTNOTIFY_DATA(obj_mode_set)
+ITT_STUB(ITTAPI, __itt_obj_state_t, obj_mode_set,
+         (__itt_obj_prop_t p, __itt_obj_state_t s))
+#define __itt_obj_mode_set ITTNOTIFY_DATA(obj_mode_set)
 #define __itt_obj_mode_set_ptr ITTNOTIFY_NAME(obj_mode_set)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_obj_mode_set(p, s) (__itt_obj_state_t)0
 #define __itt_obj_mode_set_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_obj_mode_set_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -904,15 +975,15 @@ typedef struct __itt_frame_t *__itt_frame;
 /**
  * @brief Create a global frame with given domain
  */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-__itt_frame ITTAPI __itt_frame_createA(const char    *domain);
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+__itt_frame ITTAPI __itt_frame_createA(const char *domain);
 __itt_frame ITTAPI __itt_frame_createW(const wchar_t *domain);
 #if defined(UNICODE) || defined(_UNICODE)
-#  define __itt_frame_create     __itt_frame_createW
-#  define __itt_frame_create_ptr __itt_frame_createW_ptr
+#define __itt_frame_create __itt_frame_createW
+#define __itt_frame_create_ptr __itt_frame_createW_ptr
 #else /* UNICODE */
-#  define __itt_frame_create     __itt_frame_createA
-#  define __itt_frame_create_ptr __itt_frame_createA_ptr
+#define __itt_frame_create __itt_frame_createA
+#define __itt_frame_create_ptr __itt_frame_createA_ptr
 #endif /* UNICODE */
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 __itt_frame ITTAPI __itt_frame_create(const char *domain);
@@ -921,38 +992,38 @@ __itt_frame ITTAPI __itt_frame_create(const char *domain);
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-ITT_STUB(ITTAPI, __itt_frame, frame_createA, (const char    *domain))
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+ITT_STUB(ITTAPI, __itt_frame, frame_createA, (const char *domain))
 ITT_STUB(ITTAPI, __itt_frame, frame_createW, (const wchar_t *domain))
-#else  /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-ITT_STUB(ITTAPI, __itt_frame, frame_create,  (const char *domain))
+#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
+ITT_STUB(ITTAPI, __itt_frame, frame_create, (const char *domain))
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
-#define __itt_frame_createA     ITTNOTIFY_DATA(frame_createA)
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
+#define __itt_frame_createA ITTNOTIFY_DATA(frame_createA)
 #define __itt_frame_createA_ptr ITTNOTIFY_NAME(frame_createA)
-#define __itt_frame_createW     ITTNOTIFY_DATA(frame_createW)
+#define __itt_frame_createW ITTNOTIFY_DATA(frame_createW)
 #define __itt_frame_createW_ptr ITTNOTIFY_NAME(frame_createW)
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_frame_create     ITTNOTIFY_DATA(frame_create)
+#define __itt_frame_create ITTNOTIFY_DATA(frame_create)
 #define __itt_frame_create_ptr ITTNOTIFY_NAME(frame_create)
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#else  /* INTEL_NO_ITTNOTIFY_API */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_ITTNOTIFY_API */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_frame_createA(domain)
 #define __itt_frame_createA_ptr 0
 #define __itt_frame_createW(domain)
 #define __itt_frame_createW_ptr 0
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #define __itt_frame_create(domain)
-#define __itt_frame_create_ptr  0
+#define __itt_frame_create_ptr 0
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
-#if ITT_PLATFORM==ITT_PLATFORM_WIN
+#else /* INTEL_NO_MACRO_BODY */
+#if ITT_PLATFORM == ITT_PLATFORM_WIN
 #define __itt_frame_createA_ptr 0
 #define __itt_frame_createW_ptr 0
 #else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
-#define __itt_frame_create_ptr  0
+#define __itt_frame_create_ptr 0
 #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
@@ -960,26 +1031,26 @@ ITT_STUB(ITTAPI, __itt_frame, frame_create,  (const char *domain))
 /** @brief Record a frame begin occurrence. */
 void ITTAPI __itt_frame_begin(__itt_frame frame);
 /** @brief Record a frame end occurrence. */
-void ITTAPI __itt_frame_end  (__itt_frame frame);
+void ITTAPI __itt_frame_end(__itt_frame frame);
 
 /** @cond exclude_from_documentation */
 #ifndef INTEL_NO_MACRO_BODY
 #ifndef INTEL_NO_ITTNOTIFY_API
 ITT_STUBV(ITTAPI, void, frame_begin, (__itt_frame frame))
-ITT_STUBV(ITTAPI, void, frame_end,   (__itt_frame frame))
-#define __itt_frame_begin     ITTNOTIFY_VOID(frame_begin)
+ITT_STUBV(ITTAPI, void, frame_end, (__itt_frame frame))
+#define __itt_frame_begin ITTNOTIFY_VOID(frame_begin)
 #define __itt_frame_begin_ptr ITTNOTIFY_NAME(frame_begin)
-#define __itt_frame_end       ITTNOTIFY_VOID(frame_end)
-#define __itt_frame_end_ptr   ITTNOTIFY_NAME(frame_end)
-#else  /* INTEL_NO_ITTNOTIFY_API */
+#define __itt_frame_end ITTNOTIFY_VOID(frame_end)
+#define __itt_frame_end_ptr ITTNOTIFY_NAME(frame_end)
+#else /* INTEL_NO_ITTNOTIFY_API */
 #define __itt_frame_begin(frame)
 #define __itt_frame_begin_ptr 0
 #define __itt_frame_end(frame)
-#define __itt_frame_end_ptr   0
+#define __itt_frame_end_ptr 0
 #endif /* INTEL_NO_ITTNOTIFY_API */
-#else  /* INTEL_NO_MACRO_BODY */
+#else /* INTEL_NO_MACRO_BODY */
 #define __itt_frame_begin_ptr 0
-#define __itt_frame_end_ptr   0
+#define __itt_frame_end_ptr 0
 #endif /* INTEL_NO_MACRO_BODY */
 /** @endcond */
 /** @} frames group */

diff  --git a/openmp/runtime/src/z_Linux_util.cpp b/openmp/runtime/src/z_Linux_util.cpp
index 95feafbec8e5..bb6d6c874525 100644
--- a/openmp/runtime/src/z_Linux_util.cpp
+++ b/openmp/runtime/src/z_Linux_util.cpp
@@ -122,7 +122,7 @@ void __kmp_affinity_bind_thread(int which) {
  * Linux* OS by checking __NR_sched_{get,set}affinity system calls, and set
  * __kmp_affin_mask_size to the appropriate value (0 means not capable). */
 void __kmp_affinity_determine_capable(const char *env_var) {
-// Check and see if the OS supports thread affinity.
+  // Check and see if the OS supports thread affinity.
 
 #if KMP_OS_LINUX
 #define KMP_CPU_SET_SIZE_LIMIT (1024 * 1024)
@@ -130,7 +130,6 @@ void __kmp_affinity_determine_capable(const char *env_var) {
 #define KMP_CPU_SET_SIZE_LIMIT (sizeof(cpuset_t))
 #endif
 
-
 #if KMP_OS_LINUX
   // If Linux* OS:
   // If the syscall fails or returns a suggestion for the size,
@@ -281,7 +280,8 @@ void __kmp_affinity_determine_capable(const char *env_var) {
   long gCode;
   unsigned char *buf;
   buf = (unsigned char *)KMP_INTERNAL_MALLOC(KMP_CPU_SET_SIZE_LIMIT);
-  gCode = pthread_getaffinity_np(pthread_self(), KMP_CPU_SET_SIZE_LIMIT, reinterpret_cast<cpuset_t *>(buf));
+  gCode = pthread_getaffinity_np(pthread_self(), KMP_CPU_SET_SIZE_LIMIT,
+                                 reinterpret_cast<cpuset_t *>(buf));
   KA_TRACE(30, ("__kmp_affinity_determine_capable: "
                 "initial getaffinity call returned %d errno = %d\n",
                 gCode, errno));
@@ -289,7 +289,7 @@ void __kmp_affinity_determine_capable(const char *env_var) {
     KMP_AFFINITY_ENABLE(KMP_CPU_SET_SIZE_LIMIT);
     KA_TRACE(10, ("__kmp_affinity_determine_capable: "
                   "affinity supported (mask size %d)\n",
-		  (int)__kmp_affin_mask_size));
+                  (int)__kmp_affin_mask_size));
     KMP_INTERNAL_FREE(buf);
     return;
   }
@@ -474,7 +474,7 @@ void __kmp_terminate_thread(int gtid) {
 static kmp_int32 __kmp_set_stack_info(int gtid, kmp_info_t *th) {
   int stack_data;
 #if KMP_OS_LINUX || KMP_OS_DRAGONFLY || KMP_OS_FREEBSD || KMP_OS_NETBSD ||     \
-        KMP_OS_HURD
+    KMP_OS_HURD
   pthread_attr_t attr;
   int status;
   size_t size = 0;
@@ -512,8 +512,8 @@ static kmp_int32 __kmp_set_stack_info(int gtid, kmp_info_t *th) {
     TCW_4(th->th.th_info.ds.ds_stackgrow, FALSE);
     return TRUE;
   }
-#endif /* KMP_OS_LINUX || KMP_OS_DRAGONFLY || KMP_OS_FREEBSD || KMP_OS_NETBSD ||
-              KMP_OS_HURD */
+#endif /* KMP_OS_LINUX || KMP_OS_DRAGONFLY || KMP_OS_FREEBSD || KMP_OS_NETBSD  \
+          || KMP_OS_HURD */
   /* Use incremental refinement starting from initial conservative estimate */
   TCW_PTR(th->th.th_info.ds.ds_stacksize, 0);
   TCW_PTR(th->th.th_info.ds.ds_stackbase, &stack_data);
@@ -528,7 +528,7 @@ static void *__kmp_launch_worker(void *thr) {
 #endif /* KMP_BLOCK_SIGNALS */
   void *exit_val;
 #if KMP_OS_LINUX || KMP_OS_DRAGONFLY || KMP_OS_FREEBSD || KMP_OS_NETBSD ||     \
-        KMP_OS_OPENBSD || KMP_OS_HURD
+    KMP_OS_OPENBSD || KMP_OS_HURD
   void *volatile padding = 0;
 #endif
   int gtid;
@@ -577,7 +577,7 @@ static void *__kmp_launch_worker(void *thr) {
 #endif /* KMP_BLOCK_SIGNALS */
 
 #if KMP_OS_LINUX || KMP_OS_DRAGONFLY || KMP_OS_FREEBSD || KMP_OS_NETBSD ||     \
-        KMP_OS_OPENBSD
+    KMP_OS_OPENBSD
   if (__kmp_stkoffset > 0 && gtid > 0) {
     padding = KMP_ALLOCA(gtid * __kmp_stkoffset);
   }
@@ -830,10 +830,10 @@ void __kmp_create_worker(int gtid, kmp_info_t *th, size_t stack_size) {
   stack_size += gtid * __kmp_stkoffset * 2;
 
 #if defined(__ANDROID__) && __ANDROID_API__ < 19
-    // Round the stack size to a multiple of the page size. Older versions of
-    // Android (until KitKat) would fail pthread_attr_setstacksize with EINVAL
-    // if the stack size was not a multiple of the page size.
-    stack_size = (stack_size + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1);
+  // Round the stack size to a multiple of the page size. Older versions of
+  // Android (until KitKat) would fail pthread_attr_setstacksize with EINVAL
+  // if the stack size was not a multiple of the page size.
+  stack_size = (stack_size + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1);
 #endif
 
   KA_TRACE(10, ("__kmp_create_worker: T#%d, default stacksize = %lu bytes, "
@@ -1395,9 +1395,8 @@ void __kmp_suspend_initialize_thread(kmp_info_t *th) {
   if (old_value == new_value)
     return;
   // Wait, then return if being initialized
-  if (old_value == -1 ||
-      !__kmp_atomic_compare_store(&th->th.th_suspend_init_count, old_value,
-                                  -1)) {
+  if (old_value == -1 || !__kmp_atomic_compare_store(
+                             &th->th.th_suspend_init_count, old_value, -1)) {
     while (KMP_ATOMIC_LD_ACQ(&th->th.th_suspend_init_count) != new_value) {
       KMP_CPU_PAUSE();
     }
@@ -1807,7 +1806,7 @@ static int __kmp_get_xproc(void) {
   int r = 0;
 
 #if KMP_OS_LINUX || KMP_OS_DRAGONFLY || KMP_OS_FREEBSD || KMP_OS_NETBSD ||     \
-        KMP_OS_OPENBSD || KMP_OS_HURD
+    KMP_OS_OPENBSD || KMP_OS_HURD
 
   __kmp_type_convert(sysconf(_SC_NPROCESSORS_ONLN), &(r));
 
@@ -1870,7 +1869,7 @@ void __kmp_runtime_initialize(void) {
 
   __kmp_xproc = __kmp_get_xproc();
 
-#if ! KMP_32_BIT_ARCH
+#if !KMP_32_BIT_ARCH
   struct rlimit rlim;
   // read stack size of calling thread, save it as default for worker threads;
   // this should be done before reading environment variables
@@ -2015,8 +2014,8 @@ int __kmp_is_address_mapped(void *addr) {
 
 #if KMP_OS_LINUX || KMP_OS_HURD
 
-  /* On GNUish OSes, read the /proc/<pid>/maps pseudo-file to get all the address
-     ranges mapped into the address space. */
+  /* On GNUish OSes, read the /proc/<pid>/maps pseudo-file to get all the
+     address ranges mapped into the address space. */
 
   char *name = __kmp_str_format("/proc/%d/maps", getpid());
   FILE *file = NULL;
@@ -2057,36 +2056,36 @@ int __kmp_is_address_mapped(void *addr) {
   int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_VMMAP, getpid()};
   rc = sysctl(mib, 4, NULL, &lstsz, NULL, 0);
   if (rc < 0)
-     return 0;
+    return 0;
   // We pass from number of vm entry's semantic
   // to size of whole entry map list.
   lstsz = lstsz * 4 / 3;
   buf = reinterpret_cast<char *>(kmpc_malloc(lstsz));
   rc = sysctl(mib, 4, buf, &lstsz, NULL, 0);
   if (rc < 0) {
-     kmpc_free(buf);
-     return 0;
+    kmpc_free(buf);
+    return 0;
   }
 
   char *lw = buf;
   char *up = buf + lstsz;
 
   while (lw < up) {
-      struct kinfo_vmentry *cur = reinterpret_cast<struct kinfo_vmentry *>(lw);
-      size_t cursz = cur->kve_structsize;
-      if (cursz == 0)
-          break;
-      void *start = reinterpret_cast<void *>(cur->kve_start);
-      void *end = reinterpret_cast<void *>(cur->kve_end);
-      // Readable/Writable addresses within current map entry
-      if ((addr >= start) && (addr < end)) {
-          if ((cur->kve_protection & KVME_PROT_READ) != 0 &&
-              (cur->kve_protection & KVME_PROT_WRITE) != 0) {
-              found = 1;
-              break;
-          }
+    struct kinfo_vmentry *cur = reinterpret_cast<struct kinfo_vmentry *>(lw);
+    size_t cursz = cur->kve_structsize;
+    if (cursz == 0)
+      break;
+    void *start = reinterpret_cast<void *>(cur->kve_start);
+    void *end = reinterpret_cast<void *>(cur->kve_end);
+    // Readable/Writable addresses within current map entry
+    if ((addr >= start) && (addr < end)) {
+      if ((cur->kve_protection & KVME_PROT_READ) != 0 &&
+          (cur->kve_protection & KVME_PROT_WRITE) != 0) {
+        found = 1;
+        break;
       }
-      lw += cursz;
+    }
+    lw += cursz;
   }
   kmpc_free(buf);
 
@@ -2103,7 +2102,7 @@ int __kmp_is_address_mapped(void *addr) {
       1, // Number of bytes to be read.
       (vm_address_t)(&buffer), // Address of buffer to save read bytes in.
       &count // Address of var to save number of read bytes in.
-      );
+  );
   if (rc == 0) {
     // Memory successfully read.
     found = 1;

diff  --git a/openmp/tools/archer/ompt-tsan.cpp b/openmp/tools/archer/ompt-tsan.cpp
index 3ab0eadbbef0..896c8aafbe23 100644
--- a/openmp/tools/archer/ompt-tsan.cpp
+++ b/openmp/tools/archer/ompt-tsan.cpp
@@ -624,7 +624,6 @@ static void ompt_tsan_sync_region(ompt_sync_region_t kind,
     case ompt_sync_region_reduction:
       // should never be reached
       break;
-
     }
     if (endpoint == ompt_scope_begin)
       break;
@@ -683,7 +682,6 @@ static void ompt_tsan_sync_region(ompt_sync_region_t kind,
       // Should not occur according to OpenMP 5.1
       // Tested in OMPT tests
       break;
-
     }
     break;
   }

diff  --git a/openmp/tools/multiplex/ompt-multiplex.h b/openmp/tools/multiplex/ompt-multiplex.h
index e16189f9340d..bd907f9caa8e 100644
--- a/openmp/tools/multiplex/ompt-multiplex.h
+++ b/openmp/tools/multiplex/ompt-multiplex.h
@@ -20,13 +20,13 @@
 #define _GNU_SOURCE
 #endif
 #include <dlfcn.h>
+#include <errno.h>
 #include <execinfo.h>
 #include <inttypes.h>
 #include <omp-tools.h>
 #include <omp.h>
 #include <stdio.h>
 #include <string.h>
-#include <errno.h>
 
 static ompt_set_callback_t ompt_multiplex_set_callback;
 static ompt_get_task_info_t ompt_multiplex_get_task_info;


        


More information about the Openmp-commits mailing list