OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 2
Code Issues Packages Projects Releases Wiki Activity

[OpenMP][libomp] Replace global variable references with local object 

Remove references to global __kmp_topology within a kmp_topology_t
object method. There should just be implicit references to the
private object.
This commit is contained in:
Jonathan Peyton 2022-04-12 11:15:54 -05:00
parent 9faab435a3
commit d49ce7c356
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openmp/runtime/src/kmp_affinity.cpp
View File

@ -818,7 +818,7 @@ void kmp_topology_t::canonicalize() {
// First try core, then thread, then package // First try core, then thread, then package
kmp_hw_t gran_types[3] = {KMP_HW_CORE, KMP_HW_THREAD, KMP_HW_SOCKET}; kmp_hw_t gran_types[3] = {KMP_HW_CORE, KMP_HW_THREAD, KMP_HW_SOCKET};
for (auto g : gran_types) { for (auto g : gran_types) {
if (__kmp_topology->get_equivalent_type(g) != KMP_HW_UNKNOWN) { if (get_equivalent_type(g) != KMP_HW_UNKNOWN) {
gran_type = g; gran_type = g;
break; break;
} }
@ -839,8 +839,8 @@ void kmp_topology_t::canonicalize() {
// processor groups that cover a socket, then the runtime must // processor groups that cover a socket, then the runtime must
// restrict the granularity down to the processor group level. // restrict the granularity down to the processor group level.
if (__kmp_num_proc_groups > 1) { if (__kmp_num_proc_groups > 1) {
int gran_depth = __kmp_topology->get_level(gran_type); int gran_depth = get_level(gran_type);
int proc_group_depth = __kmp_topology->get_level(KMP_HW_PROC_GROUP); int proc_group_depth = get_level(KMP_HW_PROC_GROUP);
if (gran_depth >= 0 && proc_group_depth >= 0 && if (gran_depth >= 0 && proc_group_depth >= 0 &&
gran_depth < proc_group_depth) { gran_depth < proc_group_depth) {
KMP_WARNING(AffGranTooCoarseProcGroup, "KMP_AFFINITY", KMP_WARNING(AffGranTooCoarseProcGroup, "KMP_AFFINITY",