External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 05:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Add hostcpudata for machine with CPU clusters

Browse Source 
The data is taken from an HPE Apollo 70 machine, which uses
aarch64 CPUs. It is interesting for us because non-dummy
information about CPU clusters is exposed through sysfs.

In order to keep things reasonable, the data was manually
modified so that only 8 of the original 224 CPUs are included.
Care has been taken to ensure that the topology is otherwise
unaltered.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Andrea Bolognani 2024-01-05 15:07:06 +01:00
parent 9139cf44d4
commit fb81a56f32
85 changed files with 194 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/vircaps2xmldata/linux-basic-clusters/system/cpu Symbolic link
View File

@ -0,0 +1 @@
../../../virhostcpudata/linux-with-clusters/cpu

1
tests/vircaps2xmldata/linux-basic-clusters/system/node Symbolic link
View File

@ -0,0 +1 @@
../../../virhostcpudata/linux-with-clusters/node

39
tests/vircaps2xmldata/vircaps-aarch64-basic-clusters.xml Normal file
View File

@ -0,0 +1,39 @@
<capabilities>
<host>
<cpu>
<arch>aarch64</arch>
</cpu>
<power_management/>
<iommu support='no'/>
<topology>
<cells num='2'>
<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='4'>
<cpu id='0' socket_id='36' die_id='0' core_id='0' siblings='0-1'/>
<cpu id='1' socket_id='36' die_id='0' core_id='0' siblings='0-1'/>
<cpu id='2' socket_id='36' die_id='0' core_id='1' siblings='2-3'/>
<cpu id='3' socket_id='36' die_id='0' core_id='1' siblings='2-3'/>
</cpus>
</cell>
<cell id='1'>
<memory unit='KiB'>2097152</memory>
<pages unit='KiB' size='4'>4096</pages>
<pages unit='KiB' size='2048'>6144</pages>
<pages unit='KiB' size='1048576'>8192</pages>
<cpus num='4'>
<cpu id='4' socket_id='3180' die_id='0' core_id='256' siblings='4-5'/>
<cpu id='5' socket_id='3180' die_id='0' core_id='256' siblings='4-5'/>
<cpu id='6' socket_id='3180' die_id='0' core_id='257' siblings='6-7'/>
<cpu id='7' socket_id='3180' die_id='0' core_id='257' siblings='6-7'/>
</cpus>
</cell>
</cells>
</topology>
</host>
</capabilities>

1
tests/vircaps2xmltest.c
View File

@ -93,6 +93,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("basic-clusters", VIR_ARCH_AARCH64, false, false);
DO_TEST_FULL("caches", VIR_ARCH_X86_64, true, true);

72
tests/virhostcpudata/linux-aarch64-with-clusters.cpuinfo Normal file
View File

@ -0,0 +1,72 @@
processor : 0
BogoMIPS : 400.00
Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics cpuid asimdrdm
CPU implementer : 0x43
CPU architecture: 8
CPU variant : 0x1
CPU part : 0x0af
CPU revision : 1
processor : 1
BogoMIPS : 400.00
Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics cpuid asimdrdm
CPU implementer : 0x43
CPU architecture: 8
CPU variant : 0x1
CPU part : 0x0af
CPU revision : 1
processor : 2
BogoMIPS : 400.00
Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics cpuid asimdrdm
CPU implementer : 0x43
CPU architecture: 8
CPU variant : 0x1
CPU part : 0x0af
CPU revision : 1
processor : 3
BogoMIPS : 400.00
Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics cpuid asimdrdm
CPU implementer : 0x43
CPU architecture: 8
CPU variant : 0x1
CPU part : 0x0af
CPU revision : 1
processor : 4
BogoMIPS : 400.00
Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics cpuid asimdrdm
CPU implementer : 0x43
CPU architecture: 8
CPU variant : 0x1
CPU part : 0x0af
CPU revision : 1
processor : 5
BogoMIPS : 400.00
Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics cpuid asimdrdm
CPU implementer : 0x43
CPU architecture: 8
CPU variant : 0x1
CPU part : 0x0af
CPU revision : 1
processor : 6
BogoMIPS : 400.00
Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics cpuid asimdrdm
CPU implementer : 0x43
CPU architecture: 8
CPU variant : 0x1
CPU part : 0x0af
CPU revision : 1
processor : 7
BogoMIPS : 400.00
Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics cpuid asimdrdm
CPU implementer : 0x43
CPU architecture: 8
CPU variant : 0x1
CPU part : 0x0af
CPU revision : 1

