[PATCH 10/14] cpu_map: Add new versions of ClearwaterForest 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_ClearwaterForest-v2.xml | 197 +++++++++++++++++ src/cpu_map/x86_ClearwaterForest-v3.xml | 198 ++++++++++++++++++ .../qemu_11.0.0-q35.x86_64+sgx.xml | 66 ++++++ .../domaincapsdata/qemu_11.0.0-q35.x86_64.xml | 66 ++++++ .../qemu_11.0.0-tcg.x86_64+sgx.xml | 75 +++++++ .../domaincapsdata/qemu_11.0.0-tcg.x86_64.xml | 75 +++++++ .../domaincapsdata/qemu_11.0.0.x86_64+sgx.xml | 66 ++++++ tests/domaincapsdata/qemu_11.0.0.x86_64.xml | 66 ++++++ 10 files changed, 813 insertions(+) create mode 100644 src/cpu_map/x86_ClearwaterForest-v2.xml create mode 100644 src/cpu_map/x86_ClearwaterForest-v3.xml diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index 57a28d1d1d..a67d10fd16 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -130,6 +130,8 @@ <include filename='x86_SierraForest-v2.xml'/> <include filename='x86_ClearwaterForest.xml'/> <include filename='x86_ClearwaterForest-v1.xml'/> + <include filename='x86_ClearwaterForest-v2.xml'/> + <include filename='x86_ClearwaterForest-v3.xml'/> <include filename='x86_Denverton.xml'/> <include filename='x86_Denverton-v1.xml'/> <include filename='x86_Denverton-v2.xml'/> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index 2b6b1bf3ea..f46afbd568 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -45,6 +45,8 @@ cpumap_data = [ 'x86_Cascadelake-Server-v5.xml', 'x86_Cascadelake-Server.xml', 'x86_ClearwaterForest-v1.xml', + 'x86_ClearwaterForest-v2.xml', + 'x86_ClearwaterForest-v3.xml', 'x86_ClearwaterForest.xml', 'x86_Conroe-v1.xml', 'x86_Conroe.xml', diff --git a/src/cpu_map/x86_ClearwaterForest-v2.xml b/src/cpu_map/x86_ClearwaterForest-v2.xml new file mode 100644 index 0000000000..05552788b5 --- /dev/null +++ b/src/cpu_map/x86_ClearwaterForest-v2.xml @@ -0,0 +1,197 @@ +<cpus> + <model name='ClearwaterForest-v2'> + <decode host='on' guest='off'/> + <signature family='6' model='221'/> + <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-int16'/> + <feature name='avx-vnni-int8'/> + <feature name='avx2'/> + <feature name='bhi-ctrl'/> + <feature name='bhi-no'/> + <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='ddpd-u'/> + <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='prefetchiti'/> + <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='sha512'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='sm3'/> + <feature name='sm4'/> + <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_ClearwaterForest-v3.xml b/src/cpu_map/x86_ClearwaterForest-v3.xml new file mode 100644 index 0000000000..29160cbb00 --- /dev/null +++ b/src/cpu_map/x86_ClearwaterForest-v3.xml @@ -0,0 +1,198 @@ +<cpus> + <model name='ClearwaterForest-v3'> + <decode host='on' guest='off'/> + <signature family='6' model='221'/> + <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-int16'/> + <feature name='avx-vnni-int8'/> + <feature name='avx2'/> + <feature name='bhi-ctrl'/> + <feature name='bhi-no'/> + <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='ddpd-u'/> + <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='prefetchiti'/> + <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='sha512'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='sm3'/> + <feature name='sm4'/> + <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 83844c121b..7a24ab4a28 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 @@ -234,6 +234,72 @@ <feature name='sm4'/> <feature name='ss'/> </blockers> + <model usable='no' vendor='Intel'>ClearwaterForest-v2</model> + <blockers model='ClearwaterForest-v2'> + <feature name='avx-ifma'/> + <feature name='avx-ne-convert'/> + <feature name='avx-vnni-int16'/> + <feature name='avx-vnni-int8'/> + <feature name='bhi-ctrl'/> + <feature name='bhi-no'/> + <feature name='bus-lock-detect'/> + <feature name='cet-ibt'/> + <feature name='cldemote'/> + <feature name='cmpccxadd'/> + <feature name='ddpd-u'/> + <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='prefetchiti'/> + <feature name='psdp-no'/> + <feature name='rdseed'/> + <feature name='rrsba-ctrl'/> + <feature name='sbdr-ssdp-no'/> + <feature name='serialize'/> + <feature name='sha512'/> + <feature name='sm3'/> + <feature name='sm4'/> + <feature name='ss'/> + </blockers> + <model usable='no' vendor='Intel'>ClearwaterForest-v3</model> + <blockers model='ClearwaterForest-v3'> + <feature name='avx-ifma'/> + <feature name='avx-ne-convert'/> + <feature name='avx-vnni-int16'/> + <feature name='avx-vnni-int8'/> + <feature name='bhi-ctrl'/> + <feature name='bhi-no'/> + <feature name='bus-lock-detect'/> + <feature name='cet-ibt'/> + <feature name='cldemote'/> + <feature name='cmpccxadd'/> + <feature name='ddpd-u'/> + <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='prefetchiti'/> + <feature name='psdp-no'/> + <feature name='rdseed'/> + <feature name='rrsba-ctrl'/> + <feature name='sbdr-ssdp-no'/> + <feature name='serialize'/> + <feature name='sha512'/> + <feature name='sm3'/> + <feature name='sm4'/> + <feature name='ss'/> + </blockers> <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model> <model usable='yes' vendor='Intel'>Conroe-v1</model> <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model> 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 a6881fcc76..e0c80c6932 100644 --- a/tests/domaincapsdata/qemu_11.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_11.0.0-q35.x86_64.xml @@ -234,6 +234,72 @@ <feature name='sm4'/> <feature name='ss'/> </blockers> + <model usable='no' vendor='Intel'>ClearwaterForest-v2</model> + <blockers model='ClearwaterForest-v2'> + <feature name='avx-ifma'/> + <feature name='avx-ne-convert'/> + <feature name='avx-vnni-int16'/> + <feature name='avx-vnni-int8'/> + <feature name='bhi-ctrl'/> + <feature name='bhi-no'/> + <feature name='bus-lock-detect'/> + <feature name='cet-ibt'/> + <feature name='cldemote'/> + <feature name='cmpccxadd'/> + <feature name='ddpd-u'/> + <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='prefetchiti'/> + <feature name='psdp-no'/> + <feature name='rdseed'/> + <feature name='rrsba-ctrl'/> + <feature name='sbdr-ssdp-no'/> + <feature name='serialize'/> + <feature name='sha512'/> + <feature name='sm3'/> + <feature name='sm4'/> + <feature name='ss'/> + </blockers> + <model usable='no' vendor='Intel'>ClearwaterForest-v3</model> + <blockers model='ClearwaterForest-v3'> + <feature name='avx-ifma'/> + <feature name='avx-ne-convert'/> + <feature name='avx-vnni-int16'/> + <feature name='avx-vnni-int8'/> + <feature name='bhi-ctrl'/> + <feature name='bhi-no'/> + <feature name='bus-lock-detect'/> + <feature name='cet-ibt'/> + <feature name='cldemote'/> + <feature name='cmpccxadd'/> + <feature name='ddpd-u'/> + <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='prefetchiti'/> + <feature name='psdp-no'/> + <feature name='rdseed'/> + <feature name='rrsba-ctrl'/> + <feature name='sbdr-ssdp-no'/> + <feature name='serialize'/> + <feature name='sha512'/> + <feature name='sm3'/> + <feature name='sm4'/> + <feature name='ss'/> + </blockers> <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model> <model usable='yes' vendor='Intel'>Conroe-v1</model> <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model> 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 3ba1d74336..8200852088 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 @@ -333,6 +333,81 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel'>ClearwaterForest-v2</model> + <blockers model='ClearwaterForest-v2'> + <feature name='arch-capabilities'/> + <feature name='avx-ifma'/> + <feature name='avx-ne-convert'/> + <feature name='avx-vnni'/> + <feature name='avx-vnni-int16'/> + <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='ddpd-u'/> + <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='prefetchiti'/> + <feature name='rrsba-ctrl'/> + <feature name='serialize'/> + <feature name='sha512'/> + <feature name='sm3'/> + <feature name='sm4'/> + <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'>ClearwaterForest-v3</model> + <blockers model='ClearwaterForest-v3'> + <feature name='arch-capabilities'/> + <feature name='avx-ifma'/> + <feature name='avx-ne-convert'/> + <feature name='avx-vnni'/> + <feature name='avx-vnni-int16'/> + <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='ddpd-u'/> + <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='prefetchiti'/> + <feature name='rrsba-ctrl'/> + <feature name='serialize'/> + <feature name='sha512'/> + <feature name='sm3'/> + <feature name='sm4'/> + <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='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model> <model usable='yes' vendor='Intel'>Conroe-v1</model> <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model> 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 aef68494d3..7ef090734c 100644 --- a/tests/domaincapsdata/qemu_11.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_11.0.0-tcg.x86_64.xml @@ -333,6 +333,81 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel'>ClearwaterForest-v2</model> + <blockers model='ClearwaterForest-v2'> + <feature name='arch-capabilities'/> + <feature name='avx-ifma'/> + <feature name='avx-ne-convert'/> + <feature name='avx-vnni'/> + <feature name='avx-vnni-int16'/> + <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='ddpd-u'/> + <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='prefetchiti'/> + <feature name='rrsba-ctrl'/> + <feature name='serialize'/> + <feature name='sha512'/> + <feature name='sm3'/> + <feature name='sm4'/> + <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'>ClearwaterForest-v3</model> + <blockers model='ClearwaterForest-v3'> + <feature name='arch-capabilities'/> + <feature name='avx-ifma'/> + <feature name='avx-ne-convert'/> + <feature name='avx-vnni'/> + <feature name='avx-vnni-int16'/> + <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='ddpd-u'/> + <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='prefetchiti'/> + <feature name='rrsba-ctrl'/> + <feature name='serialize'/> + <feature name='sha512'/> + <feature name='sm3'/> + <feature name='sm4'/> + <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='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model> <model usable='yes' vendor='Intel'>Conroe-v1</model> <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model> 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 9ab3a94fb6..189f4156e9 100644 --- a/tests/domaincapsdata/qemu_11.0.0.x86_64+sgx.xml +++ b/tests/domaincapsdata/qemu_11.0.0.x86_64+sgx.xml @@ -231,6 +231,72 @@ <feature name='sm4'/> <feature name='ss'/> </blockers> + <model usable='no' vendor='Intel'>ClearwaterForest-v2</model> + <blockers model='ClearwaterForest-v2'> + <feature name='avx-ifma'/> + <feature name='avx-ne-convert'/> + <feature name='avx-vnni-int16'/> + <feature name='avx-vnni-int8'/> + <feature name='bhi-ctrl'/> + <feature name='bhi-no'/> + <feature name='bus-lock-detect'/> + <feature name='cet-ibt'/> + <feature name='cldemote'/> + <feature name='cmpccxadd'/> + <feature name='ddpd-u'/> + <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='prefetchiti'/> + <feature name='psdp-no'/> + <feature name='rdseed'/> + <feature name='rrsba-ctrl'/> + <feature name='sbdr-ssdp-no'/> + <feature name='serialize'/> + <feature name='sha512'/> + <feature name='sm3'/> + <feature name='sm4'/> + <feature name='ss'/> + </blockers> + <model usable='no' vendor='Intel'>ClearwaterForest-v3</model> + <blockers model='ClearwaterForest-v3'> + <feature name='avx-ifma'/> + <feature name='avx-ne-convert'/> + <feature name='avx-vnni-int16'/> + <feature name='avx-vnni-int8'/> + <feature name='bhi-ctrl'/> + <feature name='bhi-no'/> + <feature name='bus-lock-detect'/> + <feature name='cet-ibt'/> + <feature name='cldemote'/> + <feature name='cmpccxadd'/> + <feature name='ddpd-u'/> + <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='prefetchiti'/> + <feature name='psdp-no'/> + <feature name='rdseed'/> + <feature name='rrsba-ctrl'/> + <feature name='sbdr-ssdp-no'/> + <feature name='serialize'/> + <feature name='sha512'/> + <feature name='sm3'/> + <feature name='sm4'/> + <feature name='ss'/> + </blockers> <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model> <model usable='yes' vendor='Intel'>Conroe-v1</model> <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model> diff --git a/tests/domaincapsdata/qemu_11.0.0.x86_64.xml b/tests/domaincapsdata/qemu_11.0.0.x86_64.xml index 4c0d3d7692..256dae0a72 100644 --- a/tests/domaincapsdata/qemu_11.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_11.0.0.x86_64.xml @@ -231,6 +231,72 @@ <feature name='sm4'/> <feature name='ss'/> </blockers> + <model usable='no' vendor='Intel'>ClearwaterForest-v2</model> + <blockers model='ClearwaterForest-v2'> + <feature name='avx-ifma'/> + <feature name='avx-ne-convert'/> + <feature name='avx-vnni-int16'/> + <feature name='avx-vnni-int8'/> + <feature name='bhi-ctrl'/> + <feature name='bhi-no'/> + <feature name='bus-lock-detect'/> + <feature name='cet-ibt'/> + <feature name='cldemote'/> + <feature name='cmpccxadd'/> + <feature name='ddpd-u'/> + <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='prefetchiti'/> + <feature name='psdp-no'/> + <feature name='rdseed'/> + <feature name='rrsba-ctrl'/> + <feature name='sbdr-ssdp-no'/> + <feature name='serialize'/> + <feature name='sha512'/> + <feature name='sm3'/> + <feature name='sm4'/> + <feature name='ss'/> + </blockers> + <model usable='no' vendor='Intel'>ClearwaterForest-v3</model> + <blockers model='ClearwaterForest-v3'> + <feature name='avx-ifma'/> + <feature name='avx-ne-convert'/> + <feature name='avx-vnni-int16'/> + <feature name='avx-vnni-int8'/> + <feature name='bhi-ctrl'/> + <feature name='bhi-no'/> + <feature name='bus-lock-detect'/> + <feature name='cet-ibt'/> + <feature name='cldemote'/> + <feature name='cmpccxadd'/> + <feature name='ddpd-u'/> + <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='prefetchiti'/> + <feature name='psdp-no'/> + <feature name='rdseed'/> + <feature name='rrsba-ctrl'/> + <feature name='sbdr-ssdp-no'/> + <feature name='serialize'/> + <feature name='sha512'/> + <feature name='sm3'/> + <feature name='sm4'/> + <feature name='ss'/> + </blockers> <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model> <model usable='yes' vendor='Intel'>Conroe-v1</model> <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model> -- 2.54.0