[PATCH 11/14] cpu_map: Add new versions of SierraForest CPU model

From: Jiri Denemark <jdenemar@redhat.com> Signed-off-by: Jiri Denemark <jdenemar@redhat.com> --- src/cpu_map/index.xml | 2 + src/cpu_map/meson.build | 2 + src/cpu_map/x86_SierraForest-v4.xml | 190 +++++++++++++++++ src/cpu_map/x86_SierraForest-v5.xml | 191 ++++++++++++++++++ .../qemu_11.0.0-q35.x86_64+sgx.xml | 52 +++++ .../domaincapsdata/qemu_11.0.0-q35.x86_64.xml | 52 +++++ .../qemu_11.0.0-tcg.x86_64+sgx.xml | 63 ++++++ .../domaincapsdata/qemu_11.0.0-tcg.x86_64.xml | 63 ++++++ .../domaincapsdata/qemu_11.0.0.x86_64+sgx.xml | 52 +++++ tests/domaincapsdata/qemu_11.0.0.x86_64.xml | 52 +++++ 10 files changed, 719 insertions(+) create mode 100644 src/cpu_map/x86_SierraForest-v4.xml create mode 100644 src/cpu_map/x86_SierraForest-v5.xml diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index a67d10fd16..0d3ad7f7e6 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -128,6 +128,8 @@ <include filename='x86_SierraForest.xml'/> <include filename='x86_SierraForest-v1.xml'/> <include filename='x86_SierraForest-v2.xml'/> + <include filename='x86_SierraForest-v4.xml'/> + <include filename='x86_SierraForest-v5.xml'/> <include filename='x86_ClearwaterForest.xml'/> <include filename='x86_ClearwaterForest-v1.xml'/> <include filename='x86_ClearwaterForest-v2.xml'/> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index f46afbd568..3c997a4ad8 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -165,6 +165,8 @@ cpumap_data = [ 'x86_SierraForest-v1.xml', 'x86_SierraForest-v2.xml', 'x86_SierraForest-v3.xml', + 'x86_SierraForest-v4.xml', + 'x86_SierraForest-v5.xml', 'x86_SierraForest.xml', 'x86_Skylake-Client-IBRS.xml', 'x86_Skylake-Client-noTSX-IBRS.xml', diff --git a/src/cpu_map/x86_SierraForest-v4.xml b/src/cpu_map/x86_SierraForest-v4.xml new file mode 100644 index 0000000000..95b30b2976 --- /dev/null +++ b/src/cpu_map/x86_SierraForest-v4.xml @@ -0,0 +1,190 @@ +<cpus> + <model name='SierraForest-v4'> + <decode host='on' guest='off'/> + <signature family='6' model='175'/> + <vendor name='Intel'/> + <feature name='3dnowprefetch'/> + <feature name='abm'/> + <feature name='adx'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='arat'/> + <feature name='arch-capabilities'/> + <feature name='avx'/> + <feature name='avx-ifma'/> + <feature name='avx-ne-convert'/> + <feature name='avx-vnni'/> + <feature name='avx-vnni-int8'/> + <feature name='avx2'/> + <feature name='bhi-ctrl'/> + <feature name='bmi1'/> + <feature name='bmi2'/> + <feature name='bus-lock-detect'/> + <feature name='cet-ibt'/> + <feature name='cet-ss'/> + <feature name='cldemote'/> + <feature name='clflush'/> + <feature name='clflushopt'/> + <feature name='clwb'/> + <feature name='cmov'/> + <feature name='cmpccxadd'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='erms'/> + <feature name='f16c'/> + <feature name='fbsdp-no'/> + <feature name='fma'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fsrm'/> + <feature name='fsrs'/> + <feature name='fxsr'/> + <feature name='gds-no'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='intel-psfd'/> + <feature name='invpcid'/> + <feature name='ipred-ctrl'/> + <feature name='lahf_lm'/> + <feature name='lam'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mcdt-no'/> + <feature name='mce'/> + <feature name='mds-no'/> + <feature name='mmx'/> + <feature name='movbe'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pbrsb-no'/> + <feature name='pcid'/> + <feature name='pclmuldq'/> + <feature name='pdpe1gb'/> + <feature name='pge'/> + <feature name='pku'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pschange-mc-no'/> + <feature name='psdp-no'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdctl-no'/> + <feature name='rdpid'/> + <feature name='rdrand'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='rfds-no'/> + <feature name='rrsba-ctrl'/> + <feature name='sbdr-ssdp-no'/> + <feature name='sep'/> + <feature name='serialize'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='smap'/> + <feature name='smep'/> + <feature name='spec-ctrl'/> + <feature name='ss'/> + <feature name='ssbd'/> + <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='tsc_adjust'/> + <feature name='umip'/> + <feature name='vaes'/> + <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-cet'/> + <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-cet'/> + <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='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveopt'/> + <feature name='xsaves'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_SierraForest-v5.xml b/src/cpu_map/x86_SierraForest-v5.xml new file mode 100644 index 0000000000..171be9e4ce --- /dev/null +++ b/src/cpu_map/x86_SierraForest-v5.xml @@ -0,0 +1,191 @@ +<cpus> + <model name='SierraForest-v5'> + <decode host='on' guest='off'/> + <signature family='6' model='175'/> + <vendor name='Intel'/> + <feature name='3dnowprefetch'/> + <feature name='abm'/> + <feature name='adx'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='arat'/> + <feature name='arch-capabilities'/> + <feature name='avx'/> + <feature name='avx-ifma'/> + <feature name='avx-ne-convert'/> + <feature name='avx-vnni'/> + <feature name='avx-vnni-int8'/> + <feature name='avx2'/> + <feature name='bhi-ctrl'/> + <feature name='bmi1'/> + <feature name='bmi2'/> + <feature name='bus-lock-detect'/> + <feature name='cet-ibt'/> + <feature name='cet-ss'/> + <feature name='cldemote'/> + <feature name='clflush'/> + <feature name='clflushopt'/> + <feature name='clwb'/> + <feature name='cmov'/> + <feature name='cmpccxadd'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='erms'/> + <feature name='f16c'/> + <feature name='fbsdp-no'/> + <feature name='fma'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fsrm'/> + <feature name='fsrs'/> + <feature name='fxsr'/> + <feature name='gds-no'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='intel-psfd'/> + <feature name='invpcid'/> + <feature name='ipred-ctrl'/> + <feature name='its-no'/> + <feature name='lahf_lm'/> + <feature name='lam'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mcdt-no'/> + <feature name='mce'/> + <feature name='mds-no'/> + <feature name='mmx'/> + <feature name='movbe'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pbrsb-no'/> + <feature name='pcid'/> + <feature name='pclmuldq'/> + <feature name='pdpe1gb'/> + <feature name='pge'/> + <feature name='pku'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pschange-mc-no'/> + <feature name='psdp-no'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdctl-no'/> + <feature name='rdpid'/> + <feature name='rdrand'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='rfds-no'/> + <feature name='rrsba-ctrl'/> + <feature name='sbdr-ssdp-no'/> + <feature name='sep'/> + <feature name='serialize'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='smap'/> + <feature name='smep'/> + <feature name='spec-ctrl'/> + <feature name='ss'/> + <feature name='ssbd'/> + <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='tsc_adjust'/> + <feature name='umip'/> + <feature name='vaes'/> + <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-cet'/> + <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-cet'/> + <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='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveopt'/> + <feature name='xsaves'/> + </model> +</cpus> diff --git a/tests/domaincapsdata/qemu_11.0.0-q35.x86_64+sgx.xml b/tests/domaincapsdata/qemu_11.0.0-q35.x86_64+sgx.xml index 7a24ab4a28..834f6b1d63 100644 --- a/tests/domaincapsdata/qemu_11.0.0-q35.x86_64+sgx.xml +++ b/tests/domaincapsdata/qemu_11.0.0-q35.x86_64+sgx.xml @@ -959,6 +959,58 @@ <feature name='serialize'/> <feature name='ss'/> </blockers> + <model usable='no' vendor='Intel'>SierraForest-v4</model> + <blockers model='SierraForest-v4'> + <feature name='avx-ifma'/> + <feature name='avx-ne-convert'/> + <feature name='avx-vnni-int8'/> + <feature name='bhi-ctrl'/> + <feature name='bus-lock-detect'/> + <feature name='cet-ibt'/> + <feature name='cldemote'/> + <feature name='cmpccxadd'/> + <feature name='fbsdp-no'/> + <feature name='fsrs'/> + <feature name='ibrs-all'/> + <feature name='intel-psfd'/> + <feature name='ipred-ctrl'/> + <feature name='lam'/> + <feature name='mcdt-no'/> + <feature name='pbrsb-no'/> + <feature name='pcid'/> + <feature name='psdp-no'/> + <feature name='rdseed'/> + <feature name='rrsba-ctrl'/> + <feature name='sbdr-ssdp-no'/> + <feature name='serialize'/> + <feature name='ss'/> + </blockers> + <model usable='no' vendor='Intel'>SierraForest-v5</model> + <blockers model='SierraForest-v5'> + <feature name='avx-ifma'/> + <feature name='avx-ne-convert'/> + <feature name='avx-vnni-int8'/> + <feature name='bhi-ctrl'/> + <feature name='bus-lock-detect'/> + <feature name='cet-ibt'/> + <feature name='cldemote'/> + <feature name='cmpccxadd'/> + <feature name='fbsdp-no'/> + <feature name='fsrs'/> + <feature name='ibrs-all'/> + <feature name='intel-psfd'/> + <feature name='ipred-ctrl'/> + <feature name='lam'/> + <feature name='mcdt-no'/> + <feature name='pbrsb-no'/> + <feature name='pcid'/> + <feature name='psdp-no'/> + <feature name='rdseed'/> + <feature name='rrsba-ctrl'/> + <feature name='sbdr-ssdp-no'/> + <feature name='serialize'/> + <feature name='ss'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='hle'/> diff --git a/tests/domaincapsdata/qemu_11.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_11.0.0-q35.x86_64.xml index e0c80c6932..69817846a8 100644 --- a/tests/domaincapsdata/qemu_11.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_11.0.0-q35.x86_64.xml @@ -959,6 +959,58 @@ <feature name='serialize'/> <feature name='ss'/> </blockers> + <model usable='no' vendor='Intel'>SierraForest-v4</model> + <blockers model='SierraForest-v4'> + <feature name='avx-ifma'/> + <feature name='avx-ne-convert'/> + <feature name='avx-vnni-int8'/> + <feature name='bhi-ctrl'/> + <feature name='bus-lock-detect'/> + <feature name='cet-ibt'/> + <feature name='cldemote'/> + <feature name='cmpccxadd'/> + <feature name='fbsdp-no'/> + <feature name='fsrs'/> + <feature name='ibrs-all'/> + <feature name='intel-psfd'/> + <feature name='ipred-ctrl'/> + <feature name='lam'/> + <feature name='mcdt-no'/> + <feature name='pbrsb-no'/> + <feature name='pcid'/> + <feature name='psdp-no'/> + <feature name='rdseed'/> + <feature name='rrsba-ctrl'/> + <feature name='sbdr-ssdp-no'/> + <feature name='serialize'/> + <feature name='ss'/> + </blockers> + <model usable='no' vendor='Intel'>SierraForest-v5</model> + <blockers model='SierraForest-v5'> + <feature name='avx-ifma'/> + <feature name='avx-ne-convert'/> + <feature name='avx-vnni-int8'/> + <feature name='bhi-ctrl'/> + <feature name='bus-lock-detect'/> + <feature name='cet-ibt'/> + <feature name='cldemote'/> + <feature name='cmpccxadd'/> + <feature name='fbsdp-no'/> + <feature name='fsrs'/> + <feature name='ibrs-all'/> + <feature name='intel-psfd'/> + <feature name='ipred-ctrl'/> + <feature name='lam'/> + <feature name='mcdt-no'/> + <feature name='pbrsb-no'/> + <feature name='pcid'/> + <feature name='psdp-no'/> + <feature name='rdseed'/> + <feature name='rrsba-ctrl'/> + <feature name='sbdr-ssdp-no'/> + <feature name='serialize'/> + <feature name='ss'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='hle'/> diff --git a/tests/domaincapsdata/qemu_11.0.0-tcg.x86_64+sgx.xml b/tests/domaincapsdata/qemu_11.0.0-tcg.x86_64+sgx.xml index 8200852088..a00db3136c 100644 --- a/tests/domaincapsdata/qemu_11.0.0-tcg.x86_64+sgx.xml +++ b/tests/domaincapsdata/qemu_11.0.0-tcg.x86_64+sgx.xml @@ -1880,6 +1880,69 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel'>SierraForest-v4</model> + <blockers model='SierraForest-v4'> + <feature name='arch-capabilities'/> + <feature name='avx-ifma'/> + <feature name='avx-ne-convert'/> + <feature name='avx-vnni'/> + <feature name='avx-vnni-int8'/> + <feature name='bhi-ctrl'/> + <feature name='bus-lock-detect'/> + <feature name='cet-ibt'/> + <feature name='cet-ss'/> + <feature name='cldemote'/> + <feature name='gfni'/> + <feature name='intel-psfd'/> + <feature name='invpcid'/> + <feature name='ipred-ctrl'/> + <feature name='lam'/> + <feature name='mcdt-no'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='pcid'/> + <feature name='rrsba-ctrl'/> + <feature name='serialize'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='tsc_adjust'/> + <feature name='vpclmulqdq'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>SierraForest-v5</model> + <blockers model='SierraForest-v5'> + <feature name='arch-capabilities'/> + <feature name='avx-ifma'/> + <feature name='avx-ne-convert'/> + <feature name='avx-vnni'/> + <feature name='avx-vnni-int8'/> + <feature name='bhi-ctrl'/> + <feature name='bus-lock-detect'/> + <feature name='cet-ibt'/> + <feature name='cet-ss'/> + <feature name='cldemote'/> + <feature name='gfni'/> + <feature name='intel-psfd'/> + <feature name='invpcid'/> + <feature name='ipred-ctrl'/> + <feature name='its-no'/> + <feature name='lam'/> + <feature name='mcdt-no'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='pcid'/> + <feature name='rrsba-ctrl'/> + <feature name='serialize'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='tsc_adjust'/> + <feature name='vpclmulqdq'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='hle'/> diff --git a/tests/domaincapsdata/qemu_11.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_11.0.0-tcg.x86_64.xml index 7ef090734c..7220c1e75f 100644 --- a/tests/domaincapsdata/qemu_11.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_11.0.0-tcg.x86_64.xml @@ -1880,6 +1880,69 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel'>SierraForest-v4</model> + <blockers model='SierraForest-v4'> + <feature name='arch-capabilities'/> + <feature name='avx-ifma'/> + <feature name='avx-ne-convert'/> + <feature name='avx-vnni'/> + <feature name='avx-vnni-int8'/> + <feature name='bhi-ctrl'/> + <feature name='bus-lock-detect'/> + <feature name='cet-ibt'/> + <feature name='cet-ss'/> + <feature name='cldemote'/> + <feature name='gfni'/> + <feature name='intel-psfd'/> + <feature name='invpcid'/> + <feature name='ipred-ctrl'/> + <feature name='lam'/> + <feature name='mcdt-no'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='pcid'/> + <feature name='rrsba-ctrl'/> + <feature name='serialize'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='tsc_adjust'/> + <feature name='vpclmulqdq'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>SierraForest-v5</model> + <blockers model='SierraForest-v5'> + <feature name='arch-capabilities'/> + <feature name='avx-ifma'/> + <feature name='avx-ne-convert'/> + <feature name='avx-vnni'/> + <feature name='avx-vnni-int8'/> + <feature name='bhi-ctrl'/> + <feature name='bus-lock-detect'/> + <feature name='cet-ibt'/> + <feature name='cet-ss'/> + <feature name='cldemote'/> + <feature name='gfni'/> + <feature name='intel-psfd'/> + <feature name='invpcid'/> + <feature name='ipred-ctrl'/> + <feature name='its-no'/> + <feature name='lam'/> + <feature name='mcdt-no'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='pcid'/> + <feature name='rrsba-ctrl'/> + <feature name='serialize'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='tsc_adjust'/> + <feature name='vpclmulqdq'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='hle'/> diff --git a/tests/domaincapsdata/qemu_11.0.0.x86_64+sgx.xml b/tests/domaincapsdata/qemu_11.0.0.x86_64+sgx.xml index 189f4156e9..5f27707cb1 100644 --- a/tests/domaincapsdata/qemu_11.0.0.x86_64+sgx.xml +++ b/tests/domaincapsdata/qemu_11.0.0.x86_64+sgx.xml @@ -956,6 +956,58 @@ <feature name='serialize'/> <feature name='ss'/> </blockers> + <model usable='no' vendor='Intel'>SierraForest-v4</model> + <blockers model='SierraForest-v4'> + <feature name='avx-ifma'/> + <feature name='avx-ne-convert'/> + <feature name='avx-vnni-int8'/> + <feature name='bhi-ctrl'/> + <feature name='bus-lock-detect'/> + <feature name='cet-ibt'/> + <feature name='cldemote'/> + <feature name='cmpccxadd'/> + <feature name='fbsdp-no'/> + <feature name='fsrs'/> + <feature name='ibrs-all'/> + <feature name='intel-psfd'/> + <feature name='ipred-ctrl'/> + <feature name='lam'/> + <feature name='mcdt-no'/> + <feature name='pbrsb-no'/> + <feature name='pcid'/> + <feature name='psdp-no'/> + <feature name='rdseed'/> + <feature name='rrsba-ctrl'/> + <feature name='sbdr-ssdp-no'/> + <feature name='serialize'/> + <feature name='ss'/> + </blockers> + <model usable='no' vendor='Intel'>SierraForest-v5</model> + <blockers model='SierraForest-v5'> + <feature name='avx-ifma'/> + <feature name='avx-ne-convert'/> + <feature name='avx-vnni-int8'/> + <feature name='bhi-ctrl'/> + <feature name='bus-lock-detect'/> + <feature name='cet-ibt'/> + <feature name='cldemote'/> + <feature name='cmpccxadd'/> + <feature name='fbsdp-no'/> + <feature name='fsrs'/> + <feature name='ibrs-all'/> + <feature name='intel-psfd'/> + <feature name='ipred-ctrl'/> + <feature name='lam'/> + <feature name='mcdt-no'/> + <feature name='pbrsb-no'/> + <feature name='pcid'/> + <feature name='psdp-no'/> + <feature name='rdseed'/> + <feature name='rrsba-ctrl'/> + <feature name='sbdr-ssdp-no'/> + <feature name='serialize'/> + <feature name='ss'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='hle'/> diff --git a/tests/domaincapsdata/qemu_11.0.0.x86_64.xml b/tests/domaincapsdata/qemu_11.0.0.x86_64.xml index 256dae0a72..def1cf3a1f 100644 --- a/tests/domaincapsdata/qemu_11.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_11.0.0.x86_64.xml @@ -956,6 +956,58 @@ <feature name='serialize'/> <feature name='ss'/> </blockers> + <model usable='no' vendor='Intel'>SierraForest-v4</model> + <blockers model='SierraForest-v4'> + <feature name='avx-ifma'/> + <feature name='avx-ne-convert'/> + <feature name='avx-vnni-int8'/> + <feature name='bhi-ctrl'/> + <feature name='bus-lock-detect'/> + <feature name='cet-ibt'/> + <feature name='cldemote'/> + <feature name='cmpccxadd'/> + <feature name='fbsdp-no'/> + <feature name='fsrs'/> + <feature name='ibrs-all'/> + <feature name='intel-psfd'/> + <feature name='ipred-ctrl'/> + <feature name='lam'/> + <feature name='mcdt-no'/> + <feature name='pbrsb-no'/> + <feature name='pcid'/> + <feature name='psdp-no'/> + <feature name='rdseed'/> + <feature name='rrsba-ctrl'/> + <feature name='sbdr-ssdp-no'/> + <feature name='serialize'/> + <feature name='ss'/> + </blockers> + <model usable='no' vendor='Intel'>SierraForest-v5</model> + <blockers model='SierraForest-v5'> + <feature name='avx-ifma'/> + <feature name='avx-ne-convert'/> + <feature name='avx-vnni-int8'/> + <feature name='bhi-ctrl'/> + <feature name='bus-lock-detect'/> + <feature name='cet-ibt'/> + <feature name='cldemote'/> + <feature name='cmpccxadd'/> + <feature name='fbsdp-no'/> + <feature name='fsrs'/> + <feature name='ibrs-all'/> + <feature name='intel-psfd'/> + <feature name='ipred-ctrl'/> + <feature name='lam'/> + <feature name='mcdt-no'/> + <feature name='pbrsb-no'/> + <feature name='pcid'/> + <feature name='psdp-no'/> + <feature name='rdseed'/> + <feature name='rrsba-ctrl'/> + <feature name='sbdr-ssdp-no'/> + <feature name='serialize'/> + <feature name='ss'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='hle'/> -- 2.54.0