lstopo: add --no-smt which just ignore PUs as existing filters

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

Author: bgoglin

NEWS

@@ -93,7 +93,7 @@ Version 2.1.0
       See dynamic_SVG_example.html for an example.
   + Add --nodeset options to hwloc-calc for converting between cpusets and
     nodesets.
-  + Add --no-smt to hwloc-bind and hwloc-calc to ignore multiple
+  + Add --no-smt to lstopo, hwloc-bind and hwloc-calc to ignore multiple
     PU in SMT cores.
   + hwloc-annotate may annotate multiple locations at once.
   + Add a HTML/JS version of hwloc-ps. See contrib/hwloc-ps.www/README.

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

@@ -134,6 +134,10 @@ Note also that the top-level object type cannot be ignored (usually Machine or S
 \fB\-\-ignore\fR <type>
 This is the old way to specify \fB-\-filter <type>:none\fR.
 .TP
+\fB\-\-no\-smt\fR
+Ignore PUs.
+This is identical to \fB-\-filter PU:none\fR.
+.TP
 \fB\-\-no\-caches\fR
 Do not show caches.
 This is identical to \fB-\-filter cache:none\fR.

utils/lstopo/lstopo.c

@@ -373,6 +373,7 @@ void usage(const char *name, FILE *where)
   fprintf (where, "  --filter <type>:<knd> Filter objects of the given type, or all.\n");
   fprintf (where, "     <knd> may be `all' (keep all), `none' (remove all), `structure' or `important'\n");
   fprintf (where, "  --ignore <type>       Ignore objects of the given type\n");
+  fprintf (where, "  --no-smt              Ignore PUs\n");
   fprintf (where, "  --no-caches           Do not show caches\n");
   fprintf (where, "  --no-useless-caches   Do not show caches which do not have a hierarchical\n"
                   "                        impact\n");
@@ -778,6 +779,9 @@ main (int argc, char *argv[])
 	  hwloc_topology_set_type_filter(topology, type, HWLOC_TYPE_FILTER_KEEP_NONE);
 	opt = 1;
       }
+      else if (!strcmp (argv[0], "--no-smt")) {
+	loutput.ignore_pus = 1;
+      }
       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);