1
tests/virhostcpudata/linux-aarch64-with-clusters.expected Normal file
View File

@ -0,0 +1 @@
CPUs: 8/8, MHz: 0, Nodes: 2, Sockets: 1, Cores: 2, Threads: 2

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/cluster_cpus_list Normal file
View File

@ -0,0 +1 @@
0-1

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/cluster_id Normal file
View File

@ -0,0 +1 @@
0

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/core_cpus_list Normal file
View File

@ -0,0 +1 @@
0-1

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/core_id Normal file
View File

@ -0,0 +1 @@
0

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/core_siblings_list Normal file
View File

@ -0,0 +1 @@
0-3

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/package_cpus_list Normal file
View File

@ -0,0 +1 @@
0-3

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/physical_package_id Normal file
View File

@ -0,0 +1 @@
36

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/thread_siblings_list Normal file
View File

@ -0,0 +1 @@
0-1

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/cluster_cpus_list Normal file
View File

@ -0,0 +1 @@
0-1

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/cluster_id Normal file
View File

@ -0,0 +1 @@
0

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/core_cpus_list Normal file
View File

@ -0,0 +1 @@
0-1

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/core_id Normal file
View File

@ -0,0 +1 @@
0

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/core_siblings_list Normal file
View File

@ -0,0 +1 @@
0-3

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/package_cpus_list Normal file
View File

@ -0,0 +1 @@
0-3

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/physical_package_id Normal file
View File

@ -0,0 +1 @@
36

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/thread_siblings_list Normal file
View File

@ -0,0 +1 @@
0-1

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/cluster_cpus_list Normal file
View File

@ -0,0 +1 @@
2-3

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/cluster_id Normal file
View File

@ -0,0 +1 @@
1

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/core_cpus_list Normal file
View File

@ -0,0 +1 @@
2-3

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/core_id Normal file
View File

@ -0,0 +1 @@
1

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/core_siblings_list Normal file
View File

@ -0,0 +1 @@
0-3

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/package_cpus_list Normal file
View File

@ -0,0 +1 @@
0-3

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/physical_package_id Normal file
View File

@ -0,0 +1 @@
36

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/thread_siblings_list Normal file
View File

@ -0,0 +1 @@
2-3

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/cluster_cpus_list Normal file
View File

@ -0,0 +1 @@
2-3

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/cluster_id Normal file
View File

@ -0,0 +1 @@
1

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/core_cpus_list Normal file
View File

@ -0,0 +1 @@
2-3

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/core_id Normal file
View File

@ -0,0 +1 @@
1

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/core_siblings_list Normal file
View File

@ -0,0 +1 @@
0-3

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/package_cpus_list Normal file
View File

@ -0,0 +1 @@
0-3

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/physical_package_id Normal file
View File

@ -0,0 +1 @@
36

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/thread_siblings_list Normal file
View File

@ -0,0 +1 @@
2-3

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/cluster_cpus_list Normal file
View File

@ -0,0 +1 @@
4-5

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/cluster_id Normal file
View File

@ -0,0 +1 @@
256

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/core_cpus_list Normal file
View File

@ -0,0 +1 @@
4-5

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/core_id Normal file
View File

@ -0,0 +1 @@
256

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/core_siblings_list Normal file
View File

@ -0,0 +1 @@
4-7

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/package_cpus_list Normal file
View File

@ -0,0 +1 @@
4-7

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/physical_package_id Normal file
View File

@ -0,0 +1 @@
3180

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/thread_siblings_list Normal file
View File

@ -0,0 +1 @@
4-5

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/cluster_cpus_list Normal file
View File

@ -0,0 +1 @@
4-5

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/cluster_id Normal file
View File

@ -0,0 +1 @@
256

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/core_cpus_list Normal file
View File

@ -0,0 +1 @@
4-5

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/core_id Normal file
View File

