Signed-off-by: Jiri Denemark <jdenemar@xxxxxxxxxx>
---
Notes:
Version 2:
- <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_Cooperlake-v1.xml | 6 +
src/cpu_map/x86_Cooperlake-v2.xml | 164 ++++++++++++++++++
.../x86_64-cpuid-Cooperlake-host.xml | 2 +-
.../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 21 ++-
.../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 35 +++-
tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 21 ++-
.../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 21 ++-
.../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 35 +++-
tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 21 ++-
.../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 42 ++++-
.../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 71 +++++++-
tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 42 ++++-
.../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 40 ++++-
.../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 69 +++++++-
tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 40 ++++-
.../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 40 ++++-
.../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 69 +++++++-
tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 40 ++++-
.../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 40 ++++-
.../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 69 +++++++-
tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 40 ++++-
.../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 40 ++++-
.../qemu_7.2.0-tcg.x86_64+hvf.xml | 61 ++++++-
.../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 61 ++++++-
tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 40 ++++-
.../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 40 ++++-
.../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 61 ++++++-
tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 40 ++++-
.../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 41 ++++-
.../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 45 ++++-
tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 41 ++++-
.../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 41 ++++-
.../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 45 ++++-
tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 41 ++++-
.../domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 41 ++++-
.../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 43 ++++-
tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 41 ++++-
.../domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 41 ++++-
.../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 43 ++++-
tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 41 ++++-
.../domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 41 ++++-
.../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 43 ++++-
tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 41 ++++-
45 files changed, 1863 insertions(+), 41 deletions(-)
create mode 100644 src/cpu_map/x86_Cooperlake-v1.xml
create mode 100644 src/cpu_map/x86_Cooperlake-v2.xml
diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
index d35eb80d03..923954b763 100644
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -58,6 +58,8 @@
<include filename='x86_Icelake-Server.xml'/>
<include filename='x86_Icelake-Server-noTSX.xml'/>
<include filename='x86_Cooperlake.xml'/>
+ <include filename='x86_Cooperlake-v1.xml'/>
+ <include filename='x86_Cooperlake-v2.xml'/>
<include filename='x86_Snowridge.xml'/>
<include filename='x86_Snowridge-v1.xml'/>
<include filename='x86_Snowridge-v2.xml'/>
diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
index cecb6d1d83..e08d8ccda7 100644
--- a/src/cpu_map/meson.build
+++ b/src/cpu_map/meson.build
@@ -31,6 +31,8 @@ cpumap_data = [
'x86_Cascadelake-Server-noTSX.xml',
'x86_Cascadelake-Server.xml',
'x86_Conroe.xml',
+ 'x86_Cooperlake-v1.xml',
+ 'x86_Cooperlake-v2.xml',
'x86_Cooperlake.xml',
'x86_core2duo.xml',
'x86_coreduo.xml',
diff --git a/src/cpu_map/x86_Cooperlake-v1.xml b/src/cpu_map/x86_Cooperlake-v1.xml
new file mode 100644
index 0000000000..50f90c1f1e
--- /dev/null
+++ b/src/cpu_map/x86_Cooperlake-v1.xml
@@ -0,0 +1,6 @@
+<cpus>
+ <model name='Cooperlake-v1'>
+ <decode host='on' guest='off'/>
+ <model name='Cooperlake'/>
+ </model>
+</cpus>
diff --git a/src/cpu_map/x86_Cooperlake-v2.xml b/src/cpu_map/x86_Cooperlake-v2.xml
new file mode 100644
index 0000000000..8c9c5ac2fd
--- /dev/null
+++ b/src/cpu_map/x86_Cooperlake-v2.xml
@@ -0,0 +1,164 @@
+<cpus>
+ <model name='Cooperlake-v2'>
+ <decode host='on' guest='off'/>
+ <signature family='6' model='85' stepping='10-11'/>
+ <vendor name='Intel'/>
+ <feature name='3dnowprefetch'/>
+ <feature name='abm'/>
+ <feature name='adx'/>
+ <feature name='aes'/>
+ <feature name='apic'/>
+ <feature name='arat'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx'/>
+ <feature name='avx2'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='bmi1'/>
+ <feature name='bmi2'/>
+ <feature name='clflush'/>
+ <feature name='clflushopt'/>
+ <feature name='clwb'/>
+ <feature name='cmov'/>
+ <feature name='cx16'/>
+ <feature name='cx8'/>
+ <feature name='de'/>
+ <feature name='erms'/>
+ <feature name='f16c'/>
+ <feature name='fma'/>
+ <feature name='fpu'/>
+ <feature name='fsgsbase'/>
+ <feature name='fxsr'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='lahf_lm'/>
+ <feature name='lm'/>
+ <feature name='mca'/>
+ <feature name='mce'/>
+ <feature name='mds-no'/>
+ <feature name='mmx'/>
+ <feature name='movbe'/>
+ <feature name='msr'/>
+ <feature name='mtrr'/>
+ <feature name='nx'/>
+ <feature name='pae'/>
+ <feature name='pat'/>
+ <feature name='pcid'/>
+ <feature name='pclmuldq'/>
+ <feature name='pdpe1gb'/>
+ <feature name='pge'/>
+ <feature name='pku'/>
+ <feature name='pni'/>
+ <feature name='popcnt'/>
+ <feature name='pschange-mc-no'/>
+ <feature name='pse'/>
+ <feature name='pse36'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdrand'/>
+ <feature name='rdseed'/>
+ <feature name='rdtscp'/>
+ <feature name='rtm'/>
+ <feature name='sep'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='smap'/>
+ <feature name='smep'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='sse'/>
+ <feature name='sse2'/>
+ <feature name='sse4.1'/>
+ <feature name='sse4.2'/>
+ <feature name='ssse3'/>
+ <feature name='stibp'/>
+ <feature name='syscall'/>
+ <feature name='taa-no'/>
+ <feature name='tsc'/>
+ <feature name='tsc-deadline'/>
+ <feature name='vme'/>
+ <feature name='vmx-activity-hlt'/>
+ <feature name='vmx-apicv-register'/>
+ <feature name='vmx-apicv-vid'/>
+ <feature name='vmx-apicv-x2apic'/>
+ <feature name='vmx-apicv-xapic'/>
+ <feature name='vmx-cr3-load-noexit'/>
+ <feature name='vmx-cr3-store-noexit'/>
+ <feature name='vmx-cr8-load-exit'/>
+ <feature name='vmx-cr8-store-exit'/>
+ <feature name='vmx-desc-exit'/>
+ <feature name='vmx-entry-ia32e-mode'/>
+ <feature name='vmx-entry-load-efer'/>
+ <feature name='vmx-entry-load-pat'/>
+ <feature name='vmx-entry-load-perf-global-ctrl'/>
+ <feature name='vmx-entry-noload-debugctl'/>
+ <feature name='vmx-ept'/>
+ <feature name='vmx-ept-1gb'/>
+ <feature name='vmx-ept-2mb'/>
+ <feature name='vmx-ept-execonly'/>
+ <feature name='vmx-eptad'/>
+ <feature name='vmx-eptp-switching'/>
+ <feature name='vmx-exit-ack-intr'/>
+ <feature name='vmx-exit-load-efer'/>
+ <feature name='vmx-exit-load-pat'/>
+ <feature name='vmx-exit-load-perf-global-ctrl'/>
+ <feature name='vmx-exit-nosave-debugctl'/>
+ <feature name='vmx-exit-save-efer'/>
+ <feature name='vmx-exit-save-pat'/>
+ <feature name='vmx-exit-save-preemption-timer'/>
+ <feature name='vmx-flexpriority'/>
+ <feature name='vmx-hlt-exit'/>
+ <feature name='vmx-ins-outs'/>
+ <feature name='vmx-intr-exit'/>
+ <feature name='vmx-invept'/>
+ <feature name='vmx-invept-all-context'/>
+ <feature name='vmx-invept-single-context'/>
+ <feature name='vmx-invlpg-exit'/>
+ <feature name='vmx-invpcid-exit'/>
+ <feature name='vmx-invvpid-all-context'/>
+ <feature name='vmx-invvpid-single-addr'/>
+ <feature name='vmx-invvpid-single-context-noglobals'/>
+ <feature name='vmx-io-bitmap'/>
+ <feature name='vmx-io-exit'/>
+ <feature name='vmx-monitor-exit'/>
+ <feature name='vmx-movdr-exit'/>
+ <feature name='vmx-msr-bitmap'/>
+ <feature name='vmx-mtf'/>
+ <feature name='vmx-mwait-exit'/>
+ <feature name='vmx-nmi-exit'/>
+ <feature name='vmx-page-walk-4'/>
+ <feature name='vmx-pause-exit'/>
+ <feature name='vmx-pml'/>
+ <feature name='vmx-posted-intr'/>
+ <feature name='vmx-preemption-timer'/>
+ <feature name='vmx-rdpmc-exit'/>
+ <feature name='vmx-rdrand-exit'/>
+ <feature name='vmx-rdseed-exit'/>
+ <feature name='vmx-rdtsc-exit'/>
+ <feature name='vmx-rdtscp-exit'/>
+ <feature name='vmx-secondary-ctls'/>
+ <feature name='vmx-shadow-vmcs'/>
+ <feature name='vmx-store-lma'/>
+ <feature name='vmx-true-ctls'/>
+ <feature name='vmx-tsc-offset'/>
+ <feature name='vmx-unrestricted-guest'/>
+ <feature name='vmx-vintr-pending'/>
+ <feature name='vmx-vmfunc'/>
+ <feature name='vmx-vmwrite-vmexit-fields'/>
+ <feature name='vmx-vnmi'/>
+ <feature name='vmx-vnmi-pending'/>
+ <feature name='vmx-vpid'/>
+ <feature name='vmx-wbinvd-exit'/>
+ <feature name='vmx-xsaves'/>
+ <feature name='x2apic'/>
+ <feature name='xgetbv1'/>
+ <feature name='xsave'/>
+ <feature name='xsavec'/>
+ <feature name='xsaveopt'/>
+ <feature name='xsaves'/>
+ </model>
+</cpus>
diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
index 9ff74bc029..0be098de80 100644
--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
@@ -1,6 +1,6 @@
<cpu>
<arch>x86_64</arch>
- <model>Cooperlake</model>
+ <model>Cooperlake-v1</model>
<vendor>Intel</vendor>
<signature family='6' model='85' stepping='11'/>
<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 6d0d347cd0..e8bcba9fc1 100644
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -125,7 +125,7 @@
<feature name='spec-ctrl'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='avx512-bf16'/>
<feature name='avx512bw'/>
@@ -144,6 +144,25 @@
<feature name='spec-ctrl'/>
<feature name='taa-no'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
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 3fff90679f..30d652e640 100644
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -185,7 +185,7 @@
<feature name='xsavec'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='3dnowprefetch'/>
<feature name='arch-capabilities'/>
@@ -218,6 +218,39 @@
<feature name='x2apic'/>
<feature name='xsavec'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='3dnowprefetch'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx'/>
+ <feature name='avx2'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='f16c'/>
+ <feature name='fma'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='pschange-mc-no'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='rtm'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='stibp'/>
+ <feature name='taa-no'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
<model usable='no' vendor='Hygon'>Dhyana</model>
<blockers model='Dhyana'>
<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 155affd7a2..ad76c3e130 100644
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -124,7 +124,7 @@
<feature name='spec-ctrl'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='avx512-bf16'/>
<feature name='avx512bw'/>
@@ -143,6 +143,25 @@
<feature name='spec-ctrl'/>
<feature name='taa-no'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
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 97c2f3f216..c55f8e34b9 100644
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -125,7 +125,7 @@
<feature name='spec-ctrl'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='avx512-bf16'/>
<feature name='avx512bw'/>
@@ -144,6 +144,25 @@
<feature name='spec-ctrl'/>
<feature name='taa-no'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
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 4f5abc3c87..e03c10eb84 100644
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -186,7 +186,7 @@
<feature name='xsavec'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='3dnowprefetch'/>
<feature name='arch-capabilities'/>
@@ -219,6 +219,39 @@
<feature name='x2apic'/>
<feature name='xsavec'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='3dnowprefetch'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx'/>
+ <feature name='avx2'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='f16c'/>
+ <feature name='fma'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='pschange-mc-no'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='rtm'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='stibp'/>
+ <feature name='taa-no'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
<model usable='no' vendor='Hygon'>Dhyana</model>
<blockers model='Dhyana'>
<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 1e7d5acadd..6cfa5828bb 100644
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -124,7 +124,7 @@
<feature name='spec-ctrl'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='avx512-bf16'/>
<feature name='avx512bw'/>
@@ -143,6 +143,25 @@
<feature name='spec-ctrl'/>
<feature name='taa-no'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
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 931c1ccfa8..50941234d6 100644
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -126,7 +126,7 @@
<feature name='spec-ctrl'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='avx-vnni'/>
<feature name='avx512-bf16'/>
@@ -146,6 +146,46 @@
<feature name='spec-ctrl'/>
<feature name='taa-no'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='avx-vnni'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+ <blockers model='Cooperlake-v2'>
+ <feature name='avx-vnni'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
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 c381827ef1..93cc2bd1f2 100644
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -186,7 +186,7 @@
<feature name='xsavec'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='3dnowprefetch'/>
<feature name='arch-capabilities'/>
@@ -220,6 +220,75 @@
<feature name='x2apic'/>
<feature name='xsavec'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='3dnowprefetch'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx'/>
+ <feature name='avx-vnni'/>
+ <feature name='avx2'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='f16c'/>
+ <feature name='fma'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='pschange-mc-no'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='rtm'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='stibp'/>
+ <feature name='taa-no'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+ <blockers model='Cooperlake-v2'>
+ <feature name='3dnowprefetch'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx'/>
+ <feature name='avx-vnni'/>
+ <feature name='avx2'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='f16c'/>
+ <feature name='fma'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='pschange-mc-no'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='rtm'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='stibp'/>
+ <feature name='taa-no'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='Hygon'>Dhyana</model>
<blockers model='Dhyana'>
<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 92507c01e6..7a69746717 100644
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -125,7 +125,7 @@
<feature name='spec-ctrl'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='avx-vnni'/>
<feature name='avx512-bf16'/>
@@ -145,6 +145,46 @@
<feature name='spec-ctrl'/>
<feature name='taa-no'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='avx-vnni'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+ <blockers model='Cooperlake-v2'>
+ <feature name='avx-vnni'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
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 002004001a..8a077e113d 100644
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -126,7 +126,7 @@
<feature name='spec-ctrl'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='avx512-bf16'/>
<feature name='avx512bw'/>
@@ -145,6 +145,44 @@
<feature name='spec-ctrl'/>
<feature name='taa-no'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+ <blockers model='Cooperlake-v2'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
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 7ec91e11d3..59145f6dfe 100644
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -188,7 +188,7 @@
<feature name='xsavec'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='3dnowprefetch'/>
<feature name='arch-capabilities'/>
@@ -221,6 +221,73 @@
<feature name='x2apic'/>
<feature name='xsavec'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='3dnowprefetch'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx'/>
+ <feature name='avx2'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='f16c'/>
+ <feature name='fma'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='pschange-mc-no'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='rtm'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='stibp'/>
+ <feature name='taa-no'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+ <blockers model='Cooperlake-v2'>
+ <feature name='3dnowprefetch'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx'/>
+ <feature name='avx2'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='f16c'/>
+ <feature name='fma'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='pschange-mc-no'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='rtm'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='stibp'/>
+ <feature name='taa-no'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='Hygon'>Dhyana</model>
<blockers model='Dhyana'>
<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 3b449eec8d..6f76e4795f 100644
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -125,7 +125,7 @@
<feature name='spec-ctrl'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='avx512-bf16'/>
<feature name='avx512bw'/>
@@ -144,6 +144,44 @@
<feature name='spec-ctrl'/>
<feature name='taa-no'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+ <blockers model='Cooperlake-v2'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
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 bc603035fe..44eff055b4 100644
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -127,7 +127,7 @@
<feature name='spec-ctrl'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='avx512-bf16'/>
<feature name='avx512bw'/>
@@ -146,6 +146,44 @@
<feature name='spec-ctrl'/>
<feature name='taa-no'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+ <blockers model='Cooperlake-v2'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
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 8e545b5e9d..5ccb0a9914 100644
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -189,7 +189,7 @@
<feature name='xsavec'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='3dnowprefetch'/>
<feature name='arch-capabilities'/>
@@ -222,6 +222,73 @@
<feature name='x2apic'/>
<feature name='xsavec'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='3dnowprefetch'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx'/>
+ <feature name='avx2'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='f16c'/>
+ <feature name='fma'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='pschange-mc-no'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='rtm'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='stibp'/>
+ <feature name='taa-no'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+ <blockers model='Cooperlake-v2'>
+ <feature name='3dnowprefetch'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx'/>
+ <feature name='avx2'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='f16c'/>
+ <feature name='fma'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='pschange-mc-no'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='rtm'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='stibp'/>
+ <feature name='taa-no'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='Hygon'>Dhyana</model>
<blockers model='Dhyana'>
<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 e2b164f6f2..8d364912f2 100644
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -126,7 +126,7 @@
<feature name='spec-ctrl'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='avx512-bf16'/>
<feature name='avx512bw'/>
@@ -145,6 +145,44 @@
<feature name='spec-ctrl'/>
<feature name='taa-no'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+ <blockers model='Cooperlake-v2'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
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 be1c10ba88..e33078702c 100644
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -128,7 +128,7 @@
<feature name='spec-ctrl'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='avx512-bf16'/>
<feature name='avx512bw'/>
@@ -147,6 +147,44 @@
<feature name='spec-ctrl'/>
<feature name='taa-no'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+ <blockers model='Cooperlake-v2'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
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 d43ed80338..62bd747f47 100644
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -189,7 +189,7 @@
<feature name='xsavec'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='3dnowprefetch'/>
<feature name='arch-capabilities'/>
@@ -222,6 +222,73 @@
<feature name='x2apic'/>
<feature name='xsavec'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='3dnowprefetch'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx'/>
+ <feature name='avx2'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='f16c'/>
+ <feature name='fma'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='pschange-mc-no'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='rtm'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='stibp'/>
+ <feature name='taa-no'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+ <blockers model='Cooperlake-v2'>
+ <feature name='3dnowprefetch'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx'/>
+ <feature name='avx2'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='f16c'/>
+ <feature name='fma'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='pschange-mc-no'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='rtm'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='stibp'/>
+ <feature name='taa-no'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='Hygon'>Dhyana</model>
<blockers model='Dhyana'>
<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 c8f74ea60e..46f2582342 100644
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -127,7 +127,7 @@
<feature name='spec-ctrl'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='avx512-bf16'/>
<feature name='avx512bw'/>
@@ -146,6 +146,44 @@
<feature name='spec-ctrl'/>
<feature name='taa-no'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+ <blockers model='Cooperlake-v2'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
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 890b8ec2e9..04173eab2d 100644
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
@@ -133,7 +133,7 @@
<feature name='spec-ctrl'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='avx512-bf16'/>
<feature name='avx512bw'/>
@@ -152,6 +152,44 @@
<feature name='spec-ctrl'/>
<feature name='taa-no'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+ <blockers model='Cooperlake-v2'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
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 fb20353bbf..72e50e80e3 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
@@ -154,7 +154,7 @@
<feature name='xsavec'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='3dnowprefetch'/>
<feature name='arch-capabilities'/>
@@ -183,6 +183,65 @@
<feature name='x2apic'/>
<feature name='xsavec'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='3dnowprefetch'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='pschange-mc-no'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='rtm'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='stibp'/>
+ <feature name='taa-no'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+ <blockers model='Cooperlake-v2'>
+ <feature name='3dnowprefetch'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='pschange-mc-no'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='rtm'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='stibp'/>
+ <feature name='taa-no'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='Hygon'>Dhyana</model>
<blockers model='Dhyana'>
<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 fb20353bbf..72e50e80e3 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -154,7 +154,7 @@
<feature name='xsavec'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='3dnowprefetch'/>
<feature name='arch-capabilities'/>
@@ -183,6 +183,65 @@
<feature name='x2apic'/>
<feature name='xsavec'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='3dnowprefetch'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='pschange-mc-no'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='rtm'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='stibp'/>
+ <feature name='taa-no'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+ <blockers model='Cooperlake-v2'>
+ <feature name='3dnowprefetch'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='pschange-mc-no'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='rtm'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='stibp'/>
+ <feature name='taa-no'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='Hygon'>Dhyana</model>
<blockers model='Dhyana'>
<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 02406d697a..bfd4582994 100644
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -132,7 +132,7 @@
<feature name='spec-ctrl'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='avx512-bf16'/>
<feature name='avx512bw'/>
@@ -151,6 +151,44 @@
<feature name='spec-ctrl'/>
<feature name='taa-no'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+ <blockers model='Cooperlake-v2'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
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 4e70aee549..c460ef2747 100644
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
@@ -133,7 +133,7 @@
<feature name='spec-ctrl'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='avx512-bf16'/>
<feature name='avx512bw'/>
@@ -152,6 +152,44 @@
<feature name='spec-ctrl'/>
<feature name='taa-no'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+ <blockers model='Cooperlake-v2'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
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 25c522f8d6..70cc61a266 100644
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -158,7 +158,7 @@
<feature name='xsavec'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='3dnowprefetch'/>
<feature name='arch-capabilities'/>
@@ -187,6 +187,65 @@
<feature name='x2apic'/>
<feature name='xsavec'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='3dnowprefetch'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='pschange-mc-no'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='rtm'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='stibp'/>
+ <feature name='taa-no'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+ <blockers model='Cooperlake-v2'>
+ <feature name='3dnowprefetch'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='pschange-mc-no'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='rtm'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='stibp'/>
+ <feature name='taa-no'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='Hygon'>Dhyana</model>
<blockers model='Dhyana'>
<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 d8ef35e83f..e4a6e0d835 100644
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
@@ -132,7 +132,7 @@
<feature name='spec-ctrl'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='avx512-bf16'/>
<feature name='avx512bw'/>
@@ -151,6 +151,44 @@
<feature name='spec-ctrl'/>
<feature name='taa-no'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+ <blockers model='Cooperlake-v2'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
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 b63775042f..52d5f90429 100644
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
@@ -135,7 +135,7 @@
<feature name='spec-ctrl'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='avx512-bf16'/>
<feature name='avx512bw'/>
@@ -154,6 +154,45 @@
<feature name='spec-ctrl'/>
<feature name='taa-no'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+ <blockers model='Cooperlake-v2'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='no' vendor='AMD'>EPYC-Genoa</model>
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 b08763142e..a11ab737f6 100644
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -143,7 +143,7 @@
<feature name='xsavec'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='arch-capabilities'/>
<feature name='avx512-bf16'/>
@@ -164,6 +164,49 @@
<feature name='x2apic'/>
<feature name='xsavec'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='stibp'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+ <blockers model='Cooperlake-v2'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='stibp'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='Hygon'>Dhyana</model>
<blockers model='Dhyana'>
<feature name='fxsr_opt'/>
diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
index f235e3ca55..a6c02c0eb7 100644
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
@@ -134,7 +134,7 @@
<feature name='spec-ctrl'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='avx512-bf16'/>
<feature name='avx512bw'/>
@@ -153,6 +153,45 @@
<feature name='spec-ctrl'/>
<feature name='taa-no'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+ <blockers model='Cooperlake-v2'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='no' vendor='AMD'>EPYC-Genoa</model>
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 db5e71cae3..b12b0a0738 100644
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
@@ -136,7 +136,7 @@
<feature name='spec-ctrl'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='avx512-bf16'/>
<feature name='avx512bw'/>
@@ -155,6 +155,45 @@
<feature name='spec-ctrl'/>
<feature name='taa-no'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+ <blockers model='Cooperlake-v2'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='no' vendor='AMD'>EPYC-Genoa</model>
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 bc1c8b629c..58fbf2e156 100644
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -142,7 +142,7 @@
<feature name='xsavec'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='arch-capabilities'/>
<feature name='avx512-bf16'/>
@@ -163,6 +163,49 @@
<feature name='x2apic'/>
<feature name='xsavec'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='stibp'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+ <blockers model='Cooperlake-v2'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='stibp'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='Hygon'>Dhyana</model>
<blockers model='Dhyana'>
<feature name='fxsr_opt'/>
diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
index 4092b0cbaf..9df7ab5d51 100644
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
@@ -135,7 +135,7 @@
<feature name='spec-ctrl'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='avx512-bf16'/>
<feature name='avx512bw'/>
@@ -154,6 +154,45 @@
<feature name='spec-ctrl'/>
<feature name='taa-no'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+ <blockers model='Cooperlake-v2'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='no' vendor='AMD'>EPYC-Genoa</model>
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 46cdc98b04..c6dd80de95 100644
--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
@@ -136,7 +136,7 @@
<feature name='spec-ctrl'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='avx512-bf16'/>
<feature name='avx512bw'/>
@@ -155,6 +155,45 @@
<feature name='spec-ctrl'/>
<feature name='taa-no'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+ <blockers model='Cooperlake-v2'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='no' vendor='AMD'>EPYC-Genoa</model>
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 52ce59c185..4cec75464f 100644
--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
@@ -138,7 +138,7 @@
<feature name='xsavec'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='arch-capabilities'/>
<feature name='avx512-bf16'/>
@@ -158,6 +158,47 @@
<feature name='tsc-deadline'/>
<feature name='xsavec'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='stibp'/>
+ <feature name='tsc-deadline'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+ <blockers model='Cooperlake-v2'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='stibp'/>
+ <feature name='tsc-deadline'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='Hygon'>Dhyana</model>
<blockers model='Dhyana'>
<feature name='fxsr_opt'/>
diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
index f7716b5c10..7bcc10e61c 100644
--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
@@ -135,7 +135,7 @@
<feature name='spec-ctrl'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='avx512-bf16'/>
<feature name='avx512bw'/>
@@ -154,6 +154,45 @@
<feature name='spec-ctrl'/>
<feature name='taa-no'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+ <blockers model='Cooperlake-v2'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='no' vendor='AMD'>EPYC-Genoa</model>
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 16e5de9503..3fb82c81ad 100644
--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
@@ -140,7 +140,7 @@
<feature name='spec-ctrl'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='avx512-bf16'/>
<feature name='avx512bw'/>
@@ -159,6 +159,45 @@
<feature name='spec-ctrl'/>
<feature name='taa-no'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+ <blockers model='Cooperlake-v2'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='no' vendor='AMD'>EPYC-Genoa</model>
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 b0a266f649..7600b69f9f 100644
--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
@@ -137,7 +137,7 @@
<feature name='xsavec'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='arch-capabilities'/>
<feature name='avx512-bf16'/>
@@ -157,6 +157,47 @@
<feature name='tsc-deadline'/>
<feature name='xsavec'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='stibp'/>
+ <feature name='tsc-deadline'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+ <blockers model='Cooperlake-v2'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='stibp'/>
+ <feature name='tsc-deadline'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='Hygon'>Dhyana</model>
<blockers model='Dhyana'>
<feature name='fxsr_opt'/>
diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
index a948cd9173..e8e1b804f6 100644
--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
@@ -139,7 +139,7 @@
<feature name='spec-ctrl'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='avx512-bf16'/>
<feature name='avx512bw'/>
@@ -158,6 +158,45 @@
<feature name='spec-ctrl'/>
<feature name='taa-no'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+ <blockers model='Cooperlake-v2'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='no' vendor='AMD'>EPYC-Genoa</model>
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 a986a09589..dfcaa22ea3 100644
--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
@@ -140,7 +140,7 @@
<feature name='spec-ctrl'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='avx512-bf16'/>
<feature name='avx512bw'/>
@@ -159,6 +159,45 @@
<feature name='spec-ctrl'/>
<feature name='taa-no'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+ <blockers model='Cooperlake-v2'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='no' vendor='AMD'>EPYC-Genoa</model>
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 1ad4b0a9f3..43348c344c 100644
--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
@@ -137,7 +137,7 @@
<feature name='xsavec'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='arch-capabilities'/>
<feature name='avx512-bf16'/>
@@ -157,6 +157,47 @@
<feature name='tsc-deadline'/>
<feature name='xsavec'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='stibp'/>
+ <feature name='tsc-deadline'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+ <blockers model='Cooperlake-v2'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='stibp'/>
+ <feature name='tsc-deadline'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='Hygon'>Dhyana</model>
<blockers model='Dhyana'>
<feature name='fxsr_opt'/>
diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
index 8051bf82a3..bf8f4ebba3 100644
--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
@@ -139,7 +139,7 @@
<feature name='spec-ctrl'/>
</blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
- <model usable='no' vendor='Intel'>Cooperlake</model>
+ <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
<feature name='avx512-bf16'/>
<feature name='avx512bw'/>
@@ -158,6 +158,45 @@
<feature name='spec-ctrl'/>
<feature name='taa-no'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v1</model>
+ <blockers model='Cooperlake-v1'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cooperlake-v2</model>
+ <blockers model='Cooperlake-v2'>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='taa-no'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='no' vendor='AMD'>EPYC-Genoa</model>
--
2.47.0
