[PATCH v2 25/36] cpu_map: Add versions of Broadwell CPU model

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- Notes: Version 2: - Broadwell-v2 defined as Broadwell-noTSX - Broadwell-v3 defined as Broadwell-IBRS - Broadwell-v4 defined as Broadwell-noTSX-IBRS - <decode host='on' guest='off'/> for all versioned models - canonical CPU models in domain capabilities src/cpu_map/index.xml | 4 ++ src/cpu_map/meson.build | 4 ++ src/cpu_map/x86_Broadwell-v1.xml | 6 ++ src/cpu_map/x86_Broadwell-v2.xml | 6 ++ src/cpu_map/x86_Broadwell-v3.xml | 6 ++ src/cpu_map/x86_Broadwell-v4.xml | 6 ++ .../x86_64-cpuid-Core-i7-5600U-arat-host.xml | 2 +- .../x86_64-cpuid-Core-i7-5600U-host.xml | 2 +- .../x86_64-cpuid-Core-i7-5600U-ibrs-host.xml | 2 +- .../x86_64-cpuid-Xeon-E5-2623-v4-host.xml | 2 +- .../x86_64-cpuid-Xeon-E5-2630-v4-host.xml | 2 +- .../x86_64-cpuid-Xeon-E5-2650-v4-host.xml | 2 +- .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 66 +++++++++++++++++-- tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 66 +++++++++++++++++-- tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 66 +++++++++++++++++-- tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 66 +++++++++++++++++-- tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 66 +++++++++++++++++-- tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 66 +++++++++++++++++-- tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 38 +++++++++-- .../qemu_7.2.0-tcg.x86_64+hvf.xml | 50 ++++++++++++-- .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 50 ++++++++++++-- tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 50 ++++++++++++-- tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 42 ++++++++++-- tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 42 ++++++++++-- tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 38 +++++++++-- tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 38 +++++++++-- tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 38 +++++++++-- tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 38 +++++++++-- 52 files changed, 1610 insertions(+), 166 deletions(-) create mode 100644 src/cpu_map/x86_Broadwell-v1.xml create mode 100644 src/cpu_map/x86_Broadwell-v2.xml create mode 100644 src/cpu_map/x86_Broadwell-v3.xml create mode 100644 src/cpu_map/x86_Broadwell-v4.xml diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index 4d7f8dc700..204cce459a 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -45,6 +45,10 @@ <include filename='x86_Broadwell-noTSX-IBRS.xml'/> <include filename='x86_Broadwell.xml'/> <include filename='x86_Broadwell-IBRS.xml'/> + <include filename='x86_Broadwell-v1.xml'/> + <include filename='x86_Broadwell-v2.xml'/> + <include filename='x86_Broadwell-v3.xml'/> + <include filename='x86_Broadwell-v4.xml'/> <include filename='x86_Skylake-Client.xml'/> <include filename='x86_Skylake-Client-IBRS.xml'/> <include filename='x86_Skylake-Client-noTSX-IBRS.xml'/> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index 9fea2059bd..410f29f505 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -27,6 +27,10 @@ cpumap_data = [ 'x86_Broadwell-IBRS.xml', 'x86_Broadwell-noTSX-IBRS.xml', 'x86_Broadwell-noTSX.xml', + 'x86_Broadwell-v1.xml', + 'x86_Broadwell-v2.xml', + 'x86_Broadwell-v3.xml', + 'x86_Broadwell-v4.xml', 'x86_Broadwell.xml', 'x86_Cascadelake-Server-noTSX.xml', 'x86_Cascadelake-Server-v1.xml', diff --git a/src/cpu_map/x86_Broadwell-v1.xml b/src/cpu_map/x86_Broadwell-v1.xml new file mode 100644 index 0000000000..3bbf3f4070 --- /dev/null +++ b/src/cpu_map/x86_Broadwell-v1.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Broadwell-v1'> + <decode host='on' guest='off'/> + <model name='Broadwell'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Broadwell-v2.xml b/src/cpu_map/x86_Broadwell-v2.xml new file mode 100644 index 0000000000..209bf1df2c --- /dev/null +++ b/src/cpu_map/x86_Broadwell-v2.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Broadwell-v2'> + <decode host='on' guest='off'/> + <model name='Broadwell-noTSX'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Broadwell-v3.xml b/src/cpu_map/x86_Broadwell-v3.xml new file mode 100644 index 0000000000..eec3beee73 --- /dev/null +++ b/src/cpu_map/x86_Broadwell-v3.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Broadwell-v3'> + <decode host='on' guest='off'/> + <model name='Broadwell-IBRS'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Broadwell-v4.xml b/src/cpu_map/x86_Broadwell-v4.xml new file mode 100644 index 0000000000..60fec5285f --- /dev/null +++ b/src/cpu_map/x86_Broadwell-v4.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Broadwell-v4'> + <decode host='on' guest='off'/> + <model name='Broadwell-noTSX-IBRS'/> + </model> +</cpus> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml index 32bfc2521e..872b531c0f 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>Broadwell</model> + <model>Broadwell-v1</model> <vendor>Intel</vendor> <signature family='6' model='61' stepping='4'/> <feature name='dtes64'/> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml index 32bfc2521e..872b531c0f 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>Broadwell</model> + <model>Broadwell-v1</model> <vendor>Intel</vendor> <signature family='6' model='61' stepping='4'/> <feature name='dtes64'/> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml index aeea45b444..d99718d9f7 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>Broadwell-IBRS</model> + <model>Broadwell-v3</model> <vendor>Intel</vendor> <signature family='6' model='61' stepping='4'/> <feature name='dtes64'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml index ab7c422861..6280bf46cc 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>Broadwell-IBRS</model> + <model>Broadwell-v3</model> <vendor>Intel</vendor> <signature family='6' model='79' stepping='1'/> <feature name='dtes64'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml index feb5514d22..7b3c52f39a 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>Broadwell</model> + <model>Broadwell-v1</model> <vendor>Intel</vendor> <signature family='6' model='79' stepping='1'/> <feature name='dtes64'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml index feb5514d22..7b3c52f39a 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>Broadwell</model> + <model>Broadwell-v1</model> <vendor>Intel</vendor> <signature family='6' model='79' stepping='1'/> <feature name='dtes64'/> diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml index 0a1dd449a7..d05a506975 100644 --- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml @@ -63,7 +63,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -71,7 +71,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -80,19 +80,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> 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 69d7cc7683..a8e28d279c 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -75,7 +75,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -90,7 +90,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -106,7 +106,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -119,7 +119,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -133,6 +133,64 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml index 479a03c07c..17954892e0 100644 --- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml @@ -62,7 +62,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -70,7 +70,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -79,19 +79,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> 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 7a6b9f622c..c7f12089c7 100644 --- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml @@ -63,7 +63,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -71,7 +71,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -80,19 +80,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> 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 ac171ae9c2..c2229b8837 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -76,7 +76,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -91,7 +91,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -107,7 +107,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -120,7 +120,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -134,6 +134,64 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml index 43f52d1449..aa5f264c52 100644 --- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml @@ -62,7 +62,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -70,7 +70,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -79,19 +79,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> 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 ab3c8a5a3b..2e41f8919a 100644 --- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml @@ -64,7 +64,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -72,7 +72,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -81,19 +81,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> 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 8a426d1838..a0fd318734 100644 --- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -76,7 +76,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -91,7 +91,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -107,7 +107,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -120,7 +120,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -134,6 +134,64 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml index ce9f57dfe2..3c599581f7 100644 --- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml @@ -63,7 +63,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -71,7 +71,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -80,19 +80,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> 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 cb31bebb9f..9b8a512f12 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -64,7 +64,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -72,7 +72,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -81,19 +81,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> 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 a8911370e2..7831820858 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -78,7 +78,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -93,7 +93,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -109,7 +109,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -122,7 +122,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -136,6 +136,64 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml index cc576447f7..b3ac57b859 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -63,7 +63,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -71,7 +71,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -80,19 +80,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> 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 b616d4a1e6..340266c243 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -65,7 +65,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -73,7 +73,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -82,19 +82,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> 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 53c50c2ddc..f578d1a270 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -79,7 +79,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -94,7 +94,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -110,7 +110,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -123,7 +123,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -137,6 +137,64 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml index 2454a6f8c1..2a2db648e7 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -64,7 +64,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -72,7 +72,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -81,19 +81,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> 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 ceef8576a4..bb9bb28922 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -66,7 +66,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -74,7 +74,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -83,19 +83,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> 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 c4ca961052..aadac29f25 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -79,7 +79,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -94,7 +94,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -110,7 +110,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -123,7 +123,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -137,6 +137,64 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml index 5cd771a999..1a8fb7a7fa 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -65,7 +65,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -73,7 +73,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -82,19 +82,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> 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 f0f3b2e5c3..2751f9a93f 100644 --- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml @@ -71,7 +71,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -79,7 +79,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -88,19 +88,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> 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 366b94f6fd..a891514df0 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 @@ -68,7 +68,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='3dnowprefetch'/> <feature name='hle'/> @@ -79,7 +79,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='3dnowprefetch'/> <feature name='hle'/> @@ -91,7 +91,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='3dnowprefetch'/> <feature name='invpcid'/> @@ -100,7 +100,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='invpcid'/> @@ -110,6 +110,48 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='3dnowprefetch'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='3dnowprefetch'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='3dnowprefetch'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='3dnowprefetch'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml index 366b94f6fd..a891514df0 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml @@ -68,7 +68,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='3dnowprefetch'/> <feature name='hle'/> @@ -79,7 +79,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='3dnowprefetch'/> <feature name='hle'/> @@ -91,7 +91,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='3dnowprefetch'/> <feature name='invpcid'/> @@ -100,7 +100,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='invpcid'/> @@ -110,6 +110,48 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='3dnowprefetch'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='3dnowprefetch'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='3dnowprefetch'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='3dnowprefetch'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml index 730e4ab447..eaaabd40e2 100644 --- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml @@ -70,7 +70,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -78,7 +78,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -87,19 +87,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> 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 95b4936952..5f16ac097d 100644 --- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml @@ -71,7 +71,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -79,7 +79,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -88,19 +88,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> 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 fc3502beeb..4951414527 100644 --- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml @@ -72,7 +72,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='3dnowprefetch'/> <feature name='hle'/> @@ -83,7 +83,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='3dnowprefetch'/> <feature name='hle'/> @@ -95,7 +95,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='3dnowprefetch'/> <feature name='invpcid'/> @@ -104,7 +104,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='invpcid'/> @@ -114,6 +114,48 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='3dnowprefetch'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='3dnowprefetch'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='3dnowprefetch'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='3dnowprefetch'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml index 7f36f932bd..e90833b281 100644 --- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml @@ -70,7 +70,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -78,7 +78,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -87,19 +87,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> 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 9ea66dbe8a..708cfb621c 100644 --- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml @@ -73,7 +73,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -81,7 +81,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -90,19 +90,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> 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 13f10d885a..468a78e05a 100644 --- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml @@ -73,7 +73,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='hle'/> <feature name='invpcid'/> @@ -82,7 +82,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='hle'/> <feature name='invpcid'/> @@ -92,14 +92,14 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='invpcid'/> <feature name='pcid'/> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='invpcid'/> <feature name='pcid'/> @@ -107,6 +107,40 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml index 7627ddb1d5..54320ebc71 100644 --- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml @@ -72,7 +72,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -80,7 +80,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -89,19 +89,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> 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 fc3e1855e7..8df44a2e65 100644 --- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml @@ -74,7 +74,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -82,7 +82,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -91,19 +91,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> 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 eccf032aa5..8767ab2872 100644 --- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml @@ -72,7 +72,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='hle'/> <feature name='invpcid'/> @@ -81,7 +81,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='hle'/> <feature name='invpcid'/> @@ -91,14 +91,14 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='invpcid'/> <feature name='pcid'/> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='invpcid'/> <feature name='pcid'/> @@ -106,6 +106,40 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml index 2962fb2097..f6959a66eb 100644 --- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml @@ -73,7 +73,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -81,7 +81,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -90,19 +90,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> 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 137c4e62f6..f338a2a0f4 100644 --- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml @@ -74,7 +74,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -82,7 +82,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -91,19 +91,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> 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 82a369cf25..3b799a6c96 100644 --- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml @@ -74,7 +74,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='hle'/> <feature name='invpcid'/> @@ -82,7 +82,7 @@ <feature name='rtm'/> <feature name='tsc-deadline'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='hle'/> <feature name='invpcid'/> @@ -91,19 +91,49 @@ <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='invpcid'/> <feature name='pcid'/> <feature name='tsc-deadline'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml index fa030eb235..cbffd21e13 100644 --- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml @@ -73,7 +73,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -81,7 +81,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -90,19 +90,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> 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 f99ca4b2e6..3f59106b1a 100644 --- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml @@ -78,7 +78,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -86,7 +86,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -95,19 +95,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> 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 1f38493b16..42a0c34a34 100644 --- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml @@ -73,7 +73,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='hle'/> <feature name='invpcid'/> @@ -81,7 +81,7 @@ <feature name='rtm'/> <feature name='tsc-deadline'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='hle'/> <feature name='invpcid'/> @@ -90,19 +90,49 @@ <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='invpcid'/> <feature name='pcid'/> <feature name='tsc-deadline'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml index a89a36b9b1..f3f3b54a8f 100644 --- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml @@ -77,7 +77,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -85,7 +85,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -94,19 +94,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> 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 3f5ab7b44d..f8dfc27dc3 100644 --- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml @@ -78,7 +78,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -86,7 +86,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -95,19 +95,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> 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 146d166ff7..223eaaf68d 100644 --- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml @@ -73,7 +73,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='hle'/> <feature name='invpcid'/> @@ -81,7 +81,7 @@ <feature name='rtm'/> <feature name='tsc-deadline'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='hle'/> <feature name='invpcid'/> @@ -90,19 +90,49 @@ <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='invpcid'/> <feature name='pcid'/> <feature name='tsc-deadline'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml index 6b18f6a9ad..21e1746110 100644 --- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml @@ -77,7 +77,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -85,7 +85,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -94,19 +94,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> -- 2.47.0