b971b8
From 6d67e39ed491074df0ff8829278d119f4cd7a77d Mon Sep 17 00:00:00 2001
b971b8
Message-Id: <6d67e39ed491074df0ff8829278d119f4cd7a77d@dist-git>
b971b8
From: Jiri Denemark <jdenemar@redhat.com>
b971b8
Date: Tue, 26 May 2020 10:59:36 +0200
b971b8
Subject: [PATCH] cputest: Add data for Intel(R) Xeon(R) Gold 6130 CPU
b971b8
MIME-Version: 1.0
b971b8
Content-Type: text/plain; charset=UTF-8
b971b8
Content-Transfer-Encoding: 8bit
b971b8
b971b8
Skylake-Server with family 6, model 85, stepping 4, which is currently
b971b8
mis-detected as Cascadelake-Server CPU model.
b971b8
b971b8
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
b971b8
Reviewed-by: Ján Tomko <jtomko@redhat.com>
b971b8
(cherry picked from commit 3714779b15e594a14de4e6fe49c2e3eafe39b161)
b971b8
b971b8
https://bugzilla.redhat.com/show_bug.cgi?id=1840010
b971b8
b971b8
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
b971b8
Message-Id: <b78268d7c67fc7fd7e8ff3e0a441c37d5d80f600.1590483392.git.jdenemar@redhat.com>
b971b8
Reviewed-by: Ján Tomko <jtomko@redhat.com>
b971b8
---
b971b8
 tests/cputest.c                               |    1 +
b971b8
 .../x86_64-cpuid-Xeon-Gold-6130-disabled.xml  |    7 +
b971b8
 .../x86_64-cpuid-Xeon-Gold-6130-enabled.xml   |    9 +
b971b8
 .../x86_64-cpuid-Xeon-Gold-6130-guest.xml     |   33 +
b971b8
 .../x86_64-cpuid-Xeon-Gold-6130-host.xml      |   35 +
b971b8
 .../x86_64-cpuid-Xeon-Gold-6130-json.xml      |   16 +
b971b8
 .../x86_64-cpuid-Xeon-Gold-6130.json          | 1201 +++++++++++++++++
b971b8
 .../x86_64-cpuid-Xeon-Gold-6130.sig           |    4 +
b971b8
 .../x86_64-cpuid-Xeon-Gold-6130.xml           |   54 +
b971b8
 9 files changed, 1360 insertions(+)
b971b8
 create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-disabled.xml
b971b8
 create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-enabled.xml
b971b8
 create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
b971b8
 create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
b971b8
 create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml
b971b8
 create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.json
b971b8
 create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.sig
b971b8
 create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.xml
b971b8
b971b8
diff --git a/tests/cputest.c b/tests/cputest.c
b971b8
index f9f1ca74ff..869d016ffc 100644
b971b8
--- a/tests/cputest.c
b971b8
+++ b/tests/cputest.c
b971b8
@@ -1265,6 +1265,7 @@ mymain(void)
b971b8
     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7-8890-v3", JSON_MODELS);
b971b8
     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7540", JSON_MODELS);
b971b8
     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-Gold-5115", JSON_MODELS);
b971b8
+    DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-Gold-6130", JSON_MODELS);
b971b8
     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-Gold-6148", JSON_HOST);
b971b8
     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-Platinum-8268", JSON_HOST);
b971b8
     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-Platinum-9242", JSON_MODELS);
