cputest: Give better names to baseline tests

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/tests/cputest.c b/tests/cputest.c
index 697b20ada398fd15f6e8df7bf2c3c4bed2d89638..305002bdbc686409aabb378b6c816cf151a37635 100644 (file)
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -1050,12 +1050,12 @@ mymain(void)
     DO_TEST_BASELINE(VIR_ARCH_X86_64, "incompatible-vendors", 0, -1);
     DO_TEST_BASELINE(VIR_ARCH_X86_64, "no-vendor", 0, 0);
     DO_TEST_BASELINE(VIR_ARCH_X86_64, "some-vendors", 0, 0);
-    DO_TEST_BASELINE(VIR_ARCH_X86_64, "3", 0, 0);
-    DO_TEST_BASELINE(VIR_ARCH_X86_64, "3", VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, 0);
-    DO_TEST_BASELINE(VIR_ARCH_X86_64, "4", 0, 0);
-    DO_TEST_BASELINE(VIR_ARCH_X86_64, "4", VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, 0);
-    DO_TEST_BASELINE(VIR_ARCH_X86_64, "6", 0, 0);
-    DO_TEST_BASELINE(VIR_ARCH_X86_64, "6", VIR_CONNECT_BASELINE_CPU_MIGRATABLE, 0);
+    DO_TEST_BASELINE(VIR_ARCH_X86_64, "simple", 0, 0);
+    DO_TEST_BASELINE(VIR_ARCH_X86_64, "simple", VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, 0);
+    DO_TEST_BASELINE(VIR_ARCH_X86_64, "features", 0, 0);
+    DO_TEST_BASELINE(VIR_ARCH_X86_64, "features", VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, 0);
+    DO_TEST_BASELINE(VIR_ARCH_X86_64, "Westmere+Nehalem", 0, 0);
+    DO_TEST_BASELINE(VIR_ARCH_X86_64, "Westmere+Nehalem", VIR_CONNECT_BASELINE_CPU_MIGRATABLE, 0);
 
     DO_TEST_BASELINE(VIR_ARCH_PPC64, "incompatible-vendors", 0, -1);
     DO_TEST_BASELINE(VIR_ARCH_PPC64, "no-vendor", 0, 0);

diff --git a/tests/cputestdata/x86_64-baseline-3-expanded.xml b/tests/cputestdata/x86_64-baseline-3-expanded.xml
deleted file mode 100644 (file)
index 82857e3..0000000
--- a/tests/cputestdata/x86_64-baseline-3-expanded.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='forbid'>Westmere</model>
-  <feature policy='require' name='aes'/>
-  <feature policy='require' name='apic'/>
-  <feature policy='require' name='clflush'/>
-  <feature policy='require' name='cmov'/>
-  <feature policy='require' name='cx16'/>
-  <feature policy='require' name='cx8'/>
-  <feature policy='require' name='de'/>
-  <feature policy='require' name='fpu'/>
-  <feature policy='require' name='fxsr'/>
-  <feature policy='require' name='lahf_lm'/>
-  <feature policy='require' name='lm'/>
-  <feature policy='require' name='mca'/>
-  <feature policy='require' name='mce'/>
-  <feature policy='require' name='mmx'/>
-  <feature policy='require' name='msr'/>
-  <feature policy='require' name='mtrr'/>
-  <feature policy='require' name='nx'/>
-  <feature policy='require' name='pae'/>
-  <feature policy='require' name='pat'/>
-  <feature policy='require' name='pge'/>
-  <feature policy='require' name='pni'/>
-  <feature policy='require' name='popcnt'/>
-  <feature policy='require' name='pse'/>
-  <feature policy='require' name='pse36'/>
-  <feature policy='require' name='sep'/>
-  <feature policy='require' name='sse'/>
-  <feature policy='require' name='sse2'/>
-  <feature policy='require' name='sse4.1'/>
-  <feature policy='require' name='sse4.2'/>
-  <feature policy='require' name='ssse3'/>
-  <feature policy='require' name='syscall'/>
-  <feature policy='require' name='tsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86_64-baseline-3-result.xml b/tests/cputestdata/x86_64-baseline-3-result.xml
deleted file mode 100644 (file)
index 7349831..0000000
--- a/tests/cputestdata/x86_64-baseline-3-result.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='forbid'>Westmere</model>
-</cpu>

