abb18f
From 039e6627a7ee53973da64405b79cc0c0f6111fc7 Mon Sep 17 00:00:00 2001
abb18f
Message-Id: <039e6627a7ee53973da64405b79cc0c0f6111fc7@dist-git>
abb18f
From: Jiri Denemark <jdenemar@redhat.com>
abb18f
Date: Wed, 4 May 2022 16:21:38 +0200
abb18f
Subject: [PATCH] cputest: Drop some old artificial baseline tests
abb18f
abb18f
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
abb18f
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
abb18f
(cherry picked from commit 6aff36019bbaf643f451779621c6c88cab0e64a7)
abb18f
abb18f
https://bugzilla.redhat.com/show_bug.cgi?id=2084030
abb18f
abb18f
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
abb18f
---
abb18f
 tests/cputest.c                               |  6 ---
abb18f
 .../cputestdata/x86_64-baseline-1-result.xml  |  5 --
abb18f
 tests/cputestdata/x86_64-baseline-1.xml       | 20 --------
abb18f
 .../cputestdata/x86_64-baseline-2-result.xml  |  4 --
abb18f
 tests/cputestdata/x86_64-baseline-2.xml       | 22 ---------
abb18f
 .../x86_64-baseline-5-expanded.xml            | 47 -------------------
abb18f
 .../cputestdata/x86_64-baseline-5-result.xml  | 10 ----
abb18f
 tests/cputestdata/x86_64-baseline-5.xml       | 35 --------------
abb18f
 .../cputestdata/x86_64-baseline-7-result.xml  |  4 --
abb18f
 tests/cputestdata/x86_64-baseline-7.xml       | 24 ----------
abb18f
 .../cputestdata/x86_64-baseline-8-result.xml  |  4 --
abb18f
 tests/cputestdata/x86_64-baseline-8.xml       | 28 -----------
abb18f
 12 files changed, 209 deletions(-)
abb18f
 delete mode 100644 tests/cputestdata/x86_64-baseline-1-result.xml
abb18f
 delete mode 100644 tests/cputestdata/x86_64-baseline-1.xml
abb18f
 delete mode 100644 tests/cputestdata/x86_64-baseline-2-result.xml
abb18f
 delete mode 100644 tests/cputestdata/x86_64-baseline-2.xml
abb18f
 delete mode 100644 tests/cputestdata/x86_64-baseline-5-expanded.xml
abb18f
 delete mode 100644 tests/cputestdata/x86_64-baseline-5-result.xml
abb18f
 delete mode 100644 tests/cputestdata/x86_64-baseline-5.xml
abb18f
 delete mode 100644 tests/cputestdata/x86_64-baseline-7-result.xml
abb18f
 delete mode 100644 tests/cputestdata/x86_64-baseline-7.xml
abb18f
 delete mode 100644 tests/cputestdata/x86_64-baseline-8-result.xml
abb18f
 delete mode 100644 tests/cputestdata/x86_64-baseline-8.xml
abb18f
abb18f
diff --git a/tests/cputest.c b/tests/cputest.c
abb18f
index 0f0621292a..20d56836be 100644
abb18f
--- a/tests/cputest.c
abb18f
+++ b/tests/cputest.c
abb18f
@@ -1051,18 +1051,12 @@ mymain(void)
abb18f
     DO_TEST_BASELINE(VIR_ARCH_X86_64, "incompatible-vendors", 0, -1);
abb18f
     DO_TEST_BASELINE(VIR_ARCH_X86_64, "no-vendor", 0, 0);
abb18f
     DO_TEST_BASELINE(VIR_ARCH_X86_64, "some-vendors", 0, 0);
abb18f
-    DO_TEST_BASELINE(VIR_ARCH_X86_64, "1", 0, 0);
abb18f
-    DO_TEST_BASELINE(VIR_ARCH_X86_64, "2", 0, 0);
abb18f
     DO_TEST_BASELINE(VIR_ARCH_X86_64, "3", 0, 0);
abb18f
     DO_TEST_BASELINE(VIR_ARCH_X86_64, "3", VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, 0);
