tests: add host CPU data files for validating die_id

Only Cascadelake-AP CPUs appear to report "die_id" values != 0 on Linux
right now - AMD EPYC's don't report "die_id" (at least with Fedora 31
kernel). Lacking access to Cascadelake-AP CPUs, this test data was from
a Fedora 31 QEMU guest launched with

 -cpu qemu64 -smp sockets=2,dies=3,cores=2,threads=1

Ideally we'd replace this data with some from a real machine reporting
"die_id", to ensure we're not mislead by QEMU's impl.
Reviewed-by: NDaniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: NJiri Denemark <jdenemar@redhat.com>
Signed-off-by: NDaniel P. Berrangé <berrange@redhat.com>

tests/vircaps2xmldata/linux-basic-dies/system/cpu

+../../../virhostcpudata/linux-with-die/cpu
\ No newline at end of file

tests/vircaps2xmldata/linux-basic-dies/system/node

+../../../virhostcpudata/linux-with-die/node
\ No newline at end of file

tests/vircaps2xmldata/vircaps-x86_64-basic-dies.xml

+<capabilities>
+
+  <host>
+    <cpu>
+      <arch>x86_64</arch>
+    </cpu>
+    <power_management/>
+    <iommu support='no'/>
+    <topology>
+      <cells num='1'>
+        <cell id='0'>
+          <memory unit='KiB'>1048576</memory>
+          <pages unit='KiB' size='4'>2048</pages>
+          <pages unit='KiB' size='2048'>4096</pages>
+          <pages unit='KiB' size='1048576'>6144</pages>
+          <cpus num='12'>
+            <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/>
+            <cpu id='1' socket_id='0' die_id='0' core_id='1' siblings='1'/>
+            <cpu id='2' socket_id='0' die_id='1' core_id='0' siblings='2'/>
+            <cpu id='3' socket_id='0' die_id='1' core_id='1' siblings='3'/>
+            <cpu id='4' socket_id='0' die_id='2' core_id='0' siblings='4'/>
+            <cpu id='5' socket_id='0' die_id='2' core_id='1' siblings='5'/>
+            <cpu id='6' socket_id='1' die_id='0' core_id='0' siblings='6'/>
+            <cpu id='7' socket_id='1' die_id='0' core_id='1' siblings='7'/>
+            <cpu id='8' socket_id='1' die_id='1' core_id='0' siblings='8'/>
+            <cpu id='9' socket_id='1' die_id='1' core_id='1' siblings='9'/>
+            <cpu id='10' socket_id='1' die_id='2' core_id='0' siblings='10'/>
+            <cpu id='11' socket_id='1' die_id='2' core_id='1' siblings='11'/>
+          </cpus>
+        </cell>
+      </cells>
+    </topology>
+  </host>
+
+</capabilities>

tests/vircaps2xmltest.c

@@ -102,6 +102,7 @@ mymain(void)
 
     DO_TEST_FULL("basic", VIR_ARCH_X86_64, false, false);
     DO_TEST_FULL("basic", VIR_ARCH_AARCH64, true, false);
+    DO_TEST_FULL("basic-dies", VIR_ARCH_X86_64, false, false);
 
     DO_TEST_FULL("caches", VIR_ARCH_X86_64, true, true);
 

tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_cpus

+001

tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_cpus_list

+0

tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_id

+0

tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_siblings

+03f

tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_siblings_list

+0-5

tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_cpus

+003

tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_cpus_list

+0-1

tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_id

+0

tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/package_cpus

+03f

tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/package_cpus_list

+0-5

tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/physical_package_id

+0

tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/thread_siblings

+001

tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/thread_siblings_list

+0

tests/virhostcpudata/linux-with-die/cpu/cpu1/online

+1

tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_cpus

+002

tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_cpus_list

+1

tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_id

+1

tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_siblings

+03f

tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_siblings_list

+0-5

tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_cpus

+003

tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_cpus_list

+0-1

tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_id

+0

tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/package_cpus

+03f

tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/package_cpus_list

+0-5

tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/physical_package_id

+0

tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/thread_siblings

+002

tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/thread_siblings_list

+1

tests/virhostcpudata/linux-with-die/cpu/cpu10/online

+1

tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_cpus

+400

tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_cpus_list

+10

tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_id

+0

tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_siblings

+fc0

tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_siblings_list

+6-11

tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_cpus

+c00

tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_cpus_list

+10-11

tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_id

+2

tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/package_cpus

+fc0

tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/package_cpus_list

+6-11

tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/physical_package_id

+1

tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/thread_siblings

+400

tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/thread_siblings_list

+10

tests/virhostcpudata/linux-with-die/cpu/cpu11/online

+1

tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_cpus

+800

tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_cpus_list

+11

tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_id

+1

tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_siblings

+fc0

tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_siblings_list

+6-11

tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_cpus

+c00

tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_cpus_list

+10-11

tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_id

+2

tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/package_cpus

+fc0

tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/package_cpus_list

+6-11

tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/physical_package_id

+1

tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/thread_siblings

+800

tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/thread_siblings_list

+11

tests/virhostcpudata/linux-with-die/cpu/cpu2/online

+1

tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_cpus

+004

tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_cpus_list

+2

tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_id

+0

tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_siblings

+03f

tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_siblings_list

+0-5

tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_cpus

+00c

tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_cpus_list

+2-3

tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_id

+1

tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/package_cpus

+03f

tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/package_cpus_list

+0-5

tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/physical_package_id

+0

tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/thread_siblings

+004

tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/thread_siblings_list

+2

tests/virhostcpudata/linux-with-die/cpu/cpu3/online

+1

tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_cpus

+008

tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_cpus_list

+3

tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_id

+1

tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_siblings

+03f

tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_siblings_list

+0-5

tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_cpus

+00c

tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_cpus_list

+2-3

tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_id

+1

tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/package_cpus

+03f

tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/package_cpus_list

+0-5

tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/physical_package_id

+0

tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/thread_siblings

+008

tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/thread_siblings_list

+3

tests/virhostcpudata/linux-with-die/cpu/cpu4/online

+1

tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_cpus

+010

tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_cpus_list

+4

tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_id

+0

tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_siblings

+03f

tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_siblings_list

+0-5

tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_cpus

+030

tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_cpus_list

+4-5

tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_id

+2

tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/package_cpus

+03f

tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/package_cpus_list

+0-5

tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/physical_package_id

+0

tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/thread_siblings

+010