diff --git a/tests/cputestdata/x86_64-baseline-3.xml b/tests/cputestdata/x86_64-baseline-3.xml
deleted file mode 100644 (file)
index 7654a1d..0000000
--- a/tests/cputestdata/x86_64-baseline-3.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<cpuTest>
-<cpu>
-  <arch>x86_64</arch>
-  <model>Westmere</model>
-  <topology sockets='1' cores='2' threads='1'/>
-</cpu>
-</cpuTest>

diff --git a/tests/cputestdata/x86_64-baseline-4-expanded.xml b/tests/cputestdata/x86_64-baseline-4-expanded.xml
deleted file mode 100644 (file)
index e54eca0..0000000
--- a/tests/cputestdata/x86_64-baseline-4-expanded.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='forbid'>Westmere</model>
-  <vendor>Intel</vendor>
-  <feature policy='require' name='aes'/>
-  <feature policy='require' name='apic'/>
-  <feature policy='require' name='avx'/>
-  <feature policy='require' name='clflush'/>
-  <feature policy='require' name='cmov'/>
-  <feature policy='require' name='cx16'/>
-  <feature policy='require' name='cx8'/>
-  <feature policy='require' name='de'/>
-  <feature policy='require' name='fpu'/>
-  <feature policy='require' name='fxsr'/>
-  <feature policy='require' name='hypervisor'/>
-  <feature policy='require' name='lahf_lm'/>
-  <feature policy='require' name='lm'/>
-  <feature policy='require' name='mca'/>
-  <feature policy='require' name='mce'/>
-  <feature policy='require' name='mmx'/>
-  <feature policy='require' name='msr'/>
-  <feature policy='require' name='mtrr'/>
-  <feature policy='require' name='nx'/>
-  <feature policy='require' name='osxsave'/>
-  <feature policy='require' name='pae'/>
-  <feature policy='require' name='pat'/>
-  <feature policy='require' name='pcid'/>
-  <feature policy='require' name='pclmuldq'/>
-  <feature policy='require' name='pge'/>
-  <feature policy='require' name='pni'/>
-  <feature policy='require' name='popcnt'/>
-  <feature policy='require' name='pse'/>
-  <feature policy='require' name='pse36'/>
-  <feature policy='require' name='sep'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='sse'/>
-  <feature policy='require' name='sse2'/>
-  <feature policy='require' name='sse4.1'/>
-  <feature policy='require' name='sse4.2'/>
-  <feature policy='require' name='ssse3'/>
-  <feature policy='require' name='syscall'/>
-  <feature policy='require' name='tsc'/>
-  <feature policy='require' name='tsc-deadline'/>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='x2apic'/>
-  <feature policy='require' name='xsave'/>
-</cpu>

diff --git a/tests/cputestdata/x86_64-baseline-4-result.xml b/tests/cputestdata/x86_64-baseline-4-result.xml
deleted file mode 100644 (file)
index 1461a5b..0000000
--- a/tests/cputestdata/x86_64-baseline-4-result.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='forbid'>Westmere</model>
-  <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='pclmuldq'/>
-  <feature policy='require' name='pcid'/>
-  <feature policy='require' name='x2apic'/>
-  <feature policy='require' name='tsc-deadline'/>
-  <feature policy='require' name='xsave'/>
-  <feature policy='require' name='osxsave'/>
-  <feature policy='require' name='avx'/>
-  <feature policy='require' name='hypervisor'/>
-</cpu>