@ -0,0 +1 @@
256

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/core_siblings_list Normal file
View File

@ -0,0 +1 @@
4-7

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/package_cpus_list Normal file
View File

@ -0,0 +1 @@
4-7

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/physical_package_id Normal file
View File

@ -0,0 +1 @@
3180

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/thread_siblings_list Normal file
View File

@ -0,0 +1 @@
4-5

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/cluster_cpus_list Normal file
View File

@ -0,0 +1 @@
6-7

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/cluster_id Normal file
View File

@ -0,0 +1 @@
257

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/core_cpus_list Normal file
View File

@ -0,0 +1 @@
6-7

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/core_id Normal file
View File

@ -0,0 +1 @@
257

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/core_siblings_list Normal file
View File

@ -0,0 +1 @@
4-7

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/package_cpus_list Normal file
View File

@ -0,0 +1 @@
4-7

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/physical_package_id Normal file
View File

@ -0,0 +1 @@
3180

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/thread_siblings_list Normal file
View File

@ -0,0 +1 @@
6-7

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/cluster_cpus_list Normal file
View File

@ -0,0 +1 @@
6-7

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/cluster_id Normal file
View File

@ -0,0 +1 @@
257

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/core_cpus_list Normal file
View File

@ -0,0 +1 @@
6-7

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/core_id Normal file
View File

@ -0,0 +1 @@
257

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/core_siblings_list Normal file
View File

@ -0,0 +1 @@
4-7

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/package_cpus_list Normal file
View File

@ -0,0 +1 @@
4-7

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/physical_package_id Normal file
View File

@ -0,0 +1 @@
3180

1
tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/thread_siblings_list Normal file
View File

@ -0,0 +1 @@
6-7

1
tests/virhostcpudata/linux-with-clusters/cpu/online Normal file
View File

@ -0,0 +1 @@
0-223

1
tests/virhostcpudata/linux-with-clusters/cpu/present Normal file
View File

@ -0,0 +1 @@
0-223

1
tests/virhostcpudata/linux-with-clusters/node/node0/cpu0 Symbolic link
View File

@ -0,0 +1 @@
../../cpu/cpu0

1
tests/virhostcpudata/linux-with-clusters/node/node0/cpu1 Symbolic link
View File

@ -0,0 +1 @@
../../cpu/cpu1

1
tests/virhostcpudata/linux-with-clusters/node/node0/cpu2 Symbolic link
View File

@ -0,0 +1 @@
../../cpu/cpu2

1
tests/virhostcpudata/linux-with-clusters/node/node0/cpu3 Symbolic link
View File

@ -0,0 +1 @@
../../cpu/cpu3

1
tests/virhostcpudata/linux-with-clusters/node/node0/cpulist Normal file
View File

@ -0,0 +1 @@
0-3

1
tests/virhostcpudata/linux-with-clusters/node/node1/cpu4 Symbolic link
View File

@ -0,0 +1 @@
../../cpu/cpu4

1
tests/virhostcpudata/linux-with-clusters/node/node1/cpu5 Symbolic link
View File

@ -0,0 +1 @@
../../cpu/cpu5

1
tests/virhostcpudata/linux-with-clusters/node/node1/cpu6 Symbolic link
View File

@ -0,0 +1 @@
../../cpu/cpu6

1
tests/virhostcpudata/linux-with-clusters/node/node1/cpu7 Symbolic link
View File

@ -0,0 +1 @@
../../cpu/cpu7

1
tests/virhostcpudata/linux-with-clusters/node/node1/cpulist Normal file
View File

@ -0,0 +1 @@
4-7

1
tests/virhostcpudata/linux-with-clusters/node/online Normal file
View File

@ -0,0 +1 @@
0-1

1
tests/virhostcpudata/linux-with-clusters/node/possible Normal file
View File

@ -0,0 +1 @@
0-1

1
tests/virhostcputest.c
View File

@ -273,6 +273,7 @@ mymain(void)
{"subcores3", VIR_ARCH_PPC64},
{"with-frequency", VIR_ARCH_S390X},
{"with-die", VIR_ARCH_X86_64},
{"with-clusters", VIR_ARCH_AARCH64},
};
if (virInitialize() < 0)