utils: filter based on memory tiers using numa[tier=1]

Signed-off-by: Brice Goglin <[email protected]>

Author: bgoglin

utils/hwloc/hwloc-calc.1in

@@ -404,6 +404,12 @@ To find the number of NUMA nodes with subtype "HBM":
     $ hwloc-calc -N "numa[hbm]" all
     4
 
+To find the number of NUMA nodes in memory tier 1
+(DRAM nodes on a server with HBM and DRAM):
+
+    $ hwloc-calc -N "numa[tier=1]" all
+    4
+
 To find the NUMA node of subtype MCDRAM (on KNL) near a PU:
 
     $ hwloc-calc -I "numa[mcdram]" pu:157

utils/hwloc/hwloc-calc.h

@@ -38,6 +38,7 @@ struct hwloc_calc_level {
   hwloc_obj_type_t type;
   union hwloc_obj_attr_u attr;
   char subtype[32];
+  int memory_tier;
   int pci_vendor, pci_device;
   int only_hbm; /* -1 for everything, 0 for only non-HBM, 1 for only HBM numa nodes */
 };
@@ -99,6 +100,12 @@ hwloc_calc_check_object_filtered(hwloc_obj_t obj, struct hwloc_calc_level *level
   }
 
   if (level->type == HWLOC_OBJ_NUMANODE) {
+    if (level->memory_tier >= 0) {
+      const char *tier = hwloc_obj_get_info_by_name(obj, "MemoryTier");
+      if (!tier || atoi(tier) != level->memory_tier)
+        return 1;
+    }
+
     if (level->only_hbm >= 0) {
       /* filter on hbm */
       int obj_is_hbm = obj->subtype && !strcmp(obj->subtype, "MCDRAM");
@@ -206,6 +213,11 @@ hwloc_calc_parse_level_filter(hwloc_topology_t topology __hwloc_attribute_unused
   const char *end;
   unsigned subtypelen;
 
+  if (!strncmp(current, "tier=", 5)) {
+    level->memory_tier = atoi(current+5);
+    return 0;
+  }
+
   if (!strncmp(current, "subtype=", 8)) {
     current += 8;
     goto subtype;
@@ -254,6 +266,7 @@ hwloc_calc_parse_level(struct hwloc_calc_location_context_s *lcontext,
   int err;
 
   level->subtype[0] = '\0';
+  level->memory_tier = -1;
   level->pci_device = level->pci_vendor = -1;
   level->only_hbm = -1;
   if (lcontext)

utils/hwloc/hwloc-info.c

@@ -536,6 +536,7 @@ hwloc_calc_process_location_info_cb(struct hwloc_calc_location_context_s *lconte
       level.depth = show_descendants_depth;
       level.only_hbm = -1;
       level.subtype[0] = '\0';
+      level.memory_tier = -1;
       level.pci_vendor = level.pci_device = -1;
       n = hwloc_calc_get_nbobjs_inside_sets_by_depth(lcontext, obj->cpuset, obj->nodeset, &level);
       for(i=0; i<n; i++) {

utils/hwloc/hwloc.7in

@@ -95,6 +95,7 @@ objects are wanted.
 type and also its subtype string attribute.
 For instance \fINUMA[HBM]\fR selects NUMA nodes of subtype "HBM".
 The prefix \fIsubtype=\fR may be avoided if there is no ambiguity.
+\fINUMA[tier=X]\fR select NUMA nodes of tier <X> ("MemoryTier" info attribute).
 \fIOS[Net]\fR also selects OS devices whose OS-device-specific type is Network.
 .br
 

utils/hwloc/test-hwloc-info.output

@@ -508,6 +508,9 @@ NUMANode:11
 NUMANode:3
 NUMANode:5
 
+# Memory Tier 1 filter
+NUMANode:6
+
 # NVML subtype OSdev type filter
 OSDev[Co-Processor,GPU]:2
 OSDev[Co-Processor,GPU]:5

utils/hwloc/test-hwloc-info.sh.in

@@ -124,6 +124,9 @@ set -e
   echo "# MCDRAM subtype NUMA filter"
   $info --if xml --input $xmldir/64intel64-fakeKNL-SNC4-hybrid.xml -s 'numa[mcdram]:1-2'
   echo
+  echo "# Memory Tier 1 filter"
+  $info --if xml --input $xmldir/64intel64-fakeKNL-SNC4-hybrid.xml -s 'numa[tier=1]:3'
+  echo
   echo "# NVML subtype OSdev type filter"
   $info --if xml --input $xmldir/power8gpudistances.xml -s 'os[nvml]:all'
   echo