abb18f
     DO_TEST_BASELINE(VIR_ARCH_X86_64, "4", 0, 0);
abb18f
     DO_TEST_BASELINE(VIR_ARCH_X86_64, "4", VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, 0);
abb18f
-    DO_TEST_BASELINE(VIR_ARCH_X86_64, "5", 0, 0);
abb18f
-    DO_TEST_BASELINE(VIR_ARCH_X86_64, "5", VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, 0);
abb18f
     DO_TEST_BASELINE(VIR_ARCH_X86_64, "6", 0, 0);
abb18f
     DO_TEST_BASELINE(VIR_ARCH_X86_64, "6", VIR_CONNECT_BASELINE_CPU_MIGRATABLE, 0);
abb18f
-    DO_TEST_BASELINE(VIR_ARCH_X86_64, "7", 0, 0);
abb18f
-    DO_TEST_BASELINE(VIR_ARCH_X86_64, "8", 0, 0);
abb18f
 
abb18f
     DO_TEST_BASELINE(VIR_ARCH_PPC64, "incompatible-vendors", 0, -1);
abb18f
     DO_TEST_BASELINE(VIR_ARCH_PPC64, "no-vendor", 0, 0);
abb18f
diff --git a/tests/cputestdata/x86_64-baseline-1-result.xml b/tests/cputestdata/x86_64-baseline-1-result.xml
abb18f
deleted file mode 100644
abb18f
index 96c4f43b3d..0000000000
abb18f
--- a/tests/cputestdata/x86_64-baseline-1-result.xml
abb18f
+++ /dev/null
abb18f
@@ -1,5 +0,0 @@
abb18f
-<cpu mode='custom' match='exact'>
abb18f
-  <model fallback='allow'>Conroe</model>
abb18f
-  <vendor>Intel</vendor>
abb18f
-  <feature policy='disable' name='lahf_lm'/>
abb18f
-</cpu>
abb18f
diff --git a/tests/cputestdata/x86_64-baseline-1.xml b/tests/cputestdata/x86_64-baseline-1.xml
abb18f
deleted file mode 100644
abb18f
index 509e6a85d2..0000000000
abb18f
--- a/tests/cputestdata/x86_64-baseline-1.xml
abb18f
+++ /dev/null
abb18f
@@ -1,20 +0,0 @@
abb18f
-<cpuTest>
abb18f
-<cpu>
abb18f
-  <arch>x86_64</arch>
abb18f
-  <model>Penryn</model>
abb18f
-  <vendor>Intel</vendor>
abb18f
-  <topology sockets='2' cores='4' threads='1'/>
abb18f
-</cpu>
abb18f
-<cpu>
abb18f
-  <arch>x86_64</arch>
abb18f
-  <model>Conroe</model>
abb18f
-  <vendor>Intel</vendor>
abb18f
-  <topology sockets='1' cores='1' threads='1'/>
abb18f
-</cpu>
abb18f
-<cpu>
abb18f
-  <arch>x86_64</arch>
abb18f
-  <model>core2duo</model>
abb18f
-  <vendor>Intel</vendor>
abb18f
-  <topology sockets='1' cores='1' threads='1'/>
abb18f
-</cpu>
abb18f
-</cpuTest>
abb18f
diff --git a/tests/cputestdata/x86_64-baseline-2-result.xml b/tests/cputestdata/x86_64-baseline-2-result.xml
abb18f
deleted file mode 100644
abb18f
index a11352d0b1..0000000000
abb18f
--- a/tests/cputestdata/x86_64-baseline-2-result.xml
abb18f
+++ /dev/null
abb18f
@@ -1,4 +0,0 @@
abb18f
-<cpu mode='custom' match='exact'>
abb18f
-  <model fallback='allow'>core2duo</model>
abb18f
-  <feature policy='disable' name='nx'/>
abb18f
-</cpu>
abb18f
diff --git a/tests/cputestdata/x86_64-baseline-2.xml b/tests/cputestdata/x86_64-baseline-2.xml
abb18f
deleted file mode 100644
abb18f
index 055223fd34..0000000000
abb18f
--- a/tests/cputestdata/x86_64-baseline-2.xml
abb18f
+++ /dev/null
abb18f
@@ -1,22 +0,0 @@
abb18f
-<cpuTest>
abb18f
-<cpu>
abb18f
-  <arch>x86_64</arch>
abb18f
-  <model>core2duo</model>
abb18f
-  <topology sockets='1' cores='2' threads='1'/>
abb18f
-</cpu>
abb18f
-<cpu>
abb18f
-  <arch>x86_64</arch>
abb18f
-  <model>pentiumpro</model>
abb18f
-  <topology sockets='1' cores='2' threads='1'/>
abb18f
-  <feature name='mtrr'/>
abb18f
-  <feature name='clflush'/>
abb18f
-  <feature name='mca'/>
abb18f
-  <feature name='vme'/>
abb18f
-  <feature name='pse36'/>
abb18f
-  <feature name='pni'/>
abb18f
-  <feature name='monitor'/>
abb18f
-  <feature name='ssse3'/>
abb18f
-  <feature name='lm'/>
abb18f
-  <feature name='syscall'/>
abb18f
-</cpu>
abb18f
-</cpuTest>
abb18f
diff --git a/tests/cputestdata/x86_64-baseline-5-expanded.xml b/tests/cputestdata/x86_64-baseline-5-expanded.xml
abb18f
deleted file mode 100644
abb18f
index 2c1b400150..0000000000
abb18f
--- a/tests/cputestdata/x86_64-baseline-5-expanded.xml
abb18f
+++ /dev/null
abb18f
@@ -1,47 +0,0 @@
abb18f
-<cpu mode='custom' match='exact'>
abb18f
-  <model fallback='allow'>SandyBridge</model>
abb18f
-  <vendor>Intel</vendor>
abb18f
-  <feature policy='require' name='aes'/>
abb18f
-  <feature policy='require' name='apic'/>
abb18f
-  <feature policy='require' name='avx'/>
abb18f
-  <feature policy='require' name='clflush'/>
abb18f
-  <feature policy='require' name='cmov'/>
abb18f
-  <feature policy='require' name='cx16'/>
abb18f
-  <feature policy='require' name='cx8'/>
abb18f
-  <feature policy='require' name='de'/>
abb18f
-  <feature policy='require' name='fpu'/>
abb18f
-  <feature policy='require' name='fxsr'/>
abb18f
-  <feature policy='require' name='hypervisor'/>
abb18f
-  <feature policy='require' name='lahf_lm'/>
abb18f
-  <feature policy='require' name='lm'/>
abb18f
-  <feature policy='require' name='mca'/>
abb18f
-  <feature policy='require' name='mce'/>
abb18f
-  <feature policy='require' name='mmx'/>
abb18f
-  <feature policy='require' name='msr'/>
abb18f
-  <feature policy='require' name='mtrr'/>
abb18f
-  <feature policy='require' name='nx'/>
abb18f
-  <feature policy='require' name='osxsave'/>
abb18f
-  <feature policy='require' name='pae'/>
abb18f
-  <feature policy='require' name='pat'/>
abb18f
-  <feature policy='require' name='pcid'/>
abb18f
-  <feature policy='require' name='pclmuldq'/>
abb18f
-  <feature policy='require' name='pge'/>
abb18f
-  <feature policy='require' name='pni'/>
abb18f
-  <feature policy='require' name='popcnt'/>
abb18f
-  <feature policy='require' name='pse'/>
abb18f
-  <feature policy='require' name='pse36'/>
abb18f
-  <feature policy='disable' name='rdtscp'/>
abb18f
-  <feature policy='require' name='sep'/>
abb18f
-  <feature policy='require' name='ss'/>
abb18f
-  <feature policy='require' name='sse'/>
abb18f
-  <feature policy='require' name='sse2'/>
abb18f
-  <feature policy='require' name='sse4.1'/>
abb18f
-  <feature policy='require' name='sse4.2'/>
abb18f
-  <feature policy='require' name='ssse3'/>
abb18f
-  <feature policy='require' name='syscall'/>
abb18f
-  <feature policy='require' name='tsc'/>
abb18f
-  <feature policy='require' name='tsc-deadline'/>
abb18f
-  <feature policy='require' name='vme'/>
abb18f
-  <feature policy='require' name='x2apic'/>
abb18f
-  <feature policy='require' name='xsave'/>
abb18f
-</cpu>
abb18f
diff --git a/tests/cputestdata/x86_64-baseline-5-result.xml b/tests/cputestdata/x86_64-baseline-5-result.xml
abb18f
deleted file mode 100644
abb18f
index 775a27de2e..0000000000
abb18f
--- a/tests/cputestdata/x86_64-baseline-5-result.xml
abb18f
+++ /dev/null
abb18f
@@ -1,10 +0,0 @@
abb18f
-<cpu mode='custom' match='exact'>
abb18f
-  <model fallback='allow'>SandyBridge</model>
abb18f
-  <vendor>Intel</vendor>
abb18f
-  <feature policy='require' name='vme'/>
abb18f
-  <feature policy='require' name='ss'/>
abb18f
-  <feature policy='require' name='pcid'/>
abb18f
-  <feature policy='require' name='osxsave'/>
abb18f
-  <feature policy='require' name='hypervisor'/>
abb18f
-  <feature policy='disable' name='rdtscp'/>
abb18f
-</cpu>
abb18f
diff --git a/tests/cputestdata/x86_64-baseline-5.xml b/tests/cputestdata/x86_64-baseline-5.xml
abb18f
deleted file mode 100644
abb18f
index 80cd533ca4..0000000000
abb18f
--- a/tests/cputestdata/x86_64-baseline-5.xml
abb18f
+++ /dev/null
abb18f
@@ -1,35 +0,0 @@
abb18f
-<cpuTest>
abb18f
-<cpu>
abb18f
-  <arch>x86_64</arch>
abb18f
-  <model>Westmere</model>
abb18f
-  <vendor>Intel</vendor>
abb18f
-  <topology sockets='4' cores='1' threads='1'/>
abb18f
-  <feature name='hypervisor'/>
abb18f
-  <feature name='avx'/>
abb18f
-  <feature name='osxsave'/>
abb18f
-  <feature name='xsave'/>
abb18f
-  <feature name='tsc-deadline'/>
abb18f
-  <feature name='x2apic'/>
abb18f
-  <feature name='pcid'/>
abb18f
-  <feature name='pclmuldq'/>
abb18f
-  <feature name='ss'/>
abb18f
-  <feature name='vme'/>
abb18f
-</cpu>
abb18f
-<cpu>
abb18f
-  <arch>x86_64</arch>
abb18f
-  <model>Nehalem</model>
abb18f
-  <vendor>Intel</vendor>
abb18f
-  <topology sockets='4' cores='1' threads='1'/>
abb18f
-  <feature name='aes'/>
abb18f
-  <feature name='hypervisor'/>
abb18f
-  <feature name='avx'/>
abb18f
-  <feature name='osxsave'/>
abb18f
-  <feature name='xsave'/>
abb18f
-  <feature name='tsc-deadline'/>
abb18f
-  <feature name='x2apic'/>
abb18f
-  <feature name='pcid'/>
abb18f
-  <feature name='pclmuldq'/>
abb18f
-  <feature name='ss'/>
abb18f
-  <feature name='vme'/>
abb18f
-</cpu>
abb18f
-</cpuTest>
abb18f
diff --git a/tests/cputestdata/x86_64-baseline-7-result.xml b/tests/cputestdata/x86_64-baseline-7-result.xml
abb18f
deleted file mode 100644
abb18f
index 2af549e77a..0000000000
abb18f
--- a/tests/cputestdata/x86_64-baseline-7-result.xml
abb18f
+++ /dev/null
abb18f
@@ -1,4 +0,0 @@
abb18f
-<cpu mode='custom' match='exact'>
abb18f
-  <model fallback='allow'>Haswell-noTSX</model>
abb18f
-  <vendor>Intel</vendor>
abb18f
-</cpu>
abb18f
diff --git a/tests/cputestdata/x86_64-baseline-7.xml b/tests/cputestdata/x86_64-baseline-7.xml
abb18f
deleted file mode 100644
abb18f
index b7e61b160c..0000000000
abb18f
--- a/tests/cputestdata/x86_64-baseline-7.xml
abb18f
+++ /dev/null
abb18f
@@ -1,24 +0,0 @@
abb18f
-<cpuTest>
abb18f
-    <cpu>
abb18f
-      <arch>x86_64</arch>
abb18f
-      <model>SandyBridge</model>
abb18f
-      <vendor>Intel</vendor>
abb18f
-      <topology sockets='1' cores='2' threads='2'/>
abb18f
-      <feature name='invpcid'/>
abb18f
-      <feature name='erms'/>
abb18f
-      <feature name='bmi2'/>
abb18f
-      <feature name='smep'/>
abb18f
-      <feature name='avx2'/>
abb18f
-      <feature name='bmi1'/>
abb18f
-      <feature name='fsgsbase'/>
abb18f
-      <feature name='movbe'/>
abb18f
-      <feature name='pcid'/>
abb18f
-      <feature name='fma'/>
abb18f
-    </cpu>
abb18f
-    <cpu>
abb18f
-      <arch>x86_64</arch>
abb18f
-      <model>Haswell-noTSX</model>
abb18f
-      <vendor>Intel</vendor>
abb18f
-      <topology sockets='1' cores='2' threads='2'/>
abb18f
-    </cpu>
abb18f
-</cpuTest>
abb18f
diff --git a/tests/cputestdata/x86_64-baseline-8-result.xml b/tests/cputestdata/x86_64-baseline-8-result.xml
abb18f
deleted file mode 100644
abb18f
index 88226b3dab..0000000000
abb18f
--- a/tests/cputestdata/x86_64-baseline-8-result.xml
abb18f
+++ /dev/null
abb18f
@@ -1,4 +0,0 @@
abb18f
-<cpu mode='custom' match='exact'>
abb18f
-  <model fallback='allow'>Broadwell-noTSX</model>
abb18f
-  <vendor>Intel</vendor>
abb18f
-</cpu>
abb18f
diff --git a/tests/cputestdata/x86_64-baseline-8.xml b/tests/cputestdata/x86_64-baseline-8.xml
abb18f
deleted file mode 100644
abb18f
index f1ee67d542..0000000000
abb18f
--- a/tests/cputestdata/x86_64-baseline-8.xml
abb18f
+++ /dev/null
abb18f
@@ -1,28 +0,0 @@
abb18f
-<cpuTest>
abb18f
-    <cpu>
abb18f
-      <arch>x86_64</arch>
abb18f
-      <model>SandyBridge</model>
abb18f
-      <vendor>Intel</vendor>
abb18f
-      <topology sockets='1' cores='2' threads='2'/>
abb18f
-      <feature name='invpcid'/>
abb18f
-      <feature name='erms'/>
abb18f
-      <feature name='bmi2'/>
abb18f
-      <feature name='smep'/>
abb18f
-      <feature name='avx2'/>
abb18f
-      <feature name='bmi1'/>
abb18f
-      <feature name='fsgsbase'/>
abb18f
-      <feature name='movbe'/>
abb18f
-      <feature name='pcid'/>
abb18f
-      <feature name='fma'/>
abb18f
-      <feature name='3dnowprefetch'/>
abb18f
-      <feature name='rdseed'/>
abb18f
-      <feature name='adx'/>
abb18f
-      <feature name='smap'/>
abb18f
-    </cpu>
abb18f
-    <cpu>
abb18f
-      <arch>x86_64</arch>
abb18f
-      <model>Broadwell-noTSX</model>
abb18f
-      <vendor>Intel</vendor>
abb18f
-      <topology sockets='1' cores='2' threads='2'/>
abb18f
-    </cpu>
abb18f
-</cpuTest>
abb18f
-- 
abb18f
2.35.1
abb18f