[PATCH v2 23/36] cpu_map: Add versions of Skylake-Server CPU model

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- Notes: Version 2: - Skylake-Server-v2 defined as Skylake-Server-IBRS - Skylake-Server-v3 defined as Skylake-Server-noTSX-IBRS - <decode host='on' guest='off'/> for all versioned models - canonical CPU models in domain capabilities src/cpu_map/index.xml | 5 + src/cpu_map/meson.build | 5 + src/cpu_map/x86_Skylake-Server-v1.xml | 6 + src/cpu_map/x86_Skylake-Server-v2.xml | 6 + src/cpu_map/x86_Skylake-Server-v3.xml | 6 + src/cpu_map/x86_Skylake-Server-v4.xml | 148 +++++++++++++++++ src/cpu_map/x86_Skylake-Server-v5.xml | 150 ++++++++++++++++++ .../x86_64-cpuid-Xeon-Gold-5115-host.xml | 2 +- .../x86_64-cpuid-Xeon-Gold-6130-host.xml | 2 +- .../x86_64-cpuid-Xeon-Gold-6148-host.xml | 2 +- .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 61 ++++++- .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 89 ++++++++++- tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 61 ++++++- .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 61 ++++++- .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 89 ++++++++++- tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 61 ++++++- .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 74 ++++++++- .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 110 ++++++++++++- tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 74 ++++++++- .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 74 ++++++++- .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 110 ++++++++++++- tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 74 ++++++++- .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 74 ++++++++- .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 110 ++++++++++++- tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 74 ++++++++- .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 74 ++++++++- .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 110 ++++++++++++- tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 74 ++++++++- .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 74 ++++++++- .../qemu_7.2.0-tcg.x86_64+hvf.xml | 90 ++++++++++- .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 90 ++++++++++- tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 74 ++++++++- .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 74 ++++++++- .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 90 ++++++++++- tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 74 ++++++++- .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 75 ++++++++- .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 80 +++++++++- tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 75 ++++++++- .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 75 ++++++++- .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 80 +++++++++- tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 75 ++++++++- .../domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 75 ++++++++- .../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 75 ++++++++- tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 75 ++++++++- .../domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 75 ++++++++- .../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 75 ++++++++- tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 75 ++++++++- .../domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 75 ++++++++- .../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 75 ++++++++- tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 75 ++++++++- 50 files changed, 3364 insertions(+), 123 deletions(-) create mode 100644 src/cpu_map/x86_Skylake-Server-v1.xml create mode 100644 src/cpu_map/x86_Skylake-Server-v2.xml create mode 100644 src/cpu_map/x86_Skylake-Server-v3.xml create mode 100644 src/cpu_map/x86_Skylake-Server-v4.xml create mode 100644 src/cpu_map/x86_Skylake-Server-v5.xml diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index e874a45b15..af41623bc0 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -51,6 +51,11 @@ <include filename='x86_Skylake-Server.xml'/> <include filename='x86_Skylake-Server-IBRS.xml'/> <include filename='x86_Skylake-Server-noTSX-IBRS.xml'/> + <include filename='x86_Skylake-Server-v1.xml'/> + <include filename='x86_Skylake-Server-v2.xml'/> + <include filename='x86_Skylake-Server-v3.xml'/> + <include filename='x86_Skylake-Server-v4.xml'/> + <include filename='x86_Skylake-Server-v5.xml'/> <include filename='x86_Cascadelake-Server.xml'/> <include filename='x86_Cascadelake-Server-noTSX.xml'/> <include filename='x86_Cascadelake-Server-v1.xml'/> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index 55f9e99283..60c14539d3 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -100,6 +100,11 @@ cpumap_data = [ 'x86_Skylake-Client.xml', 'x86_Skylake-Server-IBRS.xml', 'x86_Skylake-Server-noTSX-IBRS.xml', + 'x86_Skylake-Server-v1.xml', + 'x86_Skylake-Server-v2.xml', + 'x86_Skylake-Server-v3.xml', + 'x86_Skylake-Server-v4.xml', + 'x86_Skylake-Server-v5.xml', 'x86_Skylake-Server.xml', 'x86_Snowridge-v1.xml', 'x86_Snowridge-v2.xml', diff --git a/src/cpu_map/x86_Skylake-Server-v1.xml b/src/cpu_map/x86_Skylake-Server-v1.xml new file mode 100644 index 0000000000..130d97b3e9 --- /dev/null +++ b/src/cpu_map/x86_Skylake-Server-v1.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Skylake-Server-v1'> + <decode host='on' guest='off'/> + <model name='Skylake-Server'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Skylake-Server-v2.xml b/src/cpu_map/x86_Skylake-Server-v2.xml new file mode 100644 index 0000000000..dc66602166 --- /dev/null +++ b/src/cpu_map/x86_Skylake-Server-v2.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Skylake-Server-v2'> + <decode host='on' guest='off'/> + <model name='Skylake-Server-IBRS'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Skylake-Server-v3.xml b/src/cpu_map/x86_Skylake-Server-v3.xml new file mode 100644 index 0000000000..b56510c3a5 --- /dev/null +++ b/src/cpu_map/x86_Skylake-Server-v3.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Skylake-Server-v3'> + <decode host='on' guest='off'/> + <model name='Skylake-Server-noTSX-IBRS'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Skylake-Server-v4.xml b/src/cpu_map/x86_Skylake-Server-v4.xml new file mode 100644 index 0000000000..441a343e3b --- /dev/null +++ b/src/cpu_map/x86_Skylake-Server-v4.xml @@ -0,0 +1,148 @@ +<cpus> + <model name='Skylake-Server-v4'> + <decode host='on' guest='off'/> + <signature family='6' model='85' stepping='0-4'/> + <vendor name='Intel'/> + <feature name='3dnowprefetch'/> + <feature name='abm'/> + <feature name='adx'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='arat'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='bmi1'/> + <feature name='bmi2'/> + <feature name='clflush'/> + <feature name='clwb'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='erms'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fxsr'/> + <feature name='invpcid'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='movbe'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pcid'/> + <feature name='pclmuldq'/> + <feature name='pdpe1gb'/> + <feature name='pge'/> + <feature name='pku'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdrand'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <feature name='smap'/> + <feature name='smep'/> + <feature name='spec-ctrl'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='sse4.1'/> + <feature name='sse4.2'/> + <feature name='ssse3'/> + <feature name='syscall'/> + <feature name='tsc'/> + <feature name='tsc-deadline'/> + <feature name='vme'/> + <feature name='vmx-activity-hlt'/> + <feature name='vmx-apicv-register'/> + <feature name='vmx-apicv-vid'/> + <feature name='vmx-apicv-x2apic'/> + <feature name='vmx-apicv-xapic'/> + <feature name='vmx-cr3-load-noexit'/> + <feature name='vmx-cr3-store-noexit'/> + <feature name='vmx-cr8-load-exit'/> + <feature name='vmx-cr8-store-exit'/> + <feature name='vmx-desc-exit'/> + <feature name='vmx-entry-ia32e-mode'/> + <feature name='vmx-entry-load-efer'/> + <feature name='vmx-entry-load-pat'/> + <feature name='vmx-entry-load-perf-global-ctrl'/> + <feature name='vmx-entry-noload-debugctl'/> + <feature name='vmx-ept'/> + <feature name='vmx-ept-1gb'/> + <feature name='vmx-ept-2mb'/> + <feature name='vmx-ept-execonly'/> + <feature name='vmx-eptad'/> + <feature name='vmx-eptp-switching'/> + <feature name='vmx-exit-ack-intr'/> + <feature name='vmx-exit-load-efer'/> + <feature name='vmx-exit-load-pat'/> + <feature name='vmx-exit-load-perf-global-ctrl'/> + <feature name='vmx-exit-nosave-debugctl'/> + <feature name='vmx-exit-save-efer'/> + <feature name='vmx-exit-save-pat'/> + <feature name='vmx-exit-save-preemption-timer'/> + <feature name='vmx-flexpriority'/> + <feature name='vmx-hlt-exit'/> + <feature name='vmx-ins-outs'/> + <feature name='vmx-intr-exit'/> + <feature name='vmx-invept'/> + <feature name='vmx-invept-all-context'/> + <feature name='vmx-invept-single-context'/> + <feature name='vmx-invlpg-exit'/> + <feature name='vmx-invpcid-exit'/> + <feature name='vmx-invvpid-all-context'/> + <feature name='vmx-invvpid-single-addr'/> + <feature name='vmx-invvpid-single-context-noglobals'/> + <feature name='vmx-io-bitmap'/> + <feature name='vmx-io-exit'/> + <feature name='vmx-monitor-exit'/> + <feature name='vmx-movdr-exit'/> + <feature name='vmx-msr-bitmap'/> + <feature name='vmx-mtf'/> + <feature name='vmx-mwait-exit'/> + <feature name='vmx-nmi-exit'/> + <feature name='vmx-page-walk-4'/> + <feature name='vmx-pause-exit'/> + <feature name='vmx-pml'/> + <feature name='vmx-posted-intr'/> + <feature name='vmx-preemption-timer'/> + <feature name='vmx-rdpmc-exit'/> + <feature name='vmx-rdrand-exit'/> + <feature name='vmx-rdseed-exit'/> + <feature name='vmx-rdtsc-exit'/> + <feature name='vmx-rdtscp-exit'/> + <feature name='vmx-secondary-ctls'/> + <feature name='vmx-shadow-vmcs'/> + <feature name='vmx-store-lma'/> + <feature name='vmx-true-ctls'/> + <feature name='vmx-tsc-offset'/> + <feature name='vmx-unrestricted-guest'/> + <feature name='vmx-vintr-pending'/> + <feature name='vmx-vmfunc'/> + <feature name='vmx-vmwrite-vmexit-fields'/> + <feature name='vmx-vnmi'/> + <feature name='vmx-vnmi-pending'/> + <feature name='vmx-vpid'/> + <feature name='vmx-wbinvd-exit'/> + <feature name='x2apic'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveopt'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Skylake-Server-v5.xml b/src/cpu_map/x86_Skylake-Server-v5.xml new file mode 100644 index 0000000000..cb3c91e335 --- /dev/null +++ b/src/cpu_map/x86_Skylake-Server-v5.xml @@ -0,0 +1,150 @@ +<cpus> + <model name='Skylake-Server-v5'> + <decode host='on' guest='off'/> + <signature family='6' model='85' stepping='0-4'/> + <vendor name='Intel'/> + <feature name='3dnowprefetch'/> + <feature name='abm'/> + <feature name='adx'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='arat'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='bmi1'/> + <feature name='bmi2'/> + <feature name='clflush'/> + <feature name='clwb'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='erms'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fxsr'/> + <feature name='invpcid'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='movbe'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pcid'/> + <feature name='pclmuldq'/> + <feature name='pdpe1gb'/> + <feature name='pge'/> + <feature name='pku'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdrand'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <feature name='smap'/> + <feature name='smep'/> + <feature name='spec-ctrl'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='sse4.1'/> + <feature name='sse4.2'/> + <feature name='ssse3'/> + <feature name='syscall'/> + <feature name='tsc'/> + <feature name='tsc-deadline'/> + <feature name='vme'/> + <feature name='vmx-activity-hlt'/> + <feature name='vmx-apicv-register'/> + <feature name='vmx-apicv-vid'/> + <feature name='vmx-apicv-x2apic'/> + <feature name='vmx-apicv-xapic'/> + <feature name='vmx-cr3-load-noexit'/> + <feature name='vmx-cr3-store-noexit'/> + <feature name='vmx-cr8-load-exit'/> + <feature name='vmx-cr8-store-exit'/> + <feature name='vmx-desc-exit'/> + <feature name='vmx-entry-ia32e-mode'/> + <feature name='vmx-entry-load-efer'/> + <feature name='vmx-entry-load-pat'/> + <feature name='vmx-entry-load-perf-global-ctrl'/> + <feature name='vmx-entry-noload-debugctl'/> + <feature name='vmx-ept'/> + <feature name='vmx-ept-1gb'/> + <feature name='vmx-ept-2mb'/> + <feature name='vmx-ept-execonly'/> + <feature name='vmx-eptad'/> + <feature name='vmx-eptp-switching'/> + <feature name='vmx-exit-ack-intr'/> + <feature name='vmx-exit-load-efer'/> + <feature name='vmx-exit-load-pat'/> + <feature name='vmx-exit-load-perf-global-ctrl'/> + <feature name='vmx-exit-nosave-debugctl'/> + <feature name='vmx-exit-save-efer'/> + <feature name='vmx-exit-save-pat'/> + <feature name='vmx-exit-save-preemption-timer'/> + <feature name='vmx-flexpriority'/> + <feature name='vmx-hlt-exit'/> + <feature name='vmx-ins-outs'/> + <feature name='vmx-intr-exit'/> + <feature name='vmx-invept'/> + <feature name='vmx-invept-all-context'/> + <feature name='vmx-invept-single-context'/> + <feature name='vmx-invlpg-exit'/> + <feature name='vmx-invpcid-exit'/> + <feature name='vmx-invvpid-all-context'/> + <feature name='vmx-invvpid-single-addr'/> + <feature name='vmx-invvpid-single-context-noglobals'/> + <feature name='vmx-io-bitmap'/> + <feature name='vmx-io-exit'/> + <feature name='vmx-monitor-exit'/> + <feature name='vmx-movdr-exit'/> + <feature name='vmx-msr-bitmap'/> + <feature name='vmx-mtf'/> + <feature name='vmx-mwait-exit'/> + <feature name='vmx-nmi-exit'/> + <feature name='vmx-page-walk-4'/> + <feature name='vmx-pause-exit'/> + <feature name='vmx-pml'/> + <feature name='vmx-posted-intr'/> + <feature name='vmx-preemption-timer'/> + <feature name='vmx-rdpmc-exit'/> + <feature name='vmx-rdrand-exit'/> + <feature name='vmx-rdseed-exit'/> + <feature name='vmx-rdtsc-exit'/> + <feature name='vmx-rdtscp-exit'/> + <feature name='vmx-secondary-ctls'/> + <feature name='vmx-shadow-vmcs'/> + <feature name='vmx-store-lma'/> + <feature name='vmx-true-ctls'/> + <feature name='vmx-tsc-offset'/> + <feature name='vmx-unrestricted-guest'/> + <feature name='vmx-vintr-pending'/> + <feature name='vmx-vmfunc'/> + <feature name='vmx-vmwrite-vmexit-fields'/> + <feature name='vmx-vnmi'/> + <feature name='vmx-vnmi-pending'/> + <feature name='vmx-vpid'/> + <feature name='vmx-wbinvd-exit'/> + <feature name='vmx-xsaves'/> + <feature name='x2apic'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveopt'/> + <feature name='xsaves'/> + </model> +</cpus> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml index 377b484751..d0f48997ec 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>Skylake-Server-IBRS</model> + <model>Skylake-Server-v2</model> <vendor>Intel</vendor> <signature family='6' model='85' stepping='4'/> <feature name='dtes64'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml index f8cdd53f42..71a53982bc 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>Skylake-Server-IBRS</model> + <model>Skylake-Server-v2</model> <vendor>Intel</vendor> <signature family='6' model='85' stepping='4'/> <feature name='dtes64'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml index 29900eb28e..e2e5acdb60 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>Skylake-Server</model> + <model>Skylake-Server-v1</model> <vendor>Intel</vendor> <signature family='6' model='85' stepping='4'/> <feature name='dtes64'/> diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml index 57b4a6069a..bfaae20df4 100644 --- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml @@ -494,7 +494,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -508,7 +508,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -523,7 +523,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -536,6 +536,61 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml index 6358b8f227..b34875ea9b 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -853,7 +853,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -874,7 +874,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -896,7 +896,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -916,6 +916,89 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml index 48c89a0ad6..2cb7651d94 100644 --- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml @@ -493,7 +493,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -507,7 +507,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -522,7 +522,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -535,6 +535,61 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml index 7955a18190..e2c7deb232 100644 --- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml @@ -503,7 +503,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -517,7 +517,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -532,7 +532,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -545,6 +545,61 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml index 94b4aeb166..a4e9c15f3c 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -885,7 +885,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -906,7 +906,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -928,7 +928,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -948,6 +948,89 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml index 73a47cea6b..5b55f7168d 100644 --- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml @@ -502,7 +502,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -516,7 +516,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -531,7 +531,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -544,6 +544,61 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml index 8d41090780..ba98897a59 100644 --- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml @@ -567,7 +567,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -581,7 +581,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -596,7 +596,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -609,6 +609,74 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml index 8ad064a22c..e1b2fdf523 100644 --- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -993,7 +993,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -1014,7 +1014,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -1036,7 +1036,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -1056,6 +1056,110 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml index 83ae31017b..0782742c55 100644 --- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml @@ -566,7 +566,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -580,7 +580,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -595,7 +595,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -608,6 +608,74 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml index fa2a3c71b7..44b85a22bf 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -564,7 +564,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -578,7 +578,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -593,7 +593,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -606,6 +606,74 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml index 0e8730b1ca..04bc338a05 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -991,7 +991,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -1012,7 +1012,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -1034,7 +1034,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -1054,6 +1054,110 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml index 66ee266274..9ca8aea50d 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -563,7 +563,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -577,7 +577,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -592,7 +592,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -605,6 +605,74 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml index d7d70ca91a..3da0f49414 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -591,7 +591,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -605,7 +605,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -620,7 +620,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -633,6 +633,74 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml index 4dfced633e..ff8f07bcaf 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -1023,7 +1023,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -1044,7 +1044,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -1066,7 +1066,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -1086,6 +1086,110 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml index 4492a6046a..eedca7f9d2 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -590,7 +590,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -604,7 +604,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -619,7 +619,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -632,6 +632,74 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml index 46cfed5f9d..b743fd5949 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -558,7 +558,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -572,7 +572,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -587,7 +587,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -600,6 +600,74 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml index 8be62f8414..f28f88244d 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -971,7 +971,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -992,7 +992,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -1014,7 +1014,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -1034,6 +1034,110 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml index f976cc9868..7eb0dc6079 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -557,7 +557,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -571,7 +571,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -586,7 +586,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -599,6 +599,74 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml index 446a4ea7b3..3989e534b6 100644 --- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml @@ -563,7 +563,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -577,7 +577,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -592,7 +592,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -605,6 +605,74 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml index 388e9f0341..9e0488e11f 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml @@ -806,7 +806,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='3dnowprefetch'/> <feature name='avx512bw'/> @@ -823,7 +823,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx512bw'/> @@ -841,7 +841,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx512bw'/> @@ -857,6 +857,90 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='3dnowprefetch'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='3dnowprefetch'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml index 388e9f0341..9e0488e11f 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml @@ -806,7 +806,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='3dnowprefetch'/> <feature name='avx512bw'/> @@ -823,7 +823,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx512bw'/> @@ -841,7 +841,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx512bw'/> @@ -857,6 +857,90 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='3dnowprefetch'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='3dnowprefetch'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml index eac02f497a..856177f2c2 100644 --- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml @@ -562,7 +562,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -576,7 +576,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -591,7 +591,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -604,6 +604,74 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml index e0fd74a139..cd9de8aa48 100644 --- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml @@ -645,7 +645,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -659,7 +659,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -674,7 +674,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -687,6 +687,74 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml index be5e5b16b0..ddafb0c97d 100644 --- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml @@ -902,7 +902,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='3dnowprefetch'/> <feature name='avx512bw'/> @@ -919,7 +919,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx512bw'/> @@ -937,7 +937,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx512bw'/> @@ -953,6 +953,90 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='3dnowprefetch'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='3dnowprefetch'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml index 9573f80845..c8b413eeb4 100644 --- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml @@ -644,7 +644,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -658,7 +658,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -673,7 +673,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -686,6 +686,74 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml index 1b4ceacb16..2348b8a948 100644 --- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml @@ -830,7 +830,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -844,7 +844,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -859,7 +859,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -872,6 +872,75 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml index bcd73d2eb9..05a4a1c4d1 100644 --- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml @@ -902,7 +902,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -917,7 +917,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -933,7 +933,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -947,6 +947,80 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='arch-capabilities'/> diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml index 1fceafeaa8..80c021fae5 100644 --- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml @@ -829,7 +829,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -843,7 +843,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -858,7 +858,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -871,6 +871,75 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml index b3b3c5c538..a10f245559 100644 --- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml @@ -831,7 +831,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -845,7 +845,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -860,7 +860,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -873,6 +873,75 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml index 050160af25..3c1c3ccc46 100644 --- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml @@ -888,7 +888,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -903,7 +903,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -919,7 +919,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -933,6 +933,80 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='arch-capabilities'/> diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml index 1c8b91caa6..35a04b58da 100644 --- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml @@ -830,7 +830,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -844,7 +844,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -859,7 +859,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -872,6 +872,75 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml index 00950d1c3e..fe41e2f42d 100644 --- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml @@ -831,7 +831,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -845,7 +845,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -860,7 +860,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -873,6 +873,75 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml index a24a446373..a382908512 100644 --- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml @@ -852,7 +852,7 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -866,7 +866,7 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -881,7 +881,7 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -894,6 +894,75 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='arch-capabilities'/> diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml index c5126d4c10..83d5e8bbef 100644 --- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml @@ -830,7 +830,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -844,7 +844,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -859,7 +859,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -872,6 +872,75 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml index 607f0d1dcb..3f89567e0a 100644 --- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml @@ -967,7 +967,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -981,7 +981,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -996,7 +996,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -1009,6 +1009,75 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml index 729afba017..f2db7c9e9e 100644 --- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml @@ -957,7 +957,7 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -971,7 +971,7 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -986,7 +986,7 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -999,6 +999,75 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='arch-capabilities'/> diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml index 4fe1f27009..eca4245c4b 100644 --- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml @@ -966,7 +966,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -980,7 +980,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -995,7 +995,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -1008,6 +1008,75 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml index 7ac02a6559..980bc162b9 100644 --- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml @@ -967,7 +967,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -981,7 +981,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -996,7 +996,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -1009,6 +1009,75 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml index c3ccc4a83d..3960ab67f8 100644 --- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml @@ -957,7 +957,7 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -971,7 +971,7 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -986,7 +986,7 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -999,6 +999,75 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='arch-capabilities'/> diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml index dac46b82f7..5a177fd1ed 100644 --- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml @@ -966,7 +966,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -980,7 +980,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -995,7 +995,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -1008,6 +1008,75 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> -- 2.47.0