synthetic: factorize/fix default attributes

NUMA nodes declared as attached (between []) didn't have the
default size (1GB), they remained empty.

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

Author: bgoglin

hwloc/topology-synthetic.c

@@ -416,6 +416,32 @@ hwloc_synthetic_parse_attrs(const char *attrs, const char **next_posp,
   return 0;
 }
 
+static void
+hwloc_synthetic_set_default_attrs(struct hwloc_synthetic_attr_s *sattr,
+                                  int *type_count)
+{
+  hwloc_obj_type_t type = sattr->type;
+
+  if (type == HWLOC_OBJ_GROUP) {
+    if (sattr->depth == (unsigned)-1)
+      sattr->depth = type_count[HWLOC_OBJ_GROUP]--;
+
+  } else if (hwloc__obj_type_is_cache(type)) {
+    if (!sattr->memorysize) {
+      if (1 == sattr->depth)
+        /* 32KiB in L1 */
+        sattr->memorysize = 32*1024;
+      else
+        /* *4 at each level, starting from 1MiB for L2, unified */
+        sattr->memorysize = 256ULL*1024 << (2*sattr->depth);
+    }
+
+  } else if (type == HWLOC_OBJ_NUMANODE && !sattr->memorysize) {
+    /* 1GiB in memory nodes. */
+    sattr->memorysize = 1024*1024*1024;
+  }
+}
+
 /* frees level until arity = 0 */
 static void
 hwloc_synthetic_free_levels(struct hwloc_synthetic_backend_data_s *data)
@@ -803,30 +829,14 @@ hwloc_backend_synthetic_init(struct hwloc_synthetic_backend_data_s *data,
     count++;
   }
 
+  /* set default attributes that depend on the depth/hierarchy of levels */
   for (i=0; i<count; i++) {
+    struct hwloc_synthetic_attached_s *attached;
     struct hwloc_synthetic_level_data_s *curlevel = &data->level[i];
-    hwloc_obj_type_t type = curlevel->attr.type;
-
-    if (type == HWLOC_OBJ_GROUP) {
-      if (curlevel->attr.depth == (unsigned)-1)
-	curlevel->attr.depth = type_count[HWLOC_OBJ_GROUP]--;
-
-    } else if (hwloc__obj_type_is_cache(type)) {
-      if (!curlevel->attr.memorysize) {
-	if (1 == curlevel->attr.depth)
-	  /* 32KiB in L1 */
-	  curlevel->attr.memorysize = 32*1024;
-	else
-	  /* *4 at each level, starting from 1MiB for L2, unified */
-	  curlevel->attr.memorysize = 256ULL*1024 << (2*curlevel->attr.depth);
-      }
-
-    } else if (type == HWLOC_OBJ_NUMANODE && !curlevel->attr.memorysize) {
-      /* 1GiB in memory nodes. */
-      curlevel->attr.memorysize = 1024*1024*1024;
-    }
-
-    hwloc_synthetic_process_indexes(data, &data->level[i].indexes, data->level[i].totalwidth, verbose);
+    hwloc_synthetic_set_default_attrs(&curlevel->attr, type_count);
+    for(attached = curlevel->attached; attached != NULL; attached = attached->next)
+      hwloc_synthetic_set_default_attrs(&attached->attr, type_count);
+    hwloc_synthetic_process_indexes(data, &curlevel->indexes, curlevel->totalwidth, verbose);
   }
 
   hwloc_synthetic_process_indexes(data, &data->numa_attached_indexes, data->numa_attached_nr, verbose);

tests/hwloc/hwloc_synthetic.c

@@ -1,6 +1,6 @@
 /*
  * Copyright © 2009 CNRS
- * Copyright © 2009-2022 Inria.  All rights reserved.
+ * Copyright © 2009-2023 Inria.  All rights reserved.
  * Copyright © 2009 Université Bordeaux
  * Copyright © 2011 Cisco Systems, Inc.  All rights reserved.
  * See COPYING in top-level directory.
@@ -162,8 +162,8 @@ int main(void)
   assert(hwloc_get_memory_parents_depth(topology) == HWLOC_TYPE_DEPTH_MULTIPLE);
 
   err = hwloc_topology_export_synthetic(topology, buffer, sizeof(buffer), 0);
-  assert(err == 114);
-  err = strcmp("Package:2 [NUMANode(memory=1073741824)] [NUMANode(memory=1048576)] Core:2 [NUMANode(indexes=8,7,5,6,4,3,1,2)] PU:4", buffer);
+  assert(err == 132);
+  err = strcmp("Package:2 [NUMANode(memory=1073741824)] [NUMANode(memory=1048576)] Core:2 [NUMANode(memory=1073741824 indexes=8,7,5,6,4,3,1,2)] PU:4", buffer);
   assert(!err);
 
   err = hwloc_topology_export_synthetic(topology, buffer, sizeof(buffer), HWLOC_TOPOLOGY_EXPORT_SYNTHETIC_FLAG_V1);

utils/hwloc/test-hwloc-info.output

@@ -388,15 +388,16 @@ NUMANode L#1 = local memory #0 of PU L#8
  memory children = 0
  i/o children = 0
  misc children = 0
- local memory = 0
+ local memory = 1073741824
+ total memory = 1073741824
  cpuset = 0x0000ff00
  complete cpuset = 0x0000ff00
  allowed cpuset = 0x0000ff00
  nodeset = 0x00000002
  complete nodeset = 0x00000002
  allowed nodeset = 0x00000002
  symmetric subtree = 0
- memory attribute Capacity = 0
+ memory attribute Capacity = 1073741824
  memory attribute Locality = 8
 NUMANode L#2 = local memory #1 of PU L#8
  type = NUMANode
@@ -410,15 +411,16 @@ NUMANode L#2 = local memory #1 of PU L#8
  memory children = 0
  i/o children = 0
  misc children = 0
- local memory = 0
+ local memory = 1073741824
+ total memory = 1073741824
  cpuset = 0x0000ffff
  complete cpuset = 0x0000ffff
  allowed cpuset = 0x0000ffff
  nodeset = 0x00000004
  complete nodeset = 0x00000004
  allowed nodeset = 0x00000004
  symmetric subtree = 0
- memory attribute Capacity = 0
+ memory attribute Capacity = 1073741824
  memory attribute Locality = 16
 
 # 2 local-or-larger memories for one PU, silent