render / rpms / libvirt

Forked from rpms/libvirt 10 months ago
Clone
c313de
From 697bcb394816e4880cdbdb211527f057f4aea564 Mon Sep 17 00:00:00 2001
c313de
Message-Id: <697bcb394816e4880cdbdb211527f057f4aea564@dist-git>
c313de
From: Jiri Denemark <jdenemar@redhat.com>
c313de
Date: Fri, 21 Jun 2019 09:24:53 +0200
c313de
Subject: [PATCH] cputest: Add data for Intel(R) Core(TM) i7-8700
c313de
MIME-Version: 1.0
c313de
Content-Type: text/plain; charset=UTF-8
c313de
Content-Transfer-Encoding: 8bit
c313de
c313de
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
c313de
Reviewed-by: Ján Tomko <jtomko@redhat.com>
c313de
(cherry picked from commit 87a46f5d8f8b67b22eab8b25cd30a6b9901d6857)
c313de
c313de
https://bugzilla.redhat.com/show_bug.cgi?id=1686895
c313de
c313de
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
c313de
Message-Id: <2d5616ba4b88ef12435b52cfd7c90ce3360a83ef.1561068591.git.jdenemar@redhat.com>
c313de
Reviewed-by: Ján Tomko <jtomko@redhat.com>
c313de
---
c313de
 tests/cputest.c                               |   1 +
c313de
 .../x86_64-cpuid-Core-i7-8700-disabled.xml    |   6 +
c313de
 .../x86_64-cpuid-Core-i7-8700-enabled.xml     |   8 +
c313de
 .../x86_64-cpuid-Core-i7-8700-guest.xml       |  28 +
c313de
 .../x86_64-cpuid-Core-i7-8700-host.xml        |  29 +
c313de
 .../x86_64-cpuid-Core-i7-8700-json.xml        |  12 +
c313de
 .../x86_64-cpuid-Core-i7-8700.json            | 650 ++++++++++++++++++
c313de
 .../cputestdata/x86_64-cpuid-Core-i7-8700.xml |  47 ++
c313de
 8 files changed, 781 insertions(+)
c313de
 create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-8700-disabled.xml
c313de
 create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-8700-enabled.xml
c313de
 create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml
c313de
 create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
c313de
 create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-8700-json.xml
c313de
 create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-8700.json
c313de
 create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-8700.xml
c313de
c313de
diff --git a/tests/cputest.c b/tests/cputest.c
c313de
index bcbfe2d08a..9e5f807823 100644
c313de
--- a/tests/cputest.c
c313de
+++ b/tests/cputest.c
c313de
@@ -1178,6 +1178,7 @@ mymain(void)
c313de
     DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i7-5600U-ibrs", JSON_HOST);
c313de
     DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i7-7600U", JSON_MODELS);
c313de
     DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i7-7700", JSON_MODELS);
c313de
+    DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i7-8700", JSON_MODELS);
c313de
     DO_TEST_CPUID(VIR_ARCH_X86_64, "Core2-E6850", JSON_HOST);
c313de
     DO_TEST_CPUID(VIR_ARCH_X86_64, "Core2-Q9500", JSON_NONE);
c313de
     DO_TEST_CPUID(VIR_ARCH_X86_64, "EPYC-7601-32-Core", JSON_HOST);
