maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix trademarks found by scanner 

llvm-svn: 321827
This commit is contained in:
Jonathan Peyton 2018-01-04 22:56:47 +00:00
parent ab84a9a65d
commit 8c432f2d5e
6 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openmp/runtime/src/i18n/en_US.txt
View File

@ -209,7 +209,7 @@ AffStrideLessZero "%1$s: range error (%2$d < %3$d & stride < 0), not
AffRangeTooBig "%1$s: range error ((%2$d-%3$d)/%4$d too big), not using affinity."
OBSOLETE "%1$s: %2$s is defined. %3$s will be ignored."
AffNotSupported "%1$s: affinity not supported, using \"disabled\"."
OBSOLETE "%1$s: affinity only supported for Intel(R) processors."
OBSOLETE "%1$s: affinity only supported for Intel(R) Architecture Processors."
GetAffSysCallNotSupported "%1$s: getaffinity system call not supported."
SetAffSysCallNotSupported "%1$s: setaffinity system call not supported."
OBSOLETE "%1$s: pthread_aff_set_np call not found."

4
openmp/runtime/src/kmp.h
View File

@ -2884,8 +2884,8 @@ extern int __kmp_zero_bt; /* whether blocktime has been forced to zero */
#ifdef KMP_DFLT_NTH_CORES
extern int __kmp_ncores; /* Total number of cores for threads placement */
#endif
extern int
__kmp_abort_delay; /* Number of millisecs to delay on abort for VTune */
/* Number of millisecs to delay on abort for Intel(R) VTune(TM) tools */
extern int __kmp_abort_delay;
extern int __kmp_need_register_atfork_specified;
extern int

4
openmp/runtime/src/kmp_lock.h
View File

@ -87,8 +87,8 @@ extern void __kmp_validate_locks(void);
// ----------------------------------------------------------------------------
// There are 5 lock implementations:
// 1. Test and set locks.
// 2. futex locks (Linux* OS on x86 and Intel(R) Many Integrated Core
// architecture)
// 2. futex locks (Linux* OS on x86 and
// Intel(R) Many Integrated Core Architecture)
// 3. Ticket (Lamport bakery) locks.
// 4. Queuing locks (with separate spin fields).
// 5. DRPA (Dynamically Reconfigurable Distributed Polling Area) locks

4
openmp/runtime/src/kmp_runtime.cpp
View File

