CPU models that do not have a list of versions attached are still
advertised as aliases to corresponding -v1 variants. We should add the
missing variants to the CPU map.
Signed-off-by: Jiri Denemark <jdenemar@xxxxxxxxxx>
---
src/cpu_map/index.xml | 2 +
src/cpu_map/meson.build | 2 +
src/cpu_map/x86_EPYC-Genoa-v1.xml | 6 ++
src/cpu_map/x86_KnightsMill-v1.xml | 6 ++
.../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 14 ++++-
.../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 20 ++++++-
tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 14 ++++-
.../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 14 ++++-
.../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 20 ++++++-
tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 14 ++++-
.../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 14 ++++-
.../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 20 ++++++-
tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 14 ++++-
.../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 14 ++++-
.../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 20 ++++++-
tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 14 ++++-
.../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 14 ++++-
.../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 20 ++++++-
tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 14 ++++-
.../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 14 ++++-
.../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 20 ++++++-
tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 14 ++++-
.../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 14 ++++-
.../qemu_7.2.0-tcg.x86_64+hvf.xml | 16 +++++-
.../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 16 +++++-
tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 14 ++++-
.../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 14 ++++-
.../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 16 +++++-
tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 14 ++++-
.../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 46 ++++++++++++++-
.../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 56 ++++++++++++++++++-
tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 46 ++++++++++++++-
.../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 46 ++++++++++++++-
.../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 55 +++++++++++++++++-
tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 46 ++++++++++++++-
.../domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 46 ++++++++++++++-
.../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 54 +++++++++++++++++-
tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 46 ++++++++++++++-
.../domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 46 ++++++++++++++-
.../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 54 +++++++++++++++++-
tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 46 ++++++++++++++-
.../domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 46 ++++++++++++++-
.../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 54 +++++++++++++++++-
tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 46 ++++++++++++++-
44 files changed, 1086 insertions(+), 55 deletions(-)
create mode 100644 src/cpu_map/x86_EPYC-Genoa-v1.xml
create mode 100644 src/cpu_map/x86_KnightsMill-v1.xml
diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
index 287cd7395e..ee81d1c5ce 100644
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -115,6 +115,7 @@
<include filename='x86_Denverton-v2.xml'/>
<include filename='x86_Denverton-v3.xml'/>
<include filename='x86_KnightsMill.xml'/>
+ <include filename='x86_KnightsMill-v1.xml'/>
</group>
<group name='AMD CPU models'>
@@ -140,6 +141,7 @@
<include filename='x86_EPYC-Milan-v1.xml'/>
<include filename='x86_EPYC-Milan-v2.xml'/>
<include filename='x86_EPYC-Genoa.xml'/>
+ <include filename='x86_EPYC-Genoa-v1.xml'/>
</group>
<group name='Hygon CPU models'>
diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
index f659ef230e..05d4db95a6 100644
--- a/src/cpu_map/meson.build
+++ b/src/cpu_map/meson.build
@@ -54,6 +54,7 @@ cpumap_data = [
'x86_Dhyana-v1.xml',
'x86_Dhyana-v2.xml',
'x86_Dhyana.xml',
+ 'x86_EPYC-Genoa-v1.xml',
'x86_EPYC-Genoa.xml',
'x86_EPYC-IBPB.xml',
'x86_EPYC-Milan-v1.xml',
@@ -95,6 +96,7 @@ cpumap_data = [
'x86_IvyBridge-v1.xml',
'x86_IvyBridge-v2.xml',
'x86_IvyBridge.xml',
+ 'x86_KnightsMill-v1.xml',
'x86_KnightsMill.xml',
'x86_kvm32.xml',
'x86_kvm64.xml',
diff --git a/src/cpu_map/x86_EPYC-Genoa-v1.xml b/src/cpu_map/x86_EPYC-Genoa-v1.xml
new file mode 100644
index 0000000000..df45ca18ff
--- /dev/null
+++ b/src/cpu_map/x86_EPYC-Genoa-v1.xml
@@ -0,0 +1,6 @@
+<cpus>
+ <model name='EPYC-Genoa-v1'>
+ <decode host='on' guest='off'/>
+ <model name='EPYC-Genoa'/>
+ </model>
+</cpus>
diff --git a/src/cpu_map/x86_KnightsMill-v1.xml b/src/cpu_map/x86_KnightsMill-v1.xml
new file mode 100644
index 0000000000..00293d05b8
--- /dev/null
+++ b/src/cpu_map/x86_KnightsMill-v1.xml
@@ -0,0 +1,6 @@
+<cpus>
+ <model name='KnightsMill-v1'>
+ <decode host='on' guest='off'/>
+ <model name='KnightsMill'/>
+ </model>
+</cpus>
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 5fa2d07976..348f387d27 100644
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -536,7 +536,7 @@
<feature name='erms'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='avx512-4fmaps'/>
<feature name='avx512-4vnniw'/>
@@ -548,6 +548,18 @@
<feature name='erms'/>
<feature name='ss'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='erms'/>
+ <feature name='ss'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
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 0348a65589..d82487b079 100644
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -1019,7 +1019,7 @@
<feature name='tsc-deadline'/>
<feature name='x2apic'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='3dnowprefetch'/>
<feature name='avx'/>
@@ -1037,6 +1037,24 @@
<feature name='tsc-deadline'/>
<feature name='x2apic'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='3dnowprefetch'/>
+ <feature name='avx'/>
+ <feature name='avx2'/>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='f16c'/>
+ <feature name='fma'/>
+ <feature name='rdseed'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
index 49a18cd333..4717e5c53a 100644
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -535,7 +535,7 @@
<feature name='erms'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='avx512-4fmaps'/>
<feature name='avx512-4vnniw'/>
@@ -547,6 +547,18 @@
<feature name='erms'/>
<feature name='ss'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='erms'/>
+ <feature name='ss'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
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 b990a2d597..8cf43dee45 100644
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -558,7 +558,7 @@
<feature name='erms'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='avx512-4fmaps'/>
<feature name='avx512-4vnniw'/>
@@ -570,6 +570,18 @@
<feature name='erms'/>
<feature name='ss'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='erms'/>
+ <feature name='ss'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
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 6746479be5..44b58f64c7 100644
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -1109,7 +1109,7 @@
<feature name='tsc-deadline'/>
<feature name='x2apic'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='3dnowprefetch'/>
<feature name='avx'/>
@@ -1127,6 +1127,24 @@
<feature name='tsc-deadline'/>
<feature name='x2apic'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='3dnowprefetch'/>
+ <feature name='avx'/>
+ <feature name='avx2'/>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='f16c'/>
+ <feature name='fma'/>
+ <feature name='rdseed'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index 81c9bb1444..1b0a8c7dcb 100644
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -557,7 +557,7 @@
<feature name='erms'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='avx512-4fmaps'/>
<feature name='avx512-4vnniw'/>
@@ -569,6 +569,18 @@
<feature name='erms'/>
<feature name='ss'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='erms'/>
+ <feature name='ss'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
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 0cd73ee54f..aace4d7fdb 100644
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -628,7 +628,7 @@
<feature name='erms'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='avx512-4fmaps'/>
<feature name='avx512-4vnniw'/>
@@ -640,6 +640,18 @@
<feature name='erms'/>
<feature name='ss'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='erms'/>
+ <feature name='ss'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
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 8a09c53177..6ee855aa57 100644
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -1249,7 +1249,7 @@
<feature name='tsc-deadline'/>
<feature name='x2apic'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='3dnowprefetch'/>
<feature name='avx'/>
@@ -1267,6 +1267,24 @@
<feature name='tsc-deadline'/>
<feature name='x2apic'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='3dnowprefetch'/>
+ <feature name='avx'/>
+ <feature name='avx2'/>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='f16c'/>
+ <feature name='fma'/>
+ <feature name='rdseed'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index 5a23dfee52..491e63e973 100644
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -627,7 +627,7 @@
<feature name='erms'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='avx512-4fmaps'/>
<feature name='avx512-4vnniw'/>
@@ -639,6 +639,18 @@
<feature name='erms'/>
<feature name='ss'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='erms'/>
+ <feature name='ss'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
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 84e783f739..822f070fca 100644
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -625,7 +625,7 @@
<feature name='erms'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='avx512-4fmaps'/>
<feature name='avx512-4vnniw'/>
@@ -637,6 +637,18 @@
<feature name='erms'/>
<feature name='ss'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='erms'/>
+ <feature name='ss'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
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 4d7ed1eea8..b1052ae0d7 100644
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -1246,7 +1246,7 @@
<feature name='tsc-deadline'/>
<feature name='x2apic'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='3dnowprefetch'/>
<feature name='avx'/>
@@ -1264,6 +1264,24 @@
<feature name='tsc-deadline'/>
<feature name='x2apic'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='3dnowprefetch'/>
+ <feature name='avx'/>
+ <feature name='avx2'/>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='f16c'/>
+ <feature name='fma'/>
+ <feature name='rdseed'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index 0446dff4fb..1b38e7cb52 100644
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -624,7 +624,7 @@
<feature name='erms'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='avx512-4fmaps'/>
<feature name='avx512-4vnniw'/>
@@ -636,6 +636,18 @@
<feature name='erms'/>
<feature name='ss'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='erms'/>
+ <feature name='ss'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
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 e5718bc50c..f58ba1633d 100644
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -652,7 +652,7 @@
<feature name='erms'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='avx512-4fmaps'/>
<feature name='avx512-4vnniw'/>
@@ -664,6 +664,18 @@
<feature name='erms'/>
<feature name='ss'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='erms'/>
+ <feature name='ss'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
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 c3a93369e4..ca7e0b98bd 100644
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -1275,7 +1275,7 @@
<feature name='tsc-deadline'/>
<feature name='x2apic'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='3dnowprefetch'/>
<feature name='avx'/>
@@ -1293,6 +1293,24 @@
<feature name='tsc-deadline'/>
<feature name='x2apic'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='3dnowprefetch'/>
+ <feature name='avx'/>
+ <feature name='avx2'/>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='f16c'/>
+ <feature name='fma'/>
+ <feature name='rdseed'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index 7415bda6bf..e0f17473c8 100644
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -651,7 +651,7 @@
<feature name='erms'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='avx512-4fmaps'/>
<feature name='avx512-4vnniw'/>
@@ -663,6 +663,18 @@
<feature name='erms'/>
<feature name='ss'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='erms'/>
+ <feature name='ss'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
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 720387e9db..028d5db7fa 100644
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -619,7 +619,7 @@
<feature name='erms'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='avx512-4fmaps'/>
<feature name='avx512-4vnniw'/>
@@ -631,6 +631,18 @@
<feature name='erms'/>
<feature name='ss'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='erms'/>
+ <feature name='ss'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
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 3000d11487..75f7b05d29 100644
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -1223,7 +1223,7 @@
<feature name='tsc-deadline'/>
<feature name='x2apic'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='3dnowprefetch'/>
<feature name='avx'/>
@@ -1241,6 +1241,24 @@
<feature name='tsc-deadline'/>
<feature name='x2apic'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='3dnowprefetch'/>
+ <feature name='avx'/>
+ <feature name='avx2'/>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='f16c'/>
+ <feature name='fma'/>
+ <feature name='rdseed'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
index 31fe652a9f..4e03b1fc2d 100644
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -618,7 +618,7 @@
<feature name='erms'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='avx512-4fmaps'/>
<feature name='avx512-4vnniw'/>
@@ -630,6 +630,18 @@
<feature name='erms'/>
<feature name='ss'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='erms'/>
+ <feature name='ss'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
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 88db1c659e..3b968e9c43 100644
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
@@ -624,7 +624,7 @@
<feature name='erms'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='avx512-4fmaps'/>
<feature name='avx512-4vnniw'/>
@@ -636,6 +636,18 @@
<feature name='erms'/>
<feature name='ss'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='erms'/>
+ <feature name='ss'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
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 3392f2b42f..8d6f831b0d 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
@@ -1008,7 +1008,7 @@
<feature name='tsc-deadline'/>
<feature name='x2apic'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='3dnowprefetch'/>
<feature name='avx512-4fmaps'/>
@@ -1022,6 +1022,20 @@
<feature name='tsc-deadline'/>
<feature name='x2apic'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='3dnowprefetch'/>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='rdseed'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
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 3392f2b42f..8d6f831b0d 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -1008,7 +1008,7 @@
<feature name='tsc-deadline'/>
<feature name='x2apic'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='3dnowprefetch'/>
<feature name='avx512-4fmaps'/>
@@ -1022,6 +1022,20 @@
<feature name='tsc-deadline'/>
<feature name='x2apic'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='3dnowprefetch'/>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='rdseed'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
index 5223dbb2e2..025ec7d022 100644
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -623,7 +623,7 @@
<feature name='erms'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='avx512-4fmaps'/>
<feature name='avx512-4vnniw'/>
@@ -635,6 +635,18 @@
<feature name='erms'/>
<feature name='ss'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='erms'/>
+ <feature name='ss'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
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 e43c6710e9..5fe7501941 100644
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
@@ -624,7 +624,7 @@
<feature name='erms'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='avx512-4fmaps'/>
<feature name='avx512-4vnniw'/>
@@ -636,6 +636,18 @@
<feature name='erms'/>
<feature name='ss'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='erms'/>
+ <feature name='ss'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
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 3d5c15fdf1..68bcb93a5f 100644
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -1007,7 +1007,7 @@
<feature name='tsc-deadline'/>
<feature name='x2apic'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='3dnowprefetch'/>
<feature name='avx512-4fmaps'/>
@@ -1021,6 +1021,20 @@
<feature name='tsc-deadline'/>
<feature name='x2apic'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='3dnowprefetch'/>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='rdseed'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
index 420dae738f..87b7af3b6f 100644
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
@@ -623,7 +623,7 @@
<feature name='erms'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='avx512-4fmaps'/>
<feature name='avx512-4vnniw'/>
@@ -635,6 +635,18 @@
<feature name='erms'/>
<feature name='ss'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='erms'/>
+ <feature name='ss'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
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 e5853535ce..2feb9c05fd 100644
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
@@ -332,7 +332,7 @@
<feature name='xsaves'/>
</blockers>
<model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model>
- <model usable='no' vendor='AMD'>EPYC-Genoa</model>
+ <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
<blockers model='EPYC-Genoa'>
<feature name='amd-psfd'/>
<feature name='auto-ibrs'/>
@@ -362,6 +362,36 @@
<feature name='vpclmulqdq'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
+ <blockers model='EPYC-Genoa-v1'>
+ <feature name='amd-psfd'/>
+ <feature name='auto-ibrs'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512bitalg'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512ifma'/>
+ <feature name='avx512vbmi'/>
+ <feature name='avx512vbmi2'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='gfni'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='la57'/>
+ <feature name='no-nested-data-bp'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='stibp-always-on'/>
+ <feature name='vaes'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
<model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model>
<blockers model='EPYC-Milan'>
@@ -802,7 +832,7 @@
<feature name='erms'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='avx512-4fmaps'/>
<feature name='avx512-4vnniw'/>
@@ -814,6 +844,18 @@
<feature name='erms'/>
<feature name='ss'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='erms'/>
+ <feature name='ss'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
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 22c40afdb1..581e492daf 100644
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -412,7 +412,7 @@
<feature name='topoext'/>
<feature name='xsavec'/>
</blockers>
- <model usable='no' vendor='AMD'>EPYC-Genoa</model>
+ <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
<blockers model='EPYC-Genoa'>
<feature name='amd-psfd'/>
<feature name='amd-ssbd'/>
@@ -452,6 +452,46 @@
<feature name='xsavec'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
+ <blockers model='EPYC-Genoa-v1'>
+ <feature name='amd-psfd'/>
+ <feature name='amd-ssbd'/>
+ <feature name='amd-stibp'/>
+ <feature name='auto-ibrs'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512bitalg'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512ifma'/>
+ <feature name='avx512vbmi'/>
+ <feature name='avx512vbmi2'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='clzero'/>
+ <feature name='fxsr_opt'/>
+ <feature name='gfni'/>
+ <feature name='ibpb'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='lfence-always-serializing'/>
+ <feature name='misalignsse'/>
+ <feature name='no-nested-data-bp'/>
+ <feature name='nrip-save'/>
+ <feature name='null-sel-clr-base'/>
+ <feature name='osvw'/>
+ <feature name='pcid'/>
+ <feature name='perfctr_core'/>
+ <feature name='sha-ni'/>
+ <feature name='stibp-always-on'/>
+ <feature name='topoext'/>
+ <feature name='vnmi'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
<blockers model='EPYC-IBPB'>
<feature name='fxsr_opt'/>
@@ -1019,7 +1059,7 @@
<feature name='tsc-deadline'/>
<feature name='x2apic'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='avx512-4fmaps'/>
<feature name='avx512-4vnniw'/>
@@ -1031,6 +1071,18 @@
<feature name='tsc-deadline'/>
<feature name='x2apic'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
index c40cbb8a73..7e3cded8b9 100644
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
@@ -331,7 +331,7 @@
<feature name='xsaves'/>
</blockers>
<model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model>
- <model usable='no' vendor='AMD'>EPYC-Genoa</model>
+ <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
<blockers model='EPYC-Genoa'>
<feature name='amd-psfd'/>
<feature name='auto-ibrs'/>
@@ -361,6 +361,36 @@
<feature name='vpclmulqdq'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
+ <blockers model='EPYC-Genoa-v1'>
+ <feature name='amd-psfd'/>
+ <feature name='auto-ibrs'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512bitalg'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512ifma'/>
+ <feature name='avx512vbmi'/>
+ <feature name='avx512vbmi2'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='gfni'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='la57'/>
+ <feature name='no-nested-data-bp'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='stibp-always-on'/>
+ <feature name='vaes'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
<model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model>
<blockers model='EPYC-Milan'>
@@ -801,7 +831,7 @@
<feature name='erms'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='avx512-4fmaps'/>
<feature name='avx512-4vnniw'/>
@@ -813,6 +843,18 @@
<feature name='erms'/>
<feature name='ss'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='erms'/>
+ <feature name='ss'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
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 cfc4b3e301..f250a6530e 100644
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
@@ -333,7 +333,7 @@
<feature name='xsaves'/>
</blockers>
<model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model>
- <model usable='no' vendor='AMD'>EPYC-Genoa</model>
+ <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
<blockers model='EPYC-Genoa'>
<feature name='amd-psfd'/>
<feature name='auto-ibrs'/>
@@ -363,6 +363,36 @@
<feature name='vpclmulqdq'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
+ <blockers model='EPYC-Genoa-v1'>
+ <feature name='amd-psfd'/>
+ <feature name='auto-ibrs'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512bitalg'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512ifma'/>
+ <feature name='avx512vbmi'/>
+ <feature name='avx512vbmi2'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='gfni'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='la57'/>
+ <feature name='no-nested-data-bp'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='stibp-always-on'/>
+ <feature name='vaes'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
<model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model>
<blockers model='EPYC-Milan'>
@@ -803,7 +833,7 @@
<feature name='erms'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='avx512-4fmaps'/>
<feature name='avx512-4vnniw'/>
@@ -815,6 +845,18 @@
<feature name='erms'/>
<feature name='ss'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='erms'/>
+ <feature name='ss'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
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 4383050d3c..602ac96f32 100644
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -406,7 +406,7 @@
<feature name='topoext'/>
<feature name='xsavec'/>
</blockers>
- <model usable='no' vendor='AMD'>EPYC-Genoa</model>
+ <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
<blockers model='EPYC-Genoa'>
<feature name='amd-psfd'/>
<feature name='amd-ssbd'/>
@@ -445,6 +445,45 @@
<feature name='xsavec'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
+ <blockers model='EPYC-Genoa-v1'>
+ <feature name='amd-psfd'/>
+ <feature name='amd-ssbd'/>
+ <feature name='amd-stibp'/>
+ <feature name='auto-ibrs'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512bitalg'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512ifma'/>
+ <feature name='avx512vbmi'/>
+ <feature name='avx512vbmi2'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='clzero'/>
+ <feature name='fxsr_opt'/>
+ <feature name='gfni'/>
+ <feature name='ibpb'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='lfence-always-serializing'/>
+ <feature name='misalignsse'/>
+ <feature name='no-nested-data-bp'/>
+ <feature name='nrip-save'/>
+ <feature name='null-sel-clr-base'/>
+ <feature name='osvw'/>
+ <feature name='pcid'/>
+ <feature name='perfctr_core'/>
+ <feature name='stibp-always-on'/>
+ <feature name='topoext'/>
+ <feature name='vnmi'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
<blockers model='EPYC-IBPB'>
<feature name='fxsr_opt'/>
@@ -994,7 +1033,7 @@
<feature name='tsc-deadline'/>
<feature name='x2apic'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='avx512-4fmaps'/>
<feature name='avx512-4vnniw'/>
@@ -1006,6 +1045,18 @@
<feature name='tsc-deadline'/>
<feature name='x2apic'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
index 062d91ba9a..d67841bd29 100644
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
@@ -332,7 +332,7 @@
<feature name='xsaves'/>
</blockers>
<model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model>
- <model usable='no' vendor='AMD'>EPYC-Genoa</model>
+ <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
<blockers model='EPYC-Genoa'>
<feature name='amd-psfd'/>
<feature name='auto-ibrs'/>
@@ -362,6 +362,36 @@
<feature name='vpclmulqdq'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
+ <blockers model='EPYC-Genoa-v1'>
+ <feature name='amd-psfd'/>
+ <feature name='auto-ibrs'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512bitalg'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512ifma'/>
+ <feature name='avx512vbmi'/>
+ <feature name='avx512vbmi2'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='gfni'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='la57'/>
+ <feature name='no-nested-data-bp'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='stibp-always-on'/>
+ <feature name='vaes'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
<model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model>
<blockers model='EPYC-Milan'>
@@ -802,7 +832,7 @@
<feature name='erms'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='avx512-4fmaps'/>
<feature name='avx512-4vnniw'/>
@@ -814,6 +844,18 @@
<feature name='erms'/>
<feature name='ss'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='erms'/>
+ <feature name='ss'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
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 e8053efc99..fb438bf984 100644
--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
@@ -333,7 +333,7 @@
<feature name='xsaves'/>
</blockers>
<model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model>
- <model usable='no' vendor='AMD'>EPYC-Genoa</model>
+ <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
<blockers model='EPYC-Genoa'>
<feature name='amd-psfd'/>
<feature name='auto-ibrs'/>
@@ -363,6 +363,36 @@
<feature name='vpclmulqdq'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
+ <blockers model='EPYC-Genoa-v1'>
+ <feature name='amd-psfd'/>
+ <feature name='auto-ibrs'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512bitalg'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512ifma'/>
+ <feature name='avx512vbmi'/>
+ <feature name='avx512vbmi2'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='gfni'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='la57'/>
+ <feature name='no-nested-data-bp'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='stibp-always-on'/>
+ <feature name='vaes'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
<model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model>
<blockers model='EPYC-Milan'>
@@ -803,7 +833,7 @@
<feature name='erms'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='avx512-4fmaps'/>
<feature name='avx512-4vnniw'/>
@@ -815,6 +845,18 @@
<feature name='erms'/>
<feature name='ss'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='erms'/>
+ <feature name='ss'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
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 8f3357be6f..6560cdaba5 100644
--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
@@ -386,7 +386,7 @@
<feature name='topoext'/>
<feature name='xsavec'/>
</blockers>
- <model usable='no' vendor='AMD'>EPYC-Genoa</model>
+ <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
<blockers model='EPYC-Genoa'>
<feature name='amd-psfd'/>
<feature name='amd-ssbd'/>
@@ -425,6 +425,45 @@
<feature name='xsavec'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
+ <blockers model='EPYC-Genoa-v1'>
+ <feature name='amd-psfd'/>
+ <feature name='amd-ssbd'/>
+ <feature name='amd-stibp'/>
+ <feature name='auto-ibrs'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512bitalg'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512ifma'/>
+ <feature name='avx512vbmi'/>
+ <feature name='avx512vbmi2'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='clzero'/>
+ <feature name='fxsr_opt'/>
+ <feature name='gfni'/>
+ <feature name='ibpb'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='lfence-always-serializing'/>
+ <feature name='misalignsse'/>
+ <feature name='no-nested-data-bp'/>
+ <feature name='nrip-save'/>
+ <feature name='null-sel-clr-base'/>
+ <feature name='osvw'/>
+ <feature name='pcid'/>
+ <feature name='perfctr_core'/>
+ <feature name='stibp-always-on'/>
+ <feature name='topoext'/>
+ <feature name='vnmi'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
<blockers model='EPYC-IBPB'>
<feature name='fxsr_opt'/>
@@ -952,7 +991,7 @@
<feature name='spec-ctrl'/>
<feature name='tsc-deadline'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='avx512-4fmaps'/>
<feature name='avx512-4vnniw'/>
@@ -963,6 +1002,17 @@
<feature name='avx512pf'/>
<feature name='tsc-deadline'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='tsc-deadline'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
index db12bd81e3..f19b1aaf0b 100644
--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
@@ -332,7 +332,7 @@
<feature name='xsaves'/>
</blockers>
<model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model>
- <model usable='no' vendor='AMD'>EPYC-Genoa</model>
+ <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
<blockers model='EPYC-Genoa'>
<feature name='amd-psfd'/>
<feature name='auto-ibrs'/>
@@ -362,6 +362,36 @@
<feature name='vpclmulqdq'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
+ <blockers model='EPYC-Genoa-v1'>
+ <feature name='amd-psfd'/>
+ <feature name='auto-ibrs'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512bitalg'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512ifma'/>
+ <feature name='avx512vbmi'/>
+ <feature name='avx512vbmi2'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='gfni'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='la57'/>
+ <feature name='no-nested-data-bp'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='stibp-always-on'/>
+ <feature name='vaes'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
<model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model>
<blockers model='EPYC-Milan'>
@@ -802,7 +832,7 @@
<feature name='erms'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='avx512-4fmaps'/>
<feature name='avx512-4vnniw'/>
@@ -814,6 +844,18 @@
<feature name='erms'/>
<feature name='ss'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='erms'/>
+ <feature name='ss'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
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 c3a7aff766..d915937244 100644
--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
@@ -337,7 +337,7 @@
<feature name='xsaves'/>
</blockers>
<model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model>
- <model usable='no' vendor='AMD'>EPYC-Genoa</model>
+ <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
<blockers model='EPYC-Genoa'>
<feature name='amd-psfd'/>
<feature name='auto-ibrs'/>
@@ -367,6 +367,36 @@
<feature name='vpclmulqdq'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
+ <blockers model='EPYC-Genoa-v1'>
+ <feature name='amd-psfd'/>
+ <feature name='auto-ibrs'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512bitalg'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512ifma'/>
+ <feature name='avx512vbmi'/>
+ <feature name='avx512vbmi2'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='gfni'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='la57'/>
+ <feature name='no-nested-data-bp'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='stibp-always-on'/>
+ <feature name='vaes'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
<model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model>
<blockers model='EPYC-Milan'>
@@ -836,7 +866,7 @@
<feature name='erms'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='avx512-4fmaps'/>
<feature name='avx512-4vnniw'/>
@@ -848,6 +878,18 @@
<feature name='erms'/>
<feature name='ss'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='erms'/>
+ <feature name='ss'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
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 a18ce928a5..7f6b0507a5 100644
--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
@@ -385,7 +385,7 @@
<feature name='topoext'/>
<feature name='xsavec'/>
</blockers>
- <model usable='no' vendor='AMD'>EPYC-Genoa</model>
+ <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
<blockers model='EPYC-Genoa'>
<feature name='amd-psfd'/>
<feature name='amd-ssbd'/>
@@ -424,6 +424,45 @@
<feature name='xsavec'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
+ <blockers model='EPYC-Genoa-v1'>
+ <feature name='amd-psfd'/>
+ <feature name='amd-ssbd'/>
+ <feature name='amd-stibp'/>
+ <feature name='auto-ibrs'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512bitalg'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512ifma'/>
+ <feature name='avx512vbmi'/>
+ <feature name='avx512vbmi2'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='clzero'/>
+ <feature name='fxsr_opt'/>
+ <feature name='gfni'/>
+ <feature name='ibpb'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='lfence-always-serializing'/>
+ <feature name='misalignsse'/>
+ <feature name='no-nested-data-bp'/>
+ <feature name='nrip-save'/>
+ <feature name='null-sel-clr-base'/>
+ <feature name='osvw'/>
+ <feature name='pcid'/>
+ <feature name='perfctr_core'/>
+ <feature name='stibp-always-on'/>
+ <feature name='topoext'/>
+ <feature name='vnmi'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
<blockers model='EPYC-IBPB'>
<feature name='fxsr_opt'/>
@@ -977,7 +1016,7 @@
<feature name='spec-ctrl'/>
<feature name='tsc-deadline'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='avx512-4fmaps'/>
<feature name='avx512-4vnniw'/>
@@ -988,6 +1027,17 @@
<feature name='avx512pf'/>
<feature name='tsc-deadline'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='tsc-deadline'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
index 5019918b9b..ed913cf7ea 100644
--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
@@ -336,7 +336,7 @@
<feature name='xsaves'/>
</blockers>
<model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model>
- <model usable='no' vendor='AMD'>EPYC-Genoa</model>
+ <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
<blockers model='EPYC-Genoa'>
<feature name='amd-psfd'/>
<feature name='auto-ibrs'/>
@@ -366,6 +366,36 @@
<feature name='vpclmulqdq'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
+ <blockers model='EPYC-Genoa-v1'>
+ <feature name='amd-psfd'/>
+ <feature name='auto-ibrs'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512bitalg'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512ifma'/>
+ <feature name='avx512vbmi'/>
+ <feature name='avx512vbmi2'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='gfni'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='la57'/>
+ <feature name='no-nested-data-bp'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='stibp-always-on'/>
+ <feature name='vaes'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
<model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model>
<blockers model='EPYC-Milan'>
@@ -835,7 +865,7 @@
<feature name='erms'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='avx512-4fmaps'/>
<feature name='avx512-4vnniw'/>
@@ -847,6 +877,18 @@
<feature name='erms'/>
<feature name='ss'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='erms'/>
+ <feature name='ss'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
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 5cd872831b..381cc53370 100644
--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
@@ -337,7 +337,7 @@
<feature name='xsaves'/>
</blockers>
<model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model>
- <model usable='no' vendor='AMD'>EPYC-Genoa</model>
+ <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
<blockers model='EPYC-Genoa'>
<feature name='amd-psfd'/>
<feature name='auto-ibrs'/>
@@ -367,6 +367,36 @@
<feature name='vpclmulqdq'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
+ <blockers model='EPYC-Genoa-v1'>
+ <feature name='amd-psfd'/>
+ <feature name='auto-ibrs'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512bitalg'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512ifma'/>
+ <feature name='avx512vbmi'/>
+ <feature name='avx512vbmi2'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='gfni'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='la57'/>
+ <feature name='no-nested-data-bp'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='stibp-always-on'/>
+ <feature name='vaes'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
<model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model>
<blockers model='EPYC-Milan'>
@@ -836,7 +866,7 @@
<feature name='erms'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='avx512-4fmaps'/>
<feature name='avx512-4vnniw'/>
@@ -848,6 +878,18 @@
<feature name='erms'/>
<feature name='ss'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='erms'/>
+ <feature name='ss'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
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 7afc9e3d69..243c37f179 100644
--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
@@ -385,7 +385,7 @@
<feature name='topoext'/>
<feature name='xsavec'/>
</blockers>
- <model usable='no' vendor='AMD'>EPYC-Genoa</model>
+ <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
<blockers model='EPYC-Genoa'>
<feature name='amd-psfd'/>
<feature name='amd-ssbd'/>
@@ -424,6 +424,45 @@
<feature name='xsavec'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
+ <blockers model='EPYC-Genoa-v1'>
+ <feature name='amd-psfd'/>
+ <feature name='amd-ssbd'/>
+ <feature name='amd-stibp'/>
+ <feature name='auto-ibrs'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512bitalg'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512ifma'/>
+ <feature name='avx512vbmi'/>
+ <feature name='avx512vbmi2'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='clzero'/>
+ <feature name='fxsr_opt'/>
+ <feature name='gfni'/>
+ <feature name='ibpb'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='lfence-always-serializing'/>
+ <feature name='misalignsse'/>
+ <feature name='no-nested-data-bp'/>
+ <feature name='nrip-save'/>
+ <feature name='null-sel-clr-base'/>
+ <feature name='osvw'/>
+ <feature name='pcid'/>
+ <feature name='perfctr_core'/>
+ <feature name='stibp-always-on'/>
+ <feature name='topoext'/>
+ <feature name='vnmi'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
<blockers model='EPYC-IBPB'>
<feature name='fxsr_opt'/>
@@ -977,7 +1016,7 @@
<feature name='spec-ctrl'/>
<feature name='tsc-deadline'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='avx512-4fmaps'/>
<feature name='avx512-4vnniw'/>
@@ -988,6 +1027,17 @@
<feature name='avx512pf'/>
<feature name='tsc-deadline'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='tsc-deadline'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
index 11cfc7863d..80ebe9b3cf 100644
--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
@@ -336,7 +336,7 @@
<feature name='xsaves'/>
</blockers>
<model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model>
- <model usable='no' vendor='AMD'>EPYC-Genoa</model>
+ <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
<blockers model='EPYC-Genoa'>
<feature name='amd-psfd'/>
<feature name='auto-ibrs'/>
@@ -366,6 +366,36 @@
<feature name='vpclmulqdq'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
+ <blockers model='EPYC-Genoa-v1'>
+ <feature name='amd-psfd'/>
+ <feature name='auto-ibrs'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512bitalg'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512ifma'/>
+ <feature name='avx512vbmi'/>
+ <feature name='avx512vbmi2'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='gfni'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='la57'/>
+ <feature name='no-nested-data-bp'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='stibp-always-on'/>
+ <feature name='vaes'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
<model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model>
<blockers model='EPYC-Milan'>
@@ -835,7 +865,7 @@
<feature name='erms'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>KnightsMill</model>
+ <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
<blockers model='KnightsMill'>
<feature name='avx512-4fmaps'/>
<feature name='avx512-4vnniw'/>
@@ -847,6 +877,18 @@
<feature name='erms'/>
<feature name='ss'/>
</blockers>
+ <model usable='no' vendor='Intel'>KnightsMill-v1</model>
+ <blockers model='KnightsMill-v1'>
+ <feature name='avx512-4fmaps'/>
+ <feature name='avx512-4vnniw'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512er'/>
+ <feature name='avx512f'/>
+ <feature name='avx512pf'/>
+ <feature name='erms'/>
+ <feature name='ss'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
<model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
<blockers model='Nehalem-IBRS'>
--
2.47.0
