lstopo: rework --only using the hwloc_calc_level structure

Allow --only with filters as other tools do.

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

Author: bgoglin

utils/lstopo/lstopo-no-graphics.1in

@@ -163,6 +163,9 @@ otherwise it will imply \fB\-\-cpuset\fR.
 .TP
 \fB\-\-only\fR <type>
 Only show objects of the given type in the textual output.
+
+\fI<type>\fR may contain a filter to select specific objects among
+the type. For instance \fB\-\-only "numa[mcdram]"\fR only shows MCDRAM NUMA nodes on KNL.
 .TP
 \fB\-\-filter\fR <type>:<kind>, \fB\-\-filter\fR <type>
 Filter objects of type <type>, or of any type if <type> is "all".

utils/lstopo/lstopo-text.c

@@ -192,25 +192,28 @@ output_only (struct lstopo_output *loutput, hwloc_obj_t l)
 {
   FILE *output = loutput->file;
   hwloc_obj_t child;
-  if (loutput->show_only == l->type) {
-    output_console_obj (loutput, l, 0);
-    fprintf (output, "\n");
+  if (loutput->show_only.type == l->type
+      || loutput->show_only.depth == l->depth) {
+    if (!hwloc_calc_check_object_filtered(l, &loutput->show_only)) {
+      output_console_obj (loutput, l, 0);
+      fprintf (output, "\n");
+    }
   }
   /* there can be anything below normal children */
   for_each_child(child, l)
     output_only (loutput, child);
   /* there can be only memory or Misc below memory children */
-  if (hwloc_obj_type_is_memory(loutput->show_only) || loutput->show_only == HWLOC_OBJ_MISC) {
+  if (loutput->show_only.type == HWLOC_OBJ_TYPE_NONE || hwloc_obj_type_is_memory(loutput->show_only.type) || loutput->show_only.type == HWLOC_OBJ_MISC) {
     for(child = l->memory_first_child; child; child = child->next_sibling)
       output_only (loutput, child);
   }
   /* there can be only I/O or Misc below I/O children */
-  if (hwloc_obj_type_is_io(loutput->show_only) || loutput->show_only == HWLOC_OBJ_MISC) {
+  if (loutput->show_only.type == HWLOC_OBJ_TYPE_NONE || hwloc_obj_type_is_io(loutput->show_only.type) || loutput->show_only.type == HWLOC_OBJ_MISC) {
     for_each_io_child(child, l)
       output_only (loutput, child);
   }
   /* there can be only Misc below Misc children */
-  if (loutput->show_only == HWLOC_OBJ_MISC) {
+  if (loutput->show_only.type == HWLOC_OBJ_TYPE_NONE || loutput->show_only.type == HWLOC_OBJ_MISC) {
     /* Misc can only contain other Misc, no need to recurse otherwise */
     for_each_misc_child(child, l)
       output_only (loutput, child);
@@ -505,27 +508,31 @@ output_console(struct lstopo_output *loutput, const char *filename)
    * if verbose_mode > 1, print both.
    */
 
-  if (loutput->show_only != HWLOC_OBJ_TYPE_NONE) {
-    if (verbose_mode > 1)
-      fprintf(output, "Only showing %s objects\n", hwloc_obj_type_string(loutput->show_only));
+  if (loutput->show_only.depth != HWLOC_TYPE_DEPTH_UNKNOWN) {
+    if (verbose_mode > 1) {
+      if (loutput->show_only.type != HWLOC_OBJ_TYPE_NONE)
+        fprintf(output, "Only showing some %s objects\n", hwloc_obj_type_string(loutput->show_only.type));
+      else
+        fprintf(output, "Only showing some objects at depth %d\n", loutput->show_only.depth);
+    }
     output_only (loutput, hwloc_get_root_obj(topology));
   } else if (verbose_mode >= 1) {
     output_topology (loutput, hwloc_get_root_obj(topology), NULL, 0);
     fprintf(output, "\n");
   }
 
-  if ((verbose_mode > 1 || !verbose_mode) && loutput->show_only == HWLOC_OBJ_TYPE_NONE) {
+  if ((verbose_mode > 1 || !verbose_mode) && loutput->show_only.depth == HWLOC_TYPE_DEPTH_UNKNOWN) {
     hwloc_lstopo_show_summary(output, topology);
   }
 
-  if (verbose_mode > 1 && loutput->show_only == HWLOC_OBJ_TYPE_NONE) {
+  if (verbose_mode > 1 && loutput->show_only.depth == HWLOC_TYPE_DEPTH_UNKNOWN) {
     output_distances(loutput);
     output_memattrs(loutput);
     output_cpukinds(loutput);
     output_windows_processor_groups(loutput, verbose_mode > 2);
   }
 
-  if (verbose_mode > 1 && loutput->show_only == HWLOC_OBJ_TYPE_NONE) {
+  if (verbose_mode > 1 && loutput->show_only.depth == HWLOC_TYPE_DEPTH_UNKNOWN) {
     hwloc_const_bitmap_t complete = hwloc_topology_get_complete_cpuset(topology);
     hwloc_const_bitmap_t topo = hwloc_topology_get_topology_cpuset(topology);
     hwloc_const_bitmap_t allowed = hwloc_topology_get_allowed_cpuset(topology);

utils/lstopo/lstopo.c

@@ -896,6 +896,7 @@ main (int argc, char *argv[])
   hwloc_bitmap_t allow_cpuset = NULL, allow_nodeset = NULL;
   char * callname;
   char * input = NULL;
+  const char *show_only_string = NULL;
   struct hwloc_utils_input_format_s input_format = HWLOC_UTILS_INPUT_FORMAT_DEFAULT;
   enum output_format output_format = LSTOPO_OUTPUT_DEFAULT;
   struct lstopo_type_filter type_filter[HWLOC_OBJ_TYPE_MAX];
@@ -959,7 +960,6 @@ main (int argc, char *argv[])
   loutput.show_memattrs_only = 0;
   loutput.show_cpukinds_only = 0;
   loutput.show_windows_processor_groups_only = 0;
-  loutput.show_only = HWLOC_OBJ_TYPE_NONE;
   loutput.show_cpuset = 0;
   loutput.show_taskset = 0;
   loutput.transform_distances = -1;
@@ -1080,8 +1080,7 @@ main (int argc, char *argv[])
       } else if (!strcmp (argv[0], "--only")) {
 	if (argc < 2)
 	  goto out_usagefailure;
-        if (hwloc_type_sscanf(argv[1], &loutput.show_only, NULL, 0) < 0)
-	  fprintf(stderr, "Unsupported type `%s' passed to --only, ignoring.\n", argv[1]);
+        show_only_string = argv[1];
 	opt = 1;
       }
       else if (!strcmp (argv[0], "--filter")) {
@@ -1621,7 +1620,7 @@ main (int argc, char *argv[])
   /* if  the output format wasn't enforced, think a bit about what the user probably want */
   if (output_format == LSTOPO_OUTPUT_DEFAULT) {
     if (loutput.show_cpuset
-        || loutput.show_only != HWLOC_OBJ_TYPE_NONE
+        || show_only_string
 	|| loutput.show_distances_only
         || loutput.show_memattrs_only
         || loutput.show_cpukinds_only
@@ -1949,6 +1948,16 @@ main (int argc, char *argv[])
     lstopo_add_collapse_attributes(topology);
   }
 
+  loutput.show_only.depth = HWLOC_TYPE_DEPTH_UNKNOWN; /* disable this feature by default */
+  if (show_only_string) {
+    err = hwloc_calc_parse_level(NULL, topology, show_only_string, strlen(show_only_string), &loutput.show_only);
+    if (err < 0 && loutput.show_only.depth == HWLOC_TYPE_DEPTH_UNKNOWN) {
+      fprintf(stderr, "level %s passed to --only is unavailable.\n", show_only_string);
+      goto out_with_topology;
+    }
+    /* multiple depth is ok */
+  }
+
   /******************
    * Output for real
    */

utils/lstopo/lstopo.h

@@ -13,6 +13,7 @@
 #include "private/autogen/config.h"
 #include "hwloc.h"
 #include "misc.h"
+#include "hwloc-calc.h"
 
 enum lstopo_drawing_e {
   LSTOPO_DRAWING_PREPARE,
@@ -100,7 +101,7 @@ struct lstopo_output {
   int show_memattrs_only;
   int show_cpukinds_only;
   int show_windows_processor_groups_only;
-  hwloc_obj_type_t show_only;
+  struct hwloc_calc_level show_only;
   int show_cpuset;
   int show_taskset;
   int transform_distances;