diff --git a/tests/cputestdata/x86_64-baseline-4.xml b/tests/cputestdata/x86_64-baseline-4.xml
deleted file mode 100644 (file)
index 7f5ae16..0000000
--- a/tests/cputestdata/x86_64-baseline-4.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<cpuTest>
-<cpu>
-  <arch>x86_64</arch>
-  <model>Westmere</model>
-  <vendor>Intel</vendor>
-  <topology sockets='4' cores='1' threads='1'/>
-  <feature name='hypervisor'/>
-  <feature name='avx'/>
-  <feature name='osxsave'/>
-  <feature name='xsave'/>
-  <feature name='tsc-deadline'/>
-  <feature name='x2apic'/>
-  <feature name='pcid'/>
-  <feature name='pclmuldq'/>
-  <feature name='ss'/>
-  <feature name='vme'/>
-</cpu>
-</cpuTest>

diff --git a/tests/cputestdata/x86_64-baseline-6-migratable.xml b/tests/cputestdata/x86_64-baseline-6-migratable.xml
deleted file mode 100644 (file)
index 775a27d..0000000
--- a/tests/cputestdata/x86_64-baseline-6-migratable.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='allow'>SandyBridge</model>
-  <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='pcid'/>
-  <feature policy='require' name='osxsave'/>
-  <feature policy='require' name='hypervisor'/>
-  <feature policy='disable' name='rdtscp'/>
-</cpu>

diff --git a/tests/cputestdata/x86_64-baseline-6-result.xml b/tests/cputestdata/x86_64-baseline-6-result.xml
deleted file mode 100644 (file)
index cafca97..0000000
--- a/tests/cputestdata/x86_64-baseline-6-result.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='allow'>SandyBridge</model>
-  <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='pcid'/>
-  <feature policy='require' name='osxsave'/>
-  <feature policy='require' name='hypervisor'/>
-  <feature policy='require' name='invtsc'/>
-  <feature policy='disable' name='rdtscp'/>
-</cpu>

diff --git a/tests/cputestdata/x86_64-baseline-6.xml b/tests/cputestdata/x86_64-baseline-6.xml
deleted file mode 100644 (file)
index 9845b93..0000000
--- a/tests/cputestdata/x86_64-baseline-6.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<cpuTest>
-<cpu>
-  <arch>x86_64</arch>
-  <model>Westmere</model>
-  <vendor>Intel</vendor>
-  <topology sockets='4' cores='1' threads='1'/>
-  <feature name='hypervisor'/>
-  <feature name='avx'/>
-  <feature name='osxsave'/>
-  <feature name='xsave'/>
-  <feature name='tsc-deadline'/>
-  <feature name='x2apic'/>
-  <feature name='pcid'/>
-  <feature name='pclmuldq'/>
-  <feature name='ss'/>
-  <feature name='vme'/>
-  <feature name='invtsc'/>
-</cpu>
-<cpu>
-  <arch>x86_64</arch>
-  <model>Nehalem</model>
-  <vendor>Intel</vendor>
-  <topology sockets='4' cores='1' threads='1'/>
-  <feature name='aes'/>
-  <feature name='hypervisor'/>
-  <feature name='avx'/>
-  <feature name='osxsave'/>
-  <feature name='xsave'/>
-  <feature name='tsc-deadline'/>
-  <feature name='x2apic'/>
-  <feature name='pcid'/>
-  <feature name='pclmuldq'/>
-  <feature name='ss'/>
-  <feature name='vme'/>
-  <feature name='invtsc'/>
-</cpu>
-</cpuTest>