b971b8
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-disabled.xml
b971b8
new file mode 100644
b971b8
index 0000000000..e7c59cef1e
b971b8
--- /dev/null
b971b8
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-disabled.xml
b971b8
@@ -0,0 +1,7 @@
b971b8
+
b971b8
+<cpudata arch='x86'>
b971b8
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0804c1dc' edx='0xb0600000'/>
b971b8
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001000' ecx='0x00000010' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
b971b8
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
b971b8
+</cpudata>
b971b8
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-enabled.xml
b971b8
new file mode 100644
b971b8
index 0000000000..8610577479
b971b8
--- /dev/null
b971b8
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-enabled.xml
b971b8
@@ -0,0 +1,9 @@
b971b8
+
b971b8
+<cpudata arch='x86'>
b971b8
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7fa3223' edx='0x0f8bfbff'/>
b971b8
+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0xd19f4fbb' ecx='0x0000000c' edx='0xac000400'/>
b971b8
+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
b971b8
+  <msr index='0x10a' edx='0x00000000' eax='0x00000008'/>
b971b8
+</cpudata>
b971b8
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
b971b8
new file mode 100644
b971b8
index 0000000000..cfb0eb982d
b971b8
--- /dev/null
b971b8
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
b971b8
@@ -0,0 +1,33 @@
b971b8
+<cpu mode='custom' match='exact'>
b971b8
+  <model fallback='forbid'>Cascadelake-Server</model>
b971b8
+  <vendor>Intel</vendor>
b971b8
+  <feature policy='require' name='ds'/>
b971b8
+  <feature policy='require' name='acpi'/>
b971b8
+  <feature policy='require' name='ss'/>
b971b8
+  <feature policy='require' name='ht'/>
b971b8
+  <feature policy='require' name='tm'/>
b971b8
+  <feature policy='require' name='pbe'/>
b971b8
+  <feature policy='require' name='dtes64'/>
b971b8
+  <feature policy='require' name='monitor'/>
b971b8
+  <feature policy='require' name='ds_cpl'/>
b971b8
+  <feature policy='require' name='vmx'/>
b971b8
+  <feature policy='require' name='smx'/>
b971b8
+  <feature policy='require' name='est'/>
b971b8
+  <feature policy='require' name='tm2'/>
b971b8
+  <feature policy='require' name='xtpr'/>
b971b8
+  <feature policy='require' name='pdcm'/>
b971b8
+  <feature policy='require' name='dca'/>
b971b8
+  <feature policy='require' name='osxsave'/>
b971b8
+  <feature policy='require' name='tsc_adjust'/>
b971b8
+  <feature policy='require' name='cmt'/>
b971b8
+  <feature policy='require' name='intel-pt'/>
b971b8
+  <feature policy='require' name='pku'/>
b971b8
+  <feature policy='require' name='ospke'/>
b971b8
+  <feature policy='require' name='md-clear'/>
b971b8
+  <feature policy='require' name='stibp'/>
b971b8
+  <feature policy='require' name='xsaves'/>
b971b8
+  <feature policy='require' name='mbm_total'/>
b971b8
+  <feature policy='require' name='mbm_local'/>
b971b8
+  <feature policy='require' name='invtsc'/>
b971b8
+  <feature policy='disable' name='avx512vnni'/>
b971b8
+</cpu>
b971b8
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
b971b8
new file mode 100644
b971b8
index 0000000000..207e9e0ee4
b971b8
--- /dev/null
b971b8
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
b971b8
@@ -0,0 +1,35 @@
b971b8
+<cpu>
b971b8
+  <arch>x86_64</arch>
b971b8
+  <model>Skylake-Server-IBRS</model>
b971b8
+  <vendor>Intel</vendor>
b971b8
+  <feature name='ds'/>
b971b8
+  <feature name='acpi'/>
b971b8
+  <feature name='ss'/>
b971b8
+  <feature name='ht'/>
b971b8
+  <feature name='tm'/>
b971b8
+  <feature name='pbe'/>
b971b8
+  <feature name='dtes64'/>
b971b8
+  <feature name='monitor'/>
b971b8
+  <feature name='ds_cpl'/>
b971b8
+  <feature name='vmx'/>
b971b8
+  <feature name='smx'/>
b971b8
+  <feature name='est'/>
b971b8
+  <feature name='tm2'/>
b971b8
+  <feature name='xtpr'/>
b971b8
+  <feature name='pdcm'/>
b971b8
+  <feature name='dca'/>
b971b8
+  <feature name='osxsave'/>
b971b8
+  <feature name='tsc_adjust'/>
b971b8
+  <feature name='cmt'/>
b971b8
+  <feature name='clflushopt'/>
b971b8
+  <feature name='intel-pt'/>
b971b8
+  <feature name='pku'/>
b971b8
+  <feature name='ospke'/>
b971b8
+  <feature name='md-clear'/>
b971b8
+  <feature name='stibp'/>
b971b8
+  <feature name='ssbd'/>
b971b8
+  <feature name='xsaves'/>
b971b8
+  <feature name='mbm_total'/>
b971b8
+  <feature name='mbm_local'/>
b971b8
+  <feature name='invtsc'/>
b971b8
+</cpu>
b971b8
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml
b971b8
new file mode 100644
b971b8
index 0000000000..968d904557
b971b8
--- /dev/null
b971b8
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml
b971b8
@@ -0,0 +1,16 @@
b971b8
+<cpu mode='custom' match='exact'>
b971b8
+  <model fallback='forbid'>Cascadelake-Server</model>
b971b8
+  <vendor>Intel</vendor>
b971b8
+  <feature policy='require' name='ss'/>
b971b8
+  <feature policy='require' name='vmx'/>
b971b8
+  <feature policy='require' name='hypervisor'/>
b971b8
+  <feature policy='require' name='tsc_adjust'/>
b971b8
+  <feature policy='require' name='umip'/>
b971b8
+  <feature policy='require' name='pku'/>
b971b8
+  <feature policy='require' name='md-clear'/>
b971b8
+  <feature policy='require' name='stibp'/>
b971b8
+  <feature policy='require' name='arch-capabilities'/>
b971b8
+  <feature policy='require' name='xsaves'/>
b971b8
+  <feature policy='require' name='skip-l1dfl-vmentry'/>
b971b8
+  <feature policy='disable' name='avx512vnni'/>
b971b8
+</cpu>
b971b8
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.json b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.json
b971b8
new file mode 100644
b971b8
index 0000000000..1a22387617
b971b8
--- /dev/null
b971b8
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.json
b971b8
@@ -0,0 +1,1201 @@
b971b8
+{
b971b8
+  "return": {
b971b8
+    "model": {
b971b8
+      "name": "base",
b971b8
+      "props": {
b971b8
+        "phys-bits": 0,
b971b8
+        "core-id": -1,
b971b8
+        "xlevel": 2147483656,
b971b8
+        "cmov": true,
b971b8
+        "ia64": false,
b971b8
+        "ssb-no": false,
b971b8
+        "aes": true,
b971b8
+        "mmx": true,
b971b8
+        "rdpid": false,
b971b8
+        "arat": true,
b971b8
+        "gfni": false,
b971b8
+        "ibrs-all": false,
b971b8
+        "pause-filter": false,
b971b8
+        "xsavec": true,
b971b8
+        "intel-pt": false,
b971b8
+        "hv-frequencies": false,
b971b8
+        "tsc-frequency": 0,
b971b8
+        "xd": true,
b971b8
+        "x-intel-pt-auto-level": false,
b971b8
+        "hv-vendor-id": "",
b971b8
+        "kvm-asyncpf": true,
b971b8
+        "kvm_asyncpf": true,
b971b8
+        "perfctr_core": false,
b971b8
+        "perfctr-core": false,
b971b8
+        "mpx": true,
b971b8
+        "pbe": false,
b971b8
+        "decodeassists": false,
b971b8
+        "avx512cd": true,
b971b8
+        "sse4_1": true,
b971b8
+        "sse4.1": true,
b971b8
+        "sse4-1": true,
b971b8
+        "family": 6,
b971b8
+        "legacy-cache": true,
b971b8
+        "host-phys-bits-limit": 48,
b971b8
+        "vmware-cpuid-freq": true,
b971b8
+        "wbnoinvd": false,
b971b8
+        "avx512f": true,
b971b8
+        "hv-stimer-direct": false,
b971b8
+        "msr": true,
b971b8
+        "mce": true,
b971b8
+        "mca": true,
b971b8
+        "hv-runtime": false,
b971b8
+        "xcrypt": false,
b971b8
+        "thread-id": -1,
b971b8
+        "min-level": 13,
b971b8
+        "xgetbv1": true,
b971b8
+        "cid": false,
b971b8
+        "hv-relaxed": false,
b971b8
+        "hv-crash": false,
b971b8
+        "ds": false,
b971b8
+        "fxsr": true,
b971b8
+        "xsaveopt": true,
b971b8
+        "xtpr": false,
b971b8
+        "hv-evmcs": false,
b971b8
+        "avx512vl": true,
b971b8
+        "avx512-vpopcntdq": false,
b971b8
+        "phe": false,
b971b8
+        "extapic": false,
b971b8
+        "3dnowprefetch": true,
b971b8
+        "avx512vbmi2": false,
b971b8
+        "cr8legacy": false,
b971b8
+        "stibp": true,
b971b8
+        "cpuid-0xb": true,
b971b8
+        "xcrypt-en": false,
b971b8
+        "kvm_pv_eoi": true,
b971b8
+        "apic-id": 4294967295,
b971b8
+        "rsba": false,
b971b8
+        "pn": false,
b971b8
+        "dca": false,
b971b8
+        "vendor": "GenuineIntel",
b971b8
+        "hv-ipi": false,
b971b8
+        "pku": true,
b971b8
+        "smx": false,
b971b8
+        "cmp_legacy": false,
b971b8
+        "cmp-legacy": false,
b971b8
+        "node-id": -1,
b971b8
+        "avx512-4fmaps": false,
b971b8
+        "vmcb_clean": false,
b971b8
+        "vmcb-clean": false,
b971b8
+        "3dnowext": false,
b971b8
+        "amd-no-ssb": false,
b971b8
+        "hle": true,
b971b8
+        "npt": false,
b971b8
+        "rdctl-no": false,
b971b8
+        "memory": "/machine/unattached/system[0]",
b971b8
+        "clwb": true,
b971b8
+        "lbrv": false,
b971b8
+        "adx": true,
b971b8
+        "ss": true,
b971b8
+        "pni": true,
b971b8
+        "svm_lock": false,
b971b8
+        "svm-lock": false,
b971b8
+        "pfthreshold": false,
b971b8
+        "smep": true,
b971b8
+        "smap": true,
b971b8
+        "x2apic": true,
b971b8
+        "avx512vbmi": false,
b971b8
+        "avx512vnni": false,
b971b8
+        "hv-stimer": false,
b971b8
+        "x-hv-synic-kvm-only": true,
b971b8
+        "i64": true,
b971b8
+        "flushbyasid": false,
b971b8
+        "f16c": true,
b971b8
+        "ace2-en": false,
b971b8
+        "pat": true,
b971b8
+        "pae": true,
b971b8
+        "sse": true,
b971b8
+        "die-id": -1,
b971b8
+        "phe-en": false,
b971b8
+        "kvm_nopiodelay": true,
b971b8
+        "kvm-nopiodelay": true,
b971b8
+        "tm": false,
b971b8
+        "kvmclock-stable-bit": true,
b971b8
+        "hypervisor": true,
b971b8
+        "socket-id": -1,
b971b8
+        "mds-no": false,
b971b8
+        "pcommit": false,
b971b8
+        "syscall": true,
b971b8
+        "level": 13,
b971b8
+        "avx512dq": true,
b971b8
+        "x-migrate-smi-count": false,
b971b8
+        "svm": false,
b971b8
+        "full-cpuid-auto-level": true,
b971b8
+        "hv-reset": false,
b971b8
+        "invtsc": false,
b971b8
+        "sse3": true,
b971b8
+        "sse2": true,
b971b8
+        "ssbd": true,
b971b8
+        "est": false,
b971b8
+        "avx512ifma": false,
b971b8
+        "tm2": false,
b971b8
+        "kvm-pv-ipi": true,
b971b8
+        "kvm-pv-eoi": true,
b971b8
+        "cx8": true,
b971b8
+        "cldemote": false,
b971b8
+        "hv-reenlightenment": false,
b971b8
+        "kvm_mmu": false,
b971b8
+        "kvm-mmu": false,
b971b8
+        "sse4_2": true,
b971b8
+        "sse4.2": true,
b971b8
+        "sse4-2": true,
b971b8
+        "pge": true,
b971b8
+        "fill-mtrr-mask": true,
b971b8
+        "avx512bitalg": false,
b971b8
+        "nodeid_msr": false,
b971b8
+        "pdcm": false,
b971b8
+        "movbe": true,
b971b8
+        "model": 85,
b971b8
+        "nrip_save": false,
b971b8
+        "nrip-save": false,
b971b8
+        "kvm_pv_unhalt": true,
b971b8
+        "ssse3": true,
b971b8
+        "sse4a": false,
b971b8
+        "invpcid": true,
b971b8
+        "pdpe1gb": true,
b971b8
+        "tsc-deadline": true,
b971b8
+        "skip-l1dfl-vmentry": true,
b971b8
+        "fma": true,
b971b8
+        "cx16": true,
b971b8
+        "de": true,
b971b8
+        "enforce": false,
b971b8
+        "stepping": 4,
b971b8
+        "xsave": true,
b971b8
+        "clflush": true,
b971b8
+        "skinit": false,
b971b8
+        "tsc": true,
b971b8
+        "tce": false,
b971b8
+        "fpu": true,
b971b8
+        "ibs": false,
b971b8
+        "ds_cpl": false,
b971b8
+        "ds-cpl": false,
b971b8
+        "host-phys-bits": true,
b971b8
+        "fma4": false,
b971b8
+        "la57": false,
b971b8
+        "osvw": false,
b971b8
+        "check": true,
b971b8
+        "hv-spinlocks": 4294967295,
b971b8
+        "pmu": false,
b971b8
+        "pmm": false,
b971b8
+        "apic": true,
b971b8
+        "spec-ctrl": true,
b971b8
+        "min-xlevel2": 0,
b971b8
+        "tsc-adjust": true,
b971b8
+        "tsc_adjust": true,
b971b8
+        "kvm-steal-time": true,
b971b8
+        "kvm_steal_time": true,
b971b8
+        "kvmclock": true,
b971b8
+        "l3-cache": true,
b971b8
+        "lwp": false,
b971b8
+        "hv-passthrough": false,
b971b8
+        "amd-ssbd": false,
b971b8
+        "ibpb": false,
b971b8
+        "xop": false,
b971b8
+        "avx": true,
b971b8
+        "core-capability": false,
b971b8
+        "movdiri": false,
b971b8
+        "ace2": false,
b971b8
+        "avx512bw": true,
b971b8
+        "acpi": false,
b971b8
+        "hv-vapic": false,
b971b8
+        "fsgsbase": true,
b971b8
+        "ht": false,
b971b8
+        "nx": true,
b971b8
+        "pclmulqdq": true,
b971b8
+        "mmxext": false,
b971b8
+        "vaes": false,
b971b8
+        "popcnt": true,
b971b8
+        "xsaves": true,
b971b8
+        "movdir64b": false,
b971b8
+        "tcg-cpuid": true,
b971b8
+        "lm": true,
b971b8
+        "umip": true,
b971b8
+        "pse": true,
b971b8
+        "avx2": true,
b971b8
+        "sep": true,
b971b8
+        "pclmuldq": true,
b971b8
+        "virt-ssbd": false,
b971b8
+        "x-hv-max-vps": -1,
b971b8
+        "nodeid-msr": false,
b971b8
+        "md-clear": true,
b971b8
+        "split-lock-detect": false,
b971b8
+        "kvm": true,
b971b8
+        "misalignsse": false,
b971b8
+        "min-xlevel": 2147483656,
b971b8
+        "kvm-pv-unhalt": true,
b971b8
+        "bmi2": true,
b971b8
+        "bmi1": true,
b971b8
+        "realized": false,
b971b8
+        "tsc_scale": false,
b971b8
+        "tsc-scale": false,
b971b8
+        "topoext": false,
b971b8
+        "hv-vpindex": false,
b971b8
+        "xlevel2": 0,
b971b8
+        "clflushopt": true,
b971b8
+        "kvm-no-smi-migration": false,
b971b8
+        "monitor": false,
b971b8
+        "avx512er": false,
b971b8
+        "pmm-en": false,
b971b8
+        "pcid": true,
b971b8
+        "arch-capabilities": true,
b971b8
+        "3dnow": false,
b971b8
+        "erms": true,
b971b8
+        "x-force-features": false,
b971b8
+        "lahf-lm": true,
b971b8
+        "lahf_lm": true,
b971b8
+        "vpclmulqdq": false,
b971b8
+        "fxsr-opt": false,
b971b8
+        "hv-synic": false,
b971b8
+        "xstore": false,
b971b8
+        "fxsr_opt": false,
b971b8
+        "kvm-hint-dedicated": false,
b971b8
+        "rtm": true,
b971b8
+        "lmce": true,
b971b8
+        "hv-time": false,
b971b8
+        "perfctr-nb": false,
b971b8
+        "perfctr_nb": false,
b971b8
+        "ffxsr": false,
b971b8
+        "hv-tlbflush": false,
b971b8
+        "rdrand": true,
b971b8
+        "rdseed": true,
b971b8
+        "avx512-4vnniw": false,
b971b8
+        "vmx": true,
b971b8
+        "vme": true,
b971b8
+        "dtes64": false,
b971b8
+        "mtrr": true,
b971b8
+        "rdtscp": true,
b971b8
+        "pse36": true,
b971b8
+        "kvm-pv-tlb-flush": true,
b971b8
+        "tbm": false,
b971b8
+        "wdt": false,
b971b8
+        "pause_filter": false,
b971b8
+        "sha-ni": false,
b971b8
+        "model-id": "Intel(R) Xeon(R) Gold 6130 CPU @ 2.10GHz",
b971b8
+        "abm": true,
b971b8
+        "avx512pf": false,
b971b8
+        "xstore-en": false
b971b8
+      }
b971b8
+    }
b971b8
+  },
b971b8
+  "id": "model-expansion"
b971b8
+}
b971b8
+
b971b8
+{
b971b8
+  "return": [
b971b8
+    {
b971b8
+      "name": "max",
b971b8
+      "typename": "max-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": false
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "host",
b971b8
+      "typename": "host-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": false
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "base",
b971b8
+      "typename": "base-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": true,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "qemu64-v1",
b971b8
+      "typename": "qemu64-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "qemu64",
b971b8
+      "typename": "qemu64-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "qemu32-v1",
b971b8
+      "typename": "qemu32-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "qemu32",
b971b8
+      "typename": "qemu32-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "phenom-v1",
b971b8
+      "typename": "phenom-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [
b971b8
+        "mmxext",
b971b8
+        "fxsr-opt",
b971b8
+        "3dnowext",
b971b8
+        "3dnow",
b971b8
+        "sse4a",
b971b8
+        "npt"
b971b8
+      ],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "phenom",
b971b8
+      "typename": "phenom-x86_64-cpu",
b971b8
+      "unavailable-features": [
b971b8
+        "mmxext",
b971b8
+        "fxsr-opt",
b971b8
+        "3dnowext",
b971b8
+        "3dnow",
b971b8
+        "sse4a",
b971b8
+        "npt"
b971b8
+      ],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "pentium3-v1",
b971b8
+      "typename": "pentium3-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "pentium3",
b971b8
+      "typename": "pentium3-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "pentium2-v1",
b971b8
+      "typename": "pentium2-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "pentium2",
b971b8
+      "typename": "pentium2-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "pentium-v1",
b971b8
+      "typename": "pentium-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "pentium",
b971b8
+      "typename": "pentium-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "n270-v1",
b971b8
+      "typename": "n270-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "n270",
b971b8
+      "typename": "n270-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "kvm64-v1",
b971b8
+      "typename": "kvm64-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "kvm64",
b971b8
+      "typename": "kvm64-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "kvm32-v1",
b971b8
+      "typename": "kvm32-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "kvm32",
b971b8
+      "typename": "kvm32-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "cpu64-rhel6-v1",
b971b8
+      "typename": "cpu64-rhel6-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [
b971b8
+        "sse4a"
b971b8
+      ],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "cpu64-rhel6",
b971b8
+      "typename": "cpu64-rhel6-x86_64-cpu",
b971b8
+      "unavailable-features": [
b971b8
+        "sse4a"
b971b8
+      ],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "coreduo-v1",
b971b8
+      "typename": "coreduo-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "coreduo",
b971b8
+      "typename": "coreduo-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "core2duo-v1",
b971b8
+      "typename": "core2duo-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "core2duo",
b971b8
+      "typename": "core2duo-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "athlon-v1",
b971b8
+      "typename": "athlon-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [
b971b8
+        "mmxext",
b971b8
+        "3dnowext",
b971b8
+        "3dnow"
b971b8
+      ],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "athlon",
b971b8
+      "typename": "athlon-x86_64-cpu",
b971b8
+      "unavailable-features": [
b971b8
+        "mmxext",
b971b8
+        "3dnowext",
b971b8
+        "3dnow"
b971b8
+      ],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Westmere-v2",
b971b8
+      "typename": "Westmere-v2-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Westmere-v1",
b971b8
+      "typename": "Westmere-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Westmere-IBRS",
b971b8
+      "typename": "Westmere-IBRS-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Westmere",
b971b8
+      "typename": "Westmere-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Snowridge-v1",
b971b8
+      "typename": "Snowridge-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [
b971b8
+        "sha-ni",
b971b8
+        "gfni",
b971b8
+        "cldemote",
b971b8
+        "movdiri",
b971b8
+        "movdir64b",
b971b8
+        "core-capability",
b971b8
+        "split-lock-detect"
b971b8
+      ],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Snowridge",
b971b8
+      "typename": "Snowridge-x86_64-cpu",
b971b8
+      "unavailable-features": [
b971b8
+        "sha-ni",
b971b8
+        "gfni",
b971b8
+        "cldemote",
b971b8
+        "movdiri",
b971b8
+        "movdir64b",
b971b8
+        "core-capability",
b971b8
+        "split-lock-detect"
b971b8
+      ],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Skylake-Server-v2",
b971b8
+      "typename": "Skylake-Server-v2-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Skylake-Server-v1",
b971b8
+      "typename": "Skylake-Server-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Skylake-Server-IBRS",
b971b8
+      "typename": "Skylake-Server-IBRS-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Skylake-Server",
b971b8
+      "typename": "Skylake-Server-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Skylake-Client-v2",
b971b8
+      "typename": "Skylake-Client-v2-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Skylake-Client-v1",
b971b8
+      "typename": "Skylake-Client-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Skylake-Client-IBRS",
b971b8
+      "typename": "Skylake-Client-IBRS-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Skylake-Client",
b971b8
+      "typename": "Skylake-Client-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "SandyBridge-v2",
b971b8
+      "typename": "SandyBridge-v2-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "SandyBridge-v1",
b971b8
+      "typename": "SandyBridge-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "SandyBridge-IBRS",
b971b8
+      "typename": "SandyBridge-IBRS-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "SandyBridge",
b971b8
+      "typename": "SandyBridge-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Penryn-v1",
b971b8
+      "typename": "Penryn-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Penryn",
b971b8
+      "typename": "Penryn-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Opteron_G5-v1",
b971b8
+      "typename": "Opteron_G5-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [
b971b8
+        "sse4a",
b971b8
+        "misalignsse",
b971b8
+        "xop",
b971b8
+        "fma4",
b971b8
+        "tbm",
b971b8
+        "npt",
b971b8
+        "nrip-save"
b971b8
+      ],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Opteron_G5",
b971b8
+      "typename": "Opteron_G5-x86_64-cpu",
b971b8
+      "unavailable-features": [
b971b8
+        "sse4a",
b971b8
+        "misalignsse",
b971b8
+        "xop",
b971b8
+        "fma4",
b971b8
+        "tbm"
b971b8
+      ],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Opteron_G4-v1",
b971b8
+      "typename": "Opteron_G4-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [
b971b8
+        "sse4a",
b971b8
+        "misalignsse",
b971b8
+        "xop",
b971b8
+        "fma4",
b971b8
+        "npt",
b971b8
+        "nrip-save"
b971b8
+      ],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Opteron_G4",
b971b8
+      "typename": "Opteron_G4-x86_64-cpu",
b971b8
+      "unavailable-features": [
b971b8
+        "sse4a",
b971b8
+        "misalignsse",
b971b8
+        "xop",
b971b8
+        "fma4"
b971b8
+      ],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Opteron_G3-v1",
b971b8
+      "typename": "Opteron_G3-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [
b971b8
+        "sse4a",
b971b8
+        "misalignsse"
b971b8
+      ],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Opteron_G3",
b971b8
+      "typename": "Opteron_G3-x86_64-cpu",
b971b8
+      "unavailable-features": [
b971b8
+        "sse4a",
b971b8
+        "misalignsse"
b971b8
+      ],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Opteron_G2-v1",
b971b8
+      "typename": "Opteron_G2-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Opteron_G2",
b971b8
+      "typename": "Opteron_G2-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Opteron_G1-v1",
b971b8
+      "typename": "Opteron_G1-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Opteron_G1",
b971b8
+      "typename": "Opteron_G1-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Nehalem-v2",
b971b8
+      "typename": "Nehalem-v2-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Nehalem-v1",
b971b8
+      "typename": "Nehalem-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Nehalem-IBRS",
b971b8
+      "typename": "Nehalem-IBRS-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Nehalem",
b971b8
+      "typename": "Nehalem-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "KnightsMill-v1",
b971b8
+      "typename": "KnightsMill-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [
b971b8
+        "avx512pf",
b971b8
+        "avx512er",
b971b8
+        "avx512-vpopcntdq",
b971b8
+        "avx512-4vnniw",
b971b8
+        "avx512-4fmaps"
b971b8
+      ],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "KnightsMill",
b971b8
+      "typename": "KnightsMill-x86_64-cpu",
b971b8
+      "unavailable-features": [
b971b8
+        "avx512pf",
b971b8
+        "avx512er",
b971b8
+        "avx512-vpopcntdq",
b971b8
+        "avx512-4vnniw",
b971b8
+        "avx512-4fmaps"
b971b8
+      ],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "IvyBridge-v2",
b971b8
+      "typename": "IvyBridge-v2-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "IvyBridge-v1",
b971b8
+      "typename": "IvyBridge-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "IvyBridge-IBRS",
b971b8
+      "typename": "IvyBridge-IBRS-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "IvyBridge",
b971b8
+      "typename": "IvyBridge-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Icelake-Server-v1",
b971b8
+      "typename": "Icelake-Server-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [
b971b8
+        "avx512vbmi",
b971b8
+        "avx512vbmi2",
b971b8
+        "gfni",
b971b8
+        "vaes",
b971b8
+        "vpclmulqdq",
b971b8
+        "avx512vnni",
b971b8
+        "avx512bitalg",
b971b8
+        "avx512-vpopcntdq",
b971b8
+        "la57",
b971b8
+        "wbnoinvd"
b971b8
+      ],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Icelake-Server",
b971b8
+      "typename": "Icelake-Server-x86_64-cpu",
b971b8
+      "unavailable-features": [
b971b8
+        "avx512vbmi",
b971b8
+        "avx512vbmi2",
b971b8
+        "gfni",
b971b8
+        "vaes",
b971b8
+        "vpclmulqdq",
b971b8
+        "avx512vnni",
b971b8
+        "avx512bitalg",
b971b8
+        "avx512-vpopcntdq",
b971b8
+        "la57",
b971b8
+        "wbnoinvd"
b971b8
+      ],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Icelake-Client-v1",
b971b8
+      "typename": "Icelake-Client-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [
b971b8
+        "avx512vbmi",
b971b8
+        "avx512vbmi2",
b971b8
+        "gfni",
b971b8
+        "vaes",
b971b8
+        "vpclmulqdq",
b971b8
+        "avx512vnni",
b971b8
+        "avx512bitalg",
b971b8
+        "avx512-vpopcntdq",
b971b8
+        "wbnoinvd"
b971b8
+      ],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Icelake-Client",
b971b8
+      "typename": "Icelake-Client-x86_64-cpu",
b971b8
+      "unavailable-features": [
b971b8
+        "avx512vbmi",
b971b8
+        "avx512vbmi2",
b971b8
+        "gfni",
b971b8
+        "vaes",
b971b8
+        "vpclmulqdq",
b971b8
+        "avx512vnni",
b971b8
+        "avx512bitalg",
b971b8
+        "avx512-vpopcntdq",
b971b8
+        "wbnoinvd"
b971b8
+      ],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Haswell-v4",
b971b8
+      "typename": "Haswell-v4-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Haswell-v3",
b971b8
+      "typename": "Haswell-v3-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Haswell-v2",
b971b8
+      "typename": "Haswell-v2-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Haswell-v1",
b971b8
+      "typename": "Haswell-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Haswell-noTSX-IBRS",
b971b8
+      "typename": "Haswell-noTSX-IBRS-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Haswell-noTSX",
b971b8
+      "typename": "Haswell-noTSX-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Haswell-IBRS",
b971b8
+      "typename": "Haswell-IBRS-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Haswell",
b971b8
+      "typename": "Haswell-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "EPYC-v2",
b971b8
+      "typename": "EPYC-v2-x86_64-cpu",
b971b8
+      "unavailable-features": [
b971b8
+        "sha-ni",
b971b8
+        "mmxext",
b971b8
+        "fxsr-opt",
b971b8
+        "cr8legacy",
b971b8
+        "sse4a",
b971b8
+        "misalignsse",
b971b8
+        "osvw",
b971b8
+        "ibpb",
b971b8
+        "npt",
b971b8
+        "nrip-save"
b971b8
+      ],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "EPYC-v1",
b971b8
+      "typename": "EPYC-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [
b971b8
+        "sha-ni",
b971b8
+        "mmxext",
b971b8
+        "fxsr-opt",
b971b8
+        "cr8legacy",
b971b8
+        "sse4a",
b971b8
+        "misalignsse",
b971b8
+        "osvw",
b971b8
+        "npt",
b971b8
+        "nrip-save"
b971b8
+      ],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "EPYC-IBPB",
b971b8
+      "typename": "EPYC-IBPB-x86_64-cpu",
b971b8
+      "unavailable-features": [
b971b8
+        "sha-ni",
b971b8
+        "mmxext",
b971b8
+        "fxsr-opt",
b971b8
+        "cr8legacy",
b971b8
+        "sse4a",
b971b8
+        "misalignsse",
b971b8
+        "osvw",
b971b8
+        "ibpb"
b971b8
+      ],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "EPYC",
b971b8
+      "typename": "EPYC-x86_64-cpu",
b971b8
+      "unavailable-features": [
b971b8
+        "sha-ni",
b971b8
+        "mmxext",
b971b8
+        "fxsr-opt",
b971b8
+        "cr8legacy",
b971b8
+        "sse4a",
b971b8
+        "misalignsse",
b971b8
+        "osvw"
b971b8
+      ],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Dhyana-v1",
b971b8
+      "typename": "Dhyana-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [
b971b8
+        "mmxext",
b971b8
+        "fxsr-opt",
b971b8
+        "cr8legacy",
b971b8
+        "sse4a",
b971b8
+        "misalignsse",
b971b8
+        "osvw",
b971b8
+        "ibpb",
b971b8
+        "npt",
b971b8
+        "nrip-save"
b971b8
+      ],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Dhyana",
b971b8
+      "typename": "Dhyana-x86_64-cpu",
b971b8
+      "unavailable-features": [
b971b8
+        "mmxext",
b971b8
+        "fxsr-opt",
b971b8
+        "cr8legacy",
b971b8
+        "sse4a",
b971b8
+        "misalignsse",
b971b8
+        "osvw",
b971b8
+        "ibpb",
b971b8
+        "npt",
b971b8
+        "nrip-save"
b971b8
+      ],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Conroe-v1",
b971b8
+      "typename": "Conroe-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Conroe",
b971b8
+      "typename": "Conroe-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Cascadelake-Server-v2",
b971b8
+      "typename": "Cascadelake-Server-v2-x86_64-cpu",
b971b8
+      "unavailable-features": [
b971b8
+        "avx512vnni",
b971b8
+        "rdctl-no",
b971b8
+        "ibrs-all",
b971b8
+        "mds-no"
b971b8
+      ],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Cascadelake-Server-v1",
b971b8
+      "typename": "Cascadelake-Server-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [
b971b8
+        "avx512vnni"
b971b8
+      ],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Cascadelake-Server",
b971b8
+      "typename": "Cascadelake-Server-x86_64-cpu",
b971b8
+      "unavailable-features": [
b971b8
+        "avx512vnni"
b971b8
+      ],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Broadwell-v4",
b971b8
+      "typename": "Broadwell-v4-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Broadwell-v3",
b971b8
+      "typename": "Broadwell-v3-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Broadwell-v2",
b971b8
+      "typename": "Broadwell-v2-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Broadwell-v1",
b971b8
+      "typename": "Broadwell-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Broadwell-noTSX-IBRS",
b971b8
+      "typename": "Broadwell-noTSX-IBRS-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Broadwell-noTSX",
b971b8
+      "typename": "Broadwell-noTSX-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Broadwell-IBRS",
b971b8
+      "typename": "Broadwell-IBRS-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "Broadwell",
b971b8
+      "typename": "Broadwell-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "486-v1",
b971b8
+      "typename": "486-v1-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    },
b971b8
+    {
b971b8
+      "name": "486",
b971b8
+      "typename": "486-x86_64-cpu",
b971b8
+      "unavailable-features": [],
b971b8
+      "static": false,
b971b8
+      "migration-safe": true
b971b8
+    }
b971b8
+  ],
b971b8
+  "id": "definitions"
b971b8
+}
b971b8
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.sig b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.sig
b971b8
new file mode 100644
b971b8
index 0000000000..1a3f3449f0
b971b8
--- /dev/null
b971b8
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.sig
b971b8
@@ -0,0 +1,4 @@
b971b8
+050654
b971b8
+family:     6 (0x06)
b971b8
+model:     85 (0x55)
b971b8
+stepping:   4 (0x04)
b971b8
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.xml
b971b8
new file mode 100644
b971b8
index 0000000000..cb9233ee22
b971b8
--- /dev/null
b971b8
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.xml
b971b8
@@ -0,0 +1,54 @@
b971b8
+
b971b8
+<cpudata arch='x86'>
b971b8
+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x00000016' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
b971b8
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00050654' ebx='0x29200800' ecx='0x7ffefbff' edx='0xbfebfbff'/>
b971b8
+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76036301' ebx='0x00f0b5ff' ecx='0x00000000' edx='0x00c30000'/>
b971b8
+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x3c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x3c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x3c004143' ebx='0x03c0003f' ecx='0x000003ff' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x3c07c163' ebx='0x0280003f' ecx='0x00007fff' edx='0x00000004'/>
b971b8
+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00002020'/>
b971b8
+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000077' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0xd39ffffb' ecx='0x00000018' edx='0x9c002400'/>
b971b8
+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300404' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
b971b8
+  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000029'/>
b971b8
+  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000005' ebx='0x00000020' ecx='0x00000201' edx='0x00000029'/>
b971b8
+  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x000002ff' ebx='0x00000a88' ecx='0x00000a88' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x00000a08' ecx='0x00000100' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0x0000000d' ecx_in='0x03' eax='0x00000040' ebx='0x000003c0' ecx='0x00000000' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0x0000000d' ecx_in='0x04' eax='0x00000040' ebx='0x00000400' ecx='0x00000000' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0x0000000d' ecx_in='0x05' eax='0x00000040' ebx='0x00000440' ecx='0x00000000' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0x0000000d' ecx_in='0x06' eax='0x00000200' ebx='0x00000480' ecx='0x00000000' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0x0000000d' ecx_in='0x07' eax='0x00000400' ebx='0x00000680' ecx='0x00000000' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0x0000000d' ecx_in='0x08' eax='0x00000080' ebx='0x00000000' ecx='0x00000001' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0x0000000d' ecx_in='0x09' eax='0x00000008' ebx='0x00000a80' ecx='0x00000000' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0x0000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0x0000000f' ecx_in='0x00' eax='0x00000000' ebx='0x0000007f' ecx='0x00000000' edx='0x00000002'/>
b971b8
+  <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00010000' ecx='0x0000007f' edx='0x00000007'/>
b971b8
+  <cpuid eax_in='0x00000010' ecx_in='0x00' eax='0x00000000' ebx='0x0000000a' ecx='0x00000000' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0x00000010' ecx_in='0x01' eax='0x0000000a' ebx='0x00000600' ecx='0x00000004' edx='0x0000000f'/>
b971b8
+  <cpuid eax_in='0x00000010' ecx_in='0x03' eax='0x00000059' ebx='0x00000000' ecx='0x00000004' edx='0x00000007'/>
b971b8
+  <cpuid eax_in='0x00000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0x00000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0x00000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0x00000014' ecx_in='0x00' eax='0x00000001' ebx='0x0000000f' ecx='0x00000007' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0x00000014' ecx_in='0x01' eax='0x02490002' ebx='0x003f3fff' ecx='0x00000000' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0x00000015' ecx_in='0x00' eax='0x00000002' ebx='0x000000a8' ecx='0x00000000' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0x00000016' ecx_in='0x00' eax='0x00000834' ebx='0x00000e74' ecx='0x00000064' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
b971b8
+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x6f655820' edx='0x2952286e'/>
b971b8
+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x6c6f4720' ebx='0x31362064' ecx='0x43203033' edx='0x40205550'/>
b971b8
+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x312e3220' ebx='0x7a484730' ecx='0x00000000' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
b971b8
+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x0000302e' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000834' ebx='0x00000e74' ecx='0x00000064' edx='0x00000000'/>
b971b8
+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000834' ebx='0x00000e74' ecx='0x00000064' edx='0x00000000'/>
b971b8
+</cpudata>
b971b8
-- 
b971b8
2.26.2
b971b8