This is an archive of the discontinued LLVM Phabricator instance.

Differential D82301

[OpenMP][NFC] Cleanup: put two more usages of __kmp_mic_type under KMP_MIC_SUPPORTED macro.
ClosedPublic

Authored by AndreyChurbanov on Jun 22 2020, 7:29 AM.

Details

Reviewers
hbae
tlwilmar
jdoerfert
Commits
rG7f3d9cc1c059: [openmp][NFC] Cleanup: guard __kmp_mic_type by KMP_MIC_SUPPORTED macro.
Summary

The __kmp_mic_type variable declared under KMP_MIC_SUPPORTED macro, thus all its usages must be guarded by the same macro.

Diff Detail

Event Timeline

AndreyChurbanov created this revision.Jun 22 2020, 7:29 AM
Herald added a reviewer: jdoerfert. · View Herald TranscriptJun 22 2020, 7:29 AM
Herald added subscribers: openmp-commits, sstefan1, guansong, yaxunl. · View Herald Transcript
Harbormaster failed remote builds in B61229: Diff 272424!Jun 22 2020, 8:35 AM
jdoerfert accepted this revision.Jun 24 2020, 8:20 AM

LGTM

This revision is now accepted and ready to land.Jun 24 2020, 8:20 AM
Closed by commit rG7f3d9cc1c059: [openmp][NFC] Cleanup: guard __kmp_mic_type by KMP_MIC_SUPPORTED macro. (authored by AndreyChurbanov). · Explain WhyJun 29 2020, 4:17 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
openmp/
runtime/
src/
6 lines

Diff 274053

openmp/runtime/src/kmp_affinity.cpp

Show First 20 Lines • Show All 1,962 Lines • ▼ Show 20 Linesstatic void __kmp_dispatch_set_hierarchy_values() {
// Set the maximum number of L1's to number of cores // Set the maximum number of L1's to number of cores
// Set the maximum number of L2's to to either number of cores / 2 for // Set the maximum number of L2's to to either number of cores / 2 for
// Intel(R) Xeon Phi(TM) coprocessor formally codenamed Knights Landing // Intel(R) Xeon Phi(TM) coprocessor formally codenamed Knights Landing
// Or the number of cores for Intel(R) Xeon(R) processors // Or the number of cores for Intel(R) Xeon(R) processors
// Set the maximum number of NUMA nodes and L3's to number of packages // Set the maximum number of NUMA nodes and L3's to number of packages
__kmp_hier_max_units[kmp_hier_layer_e::LAYER_THREAD + 1] = __kmp_hier_max_units[kmp_hier_layer_e::LAYER_THREAD + 1] =
nPackages * nCoresPerPkg * __kmp_nThreadsPerCore; nPackages * nCoresPerPkg * __kmp_nThreadsPerCore;
__kmp_hier_max_units[kmp_hier_layer_e::LAYER_L1 + 1] = __kmp_ncores; __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) if (__kmp_mic_type >= mic3)
__kmp_hier_max_units[kmp_hier_layer_e::LAYER_L2 + 1] = __kmp_ncores / 2; __kmp_hier_max_units[kmp_hier_layer_e::LAYER_L2 + 1] = __kmp_ncores / 2;
else else
#endif // KMP_ARCH_X86_64 && (KMP_OS_LINUX || KMP_OS_WINDOWS) #endif // KMP_ARCH_X86_64 && (KMP_OS_LINUX || KMP_OS_WINDOWS)
__kmp_hier_max_units[kmp_hier_layer_e::LAYER_L2 + 1] = __kmp_ncores; __kmp_hier_max_units[kmp_hier_layer_e::LAYER_L2 + 1] = __kmp_ncores;
__kmp_hier_max_units[kmp_hier_layer_e::LAYER_L3 + 1] = nPackages; __kmp_hier_max_units[kmp_hier_layer_e::LAYER_L3 + 1] = nPackages;
__kmp_hier_max_units[kmp_hier_layer_e::LAYER_NUMA + 1] = nPackages; __kmp_hier_max_units[kmp_hier_layer_e::LAYER_NUMA + 1] = nPackages;
__kmp_hier_max_units[kmp_hier_layer_e::LAYER_LOOP + 1] = 1; __kmp_hier_max_units[kmp_hier_layer_e::LAYER_LOOP + 1] = 1;
// Set the number of threads per unit // Set the number of threads per unit
// Number of hardware threads per L1/L2/L3/NUMA/LOOP // Number of hardware threads per L1/L2/L3/NUMA/LOOP
__kmp_hier_threads_per[kmp_hier_layer_e::LAYER_THREAD + 1] = 1; __kmp_hier_threads_per[kmp_hier_layer_e::LAYER_THREAD + 1] = 1;
__kmp_hier_threads_per[kmp_hier_layer_e::LAYER_L1 + 1] = __kmp_hier_threads_per[kmp_hier_layer_e::LAYER_L1 + 1] =
__kmp_nThreadsPerCore; __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) if (__kmp_mic_type >= mic3)
__kmp_hier_threads_per[kmp_hier_layer_e::LAYER_L2 + 1] = __kmp_hier_threads_per[kmp_hier_layer_e::LAYER_L2 + 1] =
2 * __kmp_nThreadsPerCore; 2 * __kmp_nThreadsPerCore;
else else
#endif // KMP_ARCH_X86_64 && (KMP_OS_LINUX || KMP_OS_WINDOWS) #endif // KMP_ARCH_X86_64 && (KMP_OS_LINUX || KMP_OS_WINDOWS)
__kmp_hier_threads_per[kmp_hier_layer_e::LAYER_L2 + 1] = __kmp_hier_threads_per[kmp_hier_layer_e::LAYER_L2 + 1] =
__kmp_nThreadsPerCore; __kmp_nThreadsPerCore;
__kmp_hier_threads_per[kmp_hier_layer_e::LAYER_L3 + 1] = __kmp_hier_threads_per[kmp_hier_layer_e::LAYER_L3 + 1] =
▲ Show 20 Lines • Show All 3,349 Lines • Show Last 20 Lines