commit 81b5593e94860827f21839b17a0e39c3ed18a989
author Peyton, Jonathan L <jonathan.l.peyton@intel.com> Tue Feb 02 16:22:40 2021 -0600
committer Copybara-Service <copybara-worker@google.com> Sat Feb 27 00:08:56 2021 -0800
tree 49d12af71b1cd8f9f94817ec9a6921c498917c20
parent 1702e3930dbd606e1bd0bb9936feb2fb13c23952

[OpenMP] Update HWLOC code for die level detection

Differential Revision: https://reviews.llvm.org/D96748

GitOrigin-RevId: 55dff8b2e4f0ac9e852b5abc053af8dcf6c744f1

runtime/src/kmp_affinity.cpp

diff --git a/runtime/src/kmp_affinity.cpp b/runtime/src/kmp_affinity.cpp
index 03f2e19..e5e1d21 100644
--- a/runtime/src/kmp_affinity.cpp
+++ b/runtime/src/kmp_affinity.cpp
@@ -19,6 +19,10 @@
 #if KMP_USE_HIER_SCHED
 #include "kmp_dispatch_hier.h"
 #endif
+#if KMP_USE_HWLOC
+// Copied from hwloc
+#define HWLOC_GROUP_KIND_INTEL_DIE 104
+#endif
 
 // Store the real or imagined machine hierarchy here
 static hierarchy_info machine_hierarchy;
@@ -583,6 +587,13 @@
     return KMP_HW_CORE;
   case HWLOC_OBJ_PU:
     return KMP_HW_THREAD;
+  case HWLOC_OBJ_GROUP:
+    if (obj->attr->group.kind == HWLOC_GROUP_KIND_INTEL_DIE)
+      return KMP_HW_DIE;
+#if HWLOC_API_VERSION >= 0x00020100
+  case HWLOC_OBJ_DIE:
+    return KMP_HW_DIE;
+#endif
   }
   return KMP_HW_UNKNOWN;
 }