diff --git a/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-migratable.xml b/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-migratable.xml
new file mode 100644 (file)
index 0000000..775a27d
--- /dev/null
+++ b/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-migratable.xml
@@ -0,0 +1,10 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='allow'>SandyBridge</model>
+  <vendor>Intel</vendor>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='pcid'/>
+  <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='hypervisor'/>
+  <feature policy='disable' name='rdtscp'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-result.xml b/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-result.xml
new file mode 100644 (file)
index 0000000..cafca97
--- /dev/null
+++ b/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-result.xml
@@ -0,0 +1,11 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='allow'>SandyBridge</model>
+  <vendor>Intel</vendor>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='pcid'/>
+  <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='invtsc'/>
+  <feature policy='disable' name='rdtscp'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-baseline-Westmere+Nehalem.xml b/tests/cputestdata/x86_64-baseline-Westmere+Nehalem.xml
new file mode 100644 (file)
index 0000000..9845b93
--- /dev/null
+++ b/tests/cputestdata/x86_64-baseline-Westmere+Nehalem.xml
@@ -0,0 +1,37 @@
+<cpuTest>
+<cpu>
+  <arch>x86_64</arch>
+  <model>Westmere</model>
+  <vendor>Intel</vendor>
+  <topology sockets='4' cores='1' threads='1'/>
+  <feature name='hypervisor'/>
+  <feature name='avx'/>
+  <feature name='osxsave'/>
+  <feature name='xsave'/>
+  <feature name='tsc-deadline'/>
+  <feature name='x2apic'/>
+  <feature name='pcid'/>
+  <feature name='pclmuldq'/>
+  <feature name='ss'/>
+  <feature name='vme'/>
+  <feature name='invtsc'/>
+</cpu>
+<cpu>
+  <arch>x86_64</arch>
+  <model>Nehalem</model>
+  <vendor>Intel</vendor>
+  <topology sockets='4' cores='1' threads='1'/>
+  <feature name='aes'/>
+  <feature name='hypervisor'/>
+  <feature name='avx'/>
+  <feature name='osxsave'/>
+  <feature name='xsave'/>
+  <feature name='tsc-deadline'/>
+  <feature name='x2apic'/>
+  <feature name='pcid'/>
+  <feature name='pclmuldq'/>
+  <feature name='ss'/>
+  <feature name='vme'/>
+  <feature name='invtsc'/>
+</cpu>
+</cpuTest>

diff --git a/tests/cputestdata/x86_64-baseline-features-expanded.xml b/tests/cputestdata/x86_64-baseline-features-expanded.xml
new file mode 100644 (file)
index 0000000..e54eca0
--- /dev/null
+++ b/tests/cputestdata/x86_64-baseline-features-expanded.xml
@@ -0,0 +1,46 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='forbid'>Westmere</model>
+  <vendor>Intel</vendor>
+  <feature policy='require' name='aes'/>
+  <feature policy='require' name='apic'/>
+  <feature policy='require' name='avx'/>
+  <feature policy='require' name='clflush'/>
+  <feature policy='require' name='cmov'/>
+  <feature policy='require' name='cx16'/>
+  <feature policy='require' name='cx8'/>
+  <feature policy='require' name='de'/>
+  <feature policy='require' name='fpu'/>
+  <feature policy='require' name='fxsr'/>
+  <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='lahf_lm'/>
+  <feature policy='require' name='lm'/>
+  <feature policy='require' name='mca'/>
+  <feature policy='require' name='mce'/>
+  <feature policy='require' name='mmx'/>
+  <feature policy='require' name='msr'/>
+  <feature policy='require' name='mtrr'/>
+  <feature policy='require' name='nx'/>
+  <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='pae'/>
+  <feature policy='require' name='pat'/>
+  <feature policy='require' name='pcid'/>
+  <feature policy='require' name='pclmuldq'/>
+  <feature policy='require' name='pge'/>
+  <feature policy='require' name='pni'/>
+  <feature policy='require' name='popcnt'/>
+  <feature policy='require' name='pse'/>
+  <feature policy='require' name='pse36'/>
+  <feature policy='require' name='sep'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='sse'/>
+  <feature policy='require' name='sse2'/>
+  <feature policy='require' name='sse4.1'/>
+  <feature policy='require' name='sse4.2'/>
+  <feature policy='require' name='ssse3'/>
+  <feature policy='require' name='syscall'/>
+  <feature policy='require' name='tsc'/>
+  <feature policy='require' name='tsc-deadline'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='x2apic'/>
+  <feature policy='require' name='xsave'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-baseline-features-result.xml b/tests/cputestdata/x86_64-baseline-features-result.xml
new file mode 100644 (file)
index 0000000..1461a5b
--- /dev/null
+++ b/tests/cputestdata/x86_64-baseline-features-result.xml
@@ -0,0 +1,14 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='forbid'>Westmere</model>
+  <vendor>Intel</vendor>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='pclmuldq'/>
+  <feature policy='require' name='pcid'/>
+  <feature policy='require' name='x2apic'/>
+  <feature policy='require' name='tsc-deadline'/>
+  <feature policy='require' name='xsave'/>
+  <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='avx'/>
+  <feature policy='require' name='hypervisor'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-baseline-features.xml b/tests/cputestdata/x86_64-baseline-features.xml
new file mode 100644 (file)
index 0000000..7f5ae16
--- /dev/null
+++ b/tests/cputestdata/x86_64-baseline-features.xml
@@ -0,0 +1,18 @@
+<cpuTest>
+<cpu>
+  <arch>x86_64</arch>
+  <model>Westmere</model>
+  <vendor>Intel</vendor>
+  <topology sockets='4' cores='1' threads='1'/>
+  <feature name='hypervisor'/>
+  <feature name='avx'/>
+  <feature name='osxsave'/>
+  <feature name='xsave'/>
+  <feature name='tsc-deadline'/>
+  <feature name='x2apic'/>
+  <feature name='pcid'/>
+  <feature name='pclmuldq'/>
+  <feature name='ss'/>
+  <feature name='vme'/>
+</cpu>
+</cpuTest>

