Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-11-29 00:21:14 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

D11156: Fix comments by eliminating possible trademark conflicts

Browse Source 
llvm-svn: 244034
This commit is contained in:
Andrey Churbanov 2015-08-05 12:00:07 +00:00
parent 87ee8dcb64
commit 9f5a9b0d91
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openmp/runtime/src/kmp_csupport.c
View File

@ -2342,7 +2342,7 @@ __kmpc_test_nest_lock( ident_t *loc, kmp_int32 gtid, void **user_lock )
static __forceinline void static __forceinline void
__kmp_enter_critical_section_reduce_block( ident_t * loc, kmp_int32 global_tid, kmp_critical_name * crit ) { __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) // (although it's used for an internal purpose only)
// why was it visible in previous implementation? // why was it visible in previous implementation?
// should we keep it visible in new reduce block? // 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 // and be more in line with sense of NOWAIT
//AT: TO DO: do epcc test and compare times //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) // (it's neither a terminating barrier nor customer's code, it's used for an internal purpose)
#if USE_ITT_NOTIFY #if USE_ITT_NOTIFY
__kmp_threads[global_tid]->th.th_ident = loc; __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 ) ) { } else if( TEST_REDUCTION_METHOD( packed_reduction_method, tree_reduce_block ) ) {
//case 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) // (it's a terminating barrier on constructs if NOWAIT not specified)
#if USE_ITT_NOTIFY #if USE_ITT_NOTIFY
__kmp_threads[global_tid]->th.th_ident = loc; // needed for correct notification of frames __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 ); 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) // (it's a terminating barrier on constructs if NOWAIT not specified)
if( packed_reduction_method == critical_reduce_block ) { if( packed_reduction_method == critical_reduce_block ) {

7
openmp/runtime/src/thirdparty/ittnotify/ittnotify.h vendored
View File

@ -1749,10 +1749,9 @@ static const __itt_id __itt_null = { 0, 0, 0 };
/** /**
* @ingroup ids * @ingroup ids
* @brief A convenience function is provided to create an ID without domain control. * @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 * @brief This is a convenience function to initialize an __itt_id structure.
* does not affect the trace collector runtime in any way. After you make the ID with this * After you make the ID with this function, you still must create it with the
* function, you still must create it with the __itt_id_create function before using the ID * __itt_id_create function before using the ID to identify a named entity.
* to identify a named entity.
* @param[in] addr The address of object; high QWORD of the ID value. * @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. * @param[in] extra The extra data to unique identify object; low QWORD of the ID value.
*/ */

2
openmp/runtime/src/thirdparty/ittnotify/ittnotify_config.h vendored
View File

@ -278,7 +278,7 @@ ITT_INLINE long __itt_interlocked_increment(volatile long* ptr)
#ifdef __INTEL_COMPILER #ifdef __INTEL_COMPILER
#define __TBB_machine_fetchadd4(addr, val) __fetchadd4_acq((void *)addr, val) #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 */ /* TODO: Add Support for not Intel compilers for IA-64 architecture */
#endif /* __INTEL_COMPILER */ #endif /* __INTEL_COMPILER */
#elif ITT_ARCH==ITT_ARCH_IA32 || ITT_ARCH==ITT_ARCH_IA32E /* ITT_ARCH!=ITT_ARCH_IA64 */ #elif ITT_ARCH==ITT_ARCH_IA32 || ITT_ARCH==ITT_ARCH_IA32E /* ITT_ARCH!=ITT_ARCH_IA64 */
ITT_INLINE long ITT_INLINE long