utils/annotate: add the "cpukind#N" fake location to tweak cpukind infos

And document that we may also call hwloc-annotate multiple times
with same cpukind parameters but different info names and values.

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

Author: bgoglin

utils/hwloc/hwloc-annotate.1in

@@ -1,5 +1,5 @@
 .\" -*- nroff -*-
-.\" Copyright © 2013-2022 Inria.  All rights reserved.
+.\" Copyright © 2013-2023 Inria.  All rights reserved.
 .\" See COPYING in top-level directory.
 .TH HWLOC-ANNOTATE "1" "%HWLOC_DATE%" "%PACKAGE_VERSION%" "%PACKAGE_NAME%"
 .SH NAME
@@ -80,6 +80,8 @@ This is specified by the \fImode\fR:
 .B info <name> <value>
 Specifies a new string info attribute whose name is \fIname\fR and
 value is \fIvalue\fR.
+If \fBlocation\fR is \fIcpukind#<N>\fR, operate on the info attributes
+of the N-th cpukind.
 .TP
 .B subtype <subtype>
 Specifies that the subtype attribute of the object should now be \fIsubtype\fR.
@@ -132,6 +134,10 @@ ranking of kinds. It should be -1 if unknown.
 If \fIinfoname\fR and \fIinfovalue\fR are given and non-empty,
 they are added as info attributes to this kind of CPU.
 
+More info attributes may be added by applying this operating
+multiple times. See also the \fBinfo\fR operation above for ways
+to tweak info attributes using the \fIcpukind#<N>\fR location.
+
 See the function hwloc_cpukinds_register() for details.
 
 .TP
@@ -218,6 +224,10 @@ Only add to all Core objects:
 
     $ hwloc-annotate input.xml output.xml Core:all info infoname infovalue
 
+Remove all info attributes from the first cpukind:
+
+    $ hwloc-annotate --ci input.xml output.xml -- cpukind#0 -- none
++
 Add a Misc object named "foobar" under the root object of the topology
 and modify the input XML directly:
 

utils/hwloc/hwloc-annotate.c

@@ -786,7 +786,22 @@ int main(int argc, char *argv[])
 
 	  for(i=0; i<nr_locations; i++) {
 	    char *location = locations[i];
-	    if (!strcmp(location, "all")) {
+            if (!strncmp(location, "cpukind#", 8) && (infoname || clearinfos)) {
+              struct hwloc_infos_s *infos;
+              int num;
+              if (location[8] < '0' || location[8] > '9') {
+                fprintf(stderr, "Failed to recognize number after cpukind# in location %s\n", location);
+                goto out_with_topology;
+              }
+              num = atoi(location+8);
+              err = hwloc_cpukinds_get_info(topology, num, NULL, NULL, &infos, 0);
+              if (err < 0) {
+                fprintf(stderr, "Failed to find cpukind#%d\n", num);
+                goto out_with_topology;
+              } else {
+                apply_infos(infos);
+              }
+            } else if (!strcmp(location, "all")) {
 	      apply_recursive(topology, hwloc_get_root_obj(topology));
 	    } else if (!strcmp(location, "root")) {
 	      apply(topology, hwloc_get_root_obj(topology));

utils/hwloc/test-hwloc-annotate.output

@@ -170,6 +170,8 @@
   <cpukind cpuset="0x00000008" forced_efficiency="7">
     <info name="foo" value="bar"/>
     <info name="foo2" value="bar3"/>
+    <info name="foo3" value="bar4"/>
+    <info name="foo4" value="bar5"/>
   </cpukind>
   <cpukind cpuset="0x00000001" forced_efficiency="4">
     <info name="foo2" value="bar2"/>

utils/hwloc/test-hwloc-annotate.sh.in

@@ -2,7 +2,7 @@
 #-*-sh-*-
 
 #
-# Copyright © 2009-2021 Inria.  All rights reserved.
+# Copyright © 2009-2023 Inria.  All rights reserved.
 # Copyright © 2014 Cisco Systems, Inc.  All rights reserved.
 # See COPYING in top-level directory.
 #
@@ -67,6 +67,8 @@ $annotate $file $file -- dummy -- cpukind 0x5 -1 0
 $annotate $file $file -- dummy -- cpukind 0xa -1 0 foo bar
 $annotate $file $file -- dummy -- cpukind 0x3 4 0 foo2 bar2
 $annotate $file $file -- dummy -- cpukind 0xc 7 0 foo2 bar3
+$annotate $file $file -- dummy -- cpukind 0x8 7 0 foo3 bar4
+$annotate $file $file -- cpukind#1 -- info foo4 bar5
 cat > $distances << EOF
 name=mynewdistances
 5