diff --git a/tests/cputestdata/x86_64-baseline-simple-expanded.xml b/tests/cputestdata/x86_64-baseline-simple-expanded.xml
new file mode 100644 (file)
index 0000000..82857e3
--- /dev/null
+++ b/tests/cputestdata/x86_64-baseline-simple-expanded.xml
@@ -0,0 +1,35 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='forbid'>Westmere</model>
+  <feature policy='require' name='aes'/>
+  <feature policy='require' name='apic'/>
+  <feature policy='require' name='clflush'/>
+  <feature policy='require' name='cmov'/>
+  <feature policy='require' name='cx16'/>
+  <feature policy='require' name='cx8'/>
+  <feature policy='require' name='de'/>
+  <feature policy='require' name='fpu'/>
+  <feature policy='require' name='fxsr'/>
+  <feature policy='require' name='lahf_lm'/>
+  <feature policy='require' name='lm'/>
+  <feature policy='require' name='mca'/>
+  <feature policy='require' name='mce'/>
+  <feature policy='require' name='mmx'/>
+  <feature policy='require' name='msr'/>
+  <feature policy='require' name='mtrr'/>
+  <feature policy='require' name='nx'/>
+  <feature policy='require' name='pae'/>
+  <feature policy='require' name='pat'/>
+  <feature policy='require' name='pge'/>
+  <feature policy='require' name='pni'/>
+  <feature policy='require' name='popcnt'/>
+  <feature policy='require' name='pse'/>
+  <feature policy='require' name='pse36'/>
+  <feature policy='require' name='sep'/>
+  <feature policy='require' name='sse'/>
+  <feature policy='require' name='sse2'/>
+  <feature policy='require' name='sse4.1'/>
+  <feature policy='require' name='sse4.2'/>
+  <feature policy='require' name='ssse3'/>
+  <feature policy='require' name='syscall'/>
+  <feature policy='require' name='tsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-baseline-simple-result.xml b/tests/cputestdata/x86_64-baseline-simple-result.xml
new file mode 100644 (file)
index 0000000..7349831
--- /dev/null
+++ b/tests/cputestdata/x86_64-baseline-simple-result.xml
@@ -0,0 +1,3 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='forbid'>Westmere</model>
+</cpu>

diff --git a/tests/cputestdata/x86_64-baseline-simple.xml b/tests/cputestdata/x86_64-baseline-simple.xml
new file mode 100644 (file)
index 0000000..7654a1d
--- /dev/null
+++ b/tests/cputestdata/x86_64-baseline-simple.xml
@@ -0,0 +1,7 @@
+<cpuTest>
+<cpu>
+  <arch>x86_64</arch>
+  <model>Westmere</model>
+  <topology sockets='1' cores='2' threads='1'/>
+</cpu>
+</cpuTest>