[Openmp-commits] [openmp] d49ce7c - [OpenMP][libomp] Replace global variable references with local object

[Jonathan Peyton via Openmp-commits]

Author: Jonathan Peyton
Date: 2022-04-12T12:50:41-05:00
New Revision: d49ce7c35606cc6d7ee2cc673bb54846468f8980

URL: https://github.com/llvm/llvm-project/commit/d49ce7c35606cc6d7ee2cc673bb54846468f8980
DIFF: https://github.com/llvm/llvm-project/commit/d49ce7c35606cc6d7ee2cc673bb54846468f8980.diff

LOG: [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.

Added: 
    

Modified: 
    openmp/runtime/src/kmp_affinity.cpp

Removed: 
    


################################################################################
diff  --git a/openmp/runtime/src/kmp_affinity.cpp b/openmp/runtime/src/kmp_affinity.cpp
index 8a205a9d62662..d3c989e4d0c5f 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",