[PATCH v2 32/36] cpu_map: Add versions of EPYC-Rome CPU model

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- Notes: Version 2: - <decode host='on' guest='off'/> for all versioned models - canonical CPU models in domain capabilities - CPU models are no longer canonicalized in post-parse src/cpu_map/index.xml | 4 + src/cpu_map/meson.build | 4 + src/cpu_map/x86_EPYC-Rome-v1.xml | 6 ++ src/cpu_map/x86_EPYC-Rome-v2.xml | 86 +++++++++++++++++++ src/cpu_map/x86_EPYC-Rome-v3.xml | 86 +++++++++++++++++++ src/cpu_map/x86_EPYC-Rome-v4.xml | 85 ++++++++++++++++++ .../x86_64-cpuid-EPYC-7502-32-Core-host.xml | 5 +- ...86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml | 2 +- .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 3 +- .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 27 +++++- tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 3 +- .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 7 +- .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 54 +++++++++++- tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 7 +- .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 7 +- .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 54 +++++++++++- tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 7 +- .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 7 +- .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 54 +++++++++++- tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 7 +- .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 7 +- .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 52 ++++++++++- tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 7 +- .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 7 +- .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 52 ++++++++++- tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 7 +- .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 7 +- .../qemu_7.2.0-tcg.x86_64+hvf.xml | 44 +++++++++- .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 44 +++++++++- tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 7 +- .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 7 +- .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 44 +++++++++- tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 7 +- .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 20 ++++- .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 67 ++++++++++++++- tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 20 ++++- .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 20 ++++- .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 63 +++++++++++++- tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 20 ++++- .../domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 20 ++++- .../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 63 +++++++++++++- tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 20 ++++- .../domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 20 ++++- .../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 63 +++++++++++++- tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 20 ++++- .../domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 20 ++++- .../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 63 +++++++++++++- tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 20 ++++- 48 files changed, 1281 insertions(+), 45 deletions(-) create mode 100644 src/cpu_map/x86_EPYC-Rome-v1.xml create mode 100644 src/cpu_map/x86_EPYC-Rome-v2.xml create mode 100644 src/cpu_map/x86_EPYC-Rome-v3.xml create mode 100644 src/cpu_map/x86_EPYC-Rome-v4.xml diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index 5a1a4aa691..9ea2b86bf7 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -123,6 +123,10 @@ <include filename='x86_EPYC.xml'/> <include filename='x86_EPYC-IBPB.xml'/> <include filename='x86_EPYC-Rome.xml'/> + <include filename='x86_EPYC-Rome-v1.xml'/> + <include filename='x86_EPYC-Rome-v2.xml'/> + <include filename='x86_EPYC-Rome-v3.xml'/> + <include filename='x86_EPYC-Rome-v4.xml'/> <include filename='x86_EPYC-Milan.xml'/> <include filename='x86_EPYC-Milan-v1.xml'/> <include filename='x86_EPYC-Milan-v2.xml'/> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index 5baf6543dd..912db3d2de 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -54,6 +54,10 @@ cpumap_data = [ 'x86_EPYC-Milan-v1.xml', 'x86_EPYC-Milan-v2.xml', 'x86_EPYC-Milan.xml', + 'x86_EPYC-Rome-v1.xml', + 'x86_EPYC-Rome-v2.xml', + 'x86_EPYC-Rome-v3.xml', + 'x86_EPYC-Rome-v4.xml', 'x86_EPYC-Rome.xml', 'x86_features.xml', 'x86_GraniteRapids-v1.xml', diff --git a/src/cpu_map/x86_EPYC-Rome-v1.xml b/src/cpu_map/x86_EPYC-Rome-v1.xml new file mode 100644 index 0000000000..c0b3760dc1 --- /dev/null +++ b/src/cpu_map/x86_EPYC-Rome-v1.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='EPYC-Rome-v1'> + <decode host='on' guest='off'/> + <model name='EPYC-Rome'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_EPYC-Rome-v2.xml b/src/cpu_map/x86_EPYC-Rome-v2.xml new file mode 100644 index 0000000000..92675c5eb9 --- /dev/null +++ b/src/cpu_map/x86_EPYC-Rome-v2.xml @@ -0,0 +1,86 @@ +<cpus> + <model name='EPYC-Rome-v2'> + <decode host='on' guest='off'/> + <signature family='23' model='49'/> + <vendor name='AMD'/> + <feature name='3dnowprefetch'/> + <feature name='abm'/> + <feature name='adx'/> + <feature name='aes'/> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='apic'/> + <feature name='arat'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='bmi1'/> + <feature name='bmi2'/> + <feature name='clflush'/> + <feature name='clflushopt'/> + <feature name='clwb'/> + <feature name='clzero'/> + <feature name='cmov'/> + <feature name='cr8legacy'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fxsr'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='misalignsse'/> + <feature name='mmx'/> + <feature name='mmxext'/> + <feature name='movbe'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='npt'/> + <feature name='nrip-save'/> + <feature name='nx'/> + <feature name='osvw'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pclmuldq'/> + <feature name='pdpe1gb'/> + <feature name='perfctr_core'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdpid'/> + <feature name='rdrand'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <feature name='sha-ni'/> + <feature name='smap'/> + <feature name='smep'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='sse4.1'/> + <feature name='sse4.2'/> + <feature name='sse4a'/> + <feature name='ssse3'/> + <feature name='svm'/> + <feature name='syscall'/> + <feature name='tsc'/> + <feature name='umip'/> + <feature name='vme'/> + <feature name='wbnoinvd'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaveopt'/> + <feature name='xsaves'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_EPYC-Rome-v3.xml b/src/cpu_map/x86_EPYC-Rome-v3.xml new file mode 100644 index 0000000000..f3f8b792dc --- /dev/null +++ b/src/cpu_map/x86_EPYC-Rome-v3.xml @@ -0,0 +1,86 @@ +<cpus> + <model name='EPYC-Rome-v3'> + <decode host='on' guest='off'/> + <signature family='23' model='49'/> + <vendor name='AMD'/> + <feature name='3dnowprefetch'/> + <feature name='abm'/> + <feature name='adx'/> + <feature name='aes'/> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='apic'/> + <feature name='arat'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='bmi1'/> + <feature name='bmi2'/> + <feature name='clflush'/> + <feature name='clflushopt'/> + <feature name='clwb'/> + <feature name='clzero'/> + <feature name='cmov'/> + <feature name='cr8legacy'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fxsr'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='misalignsse'/> + <feature name='mmx'/> + <feature name='mmxext'/> + <feature name='movbe'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='npt'/> + <feature name='nrip-save'/> + <feature name='nx'/> + <feature name='osvw'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pclmuldq'/> + <feature name='pdpe1gb'/> + <feature name='perfctr_core'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdpid'/> + <feature name='rdrand'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <feature name='sha-ni'/> + <feature name='smap'/> + <feature name='smep'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='sse4.1'/> + <feature name='sse4.2'/> + <feature name='sse4a'/> + <feature name='ssse3'/> + <feature name='svm'/> + <feature name='syscall'/> + <feature name='tsc'/> + <feature name='umip'/> + <feature name='vme'/> + <feature name='wbnoinvd'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaveopt'/> + <feature name='xsaves'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_EPYC-Rome-v4.xml b/src/cpu_map/x86_EPYC-Rome-v4.xml new file mode 100644 index 0000000000..4d92c5074a --- /dev/null +++ b/src/cpu_map/x86_EPYC-Rome-v4.xml @@ -0,0 +1,85 @@ +<cpus> + <model name='EPYC-Rome-v4'> + <decode host='on' guest='off'/> + <signature family='23' model='49'/> + <vendor name='AMD'/> + <feature name='3dnowprefetch'/> + <feature name='abm'/> + <feature name='adx'/> + <feature name='aes'/> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='apic'/> + <feature name='arat'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='bmi1'/> + <feature name='bmi2'/> + <feature name='clflush'/> + <feature name='clflushopt'/> + <feature name='clwb'/> + <feature name='clzero'/> + <feature name='cmov'/> + <feature name='cr8legacy'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fxsr'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='misalignsse'/> + <feature name='mmx'/> + <feature name='mmxext'/> + <feature name='movbe'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='npt'/> + <feature name='nrip-save'/> + <feature name='nx'/> + <feature name='osvw'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pclmuldq'/> + <feature name='pdpe1gb'/> + <feature name='perfctr_core'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdpid'/> + <feature name='rdrand'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <feature name='sha-ni'/> + <feature name='smap'/> + <feature name='smep'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='sse4.1'/> + <feature name='sse4.2'/> + <feature name='sse4a'/> + <feature name='ssse3'/> + <feature name='svm'/> + <feature name='syscall'/> + <feature name='tsc'/> + <feature name='umip'/> + <feature name='vme'/> + <feature name='wbnoinvd'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaveopt'/> + </model> +</cpus> diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml index 7f242404f0..4bc3acbc20 100644 --- a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml +++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml @@ -1,13 +1,12 @@ <cpu> <arch>x86_64</arch> - <model>EPYC-Rome</model> + <model>EPYC-Rome-v3</model> <vendor>AMD</vendor> <signature family='23' model='49' stepping='0'/> <feature name='monitor'/> <feature name='osxsave'/> <feature name='ht'/> <feature name='cmt'/> - <feature name='xsaves'/> <feature name='mbm_total'/> <feature name='mbm_local'/> <feature name='cmp_legacy'/> @@ -21,8 +20,6 @@ <feature name='overflow-recov'/> <feature name='succor'/> <feature name='invtsc'/> - <feature name='ibrs'/> - <feature name='amd-ssbd'/> <feature name='lbrv'/> <feature name='svm-lock'/> <feature name='tsc-scale'/> diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml index 5b9093d1e8..b569a00753 100644 --- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>EPYC-Rome</model> + <model>EPYC-Rome-v1</model> <vendor>AMD</vendor> <signature family='23' model='113' stepping='0'/> <feature name='monitor'/> 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 bad71f224b..382a47b1eb 100644 --- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml @@ -259,7 +259,8 @@ <model usable='yes' vendor='Hygon'>Dhyana</model> <model usable='yes' vendor='AMD'>EPYC</model> <model usable='yes' vendor='AMD'>EPYC-IBPB</model> - <model usable='yes' vendor='AMD'>EPYC-Rome</model> + <model usable='yes' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> + <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> 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 a029038c40..f8669af5d0 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -465,7 +465,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Rome</model> + <model usable='no' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='3dnowprefetch'/> <feature name='amd-stibp'/> @@ -490,6 +490,31 @@ <feature name='xsaveerptr'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v1</model> + <blockers model='EPYC-Rome-v1'> + <feature name='3dnowprefetch'/> + <feature name='amd-stibp'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='clzero'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='umip'/> + <feature name='wbnoinvd'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='avx'/> diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml index b67d477e3e..6b9bddd8b8 100644 --- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml @@ -258,7 +258,8 @@ <model usable='yes' vendor='Hygon'>Dhyana</model> <model usable='yes' vendor='AMD'>EPYC</model> <model usable='yes' vendor='AMD'>EPYC-IBPB</model> - <model usable='yes' vendor='AMD'>EPYC-Rome</model> + <model usable='yes' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> + <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> 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 7f55b528e6..b63f66fb0b 100644 --- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml @@ -277,7 +277,12 @@ <feature name='pcid'/> <feature name='pku'/> </blockers> - <model usable='yes' vendor='AMD'>EPYC-Rome</model> + <model usable='yes' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> + <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='ibrs'/> + </blockers> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> 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 4de66b9fc1..97fb021c94 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -528,7 +528,7 @@ <feature name='xsaveerptr'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Rome</model> + <model usable='no' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='3dnowprefetch'/> <feature name='amd-stibp'/> @@ -553,6 +553,58 @@ <feature name='xsaveerptr'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v1</model> + <blockers model='EPYC-Rome-v1'> + <feature name='3dnowprefetch'/> + <feature name='amd-stibp'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='clzero'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='umip'/> + <feature name='wbnoinvd'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='3dnowprefetch'/> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='clzero'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='umip'/> + <feature name='wbnoinvd'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='avx'/> diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml index 5c9d38ca08..fe6640357e 100644 --- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml @@ -276,7 +276,12 @@ <feature name='pcid'/> <feature name='pku'/> </blockers> - <model usable='yes' vendor='AMD'>EPYC-Rome</model> + <model usable='yes' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> + <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='ibrs'/> + </blockers> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> 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 9d6d6ccdf7..a31f32d941 100644 --- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml @@ -315,7 +315,12 @@ <feature name='pcid'/> <feature name='pku'/> </blockers> - <model usable='yes' vendor='AMD'>EPYC-Rome</model> + <model usable='yes' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> + <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='ibrs'/> + </blockers> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> 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 ab6728b6f3..83f3d85fbf 100644 --- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -593,7 +593,7 @@ <feature name='xsaveerptr'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Rome</model> + <model usable='no' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='3dnowprefetch'/> <feature name='amd-stibp'/> @@ -618,6 +618,58 @@ <feature name='xsaveerptr'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v1</model> + <blockers model='EPYC-Rome-v1'> + <feature name='3dnowprefetch'/> + <feature name='amd-stibp'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='clzero'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='umip'/> + <feature name='wbnoinvd'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='3dnowprefetch'/> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='clzero'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='umip'/> + <feature name='wbnoinvd'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='avx'/> diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml index ea112f1748..55490e84e2 100644 --- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml @@ -314,7 +314,12 @@ <feature name='pcid'/> <feature name='pku'/> </blockers> - <model usable='yes' vendor='AMD'>EPYC-Rome</model> + <model usable='yes' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> + <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='ibrs'/> + </blockers> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> 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 dec6db99f0..7c95a85710 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -312,7 +312,12 @@ <feature name='pcid'/> <feature name='pku'/> </blockers> - <model usable='yes' vendor='AMD'>EPYC-Rome</model> + <model usable='yes' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> + <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='ibrs'/> + </blockers> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> 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 8b15c74e33..2bb7c6d3f0 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -590,7 +590,7 @@ <feature name='xsaveerptr'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Rome</model> + <model usable='no' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='3dnowprefetch'/> <feature name='amd-stibp'/> @@ -615,6 +615,58 @@ <feature name='xsaveerptr'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v1</model> + <blockers model='EPYC-Rome-v1'> + <feature name='3dnowprefetch'/> + <feature name='amd-stibp'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='clzero'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='umip'/> + <feature name='wbnoinvd'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='3dnowprefetch'/> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='clzero'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='umip'/> + <feature name='wbnoinvd'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='avx'/> diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml index b136ce847c..0bc265f553 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -311,7 +311,12 @@ <feature name='pcid'/> <feature name='pku'/> </blockers> - <model usable='yes' vendor='AMD'>EPYC-Rome</model> + <model usable='yes' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> + <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='ibrs'/> + </blockers> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> 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 8a5dd3af81..7ca80c159a 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -313,7 +313,12 @@ <feature name='pcid'/> <feature name='pku'/> </blockers> - <model usable='yes' vendor='AMD'>EPYC-Rome</model> + <model usable='yes' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> + <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='ibrs'/> + </blockers> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> 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 cee1f740d4..a69abcfb0c 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -589,7 +589,7 @@ <feature name='xsaveerptr'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Rome</model> + <model usable='no' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='3dnowprefetch'/> <feature name='amd-stibp'/> @@ -613,6 +613,56 @@ <feature name='xsaveerptr'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v1</model> + <blockers model='EPYC-Rome-v1'> + <feature name='3dnowprefetch'/> + <feature name='amd-stibp'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='clzero'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='wbnoinvd'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='3dnowprefetch'/> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='clzero'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='wbnoinvd'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='avx'/> diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml index 15be5d34e0..09a9ea1792 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -312,7 +312,12 @@ <feature name='pcid'/> <feature name='pku'/> </blockers> - <model usable='yes' vendor='AMD'>EPYC-Rome</model> + <model usable='yes' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> + <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='ibrs'/> + </blockers> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> 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 e70d3c7498..a9bf1e222d 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -314,7 +314,12 @@ <feature name='pcid'/> <feature name='pku'/> </blockers> - <model usable='yes' vendor='AMD'>EPYC-Rome</model> + <model usable='yes' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> + <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='ibrs'/> + </blockers> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> 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 676d13fb3b..94744c83d4 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -589,7 +589,7 @@ <feature name='xsaveerptr'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Rome</model> + <model usable='no' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='3dnowprefetch'/> <feature name='amd-stibp'/> @@ -613,6 +613,56 @@ <feature name='xsaveerptr'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v1</model> + <blockers model='EPYC-Rome-v1'> + <feature name='3dnowprefetch'/> + <feature name='amd-stibp'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='clzero'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='wbnoinvd'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='3dnowprefetch'/> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='clzero'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='wbnoinvd'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='avx'/> diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml index 6859c4de66..3698fa6b95 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -313,7 +313,12 @@ <feature name='pcid'/> <feature name='pku'/> </blockers> - <model usable='yes' vendor='AMD'>EPYC-Rome</model> + <model usable='yes' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> + <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='ibrs'/> + </blockers> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> 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 a2be591f11..b628d0fbd7 100644 --- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml @@ -319,7 +319,12 @@ <feature name='pcid'/> <feature name='pku'/> </blockers> - <model usable='yes' vendor='AMD'>EPYC-Rome</model> + <model usable='yes' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> + <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='ibrs'/> + </blockers> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> 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 cecfdf6b5e..80e2034cdc 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 @@ -486,7 +486,7 @@ <feature name='xsaveerptr'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Rome</model> + <model usable='no' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='3dnowprefetch'/> <feature name='amd-stibp'/> @@ -506,6 +506,48 @@ <feature name='xsaveerptr'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v1</model> + <blockers model='EPYC-Rome-v1'> + <feature name='3dnowprefetch'/> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='wbnoinvd'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='3dnowprefetch'/> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='wbnoinvd'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='hle'/> 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 cecfdf6b5e..80e2034cdc 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml @@ -486,7 +486,7 @@ <feature name='xsaveerptr'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Rome</model> + <model usable='no' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='3dnowprefetch'/> <feature name='amd-stibp'/> @@ -506,6 +506,48 @@ <feature name='xsaveerptr'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v1</model> + <blockers model='EPYC-Rome-v1'> + <feature name='3dnowprefetch'/> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='wbnoinvd'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='3dnowprefetch'/> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='wbnoinvd'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='hle'/> diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml index 2aecbb33bc..a1235cc34f 100644 --- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml @@ -318,7 +318,12 @@ <feature name='pcid'/> <feature name='pku'/> </blockers> - <model usable='yes' vendor='AMD'>EPYC-Rome</model> + <model usable='yes' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> + <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='ibrs'/> + </blockers> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> 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 2640491c43..8aec71596b 100644 --- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml @@ -319,7 +319,12 @@ <feature name='pcid'/> <feature name='pku'/> </blockers> - <model usable='yes' vendor='AMD'>EPYC-Rome</model> + <model usable='yes' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> + <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='ibrs'/> + </blockers> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> 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 489085a666..ea81ce32d4 100644 --- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml @@ -488,7 +488,7 @@ <feature name='xsaveerptr'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Rome</model> + <model usable='no' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='3dnowprefetch'/> <feature name='amd-stibp'/> @@ -508,6 +508,48 @@ <feature name='xsaveerptr'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v1</model> + <blockers model='EPYC-Rome-v1'> + <feature name='3dnowprefetch'/> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='wbnoinvd'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='3dnowprefetch'/> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='wbnoinvd'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='hle'/> diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml index a8027a43e9..8502f47d88 100644 --- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml @@ -318,7 +318,12 @@ <feature name='pcid'/> <feature name='pku'/> </blockers> - <model usable='yes' vendor='AMD'>EPYC-Rome</model> + <model usable='yes' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> + <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='ibrs'/> + </blockers> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> 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 aa179c38f6..d18568f3a6 100644 --- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml @@ -370,10 +370,28 @@ <feature name='vpclmulqdq'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Rome</model> + <model usable='no' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v1</model> + <blockers model='EPYC-Rome-v1'> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='ibrs'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v3</model> + <blockers model='EPYC-Rome-v3'> + <feature name='ibrs'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v4</model> + <blockers model='EPYC-Rome-v4'> + <feature name='ibrs'/> + </blockers> <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> 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 cac6a73071..66efea8372 100644 --- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml @@ -464,7 +464,7 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Rome</model> + <model usable='no' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='amd-stibp'/> <feature name='clzero'/> @@ -479,6 +479,71 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v1</model> + <blockers model='EPYC-Rome-v1'> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v3</model> + <blockers model='EPYC-Rome-v3'> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v4</model> + <blockers model='EPYC-Rome-v4'> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + </blockers> <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml index 1f996902da..e32562a964 100644 --- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml @@ -369,10 +369,28 @@ <feature name='vpclmulqdq'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Rome</model> + <model usable='no' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v1</model> + <blockers model='EPYC-Rome-v1'> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='ibrs'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v3</model> + <blockers model='EPYC-Rome-v3'> + <feature name='ibrs'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v4</model> + <blockers model='EPYC-Rome-v4'> + <feature name='ibrs'/> + </blockers> <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> 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 9038f79bb2..e92c85d74f 100644 --- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml @@ -371,10 +371,28 @@ <feature name='vpclmulqdq'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Rome</model> + <model usable='no' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v1</model> + <blockers model='EPYC-Rome-v1'> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='ibrs'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v3</model> + <blockers model='EPYC-Rome-v3'> + <feature name='ibrs'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v4</model> + <blockers model='EPYC-Rome-v4'> + <feature name='ibrs'/> + </blockers> <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> 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 7574fb3d27..fdb16866fa 100644 --- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml @@ -457,7 +457,7 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Rome</model> + <model usable='no' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='amd-stibp'/> <feature name='clzero'/> @@ -471,6 +471,67 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v1</model> + <blockers model='EPYC-Rome-v1'> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v3</model> + <blockers model='EPYC-Rome-v3'> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v4</model> + <blockers model='EPYC-Rome-v4'> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='topoext'/> + <feature name='xsavec'/> + </blockers> <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml index 5b06b58bdd..53dd6165f1 100644 --- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml @@ -370,10 +370,28 @@ <feature name='vpclmulqdq'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Rome</model> + <model usable='no' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v1</model> + <blockers model='EPYC-Rome-v1'> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='ibrs'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v3</model> + <blockers model='EPYC-Rome-v3'> + <feature name='ibrs'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v4</model> + <blockers model='EPYC-Rome-v4'> + <feature name='ibrs'/> + </blockers> <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> 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 1f01a23a96..a1710315a0 100644 --- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml @@ -371,10 +371,28 @@ <feature name='vpclmulqdq'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Rome</model> + <model usable='no' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v1</model> + <blockers model='EPYC-Rome-v1'> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='ibrs'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v3</model> + <blockers model='EPYC-Rome-v3'> + <feature name='ibrs'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v4</model> + <blockers model='EPYC-Rome-v4'> + <feature name='ibrs'/> + </blockers> <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> 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 72a66a62e3..974a596dbb 100644 --- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml @@ -441,7 +441,7 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Rome</model> + <model usable='no' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='amd-stibp'/> <feature name='clzero'/> @@ -455,6 +455,67 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v1</model> + <blockers model='EPYC-Rome-v1'> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v3</model> + <blockers model='EPYC-Rome-v3'> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v4</model> + <blockers model='EPYC-Rome-v4'> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='topoext'/> + <feature name='xsavec'/> + </blockers> <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml index 941fb3bf31..077fbfa679 100644 --- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml @@ -370,10 +370,28 @@ <feature name='vpclmulqdq'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Rome</model> + <model usable='no' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v1</model> + <blockers model='EPYC-Rome-v1'> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='ibrs'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v3</model> + <blockers model='EPYC-Rome-v3'> + <feature name='ibrs'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v4</model> + <blockers model='EPYC-Rome-v4'> + <feature name='ibrs'/> + </blockers> <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> 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 7f1da49da1..fe3ddbc371 100644 --- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml @@ -375,10 +375,28 @@ <feature name='vpclmulqdq'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Rome</model> + <model usable='no' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v1</model> + <blockers model='EPYC-Rome-v1'> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='ibrs'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v3</model> + <blockers model='EPYC-Rome-v3'> + <feature name='ibrs'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v4</model> + <blockers model='EPYC-Rome-v4'> + <feature name='ibrs'/> + </blockers> <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> 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 529b90c1fe..9bef84873c 100644 --- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml @@ -440,7 +440,7 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Rome</model> + <model usable='no' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='amd-stibp'/> <feature name='clzero'/> @@ -454,6 +454,67 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v1</model> + <blockers model='EPYC-Rome-v1'> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v3</model> + <blockers model='EPYC-Rome-v3'> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v4</model> + <blockers model='EPYC-Rome-v4'> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='topoext'/> + <feature name='xsavec'/> + </blockers> <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml index ba51b7cfc8..a9bd9b8a89 100644 --- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml @@ -374,10 +374,28 @@ <feature name='vpclmulqdq'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Rome</model> + <model usable='no' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v1</model> + <blockers model='EPYC-Rome-v1'> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='ibrs'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v3</model> + <blockers model='EPYC-Rome-v3'> + <feature name='ibrs'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v4</model> + <blockers model='EPYC-Rome-v4'> + <feature name='ibrs'/> + </blockers> <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> 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 ad25b70d3a..1df9ba1786 100644 --- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml @@ -375,10 +375,28 @@ <feature name='vpclmulqdq'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Rome</model> + <model usable='no' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v1</model> + <blockers model='EPYC-Rome-v1'> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='ibrs'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v3</model> + <blockers model='EPYC-Rome-v3'> + <feature name='ibrs'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v4</model> + <blockers model='EPYC-Rome-v4'> + <feature name='ibrs'/> + </blockers> <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> 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 b627dc398f..be3a49c060 100644 --- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml @@ -440,7 +440,7 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Rome</model> + <model usable='no' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='amd-stibp'/> <feature name='clzero'/> @@ -454,6 +454,67 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v1</model> + <blockers model='EPYC-Rome-v1'> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v3</model> + <blockers model='EPYC-Rome-v3'> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v4</model> + <blockers model='EPYC-Rome-v4'> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='topoext'/> + <feature name='xsavec'/> + </blockers> <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml index d1a71cf441..ae1d858cd9 100644 --- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml @@ -374,10 +374,28 @@ <feature name='vpclmulqdq'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Rome</model> + <model usable='no' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v1</model> + <blockers model='EPYC-Rome-v1'> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v2</model> + <blockers model='EPYC-Rome-v2'> + <feature name='ibrs'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v3</model> + <blockers model='EPYC-Rome-v3'> + <feature name='ibrs'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Rome-v4</model> + <blockers model='EPYC-Rome-v4'> + <feature name='ibrs'/> + </blockers> <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> -- 2.47.0