From d49ce7c35606cc6d7ee2cc673bb54846468f8980 Mon Sep 17 00:00:00 2001 From: Jonathan Peyton Date: Tue, 12 Apr 2022 11:15:54 -0500 Subject: [PATCH] [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. --- openmp/runtime/src/kmp_affinity.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openmp/runtime/src/kmp_affinity.cpp b/openmp/runtime/src/kmp_affinity.cpp index 8a205a9..d3c989e 100644 --- a/openmp/runtime/src/kmp_affinity.cpp +++ b/openmp/runtime/src/kmp_affinity.cpp @@ -818,7 +818,7 @@ void kmp_topology_t::canonicalize() { // First try core, then thread, then package kmp_hw_t gran_types[3] = {KMP_HW_CORE, KMP_HW_THREAD, KMP_HW_SOCKET}; 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; break; } @@ -839,8 +839,8 @@ void kmp_topology_t::canonicalize() { // processor groups that cover a socket, then the runtime must // restrict the granularity down to the processor group level. if (__kmp_num_proc_groups > 1) { - int gran_depth = __kmp_topology->get_level(gran_type); - int proc_group_depth = __kmp_topology->get_level(KMP_HW_PROC_GROUP); + int gran_depth = get_level(gran_type); + int proc_group_depth = get_level(KMP_HW_PROC_GROUP); if (gran_depth >= 0 && proc_group_depth >= 0 && gran_depth < proc_group_depth) { KMP_WARNING(AffGranTooCoarseProcGroup, "KMP_AFFINITY", -- 2.7.4