lstopo/draw: make sure we always remove the separator between PU boxes

Some topology may have cores at level N-2 and PU at level N because
a unrelated level was placed at N-1 (for instance groups of GPU CPU-less
NUMA node on the side). There's no easy way to force PU parents
at N-1 and everything lese before.

Fix lstopo to handle that case instead of assuming PU parents are always N-1.

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

Author: bgoglin

utils/lstopo/lstopo-draw.c

@@ -504,6 +504,7 @@ place_children(struct lstopo_output *loutput, hwloc_obj_t parent,
   unsigned children_width = 0, children_height = 0;
   unsigned above_children_width, above_children_height;
   unsigned existing_kinds;
+  int normal_children_are_PUs;
   hwloc_obj_t child;
   int ncstate;
   unsigned i;
@@ -539,23 +540,27 @@ place_children(struct lstopo_output *loutput, hwloc_obj_t parent,
     orient = LSTOPO_ORIENT_HORIZ;
   }
 
-  /* recurse into children to prepare their sizes */
+  /* recurse into children to prepare their sizes,
+   * and check whether all normal children are PUs. */
+  normal_children_are_PUs = 1;
   for(i = 0, child = next_child(loutput, parent, LSTOPO_CHILD_KIND_ALL, NULL, &ncstate);
       child;
       i++, child = next_child(loutput, parent, LSTOPO_CHILD_KIND_ALL, child, &ncstate)) {
     get_type_fun(child->type)(loutput, child, 0, 0, 0);
+    if (hwloc_obj_type_is_normal(child->type) && child->type != HWLOC_OBJ_PU)
+      normal_children_are_PUs = 0;
   }
   if (!i)
     return;
 
 
   /* no separator between PUs */
-  if ((unsigned)parent->depth == loutput->depth-2)
+  if (normal_children_are_PUs)
     normal_children_separator = 0;
 
   /* add separator between a cache parent and its children */
   if (hwloc_obj_type_is_cache(parent->type) || parent->type == HWLOC_OBJ_MEMCACHE) {
-    if ((unsigned)parent->depth == loutput->depth-2 || parent->type == HWLOC_OBJ_MEMCACHE)
+    if (normal_children_are_PUs || parent->type == HWLOC_OBJ_MEMCACHE)
       /* except between cache parent and PU children */
       separator_below_cache = 0;
     /* update children placement */