D11156: Fix comments by eliminating possible trademark conflicts

llvm-svn: 244034

3 files changed, 8 insertions, 9 deletions

diff --git a/openmp/runtime/src/kmp_csupport.c b/openmp/runtime/src/kmp_csupport.c
index 93add76f5d1..1c8c5fb7d1b 100644
--- a/openmp/runtime/src/kmp_csupport.c
+++ b/openmp/runtime/src/kmp_csupport.c
@@ -2342,7 +2342,7 @@ __kmpc_test_nest_lock( ident_t *loc, kmp_int32 gtid, void **user_lock )
 static __forceinline void
 __kmp_enter_critical_section_reduce_block( ident_t * loc, kmp_int32 global_tid, kmp_critical_name * crit ) {
 
-    // this lock was visible to a customer and to the thread profiler as a serial overhead span
+    // this lock was visible to a customer and to the threading profile tool as a serial overhead span
     //            (although it's used for an internal purpose only)
     //            why was it visible in previous implementation?
     //            should we keep it visible in new reduce block?
@@ -2538,7 +2538,7 @@ __kmpc_reduce_nowait(
         //        and be more in line with sense of NOWAIT
         //AT: TO DO: do epcc test and compare times
 
-        // this barrier should be invisible to a customer and to the thread profiler
+        // this barrier should be invisible to a customer and to the threading profile tool
         //              (it's neither a terminating barrier nor customer's code, it's used for an internal purpose)
 #if USE_ITT_NOTIFY
         __kmp_threads[global_tid]->th.th_ident = loc;
@@ -2691,7 +2691,7 @@ __kmpc_reduce(
     } else if( TEST_REDUCTION_METHOD( packed_reduction_method, tree_reduce_block ) ) {
 
         //case tree_reduce_block:
-        // this barrier should be visible to a customer and to the thread profiler
+        // this barrier should be visible to a customer and to the threading profile tool
         //              (it's a terminating barrier on constructs if NOWAIT not specified)
 #if USE_ITT_NOTIFY
         __kmp_threads[global_tid]->th.th_ident = loc; // needed for correct notification of frames
@@ -2737,7 +2737,7 @@ __kmpc_end_reduce( ident_t *loc, kmp_int32 global_tid, kmp_critical_name *lck )
 
     packed_reduction_method = __KMP_GET_REDUCTION_METHOD( global_tid );
 
-    // this barrier should be visible to a customer and to the thread profiler
+    // this barrier should be visible to a customer and to the threading profile tool
     //              (it's a terminating barrier on constructs if NOWAIT not specified)
 
     if( packed_reduction_method == critical_reduce_block ) {
diff --git a/openmp/runtime/src/thirdparty/ittnotify/ittnotify.h b/openmp/runtime/src/thirdparty/ittnotify/ittnotify.h
index d05d8b73c36..c79f110cc1e 100644
--- a/openmp/runtime/src/thirdparty/ittnotify/ittnotify.h
+++ b/openmp/runtime/src/thirdparty/ittnotify/ittnotify.h
@@ -1749,10 +1749,9 @@ 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 trace 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 This is a convenience function to initialize an __itt_id structure.
+ * 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.
  */
diff --git a/openmp/runtime/src/thirdparty/ittnotify/ittnotify_config.h b/openmp/runtime/src/thirdparty/ittnotify/ittnotify_config.h
index c1bfbcc4432..827fec37a66 100644
--- a/openmp/runtime/src/thirdparty/ittnotify/ittnotify_config.h
+++ b/openmp/runtime/src/thirdparty/ittnotify/ittnotify_config.h
@@ -278,7 +278,7 @@ ITT_INLINE long __itt_interlocked_increment(volatile long* ptr)
 #ifdef __INTEL_COMPILER
 #define __TBB_machine_fetchadd4(addr, val) __fetchadd4_acq((void *)addr, val)
 #else  /* __INTEL_COMPILER */
-/* TODO: Add Support for not Intel compilers for IA-64 */
+/* 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