c313de
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-disabled.xml
c313de
new file mode 100644
c313de
index 0000000000..6a7de576f1
c313de
--- /dev/null
c313de
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-disabled.xml
c313de
@@ -0,0 +1,6 @@
c313de
+
c313de
+<cpudata arch='x86'>
c313de
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0800c1fc' edx='0xb0600000'/>
c313de
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02000000' ecx='0x00000000' edx='0x08000000'/>
c313de
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
c313de
+</cpudata>
c313de
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-enabled.xml
c313de
new file mode 100644
c313de
index 0000000000..f0727d497b
c313de
--- /dev/null
c313de
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-enabled.xml
c313de
@@ -0,0 +1,8 @@
c313de
+
c313de
+<cpudata arch='x86'>
c313de
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7fa3203' edx='0x0f8bfbff'/>
c313de
+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
c313de
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x009c4fbb' ecx='0x00000004' edx='0x84000000'/>
c313de
+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
c313de
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
c313de
+</cpudata>
c313de
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml
c313de
new file mode 100644
c313de
index 0000000000..70a0fc3286
c313de
--- /dev/null
c313de
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml
c313de
@@ -0,0 +1,28 @@
c313de
+<cpu mode='custom' match='exact'>
c313de
+  <model fallback='forbid'>Skylake-Client-IBRS</model>
c313de
+  <vendor>Intel</vendor>
c313de
+  <feature policy='require' name='ds'/>
c313de
+  <feature policy='require' name='acpi'/>
c313de
+  <feature policy='require' name='ss'/>
c313de
+  <feature policy='require' name='ht'/>
c313de
+  <feature policy='require' name='tm'/>
c313de
+  <feature policy='require' name='pbe'/>
c313de
+  <feature policy='require' name='dtes64'/>
c313de
+  <feature policy='require' name='monitor'/>
c313de
+  <feature policy='require' name='ds_cpl'/>
c313de
+  <feature policy='require' name='vmx'/>
c313de
+  <feature policy='require' name='smx'/>
c313de
+  <feature policy='require' name='est'/>
c313de
+  <feature policy='require' name='tm2'/>
c313de
+  <feature policy='require' name='xtpr'/>
c313de
+  <feature policy='require' name='pdcm'/>
c313de
+  <feature policy='require' name='osxsave'/>
c313de
+  <feature policy='require' name='tsc_adjust'/>
c313de
+  <feature policy='require' name='clflushopt'/>
c313de
+  <feature policy='require' name='intel-pt'/>
c313de
+  <feature policy='require' name='stibp'/>
c313de
+  <feature policy='require' name='ssbd'/>
c313de
+  <feature policy='require' name='xsaves'/>
c313de
+  <feature policy='require' name='pdpe1gb'/>
c313de
+  <feature policy='require' name='invtsc'/>
c313de
+</cpu>
c313de
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
c313de
new file mode 100644
c313de
index 0000000000..bbdfb6aa61
c313de
--- /dev/null
c313de
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
c313de
@@ -0,0 +1,29 @@
c313de
+<cpu>
c313de
+  <arch>x86_64</arch>
c313de
+  <model>Skylake-Client-IBRS</model>
c313de
+  <vendor>Intel</vendor>
c313de
+  <feature name='ds'/>
c313de
+  <feature name='acpi'/>
c313de
+  <feature name='ss'/>
c313de
+  <feature name='ht'/>
c313de
+  <feature name='tm'/>
c313de
+  <feature name='pbe'/>
c313de
+  <feature name='dtes64'/>
c313de
+  <feature name='monitor'/>
c313de
+  <feature name='ds_cpl'/>
c313de
+  <feature name='vmx'/>
c313de
+  <feature name='smx'/>
c313de
+  <feature name='est'/>
c313de
+  <feature name='tm2'/>
c313de
+  <feature name='xtpr'/>
c313de
+  <feature name='pdcm'/>
c313de
+  <feature name='osxsave'/>
c313de
+  <feature name='tsc_adjust'/>
c313de
+  <feature name='clflushopt'/>
c313de
+  <feature name='intel-pt'/>
c313de
+  <feature name='stibp'/>
c313de
+  <feature name='ssbd'/>
c313de
+  <feature name='xsaves'/>
c313de
+  <feature name='pdpe1gb'/>
c313de
+  <feature name='invtsc'/>
c313de
+</cpu>
c313de
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-json.xml
c313de
new file mode 100644
c313de
index 0000000000..fd7539f7ce
c313de
--- /dev/null
c313de
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-json.xml
c313de
@@ -0,0 +1,12 @@
c313de
+<cpu mode='custom' match='exact'>
c313de
+  <model fallback='forbid'>Skylake-Client-IBRS</model>
c313de
+  <vendor>Intel</vendor>
c313de
+  <feature policy='require' name='ss'/>
c313de
+  <feature policy='require' name='hypervisor'/>
c313de
+  <feature policy='require' name='tsc_adjust'/>
c313de
+  <feature policy='require' name='clflushopt'/>
c313de
+  <feature policy='require' name='umip'/>
c313de
+  <feature policy='require' name='ssbd'/>
c313de
+  <feature policy='require' name='xsaves'/>
c313de
+  <feature policy='require' name='pdpe1gb'/>
c313de
+</cpu>
c313de
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700.json b/tests/cputestdata/x86_64-cpuid-Core-i7-8700.json
c313de
new file mode 100644
c313de
index 0000000000..122a1b2985
c313de
--- /dev/null
c313de
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700.json
c313de
@@ -0,0 +1,650 @@
c313de
+{
c313de
+  "return": {
c313de
+    "model": {
c313de
+      "name": "base",
c313de
+      "props": {
c313de
+        "phys-bits": 0,
c313de
+        "core-id": -1,
c313de
+        "xlevel": 2147483656,
c313de
+        "cmov": true,
c313de
+        "ia64": false,
c313de
+        "aes": true,
c313de
+        "mmx": true,
c313de
+        "rdpid": false,
c313de
+        "arat": true,
c313de
+        "gfni": false,
c313de
+        "pause-filter": false,
c313de
+        "xsavec": true,
c313de
+        "intel-pt": false,
c313de
+        "osxsave": false,
c313de
+        "hv-frequencies": false,
c313de
+        "tsc-frequency": 0,
c313de
+        "xd": true,
c313de
+        "hv-vendor-id": "",
c313de
+        "kvm-asyncpf": true,
c313de
+        "kvm_asyncpf": true,
c313de
+        "perfctr_core": false,
c313de
+        "perfctr-core": false,
c313de
+        "mpx": true,
c313de
+        "pbe": false,
c313de
+        "decodeassists": false,
c313de
+        "avx512cd": false,
c313de
+        "sse4_1": true,
c313de
+        "sse4.1": true,
c313de
+        "sse4-1": true,
c313de
+        "family": 6,
c313de
+        "legacy-cache": true,
c313de
+        "vmware-cpuid-freq": true,
c313de
+        "avx512f": false,
c313de
+        "msr": true,
c313de
+        "mce": true,
c313de
+        "mca": true,
c313de
+        "hv-runtime": false,
c313de
+        "xcrypt": false,
c313de
+        "thread-id": -1,
c313de
+        "min-level": 13,
c313de
+        "xgetbv1": true,
c313de
+        "cid": false,
c313de
+        "hv-relaxed": false,
c313de
+        "hv-crash": false,
c313de
+        "ds": false,
c313de
+        "fxsr": true,
c313de
+        "xsaveopt": true,
c313de
+        "xtpr": false,
c313de
+        "avx512vl": false,
c313de
+        "avx512-vpopcntdq": false,
c313de
+        "phe": false,
c313de
+        "extapic": false,
c313de
+        "3dnowprefetch": true,
c313de
+        "avx512vbmi2": false,
c313de
+        "cr8legacy": false,
c313de
+        "cpuid-0xb": true,
c313de
+        "xcrypt-en": false,
c313de
+        "kvm_pv_eoi": true,
c313de
+        "apic-id": 4294967295,
c313de
+        "pn": false,
c313de
+        "dca": false,
c313de
+        "vendor": "GenuineIntel",
c313de
+        "pku": false,
c313de
+        "smx": false,
c313de
+        "cmp_legacy": false,
c313de
+        "cmp-legacy": false,
c313de
+        "node-id": -1,
c313de
+        "avx512-4fmaps": false,
c313de
+        "vmcb_clean": false,
c313de
+        "vmcb-clean": false,
c313de
+        "3dnowext": false,
c313de
+        "hle": true,
c313de
+        "npt": false,
c313de
+        "memory": "/machine/unattached/system[0]",
c313de
+        "clwb": false,
c313de
+        "lbrv": false,
c313de
+        "adx": true,
c313de
+        "ss": true,
c313de
+        "pni": true,
c313de
+        "svm_lock": false,
c313de
+        "svm-lock": false,
c313de
+        "pfthreshold": false,
c313de
+        "smep": true,
c313de
+        "smap": true,
c313de
+        "x2apic": true,
c313de
+        "avx512vbmi": false,
c313de
+        "avx512vnni": false,
c313de
+        "hv-stimer": false,
c313de
+        "i64": true,
c313de
+        "flushbyasid": false,
c313de
+        "f16c": true,
c313de
+        "ace2-en": false,
c313de
+        "pat": true,
c313de
+        "pae": true,
c313de
+        "sse": true,
c313de
+        "phe-en": false,
c313de
+        "kvm_nopiodelay": true,
c313de
+        "kvm-nopiodelay": true,
c313de
+        "tm": false,
c313de
+        "kvmclock-stable-bit": true,
c313de
+        "hypervisor": true,
c313de
+        "socket-id": -1,
c313de
+        "pcommit": false,
c313de
+        "syscall": true,
c313de
+        "level": 13,
c313de
+        "avx512dq": false,
c313de
+        "svm": false,
c313de
+        "full-cpuid-auto-level": true,
c313de
+        "hv-reset": false,
c313de
+        "invtsc": false,
c313de
+        "sse3": true,
c313de
+        "sse2": true,
c313de
+        "ssbd": true,
c313de
+        "est": false,
c313de
+        "avx512ifma": false,
c313de
+        "tm2": false,
c313de
+        "kvm-pv-eoi": true,
c313de
+        "cx8": true,
c313de
+        "kvm_mmu": false,
c313de
+        "kvm-mmu": false,
c313de
+        "sse4_2": true,
c313de
+        "sse4.2": true,
c313de
+        "sse4-2": true,
c313de
+        "pge": true,
c313de
+        "fill-mtrr-mask": true,
c313de
+        "avx512bitalg": false,
c313de
+        "nodeid_msr": false,
c313de
+        "pdcm": false,
c313de
+        "movbe": true,
c313de
+        "model": 158,
c313de
+        "nrip_save": false,
c313de
+        "nrip-save": false,
c313de
+        "kvm_pv_unhalt": true,
c313de
+        "ssse3": true,
c313de
+        "sse4a": false,
c313de
+        "invpcid": true,
c313de
+        "pdpe1gb": true,
c313de
+        "tsc-deadline": true,
c313de
+        "fma": true,
c313de
+        "cx16": true,
c313de
+        "de": true,
c313de
+        "enforce": false,
c313de
+        "stepping": 10,
c313de
+        "xsave": true,
c313de
+        "clflush": true,
c313de
+        "skinit": false,
c313de
+        "tsc": true,
c313de
+        "tce": false,
c313de
+        "fpu": true,
c313de
+        "ibs": false,
c313de
+        "ds_cpl": false,
c313de
+        "ds-cpl": false,
c313de
+        "host-phys-bits": true,
c313de
+        "fma4": false,
c313de
+        "la57": false,
c313de
+        "osvw": false,
c313de
+        "check": true,
c313de
+        "hv-spinlocks": -1,
c313de
+        "pmu": false,
c313de
+        "pmm": false,
c313de
+        "apic": true,
c313de
+        "spec-ctrl": true,
c313de
+        "min-xlevel2": 0,
c313de
+        "tsc-adjust": true,
c313de
+        "tsc_adjust": true,
c313de
+        "kvm-steal-time": true,
c313de
+        "kvm_steal_time": true,
c313de
+        "kvmclock": true,
c313de
+        "l3-cache": true,
c313de
+        "lwp": false,
c313de
+        "ibpb": false,
c313de
+        "xop": false,
c313de
+        "avx": true,
c313de
+        "ospke": false,
c313de
+        "ace2": false,
c313de
+        "avx512bw": false,
c313de
+        "acpi": false,
c313de
+        "hv-vapic": false,
c313de
+        "fsgsbase": true,
c313de
+        "ht": false,
c313de
+        "nx": true,
c313de
+        "pclmulqdq": true,
c313de
+        "mmxext": false,
c313de
+        "vaes": false,
c313de
+        "popcnt": true,
c313de
+        "xsaves": true,
c313de
+        "tcg-cpuid": true,
c313de
+        "lm": true,
c313de
+        "umip": true,
c313de
+        "pse": true,
c313de
+        "avx2": true,
c313de
+        "sep": true,
c313de
+        "pclmuldq": true,
c313de
+        "virt-ssbd": false,
c313de
+        "x-hv-max-vps": -1,
c313de
+        "nodeid-msr": false,
c313de
+        "kvm": true,
c313de
+        "misalignsse": false,
c313de
+        "min-xlevel": 2147483656,
c313de
+        "kvm-pv-unhalt": true,
c313de
+        "bmi2": true,
c313de
+        "bmi1": true,
c313de
+        "realized": false,
c313de
+        "tsc_scale": false,
c313de
+        "tsc-scale": false,
c313de
+        "topoext": false,
c313de
+        "hv-vpindex": false,
c313de
+        "xlevel2": 0,
c313de
+        "clflushopt": true,
c313de
+        "kvm-no-smi-migration": false,
c313de
+        "monitor": false,
c313de
+        "avx512er": false,
c313de
+        "pmm-en": false,
c313de
+        "pcid": true,
c313de
+        "3dnow": false,
c313de
+        "erms": true,
c313de
+        "lahf-lm": true,
c313de
+        "lahf_lm": true,
c313de
+        "vpclmulqdq": false,
c313de
+        "fxsr-opt": false,
c313de
+        "hv-synic": false,
c313de
+        "xstore": false,
c313de
+        "fxsr_opt": false,
c313de
+        "kvm-hint-dedicated": false,
c313de
+        "rtm": true,
c313de
+        "lmce": true,
c313de
+        "hv-time": false,
c313de
+        "perfctr-nb": false,
c313de
+        "perfctr_nb": false,
c313de
+        "ffxsr": false,
c313de
+        "rdrand": true,
c313de
+        "rdseed": true,
c313de
+        "avx512-4vnniw": false,
c313de
+        "vmx": false,
c313de
+        "vme": true,
c313de
+        "dtes64": false,
c313de
+        "mtrr": true,
c313de
+        "rdtscp": true,
c313de
+        "pse36": true,
c313de
+        "kvm-pv-tlb-flush": true,
c313de
+        "tbm": false,
c313de
+        "wdt": false,
c313de
+        "pause_filter": false,
c313de
+        "sha-ni": false,
c313de
+        "model-id": "Intel(R) Core(TM) i7-8700 CPU @ 3.20GHz",
c313de
+        "abm": true,
c313de
+        "avx512pf": false,
c313de
+        "xstore-en": false
c313de
+      }
c313de
+    }
c313de
+  },
c313de
+  "id": "model-expansion"
c313de
+}
c313de
+
c313de
+{
c313de
+  "return": [
c313de
+    {
c313de
+      "name": "max",
c313de
+      "typename": "max-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": false,
c313de
+      "migration-safe": false
c313de
+    },
c313de
+    {
c313de
+      "name": "host",
c313de
+      "typename": "host-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": false,
c313de
+      "migration-safe": false
c313de
+    },
c313de
+    {
c313de
+      "name": "base",
c313de
+      "typename": "base-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": true,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "qemu64",
c313de
+      "typename": "qemu64-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "qemu32",
c313de
+      "typename": "qemu32-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "phenom",
c313de
+      "typename": "phenom-x86_64-cpu",
c313de
+      "unavailable-features": [
c313de
+        "mmxext",
c313de
+        "fxsr-opt",
c313de
+        "3dnowext",
c313de
+        "3dnow",
c313de
+        "sse4a",
c313de
+        "npt"
c313de
+      ],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "pentium3",
c313de
+      "typename": "pentium3-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "pentium2",
c313de
+      "typename": "pentium2-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "pentium",
c313de
+      "typename": "pentium-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "n270",
c313de
+      "typename": "n270-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "kvm64",
c313de
+      "typename": "kvm64-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "kvm32",
c313de
+      "typename": "kvm32-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "cpu64-rhel6",
c313de
+      "typename": "cpu64-rhel6-x86_64-cpu",
c313de
+      "unavailable-features": [
c313de
+        "sse4a"
c313de
+      ],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "coreduo",
c313de
+      "typename": "coreduo-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "core2duo",
c313de
+      "typename": "core2duo-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "athlon",
c313de
+      "typename": "athlon-x86_64-cpu",
c313de
+      "unavailable-features": [
c313de
+        "mmxext",
c313de
+        "3dnowext",
c313de
+        "3dnow"
c313de
+      ],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "Westmere",
c313de
+      "typename": "Westmere-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "Westmere-IBRS",
c313de
+      "typename": "Westmere-IBRS-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "Skylake-Server",
c313de
+      "typename": "Skylake-Server-x86_64-cpu",
c313de
+      "unavailable-features": [
c313de
+        "avx512f",
c313de
+        "avx512dq",
c313de
+        "clwb",
c313de
+        "avx512cd",
c313de
+        "avx512bw",
c313de
+        "avx512vl",
c313de
+        "avx512f",
c313de
+        "avx512f",
c313de
+        "avx512f"
c313de
+      ],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "Skylake-Server-IBRS",
c313de
+      "typename": "Skylake-Server-IBRS-x86_64-cpu",
c313de
+      "unavailable-features": [
c313de
+        "avx512f",
c313de
+        "avx512dq",
c313de
+        "clwb",
c313de
+        "avx512cd",
c313de
+        "avx512bw",
c313de
+        "avx512vl",
c313de
+        "avx512f",
c313de
+        "avx512f",
c313de
+        "avx512f"
c313de
+      ],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "Skylake-Client",
c313de
+      "typename": "Skylake-Client-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "Skylake-Client-IBRS",
c313de
+      "typename": "Skylake-Client-IBRS-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "SandyBridge",
c313de
+      "typename": "SandyBridge-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "SandyBridge-IBRS",
c313de
+      "typename": "SandyBridge-IBRS-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "Penryn",
c313de
+      "typename": "Penryn-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "Opteron_G5",
c313de
+      "typename": "Opteron_G5-x86_64-cpu",
c313de
+      "unavailable-features": [
c313de
+        "sse4a",
c313de
+        "misalignsse",
c313de
+        "xop",
c313de
+        "fma4",
c313de
+        "tbm"
c313de
+      ],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "Opteron_G4",
c313de
+      "typename": "Opteron_G4-x86_64-cpu",
c313de
+      "unavailable-features": [
c313de
+        "sse4a",
c313de
+        "misalignsse",
c313de
+        "xop",
c313de
+        "fma4"
c313de
+      ],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "Opteron_G3",
c313de
+      "typename": "Opteron_G3-x86_64-cpu",
c313de
+      "unavailable-features": [
c313de
+        "sse4a",
c313de
+        "misalignsse"
c313de
+      ],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "Opteron_G2",
c313de
+      "typename": "Opteron_G2-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "Opteron_G1",
c313de
+      "typename": "Opteron_G1-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "Nehalem",
c313de
+      "typename": "Nehalem-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "Nehalem-IBRS",
c313de
+      "typename": "Nehalem-IBRS-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "IvyBridge",
c313de
+      "typename": "IvyBridge-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "IvyBridge-IBRS",
c313de
+      "typename": "IvyBridge-IBRS-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "Haswell",
c313de
+      "typename": "Haswell-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "Haswell-noTSX",
c313de
+      "typename": "Haswell-noTSX-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "Haswell-noTSX-IBRS",
c313de
+      "typename": "Haswell-noTSX-IBRS-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "Haswell-IBRS",
c313de
+      "typename": "Haswell-IBRS-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "EPYC",
c313de
+      "typename": "EPYC-x86_64-cpu",
c313de
+      "unavailable-features": [
c313de
+        "sha-ni",
c313de
+        "mmxext",
c313de
+        "fxsr-opt",
c313de
+        "cr8legacy",
c313de
+        "sse4a",
c313de
+        "misalignsse",
c313de
+        "osvw"
c313de
+      ],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "EPYC-IBPB",
c313de
+      "typename": "EPYC-IBPB-x86_64-cpu",
c313de
+      "unavailable-features": [
c313de
+        "sha-ni",
c313de
+        "mmxext",
c313de
+        "fxsr-opt",
c313de
+        "cr8legacy",
c313de
+        "sse4a",
c313de
+        "misalignsse",
c313de
+        "osvw",
c313de
+        "ibpb"
c313de
+      ],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "Conroe",
c313de
+      "typename": "Conroe-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "Broadwell",
c313de
+      "typename": "Broadwell-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "Broadwell-noTSX",
c313de
+      "typename": "Broadwell-noTSX-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "Broadwell-noTSX-IBRS",
c313de
+      "typename": "Broadwell-noTSX-IBRS-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "Broadwell-IBRS",
c313de
+      "typename": "Broadwell-IBRS-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    },
c313de
+    {
c313de
+      "name": "486",
c313de
+      "typename": "486-x86_64-cpu",
c313de
+      "unavailable-features": [],
c313de
+      "static": false,
c313de
+      "migration-safe": true
c313de
+    }
c313de
+  ],
c313de
+  "id": "definitions"
c313de
+}
c313de
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8700.xml
c313de
new file mode 100644
c313de
index 0000000000..03ba0a3925
c313de
--- /dev/null
c313de
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700.xml
c313de
@@ -0,0 +1,47 @@
c313de
+
c313de
+<cpudata arch='x86'>
c313de
+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x00000016' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
c313de
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000906ea' ebx='0x01100800' ecx='0x7ffafbff' edx='0xbfebfbff'/>
c313de
+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76036301' ebx='0x00f0b5ff' ecx='0x00000000' edx='0x00c30000'/>
c313de
+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
c313de
+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
c313de
+  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
c313de
+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x00c0003f' ecx='0x000003ff' edx='0x00000000'/>
c313de
+  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x03c0003f' ecx='0x00002fff' edx='0x00000006'/>
c313de
+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x11142120'/>
c313de
+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x000027f7' ebx='0x00000002' ecx='0x00000001' edx='0x00000000'/>
c313de
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x029c6fbf' ecx='0x40000000' edx='0x9c000000'/>
c313de
+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
c313de
+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
c313de
+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300404' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
c313de
+  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000001'/>
c313de
+  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x0000000c' ecx='0x00000201' edx='0x00000001'/>
c313de
+  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
c313de
+  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x0000001f' ebx='0x00000440' ecx='0x00000440' edx='0x00000000'/>
c313de
+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x000003c0' ecx='0x00000100' edx='0x00000000'/>
c313de
+  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
c313de
+  <cpuid eax_in='0x0000000d' ecx_in='0x03' eax='0x00000040' ebx='0x000003c0' ecx='0x00000000' edx='0x00000000'/>
c313de
+  <cpuid eax_in='0x0000000d' ecx_in='0x04' eax='0x00000040' ebx='0x00000400' ecx='0x00000000' edx='0x00000000'/>
c313de
+  <cpuid eax_in='0x0000000d' ecx_in='0x08' eax='0x00000080' ebx='0x00000000' ecx='0x00000001' edx='0x00000000'/>
c313de
+  <cpuid eax_in='0x0000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
c313de
+  <cpuid eax_in='0x0000000f' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
c313de
+  <cpuid eax_in='0x00000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
c313de
+  <cpuid eax_in='0x00000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
c313de
+  <cpuid eax_in='0x00000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
c313de
+  <cpuid eax_in='0x00000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
c313de
+  <cpuid eax_in='0x00000014' ecx_in='0x00' eax='0x00000001' ebx='0x0000000f' ecx='0x00000007' edx='0x00000000'/>
c313de
+  <cpuid eax_in='0x00000014' ecx_in='0x01' eax='0x02490002' ebx='0x003f3fff' ecx='0x00000000' edx='0x00000000'/>
c313de
+  <cpuid eax_in='0x00000015' ecx_in='0x00' eax='0x00000002' ebx='0x0000010a' ecx='0x00000000' edx='0x00000000'/>
c313de
+  <cpuid eax_in='0x00000016' ecx_in='0x00' eax='0x00000c80' ebx='0x000011f8' ecx='0x00000064' edx='0x00000000'/>
c313de
+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
c313de
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
c313de
+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x726f4320' edx='0x4d542865'/>
c313de
+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x37692029' ebx='0x3037382d' ecx='0x50432030' edx='0x20402055'/>
c313de
+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x30322e33' ebx='0x007a4847' ecx='0x00000000' edx='0x00000000'/>
c313de
+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
c313de
+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
c313de
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
c313de
+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003027' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
c313de
+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000c80' ebx='0x000011f8' ecx='0x00000064' edx='0x00000000'/>
c313de
+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000c80' ebx='0x000011f8' ecx='0x00000064' edx='0x00000000'/>
c313de
+</cpudata>
c313de
-- 
c313de
2.22.0
c313de