tools: update for memory-side caches

lstopo/graphics:
When there's a memcache, we always put memory children inside a dedicated
memory box. The cache is placed above its NUMA node(s), without a vertical
space between, so that we know which NUMA node is cached.

all:
--no-caches or --filter cache:... applies to both cpu-side and memory-side
caches since both are enabled by default in tools (contrary to the API).

Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr>

Author: bgoglin

utils/hwloc/hwloc-info.c

@@ -131,6 +131,7 @@ hwloc_info_show_obj(hwloc_topology_t topology, hwloc_obj_t obj, const char *type
   case HWLOC_OBJ_L1ICACHE:
   case HWLOC_OBJ_L2ICACHE:
   case HWLOC_OBJ_L3ICACHE:
+  case HWLOC_OBJ_MEMCACHE:
     printf("%s attr cache depth = %u\n", prefix, obj->attr->cache.depth);
     switch (obj->attr->cache.type) {
     case HWLOC_OBJ_CACHE_UNIFIED: printf("%s attr cache type = Unified\n", prefix); break;
@@ -455,9 +456,10 @@ main (int argc, char *argv[])
           hwloc_topology_set_all_types_filter(topology, filter);
 	else if (allio)
           hwloc_topology_set_io_types_filter(topology, filter);
-	else if (allcaches)
+	else if (allcaches) {
 	  hwloc_topology_set_cache_types_filter(topology, filter);
-	else if (allicaches)
+	  hwloc_topology_set_type_filter(topology, HWLOC_OBJ_MEMCACHE, filter);
+	} else if (allicaches)
 	  hwloc_topology_set_icache_types_filter(topology, filter);
         else
           hwloc_topology_set_type_filter(topology, type, filter);

utils/hwloc/misc.h

@@ -1,6 +1,6 @@
 /*
  * Copyright © 2009 CNRS
- * Copyright © 2009-2018 Inria.  All rights reserved.
+ * Copyright © 2009-2019 Inria.  All rights reserved.
  * Copyright © 2009-2012 Université Bordeaux
  * Copyright © 2009-2011 Cisco Systems, Inc.  All rights reserved.
  * See COPYING in top-level directory.
@@ -389,6 +389,7 @@ hwloc_lstopo_show_summary(FILE *output, hwloc_topology_t topology)
     hwloc_lstopo_show_summary_depth(output, prefixmaxlen, topology, depth);
   /* FIXME: which order? */
   hwloc_lstopo_show_summary_depth(output, prefixmaxlen, topology, HWLOC_TYPE_DEPTH_NUMANODE);
+  hwloc_lstopo_show_summary_depth(output, prefixmaxlen, topology, HWLOC_TYPE_DEPTH_MEMCACHE);
   hwloc_lstopo_show_summary_depth(output, prefixmaxlen, topology, HWLOC_TYPE_DEPTH_BRIDGE);
   hwloc_lstopo_show_summary_depth(output, prefixmaxlen, topology, HWLOC_TYPE_DEPTH_PCI_DEVICE);
   hwloc_lstopo_show_summary_depth(output, prefixmaxlen, topology, HWLOC_TYPE_DEPTH_OS_DEVICE);

utils/lstopo/lstopo-draw.c

@@ -516,7 +516,7 @@ place_children(struct lstopo_output *loutput, hwloc_obj_t parent,
     | (parent->io_arity ? LSTOPO_CHILD_KIND_IO : 0)
     | (parent->misc_arity ? LSTOPO_CHILD_KIND_MISC : 0);
   /* now assign them below or above the parent */
-  if (loutput->plain_children_order) {
+  if (loutput->plain_children_order || hwloc_obj_type_is_memory(parent->type)) {
     plud->children.kinds = existing_kinds;
     plud->above_children.kinds = 0;
   } else {
@@ -552,8 +552,8 @@ place_children(struct lstopo_output *loutput, hwloc_obj_t parent,
     normal_children_separator = 0;
 
   /* add separator between a cache parent and its children */
-  if (hwloc_obj_type_is_cache(parent->type)) {
-    if ((unsigned)parent->depth == loutput->depth-2)
+  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)
       /* except between cache parent and PU children */
       separator_below_cache = 0;
     /* update children placement */
@@ -567,14 +567,21 @@ place_children(struct lstopo_output *loutput, hwloc_obj_t parent,
   /* place children above the parent, if any*/
   if (plud->above_children.kinds) {
     enum lstopo_orient_e morient = LSTOPO_ORIENT_HORIZ;
-    unsigned memory_border;
+    int need_box;
 
     assert(plud->above_children.kinds == LSTOPO_CHILD_KIND_MEMORY);
-    memory_border = parent->memory_arity > 1 ? border : 0;
 
-    place__children(loutput, parent, plud->above_children.kinds, &morient, memory_border, separator, &above_children_width, &above_children_height);
+    /* we need a memory children box if parent isn't a memory object
+     * and if there are multiple objects in the box
+     */
+    need_box = !hwloc_obj_type_is_memory(parent->type)
+      && (parent->memory_arity + parent->memory_first_child->memory_arity > 1);
+
+    place__children(loutput, parent, plud->above_children.kinds, &morient, need_box ? border : 0, separator, &above_children_width, &above_children_height);
+    if (parent->type == HWLOC_OBJ_MEMCACHE)
+      above_children_height -= separator;
 
-    if (parent->memory_arity > 1) {
+    if (need_box) {
       /* if there are multiple memory children, add a box, as large as the parent */
       if (above_children_width < children_width) {
 	above_children_width = children_width;
@@ -593,7 +600,7 @@ place_children(struct lstopo_output *loutput, hwloc_obj_t parent,
   }
 
   /* adjust parent size */
-  if (hwloc_obj_type_is_cache(parent->type)) {
+  if (hwloc_obj_type_is_cache(parent->type) || parent->type == HWLOC_OBJ_MEMCACHE) {
     /* cache children are below */
     if (children_width > totwidth)
       totwidth = children_width;
@@ -882,6 +889,7 @@ lstopo_set_object_color(struct lstopo_output *loutput,
   case HWLOC_OBJ_L1ICACHE:
   case HWLOC_OBJ_L2ICACHE:
   case HWLOC_OBJ_L3ICACHE:
+  case HWLOC_OBJ_MEMCACHE:
     s->bg = &CACHE_COLOR;
     break;
 
@@ -1505,6 +1513,7 @@ get_type_fun(hwloc_obj_type_t type)
     case HWLOC_OBJ_L1ICACHE: return cache_draw;
     case HWLOC_OBJ_L2ICACHE: return cache_draw;
     case HWLOC_OBJ_L3ICACHE: return cache_draw;
+    case HWLOC_OBJ_MEMCACHE: return cache_draw;
     case HWLOC_OBJ_PCI_DEVICE: return pci_device_draw;
     case HWLOC_OBJ_BRIDGE: return bridge_draw;
     default:

utils/lstopo/lstopo.c

@@ -628,6 +628,7 @@ main (int argc, char *argv[])
   for(i=HWLOC_OBJ_L1CACHE; i<=HWLOC_OBJ_L3ICACHE; i++)
     loutput.force_orient[i] = LSTOPO_ORIENT_HORIZ;
   loutput.force_orient[HWLOC_OBJ_NUMANODE] = LSTOPO_ORIENT_HORIZ;
+  loutput.force_orient[HWLOC_OBJ_MEMCACHE] = LSTOPO_ORIENT_HORIZ;
   for(i=HWLOC_OBJ_TYPE_MIN; i<HWLOC_OBJ_TYPE_MAX; i++) {
     loutput.show_indexes[i] = 1;
     loutput.show_attrs[i] = 1;
@@ -742,9 +743,10 @@ main (int argc, char *argv[])
 	  hwloc_topology_set_all_types_filter(topology, filter);
 	else if (allio)
 	  hwloc_topology_set_io_types_filter(topology, filter);
-	else if (allcaches)
+	else if (allcaches) {
 	  hwloc_topology_set_cache_types_filter(topology, filter);
-	else if (allicaches)
+	  hwloc_topology_set_type_filter(topology, HWLOC_OBJ_MEMCACHE, filter);
+	} else if (allicaches)
 	  hwloc_topology_set_icache_types_filter(topology, filter);
 	else
 	  hwloc_topology_set_type_filter(topology, type, filter);
@@ -770,9 +772,11 @@ main (int argc, char *argv[])
       }
       else if (!strcmp (argv[0], "--no-caches")) {
 	hwloc_topology_set_cache_types_filter(topology, HWLOC_TYPE_FILTER_KEEP_NONE);
+	hwloc_topology_set_type_filter(topology, HWLOC_OBJ_MEMCACHE, HWLOC_TYPE_FILTER_KEEP_NONE);
       }
       else if (!strcmp (argv[0], "--no-useless-caches")) {
 	hwloc_topology_set_cache_types_filter(topology, HWLOC_TYPE_FILTER_KEEP_STRUCTURE);
+	hwloc_topology_set_type_filter(topology, HWLOC_OBJ_MEMCACHE, HWLOC_TYPE_FILTER_KEEP_STRUCTURE);
       }
       else if (!strcmp (argv[0], "--no-icaches")) {
 	hwloc_topology_set_icache_types_filter(topology, HWLOC_TYPE_FILTER_KEEP_NONE);