lstopo: allow output format/extension v2xml/v3xml

To enforce exporting to v2 XML or not.

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

Author: bgoglin

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

@@ -71,6 +71,9 @@ that are passed to \fIhwloc_topology_export_xml()\fR.
 Those names may be substrings of actual flag names as long as a single one matches.
 A value of \fB2\fR (or \fBv2\fR) reverts to the format of hwloc v2.x.
 The default is \fB0\fR (or \fBnone\fR).
+
+Output formats \fBv2xml\fR and \fBv3xml\fR may also be used to specify
+which XML version is desired.
 .TP
 \fB\-\-export\-synthetic\-flags\fR <flags>
 Enforce flags when exporting to the synthetic format.
@@ -614,6 +617,9 @@ It may be reused later, even on another machine, with lstopo \-\-input,
 the HWLOC_XMLFILE environment variable, or the hwloc_topology_set_xml()
 function.
 
+\fBv2xml\fR may also be used to specify that hwloc v2-compatible XML
+should be exported.
+
 .PP
 The following special names may be used:
 .TP

utils/lstopo/lstopo.c

@@ -685,7 +685,7 @@ enum output_format {
 };
 
 static enum output_format
-parse_output_format(const char *name, char *callname __hwloc_attribute_unused)
+parse_output_format(const char *name, unsigned long *xml_flags)
 {
   if (!hwloc_strncasecmp(name, "default", 3))
     return LSTOPO_OUTPUT_DEFAULT;
@@ -714,7 +714,13 @@ parse_output_format(const char *name, char *callname __hwloc_attribute_unused)
     return LSTOPO_OUTPUT_CAIROSVG;
   else if (!strcasecmp(name, "nativesvg") || !strcasecmp(name, "svg(native)"))
     return LSTOPO_OUTPUT_NATIVESVG;
-  else if (!strcasecmp(name, "xml"))
+  else if (!strcasecmp(name, "v2xml")) {
+    *xml_flags |= HWLOC_TOPOLOGY_EXPORT_XML_FLAG_V2;
+    return LSTOPO_OUTPUT_XML;
+  } else if (!strcasecmp(name, "v3xml")) {
+    *xml_flags &= ~HWLOC_TOPOLOGY_EXPORT_XML_FLAG_V2;
+    return LSTOPO_OUTPUT_XML;
+  } else if (!strcasecmp(name, "xml"))
     return LSTOPO_OUTPUT_XML;
   else if (!strcasecmp(name, "shmem"))
     return LSTOPO_OUTPUT_SHMEM;
@@ -1472,7 +1478,7 @@ main (int argc, char *argv[])
       } else if (!strcmp (argv[0], "--output-format") || !strcmp (argv[0], "--of")) {
 	if (argc < 2)
 	  goto out_usagefailure;
-        output_format = parse_output_format(argv[1], callname);
+        output_format = parse_output_format(argv[1], &loutput.export_xml_flags);
         opt = 1;
       } else {
 	if (filename) {
@@ -1513,7 +1519,7 @@ main (int argc, char *argv[])
     } else {
       char *dot = strrchr(filename, '.');
       if (dot) {
-        output_format = parse_output_format(dot+1, callname);
+        output_format = parse_output_format(dot+1, &loutput.export_xml_flags);
         if (dot == filename+1 && filename[0] == '-' && output_format != LSTOPO_OUTPUT_ERROR)
           filename = "-"; /* to simplify things later */
       } else {

utils/lstopo/test-lstopo.sh.in

@@ -123,7 +123,7 @@ echo "**** Import from synthetic so that we can check some exact outputs in $fil
   echo "** Export synthetic flag extended,attrs,v1..."
   $ls -i "node:4 pu:4" -.synthetic --export-synthetic-flags extended,attrs,v1
   echo "** Export XML flag v2..."
-  $ls -i "node:4 pu:4" -.xml --export-xml-flags v2
+  $ls -i "node:4 pu:4" -.v2xml
   echo "** Topology flag disallowed..."
   $ls -i "node:4 pu:4" - --allow 0xf --flags disallowed -v
 ) > "$file"