[PATCH v2 28/36] cpu_map: Add versions of SandyBridge CPU model

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- Notes: Version 2: - SandyBridge-v2 defined as SandyBridge-IBRS - <decode host='on' guest='off'/> for all versioned models - canonical CPU models in domain capabilities src/cpu_map/index.xml | 2 ++ src/cpu_map/meson.build | 2 ++ src/cpu_map/x86_SandyBridge-v1.xml | 6 ++++++ src/cpu_map/x86_SandyBridge-v2.xml | 6 ++++++ .../x86_64-cpuid-Core-i5-2500-host.xml | 2 +- .../x86_64-cpuid-Core-i5-2540M-host.xml | 2 +- .../x86_64-cpuid-Core-i7-2600-host.xml | 2 +- .../x86_64-cpuid-Core-i7-2600-xsaveopt-host.xml | 2 +- .../x86_64-cpuid-Xeon-E5-2650-host.xml | 2 +- tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 17 +++++++++++++++-- tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 17 +++++++++++++++-- tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 17 +++++++++++++++-- tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 17 +++++++++++++++-- tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 17 +++++++++++++++-- tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 17 +++++++++++++++-- tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 9 +++++++-- .../qemu_7.2.0-tcg.x86_64+hvf.xml | 15 +++++++++++++-- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 15 +++++++++++++-- tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 15 +++++++++++++-- tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 15 +++++++++++++-- tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 15 +++++++++++++-- tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 13 +++++++++++-- tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 13 +++++++++++-- tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 13 +++++++++++-- tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 9 +++++++-- 49 files changed, 391 insertions(+), 85 deletions(-) create mode 100644 src/cpu_map/x86_SandyBridge-v1.xml create mode 100644 src/cpu_map/x86_SandyBridge-v2.xml diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index 02e15bc0fb..0b003b7e5c 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -35,6 +35,8 @@ <include filename='x86_Westmere-IBRS.xml'/> <include filename='x86_SandyBridge.xml'/> <include filename='x86_SandyBridge-IBRS.xml'/> + <include filename='x86_SandyBridge-v1.xml'/> + <include filename='x86_SandyBridge-v2.xml'/> <include filename='x86_IvyBridge.xml'/> <include filename='x86_IvyBridge-IBRS.xml'/> <include filename='x86_IvyBridge-v1.xml'/> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index 5f5cbc6049..de1eb8efbd 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -98,6 +98,8 @@ cpumap_data = [ 'x86_qemu32.xml', 'x86_qemu64.xml', 'x86_SandyBridge-IBRS.xml', + 'x86_SandyBridge-v1.xml', + 'x86_SandyBridge-v2.xml', 'x86_SandyBridge.xml', 'x86_SapphireRapids-v1.xml', 'x86_SapphireRapids-v2.xml', diff --git a/src/cpu_map/x86_SandyBridge-v1.xml b/src/cpu_map/x86_SandyBridge-v1.xml new file mode 100644 index 0000000000..eca815e90c --- /dev/null +++ b/src/cpu_map/x86_SandyBridge-v1.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='SandyBridge-v1'> + <decode host='on' guest='off'/> + <model name='SandyBridge'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_SandyBridge-v2.xml b/src/cpu_map/x86_SandyBridge-v2.xml new file mode 100644 index 0000000000..da7448e991 --- /dev/null +++ b/src/cpu_map/x86_SandyBridge-v2.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='SandyBridge-v2'> + <decode host='on' guest='off'/> + <model name='SandyBridge-IBRS'/> + </model> +</cpus> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml index 4d721b4d07..15acb88238 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>SandyBridge</model> + <model>SandyBridge-v1</model> <vendor>Intel</vendor> <signature family='6' model='42' stepping='7'/> <feature name='dtes64'/> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml index 4d721b4d07..15acb88238 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>SandyBridge</model> + <model>SandyBridge-v1</model> <vendor>Intel</vendor> <signature family='6' model='42' stepping='7'/> <feature name='dtes64'/> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml index 4d721b4d07..15acb88238 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>SandyBridge</model> + <model>SandyBridge-v1</model> <vendor>Intel</vendor> <signature family='6' model='42' stepping='7'/> <feature name='dtes64'/> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-host.xml index 32612c78e7..922a565fbf 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>SandyBridge</model> + <model>SandyBridge-v1</model> <vendor>Intel</vendor> <signature family='6' model='42' stepping='7'/> <feature name='dtes64'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml index 8f56d42213..e243de08f1 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>SandyBridge-IBRS</model> + <model>SandyBridge-v2</model> <vendor>Intel</vendor> <signature family='6' model='45' stepping='7'/> <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 91470f547c..fef8d6b7e6 100644 --- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml @@ -534,11 +534,16 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='yes' vendor='Intel'>SandyBridge</model> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml index ea9d251170..ef6c42b26e 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -915,19 +915,32 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='no' vendor='Intel'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <blockers model='SandyBridge'> <feature name='avx'/> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='avx'/> <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v1</model> + <blockers model='SandyBridge-v1'> + <feature name='avx'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='avx'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <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 5595aa189f..bf133ee52f 100644 --- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml @@ -533,11 +533,16 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='yes' vendor='Intel'>SandyBridge</model> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml index 67e9581392..4d70c4dff3 100644 --- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml @@ -543,11 +543,16 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='yes' vendor='Intel'>SandyBridge</model> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml index dece2c5a51..51c450070e 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -947,19 +947,32 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='no' vendor='Intel'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <blockers model='SandyBridge'> <feature name='avx'/> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='avx'/> <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v1</model> + <blockers model='SandyBridge-v1'> + <feature name='avx'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='avx'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <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 b20142b754..5aa253d292 100644 --- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml @@ -542,11 +542,16 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='yes' vendor='Intel'>SandyBridge</model> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml index 20cf24f7d2..8331b137a4 100644 --- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml @@ -607,11 +607,16 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='yes' vendor='Intel'>SandyBridge</model> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml index 8c105600d1..ffb6f8b8f5 100644 --- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -1055,19 +1055,32 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='no' vendor='Intel'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <blockers model='SandyBridge'> <feature name='avx'/> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='avx'/> <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v1</model> + <blockers model='SandyBridge-v1'> + <feature name='avx'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='avx'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <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 d04712fac0..5d9e5e7d0a 100644 --- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml @@ -606,11 +606,16 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='yes' vendor='Intel'>SandyBridge</model> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml index fcb4bc875c..8b5d68d86f 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -604,11 +604,16 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='yes' vendor='Intel'>SandyBridge</model> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml index 89d88b5ba6..99aee06e01 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -1053,19 +1053,32 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='no' vendor='Intel'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <blockers model='SandyBridge'> <feature name='avx'/> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='avx'/> <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v1</model> + <blockers model='SandyBridge-v1'> + <feature name='avx'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='avx'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <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 dd65742683..eecf62e23c 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -603,11 +603,16 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='yes' vendor='Intel'>SandyBridge</model> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml index 7a8c833ffb..1594090e93 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -631,11 +631,16 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='yes' vendor='Intel'>SandyBridge</model> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml index e180310c57..5cbef5a3d9 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -1085,19 +1085,32 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='no' vendor='Intel'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <blockers model='SandyBridge'> <feature name='avx'/> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='avx'/> <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v1</model> + <blockers model='SandyBridge-v1'> + <feature name='avx'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='avx'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <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 0e27307188..7686d541af 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -630,11 +630,16 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='yes' vendor='Intel'>SandyBridge</model> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml index 63b5f3daeb..64f907d402 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -598,11 +598,16 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='yes' vendor='Intel'>SandyBridge</model> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml index f2f45a3159..2c3d3c6831 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -1033,19 +1033,32 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='no' vendor='Intel'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <blockers model='SandyBridge'> <feature name='avx'/> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='avx'/> <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v1</model> + <blockers model='SandyBridge-v1'> + <feature name='avx'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='avx'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <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 4596b3cfaa..d44bbf5916 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -597,11 +597,16 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='yes' vendor='Intel'>SandyBridge</model> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml index eb02099bdd..0c80394deb 100644 --- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml @@ -603,11 +603,16 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='yes' vendor='Intel'>SandyBridge</model> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml index 8833bf346f..c0bccf6d63 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 @@ -846,17 +846,28 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='no' vendor='Intel'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <blockers model='SandyBridge'> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v1</model> + <blockers model='SandyBridge-v1'> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <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 8833bf346f..c0bccf6d63 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml @@ -846,17 +846,28 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='no' vendor='Intel'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <blockers model='SandyBridge'> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v1</model> + <blockers model='SandyBridge-v1'> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <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 abb210a30b..495ff2a7a6 100644 --- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml @@ -602,11 +602,16 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='yes' vendor='Intel'>SandyBridge</model> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml index 283617171c..14b575174e 100644 --- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml @@ -603,11 +603,16 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='yes' vendor='Intel'>SandyBridge</model> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model> <blockers model='SapphireRapids'> <feature name='amx-bf16'/> 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 65e487ff9e..5ea1d67be6 100644 --- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml @@ -846,17 +846,28 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='no' vendor='Intel'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <blockers model='SandyBridge'> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v1</model> + <blockers model='SandyBridge-v1'> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model> <blockers model='SapphireRapids'> <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 0760bdaac4..910375f2f9 100644 --- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml @@ -602,11 +602,16 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='yes' vendor='Intel'>SandyBridge</model> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model> <blockers model='SapphireRapids'> <feature name='amx-bf16'/> 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 e1d63a9007..76d4068514 100644 --- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml @@ -741,11 +741,16 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='yes' vendor='Intel'>SandyBridge</model> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model> <blockers model='SapphireRapids'> <feature name='amx-bf16'/> diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml index edd510b459..85c1c55285 100644 --- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml @@ -826,17 +826,28 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='no' vendor='Intel'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <blockers model='SandyBridge'> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v1</model> + <blockers model='SandyBridge-v1'> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model> <blockers model='SapphireRapids'> <feature name='amx-bf16'/> diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml index db88c10e02..31faf3b348 100644 --- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml @@ -740,11 +740,16 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='yes' vendor='Intel'>SandyBridge</model> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model> <blockers model='SapphireRapids'> <feature name='amx-bf16'/> diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml index 32ca16ad7a..b19817918f 100644 --- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml @@ -742,11 +742,16 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='yes' vendor='Intel'>SandyBridge</model> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model> <blockers model='SapphireRapids'> <feature name='amx-bf16'/> diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml index bbedbc97e8..f5c4c5cde5 100644 --- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml @@ -815,17 +815,28 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='no' vendor='Intel'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <blockers model='SandyBridge'> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v1</model> + <blockers model='SandyBridge-v1'> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model> <blockers model='SapphireRapids'> <feature name='amx-bf16'/> diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml index dbb2f570c4..382c098a1a 100644 --- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml @@ -741,11 +741,16 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='yes' vendor='Intel'>SandyBridge</model> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model> <blockers model='SapphireRapids'> <feature name='amx-bf16'/> diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml index 1bb022ed96..5e85710109 100644 --- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml @@ -742,11 +742,16 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='yes' vendor='Intel'>SandyBridge</model> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model> <blockers model='SapphireRapids'> <feature name='amx-bf16'/> diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml index 36e94c5332..003aca6d5a 100644 --- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml @@ -777,15 +777,24 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='no' vendor='Intel'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <blockers model='SandyBridge'> <feature name='tsc-deadline'/> </blockers> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v1</model> + <blockers model='SandyBridge-v1'> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + </blockers> <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model> <blockers model='SapphireRapids'> <feature name='amx-bf16'/> diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml index 1f322d41c3..be10184da3 100644 --- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml @@ -741,11 +741,16 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='yes' vendor='Intel'>SandyBridge</model> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model> <blockers model='SapphireRapids'> <feature name='amx-bf16'/> diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml index 1a646e25eb..eba43c60e4 100644 --- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml @@ -775,11 +775,16 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='yes' vendor='Intel'>SandyBridge</model> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model> <blockers model='SapphireRapids'> <feature name='amx-bf16'/> diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml index 5ed8b25139..58bb4f9db6 100644 --- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml @@ -802,15 +802,24 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='no' vendor='Intel'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <blockers model='SandyBridge'> <feature name='tsc-deadline'/> </blockers> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v1</model> + <blockers model='SandyBridge-v1'> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + </blockers> <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model> <blockers model='SapphireRapids'> <feature name='amx-bf16'/> diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml index fa46dd5393..e548534e1f 100644 --- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml @@ -774,11 +774,16 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='yes' vendor='Intel'>SandyBridge</model> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model> <blockers model='SapphireRapids'> <feature name='amx-bf16'/> diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml index 3cfbed919a..5be6724161 100644 --- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml @@ -775,11 +775,16 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='yes' vendor='Intel'>SandyBridge</model> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model> <blockers model='SapphireRapids'> <feature name='amx-bf16'/> diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml index f6f461bbf4..1eec80af8d 100644 --- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml @@ -802,15 +802,24 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='no' vendor='Intel'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <blockers model='SandyBridge'> <feature name='tsc-deadline'/> </blockers> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v1</model> + <blockers model='SandyBridge-v1'> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + </blockers> <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model> <blockers model='SapphireRapids'> <feature name='amx-bf16'/> diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml index f2f765ade9..0716a44ed5 100644 --- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml @@ -774,11 +774,16 @@ <feature name='xop'/> </blockers> <model usable='yes' vendor='Intel'>Penryn</model> - <model usable='yes' vendor='Intel'>SandyBridge</model> - <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> + <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> + <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model> <blockers model='SapphireRapids'> <feature name='amx-bf16'/> -- 2.47.0