@ -2199,7 +2199,7 @@ int __kmp_fork_call(ident_t *loc, int gtid,
#endif /* USE_ITT_NOTIFY */
if ((__itt_frame_begin_v3_ptr || KMP_ITT_DEBUG) &&
__kmp_forkjoin_frames && !__kmp_forkjoin_frames_mode) {
// Mark start of "parallel" region for VTune.
// Mark start of "parallel" region for Intel(R) VTune(TM) analyzer.
__kmp_itt_region_forking(gtid, team->t.t_nproc, 0);
}
}
@ -2394,7 +2394,7 @@ void __kmp_join_call(ident_t *loc, int gtid
.t_stack_id); // destroy the stack stitching id after join barrier
}
// Mark end of "parallel" region for VTune.
// Mark end of "parallel" region for Intel(R) VTune(TM) analyzer.
if (team->t.t_active_level == 1
#if OMP_40_ENABLED
&& !master_th->th.th_teams_microtask /* not in teams construct */

12
openmp/runtime/src/kmp_settings.cpp
View File

@ -4702,7 +4702,7 @@ static void __kmp_stg_init(void) {
kmp_setting_t *omp_stacksize =
__kmp_stg_find("OMP_STACKSIZE"); // 3rd priority.
// !!! volatile keyword is Intel (R) C Compiler bug CQ49908 workaround.
// !!! volatile keyword is Intel(R) C Compiler bug CQ49908 workaround.
// !!! Compiler does not understand rivals is used and optimizes out
// assignments
// !!! rivals[ i ++ ] = ...;
@ -4740,7 +4740,7 @@ static void __kmp_stg_init(void) {
kmp_setting_t *omp_wait_policy =
__kmp_stg_find("OMP_WAIT_POLICY"); // 2nd priority.
// !!! volatile keyword is Intel (R) C Compiler bug CQ49908 workaround.
// !!! volatile keyword is Intel(R) C Compiler bug CQ49908 workaround.
static kmp_setting_t *volatile rivals[3];
static kmp_stg_wp_data_t kmp_data = {0, CCAST(kmp_setting_t **, rivals)};
static kmp_stg_wp_data_t omp_data = {1, CCAST(kmp_setting_t **, rivals)};
@ -4764,7 +4764,7 @@ static void __kmp_stg_init(void) {
kmp_setting_t *kmp_all_threads =
__kmp_stg_find("KMP_ALL_THREADS"); // 2nd priority.
// !!! volatile keyword is Intel (R) C Compiler bug CQ49908 workaround.
// !!! volatile keyword is Intel(R) C Compiler bug CQ49908 workaround.
static kmp_setting_t *volatile rivals[3];
int i = 0;
@ -4782,7 +4782,7 @@ static void __kmp_stg_init(void) {
// 2nd priority
kmp_setting_t *kmp_place_threads = __kmp_stg_find("KMP_PLACE_THREADS");
// !!! volatile keyword is Intel (R) C Compiler bug CQ49908 workaround.
// !!! volatile keyword is Intel(R) C Compiler bug CQ49908 workaround.
static kmp_setting_t *volatile rivals[3];
int i = 0;
@ -4810,7 +4810,7 @@ static void __kmp_stg_init(void) {
__kmp_stg_find("OMP_PROC_BIND"); // 3rd priority.
KMP_DEBUG_ASSERT(omp_proc_bind != NULL);
// !!! volatile keyword is Intel (R) C Compiler bug CQ49908 workaround.
// !!! volatile keyword is Intel(R) C Compiler bug CQ49908 workaround.
static kmp_setting_t *volatile rivals[4];
int i = 0;
@ -4852,7 +4852,7 @@ static void __kmp_stg_init(void) {
kmp_setting_t *kmp_determ_red =
__kmp_stg_find("KMP_DETERMINISTIC_REDUCTION"); // 2nd priority.
// !!! volatile keyword is Intel (R) C Compiler bug CQ49908 workaround.
// !!! volatile keyword is Intel(R) C Compiler bug CQ49908 workaround.
static kmp_setting_t *volatile rivals[3];
static kmp_stg_fr_data_t force_data = {1,
CCAST(kmp_setting_t **, rivals)};

30
openmp/runtime/src/kmp_version.cpp
View File

@ -25,35 +25,35 @@
// Detect compiler.
#if KMP_COMPILER_ICC
#if __INTEL_COMPILER == 1010
#define KMP_COMPILER "Intel C++ Compiler 10.1"
#define KMP_COMPILER "Intel(R) C++ Compiler 10.1"
#elif __INTEL_COMPILER == 1100
#define KMP_COMPILER "Intel C++ Compiler 11.0"
#define KMP_COMPILER "Intel(R) C++ Compiler 11.0"
#elif __INTEL_COMPILER == 1110
#define KMP_COMPILER "Intel C++ Compiler 11.1"
#define KMP_COMPILER "Intel(R) C++ Compiler 11.1"
#elif __INTEL_COMPILER == 1200
#define KMP_COMPILER "Intel C++ Compiler 12.0"
#define KMP_COMPILER "Intel(R) C++ Compiler 12.0"
#elif __INTEL_COMPILER == 1210
#define KMP_COMPILER "Intel C++ Compiler 12.1"
#define KMP_COMPILER "Intel(R) C++ Compiler 12.1"
#elif __INTEL_COMPILER == 1300
#define KMP_COMPILER "Intel C++ Compiler 13.0"
#define KMP_COMPILER "Intel(R) C++ Compiler 13.0"
#elif __INTEL_COMPILER == 1310
#define KMP_COMPILER "Intel C++ Compiler 13.1"
#define KMP_COMPILER "Intel(R) C++ Compiler 13.1"
#elif __INTEL_COMPILER == 1400
#define KMP_COMPILER "Intel C++ Compiler 14.0"
#define KMP_COMPILER "Intel(R) C++ Compiler 14.0"
#elif __INTEL_COMPILER == 1410
#define KMP_COMPILER "Intel C++ Compiler 14.1"
#define KMP_COMPILER "Intel(R) C++ Compiler 14.1"
#elif __INTEL_COMPILER == 1500
#define KMP_COMPILER "Intel C++ Compiler 15.0"
#define KMP_COMPILER "Intel(R) C++ Compiler 15.0"
#elif __INTEL_COMPILER == 1600
#define KMP_COMPILER "Intel C++ Compiler 16.0"
#define KMP_COMPILER "Intel(R) C++ Compiler 16.0"
#elif __INTEL_COMPILER == 1700
#define KMP_COMPILER "Intel C++ Compiler 17.0"
#define KMP_COMPILER "Intel(R) C++ Compiler 17.0"
#elif __INTEL_COMPILER == 1800
#define KMP_COMPILER "Intel C++ Compiler 18.0"
#define KMP_COMPILER "Intel(R) C++ Compiler 18.0"
#elif __INTEL_COMPILER == 9998
#define KMP_COMPILER "Intel C++ Compiler mainline"
#define KMP_COMPILER "Intel(R) C++ Compiler mainline"
#elif __INTEL_COMPILER == 9999
#define KMP_COMPILER "Intel C++ Compiler mainline"
#define KMP_COMPILER "Intel(R) C++ Compiler mainline"
#endif
#elif KMP_COMPILER_CLANG
#define KMP_COMPILER \