cpu_map: Add KnightsMill-v1 CPU model

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
index 16ebe3653985806419e907dbb44c75940408f205..a0aa677dee80944ba066c560c5fbc6d1111af928 100644 (file)
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -128,6 +128,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'>

diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
index 4d74431c55a52dc9c2d3195ca974efa0a23adad7..70c7d2091b112088218a40cc68194a0bd6a772a0 100644 (file)
--- a/src/cpu_map/meson.build
+++ b/src/cpu_map/meson.build
@@ -99,6 +99,7 @@ cpumap_data = [
   'x86_IvyBridge-v1.xml',
   'x86_IvyBridge-v2.xml',
   'x86_IvyBridge.xml',
+  'x86_KnightsMill-v1.xml',
   'x86_KnightsMill.xml',
   'x86_kvm32-v1.xml',
   'x86_kvm32.xml',

diff --git a/src/cpu_map/x86_KnightsMill-v1.xml b/src/cpu_map/x86_KnightsMill-v1.xml
new file mode 100644 (file)
index 0000000..00293d0
--- /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 efd8f06104874c0c953f8c8ff66808793a9833cd..43e1ca8861a58a8a2017986f277534520b7ad3ce 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -538,7 +538,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'/>
@@ -550,6 +550,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 beb923a1f3d6b68abe2ecd8b11ce2caaf352205b..0718de04f757ce024c4f1b6f377c7bd238844384 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -1021,7 +1021,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'/>
@@ -1039,6 +1039,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 d9ae5568be8bc394a9e518f90aeee1ee492ab977..6eb78e68f0483190f109358502ff6e2dce222893 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -537,7 +537,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'/>
@@ -549,6 +549,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 403b9f66740800880139cd43375d8878a134a60b..3b716faf00ffabf0082662177ddeca5f7dc540b8 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -560,7 +560,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'/>
@@ -572,6 +572,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 f2ad35c6cde7bedaf887ca9e417e1542bb501361..bd8c0a086c4894f04b9af0045d06c1d38fea8932 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -1111,7 +1111,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'/>
@@ -1129,6 +1129,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 07570f5b024f01dee062b4d8f93fd0257c3a1216..b6ec55cf0c03004a33d0af422317f65c2995d2b1 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -559,7 +559,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'/>
@@ -571,6 +571,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 4cf841b3e9ae9121e3a461f27aba558466b6dbb4..e6615316f750494eb22f337a6c64faa17c8ce242 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -630,7 +630,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'/>
@@ -642,6 +642,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 bbb9cfff7fb13204eb4e325f84f34840dbabfb61..50d6395d7f403948a1e91f8ef54f8418afb04abe 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -1251,7 +1251,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'/>
@@ -1269,6 +1269,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 0c615f180255217619c221309d3ffcbdd9d9de3d..974346f9809307694e25f73556d3a8802db259ec 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -629,7 +629,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'/>
@@ -641,6 +641,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 e468a909112ec9f1f5b9e4dbfc1a57cd92a60b17..812ebd5e0a63c8e7450f632be6dd5982dffb619f 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.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-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
index b46a5158645ad0d3d8dd37b21c10c7eb2713b381..24f22dd53febc45af0f28c8149853fb9dea5c682 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -1248,7 +1248,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'/>
@@ -1266,6 +1266,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 d06e67a5e212e83fc411a4ab3cdfd285ba459619..9af219d59de5a317690557b5db4145148121944e 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -626,7 +626,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'/>
@@ -638,6 +638,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 a0c47fd84e932090204b63ddd144fa2efb70791f..439f609233a7d51137427427fca9379bb40a64ec 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -654,7 +654,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'/>
@@ -666,6 +666,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 db68047af79140182d6f51a58bf2c35a0c84c085..53c114699c816e897f34f449df31da7c63300c4f 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -1277,7 +1277,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'/>
@@ -1295,6 +1295,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 71999ab677c9a4862c572df12ebf96ff71f260bc..6d91c4ac75cfaa1f4a272794243ca859518d137d 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -653,7 +653,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'/>
@@ -665,6 +665,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 3a2874f08afa05f3ff0ec56f6c90e5df063d01b7..d61b339dd9e28ceefd282ad736ab6e9b38d250d3 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -621,7 +621,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'/>
@@ -633,6 +633,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 241698785224dc82ddc2193d40b1386a10194a2e..a758fbabc56bf7206e5475e2be151e0e7d9b556f 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -1225,7 +1225,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'/>
@@ -1243,6 +1243,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 eda271a1b2a94018c59ceed08eefb1dfda920386..48e8299c23221e2db2d9a37a259c84960004e0c2 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -620,7 +620,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'/>
@@ -632,6 +632,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 2b5cfdae87b5d4ed3332341839b3398550611b81..6a15994158d34acdc46ca258b3f5872b7e3c96de 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
@@ -626,7 +626,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'/>
@@ -638,6 +638,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 6a191f3ce8ed626ece343ee069d0ae79c9cfcb08..4d0def8fc7bff8366548d726c4a75bd470d2efe1 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
@@ -1010,7 +1010,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'/>
@@ -1024,6 +1024,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 6a191f3ce8ed626ece343ee069d0ae79c9cfcb08..4d0def8fc7bff8366548d726c4a75bd470d2efe1 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -1010,7 +1010,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'/>
@@ -1024,6 +1024,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 48b4ced22f5f28ebfc2927edd928ac14b669d946..ead8df9815eb35d7f6655d7773b8a0c30288e07b 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.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_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
index ec1fea19fc062ab1a71062db7d4a5ef2d60d9a36..1936c89c7087544ff2698f06a7e796ce5931302f 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
@@ -626,7 +626,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'/>
@@ -638,6 +638,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 049bef7aa6b34e39b91b145b85db041fb7aa276f..d72b0c93d3983f04c458ebd4a6ad9aba2a8c0e9b 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -1009,7 +1009,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'/>
@@ -1023,6 +1023,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 206a3a86a2c7e66361514ca7a0780f9af24f8a8e..4adb6402ae9605c53c928fe7206dd1c13dc517fb 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.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_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
index 34fbc59118258a28335f4bc8e14bc9d999f3fe5c..c9f53064ff160328bba2436a18ed72fdd80b642a 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
@@ -804,7 +804,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'/>
@@ -816,6 +816,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 2a836cbc21e17ce8909124e348e29354bfb78b70..b2e2c3264b91f5d9e47304ffb12cd080de6b0d38 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -1021,7 +1021,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'/>
@@ -1033,6 +1033,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 3380b8a9aa76f3b261d9ef51880a66a989f7f1c8..c630356571accc783a2a61fdfdb689d45b39bd2f 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
@@ -803,7 +803,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 +815,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 0ec9ebeafe2af12825344af41b79950d2c700c8e..17f4f6c4f0781d6afa4024740e870aa9c134afe2 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
@@ -805,7 +805,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'/>
@@ -817,6 +817,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 b3fd8eb6c62b4ebf4a5cee743743a2fd1a3a4284..3ea2911762c0f90b98d12c4fa9fc042cfcf279df 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -996,7 +996,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'/>
@@ -1008,6 +1008,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 210024bc4459f3aa98e16befc3b501783e6c192e..77286e9aef0cfee0413058a91da322db5b936814 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
@@ -804,7 +804,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'/>
@@ -816,6 +816,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 2aade71dae441fff952a1b0f1b72b4a41fe44aaa..d304fbd62ba02d15d6baebb8fd413ed130aa3791 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
@@ -805,7 +805,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'/>
@@ -817,6 +817,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 36cec1ee6b1130591c66c64e7604682e17509908..3e6cc2552935f75281f04731c8ab07d280f3e75d 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
@@ -954,7 +954,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'/>
@@ -965,6 +965,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 8316b40fce88c478ede6edff4e51ad93cdd28c5b..a6fae9e3f11a40d425accfff79961ed1747edc2d 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
@@ -804,7 +804,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'/>
@@ -816,6 +816,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 cabd1c3694df6e32a8953ae4b72dabc7c75d208c..060d96ab099d0085ae31472de67295585f759c0c 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
@@ -838,7 +838,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'/>
@@ -850,6 +850,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 67a8a5f5e707e0ce6ff4982d6676f21d21efe714..75f83cb376c5d073a79945d16215004361bcce8f 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
@@ -979,7 +979,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'/>
@@ -990,6 +990,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 45252b6b8194e81aad47b30320ff7cb6abf7ecf2..66dcb81fe63d9a39fa8dd045f925a7728085932f 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
@@ -837,7 +837,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'/>
@@ -849,6 +849,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 cc5cbfbf194dfca7fa78e2a378af6c1690a99c19..72df5e5e7dd811c749ccb1bf4129672682edc8bd 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
@@ -838,7 +838,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'/>
@@ -850,6 +850,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 d0761a2c57460c9cc74884612f578f4e66e02bf0..6a756782cdddf853035ab9fd03b11d6f4109eb2c 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
@@ -979,7 +979,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'/>
@@ -990,6 +990,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 df2f9d27ad738a9d993cc588cc67d40351cc63d8..ef7b2bb67ba80ffe53e20fa51f8fa8cc9edc1e64 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
@@ -837,7 +837,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'/>
@@ -849,6 +849,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'>