[OpenMP] Update HWLOC topology detection for die level

[jlpeyton]

Summary

Incorporate HWLOC 2.x code to detect die level.

[hbae]

LGTM

openmp/runtime/src/kmp_affinity.cpp

 #include "kmp_affinity.h"
 #include "kmp_i18n.h"
 #include "kmp_io.h"
 #include "kmp_str.h"
 #include "kmp_wrapper_getpid.h"
 #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;
 
 void __kmp_cleanup_hierarchy() { machine_hierarchy.fini(); }
 
 void __kmp_get_hierarchy(kmp_uint32 nproc, kmp_bstate_t *thr_bar) {
   kmp_uint32 depth;
#endif
   case HWLOC_OBJ_PACKAGE:
     return KMP_HW_SOCKET;
   case HWLOC_OBJ_NUMANODE:
     return KMP_HW_NUMA;
   case HWLOC_OBJ_CORE:
     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;
 }
 
 // Returns the number of objects of type 'type' below 'obj' within the topology
 // tree structure. e.g., if obj is a HWLOC_OBJ_PACKAGE object, and type is
 // HWLOC_OBJ_PU, then this will return the number of PU's under the SOCKET
 // object.