cpu_map: Add versions of Haswell CPU model

author Jiri Denemark <jdenemar@redhat.com>

Tue, 22 Oct 2024 09:46:25 +0000 (11:46 +0200)

committer Jiri Denemark <jdenemar@redhat.com>

Tue, 26 Nov 2024 12:04:35 +0000 (13:04 +0100)
author Jiri Denemark <jdenemar@redhat.com>
Tue, 22 Oct 2024 09:46:25 +0000 (11:46 +0200)
committer Jiri Denemark <jdenemar@redhat.com>
Tue, 26 Nov 2024 12:04:35 +0000 (13:04 +0100)
diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml

index 204cce459a95bd5f4ba100f8b4a02e8860a1f0ed..c94be551fbe869c7a88b22efde02ec52e43ab028 100644 (file)
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -41,6 +41,10 @@
        <include filename='x86_Haswell-noTSX-IBRS.xml'/>
        <include filename='x86_Haswell.xml'/>
        <include filename='x86_Haswell-IBRS.xml'/>
+      <include filename='x86_Haswell-v1.xml'/>
+      <include filename='x86_Haswell-v2.xml'/>
+      <include filename='x86_Haswell-v3.xml'/>
+      <include filename='x86_Haswell-v4.xml'/>
        <include filename='x86_Broadwell-noTSX.xml'/>
        <include filename='x86_Broadwell-noTSX-IBRS.xml'/>
        <include filename='x86_Broadwell.xml'/>
diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build

index 410f29f505a4a5ac38c73cecec014b8b2f65bcf3..e230ade8f07bb91f3caa216fc097ef9fe7938e13 100644 (file)
--- a/src/cpu_map/meson.build
+++ b/src/cpu_map/meson.build
@@ -59,6 +59,10 @@ cpumap_data = [
    'x86_Haswell-IBRS.xml',
    'x86_Haswell-noTSX-IBRS.xml',
    'x86_Haswell-noTSX.xml',
+  'x86_Haswell-v1.xml',
+  'x86_Haswell-v2.xml',
+  'x86_Haswell-v3.xml',
+  'x86_Haswell-v4.xml',
    'x86_Haswell.xml',
    'x86_Icelake-Client-noTSX.xml',
    'x86_Icelake-Client.xml',
diff --git a/src/cpu_map/x86_Haswell-v1.xml b/src/cpu_map/x86_Haswell-v1.xml

new file mode 100644 (file)

index 0000000..729daf1
--- /dev/null
+++ b/src/cpu_map/x86_Haswell-v1.xml
@@ -0,0 +1,6 @@
+<cpus>
+  <model name='Haswell-v1'>
+    <decode host='on' guest='off'/>
+    <model name='Haswell'/>
+  </model>
+</cpus>
diff --git a/src/cpu_map/x86_Haswell-v2.xml b/src/cpu_map/x86_Haswell-v2.xml

new file mode 100644 (file)

index 0000000..1657d0d
--- /dev/null
+++ b/src/cpu_map/x86_Haswell-v2.xml
@@ -0,0 +1,6 @@
+<cpus>
+  <model name='Haswell-v2'>
+    <decode host='on' guest='off'/>
+    <model name='Haswell-noTSX'/>
+  </model>
+</cpus>
diff --git a/src/cpu_map/x86_Haswell-v3.xml b/src/cpu_map/x86_Haswell-v3.xml

new file mode 100644 (file)

index 0000000..fd38a86
--- /dev/null
+++ b/src/cpu_map/x86_Haswell-v3.xml
@@ -0,0 +1,6 @@
+<cpus>
+  <model name='Haswell-v3'>
+    <decode host='on' guest='off'/>
+    <model name='Haswell-IBRS'/>
+  </model>
+</cpus>
diff --git a/src/cpu_map/x86_Haswell-v4.xml b/src/cpu_map/x86_Haswell-v4.xml

new file mode 100644 (file)

index 0000000..d28eb14
--- /dev/null
+++ b/src/cpu_map/x86_Haswell-v4.xml
@@ -0,0 +1,6 @@
+<cpus>
+  <model name='Haswell-v4'>
+    <decode host='on' guest='off'/>
+    <model name='Haswell-noTSX-IBRS'/>
+  </model>
+</cpus>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml

index bb15f84c47b585c10e539ae2ebdb06f119694f8c..7986162053bffefcd6f3c517084803bb6a7f22b0 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml
@@ -1,6 +1,6 @@
  <cpu>
    <arch>x86_64</arch>
-  <model>Haswell-noTSX</model>
+  <model>Haswell-v2</model>
    <vendor>Intel</vendor>
    <signature family='6' model='60' stepping='3'/>
    <feature name='dtes64'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml

index fbcb3bd63fac2bee875a779216a07a7d083b84c9..41545483f2273584060f900ac66222c1b21bddc4 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml
@@ -1,6 +1,6 @@
  <cpu>
    <arch>x86_64</arch>
-  <model>Haswell-noTSX</model>
+  <model>Haswell-v2</model>
    <vendor>Intel</vendor>
    <signature family='6' model='69' stepping='1'/>
    <feature name='dtes64'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml

index d641d70bbdb849f44a1238db71a0884ea40c4a03..9e57e13c7d1b303c516c7e916bc9cbaa9b77bb26 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml
@@ -1,6 +1,6 @@
  <cpu>
    <arch>x86_64</arch>
-  <model>Haswell-noTSX-IBRS</model>
+  <model>Haswell-v4</model>
    <vendor>Intel</vendor>
    <signature family='6' model='63' stepping='2'/>
    <feature name='dtes64'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml

index b8bafccab39a5bb5d9075ea4442db42f702f6eee..44a435e71c3b71dca5b8d568fd682ba4a46daeba 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml
@@ -1,6 +1,6 @@
  <cpu>
    <arch>x86_64</arch>
-  <model>Haswell-noTSX</model>
+  <model>Haswell-v2</model>
    <vendor>Intel</vendor>
    <signature family='6' model='63' stepping='2'/>
    <feature name='dtes64'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml

index b8bafccab39a5bb5d9075ea4442db42f702f6eee..44a435e71c3b71dca5b8d568fd682ba4a46daeba 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml
@@ -1,6 +1,6 @@
  <cpu>
    <arch>x86_64</arch>
-  <model>Haswell-noTSX</model>
+  <model>Haswell-v2</model>
    <vendor>Intel</vendor>
    <signature family='6' model='63' stepping='2'/>
    <feature name='dtes64'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml

index 92d920624243829b1d3f1c0fc3c014a5a7ecb6ed..f5a846da2771d749a205f174a21760c1f79c6e51 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml
@@ -1,6 +1,6 @@
  <cpu>
    <arch>x86_64</arch>
-  <model>Haswell</model>
+  <model>Haswell-v1</model>
    <vendor>Intel</vendor>
    <signature family='6' model='63' stepping='4'/>
    <feature name='dtes64'/>
diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml

index d05a5069752479bd7bcef0466c92157450945edb..b44ea2611d3bb63ad1cc783e11eed968e69d8f2a 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -260,7 +260,7 @@
        <model usable='yes' vendor='AMD'>EPYC</model>
        <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
        <model usable='yes' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -268,7 +268,7 @@
          <feature name='pcid'/>
          <feature name='rtm'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -277,19 +277,49 @@
          <feature name='rtm'/>
          <feature name='spec-ctrl'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='spec-ctrl'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
        <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
        <blockers model='Icelake-Client'>
          <feature name='avx512-vpopcntdq'/>
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 a8e28d279cbb1637f2d9501927f60c36eec9992c..799996be482e639c68ea7a17f9e24c98ebc73d1c 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -490,7 +490,7 @@
          <feature name='xsaveerptr'/>
          <feature name='xsaves'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='avx'/>
          <feature name='avx2'/>
@@ -503,7 +503,7 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='avx'/>
          <feature name='avx2'/>
@@ -517,7 +517,7 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='avx'/>
          <feature name='avx2'/>
@@ -528,7 +528,7 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='avx'/>
          <feature name='avx2'/>
@@ -540,6 +540,56 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='avx'/>
+        <feature name='avx2'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='avx'/>
+        <feature name='avx2'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='avx'/>
+        <feature name='avx2'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='avx'/>
+        <feature name='avx2'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
        <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
        <blockers model='Icelake-Client'>
          <feature name='3dnowprefetch'/>
diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml

index 17954892e04a83359566556cfae765bb85cdad68..252f6afa184630f3bf6879e0cd2ccabe9d780554 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -259,7 +259,7 @@
        <model usable='yes' vendor='AMD'>EPYC</model>
        <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
        <model usable='yes' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -267,7 +267,7 @@
          <feature name='pcid'/>
          <feature name='rtm'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -276,19 +276,49 @@
          <feature name='rtm'/>
          <feature name='spec-ctrl'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='spec-ctrl'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
        <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
        <blockers model='Icelake-Client'>
          <feature name='avx512-vpopcntdq'/>
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 c7f12089c723a01f498a3971b6a355dea3de52ec..beaa1dafbd0a01b7bfebc8226b77ad08808c8960 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -269,7 +269,7 @@
          <feature name='pku'/>
        </blockers>
        <model usable='yes' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -277,7 +277,7 @@
          <feature name='pcid'/>
          <feature name='rtm'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -286,19 +286,49 @@
          <feature name='rtm'/>
          <feature name='spec-ctrl'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='spec-ctrl'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
        <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
        <blockers model='Icelake-Client'>
          <feature name='avx512-vpopcntdq'/>
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 c2229b8837ef99d68f8b30fcd82612f4f4121a0f..36163763f866a67eae89fbbbc4caed4641740820 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -522,7 +522,7 @@
          <feature name='xsaveerptr'/>
          <feature name='xsaves'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='avx'/>
          <feature name='avx2'/>
@@ -535,7 +535,7 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='avx'/>
          <feature name='avx2'/>
@@ -549,7 +549,7 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='avx'/>
          <feature name='avx2'/>
@@ -560,7 +560,7 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='avx'/>
          <feature name='avx2'/>
@@ -572,6 +572,56 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='avx'/>
+        <feature name='avx2'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='avx'/>
+        <feature name='avx2'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='avx'/>
+        <feature name='avx2'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='avx'/>
+        <feature name='avx2'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
        <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
        <blockers model='Icelake-Client'>
          <feature name='3dnowprefetch'/>
diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml

index aa5f264c52c295212860d813ad41ad7da48600ce..eed3864bb1602b1d5f92f1e53983af423dc4c0d4 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -268,7 +268,7 @@
          <feature name='pku'/>
        </blockers>
        <model usable='yes' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -276,7 +276,7 @@
          <feature name='pcid'/>
          <feature name='rtm'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -285,19 +285,49 @@
          <feature name='rtm'/>
          <feature name='spec-ctrl'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='spec-ctrl'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
        <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
        <blockers model='Icelake-Client'>
          <feature name='avx512-vpopcntdq'/>
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 2e41f8919abce79b39ff860a5eaefcdff0fba4b0..c3b4c797322e4173cdbcbe5575d2890f04d2362b 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -307,7 +307,7 @@
          <feature name='pku'/>
        </blockers>
        <model usable='yes' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -315,7 +315,7 @@
          <feature name='pcid'/>
          <feature name='rtm'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -324,19 +324,49 @@
          <feature name='rtm'/>
          <feature name='spec-ctrl'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='spec-ctrl'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
        <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
        <blockers model='Icelake-Client'>
          <feature name='avx512-vpopcntdq'/>
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 a0fd3187348cfb99f326b29c07f6091a78e59a3c..d584638f3301397b14d6cb0372af67b08b1157b2 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -587,7 +587,7 @@
          <feature name='xsaveerptr'/>
          <feature name='xsaves'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='avx'/>
          <feature name='avx2'/>
@@ -600,7 +600,7 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='avx'/>
          <feature name='avx2'/>
@@ -614,7 +614,7 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='avx'/>
          <feature name='avx2'/>
@@ -625,7 +625,7 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='avx'/>
          <feature name='avx2'/>
@@ -637,6 +637,56 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='avx'/>
+        <feature name='avx2'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='avx'/>
+        <feature name='avx2'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='avx'/>
+        <feature name='avx2'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='avx'/>
+        <feature name='avx2'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
        <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
        <blockers model='Icelake-Client'>
          <feature name='3dnowprefetch'/>
diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml

index 3c599581f7f9e27d089a3c22723152eafdf11b37..5bb327039da93811dffe5819b47712e7ec7538b3 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -306,7 +306,7 @@
          <feature name='pku'/>
        </blockers>
        <model usable='yes' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -314,7 +314,7 @@
          <feature name='pcid'/>
          <feature name='rtm'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -323,19 +323,49 @@
          <feature name='rtm'/>
          <feature name='spec-ctrl'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='spec-ctrl'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
        <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
        <blockers model='Icelake-Client'>
          <feature name='avx512-vpopcntdq'/>
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 9b8a512f128bc908c53cbf2d26a879b462be38bd..5d5fbc9c313395e32856ab52ab662b0d2cf3ff51 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -304,7 +304,7 @@
          <feature name='pku'/>
        </blockers>
        <model usable='yes' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -312,7 +312,7 @@
          <feature name='pcid'/>
          <feature name='rtm'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -321,19 +321,49 @@
          <feature name='rtm'/>
          <feature name='spec-ctrl'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='spec-ctrl'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
        <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
        <blockers model='Icelake-Client'>
          <feature name='avx512-vpopcntdq'/>
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 7831820858f9bcacf5ff6c8fd499188fac41cd65..5165e04d7818a8e4fd21aa73ff8da93173ba5472 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -585,7 +585,7 @@
          <feature name='xsaveerptr'/>
          <feature name='xsaves'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='avx'/>
          <feature name='avx2'/>
@@ -598,7 +598,7 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='avx'/>
          <feature name='avx2'/>
@@ -612,7 +612,7 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='avx'/>
          <feature name='avx2'/>
@@ -623,7 +623,7 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='avx'/>
          <feature name='avx2'/>
@@ -635,6 +635,56 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='avx'/>
+        <feature name='avx2'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='avx'/>
+        <feature name='avx2'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='avx'/>
+        <feature name='avx2'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='avx'/>
+        <feature name='avx2'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
        <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
        <blockers model='Icelake-Client'>
          <feature name='3dnowprefetch'/>
diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml

index b3ac57b8591e435ec3a03a0f1beea489630be69b..d1cf0e97029b550830cdd2c3369be5c17af51c56 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -303,7 +303,7 @@
          <feature name='pku'/>
        </blockers>
        <model usable='yes' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -311,7 +311,7 @@
          <feature name='pcid'/>
          <feature name='rtm'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -320,19 +320,49 @@
          <feature name='rtm'/>
          <feature name='spec-ctrl'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='spec-ctrl'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
        <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
        <blockers model='Icelake-Client'>
          <feature name='avx512-vpopcntdq'/>
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 340266c243340628ebc6947f42b0be229c283bc5..758066b64b008e4deb6d3a806e053e1763d023ec 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -305,7 +305,7 @@
          <feature name='pku'/>
        </blockers>
        <model usable='yes' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -313,7 +313,7 @@
          <feature name='pcid'/>
          <feature name='rtm'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -322,19 +322,49 @@
          <feature name='rtm'/>
          <feature name='spec-ctrl'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='spec-ctrl'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
        <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
        <blockers model='Icelake-Client'>
          <feature name='avx512-vpopcntdq'/>
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 f578d1a2700a07a321f376b7e265f258783f869f..ed7c6225c0ecde1ea0d17ff470469db615741a0b 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -584,7 +584,7 @@
          <feature name='xsaveerptr'/>
          <feature name='xsaves'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='avx'/>
          <feature name='avx2'/>
@@ -597,7 +597,7 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='avx'/>
          <feature name='avx2'/>
@@ -611,7 +611,7 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='avx'/>
          <feature name='avx2'/>
@@ -622,7 +622,7 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='avx'/>
          <feature name='avx2'/>
@@ -634,6 +634,56 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='avx'/>
+        <feature name='avx2'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='avx'/>
+        <feature name='avx2'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='avx'/>
+        <feature name='avx2'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='avx'/>
+        <feature name='avx2'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
        <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
        <blockers model='Icelake-Client'>
          <feature name='3dnowprefetch'/>
diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml

index 2a2db648e7b436b83e10178d7208fcc16dfca695..8cde45efa8e20b552d8ad647c06ce9ab3dac5439 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -304,7 +304,7 @@
          <feature name='pku'/>
        </blockers>
        <model usable='yes' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -312,7 +312,7 @@
          <feature name='pcid'/>
          <feature name='rtm'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -321,19 +321,49 @@
          <feature name='rtm'/>
          <feature name='spec-ctrl'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='spec-ctrl'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
        <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
        <blockers model='Icelake-Client'>
          <feature name='avx512-vpopcntdq'/>
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 bb9bb289221fb42e76c9787ec20393dd9314d62c..64b5033873672f76486c0caaa2c6804d2b1cd021 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -306,7 +306,7 @@
          <feature name='pku'/>
        </blockers>
        <model usable='yes' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -314,7 +314,7 @@
          <feature name='pcid'/>
          <feature name='rtm'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -323,19 +323,49 @@
          <feature name='rtm'/>
          <feature name='spec-ctrl'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='spec-ctrl'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
        <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model>
        <blockers model='Icelake-Server'>
          <feature name='avx512-vpopcntdq'/>
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 aadac29f258856c520adb858a6177f189420b5cf..4bebb680d0a7de3916b620e546e3c35c05193de7 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -584,7 +584,7 @@
          <feature name='xsaveerptr'/>
          <feature name='xsaves'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='avx'/>
          <feature name='avx2'/>
@@ -597,7 +597,7 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='avx'/>
          <feature name='avx2'/>
@@ -611,7 +611,7 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='avx'/>
          <feature name='avx2'/>
@@ -622,7 +622,7 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='avx'/>
          <feature name='avx2'/>
@@ -634,6 +634,56 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='avx'/>
+        <feature name='avx2'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='avx'/>
+        <feature name='avx2'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='avx'/>
+        <feature name='avx2'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='avx'/>
+        <feature name='avx2'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
        <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model>
        <blockers model='Icelake-Server'>
          <feature name='3dnowprefetch'/>
diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml

index 1a8fb7a7fa7e2848e5afb50bba2f9de101cbcaba..f4c7fb008942ce1552ce6cdde0701537660a213b 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -305,7 +305,7 @@
          <feature name='pku'/>
        </blockers>
        <model usable='yes' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -313,7 +313,7 @@
          <feature name='pcid'/>
          <feature name='rtm'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -322,19 +322,49 @@
          <feature name='rtm'/>
          <feature name='spec-ctrl'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='spec-ctrl'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
        <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model>
        <blockers model='Icelake-Server'>
          <feature name='avx512-vpopcntdq'/>
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 2751f9a93faa2213f87da0f988e84c9330f761c6..a0fb5fad670facde0df976137539a2139574eea4 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
@@ -311,7 +311,7 @@
          <feature name='pku'/>
        </blockers>
        <model usable='yes' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -319,7 +319,7 @@
          <feature name='pcid'/>
          <feature name='rtm'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -328,19 +328,49 @@
          <feature name='rtm'/>
          <feature name='spec-ctrl'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='spec-ctrl'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
        <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model>
        <blockers model='Icelake-Server'>
          <feature name='avx512-vpopcntdq'/>
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 a891514df09495f7355aa528b671d850f6d2aa62..17e4b135bb5a17187455e1a076109b0a4c506108 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
@@ -481,7 +481,7 @@
          <feature name='xsaveerptr'/>
          <feature name='xsaves'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='hle'/>
          <feature name='invpcid'/>
@@ -490,7 +490,7 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='hle'/>
          <feature name='invpcid'/>
@@ -500,14 +500,14 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='invpcid'/>
          <feature name='pcid'/>
@@ -515,6 +515,40 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
        <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model>
        <blockers model='Icelake-Server'>
          <feature name='3dnowprefetch'/>
diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml

index a891514df09495f7355aa528b671d850f6d2aa62..17e4b135bb5a17187455e1a076109b0a4c506108 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -481,7 +481,7 @@
          <feature name='xsaveerptr'/>
          <feature name='xsaves'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='hle'/>
          <feature name='invpcid'/>
@@ -490,7 +490,7 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='hle'/>
          <feature name='invpcid'/>
@@ -500,14 +500,14 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='invpcid'/>
          <feature name='pcid'/>
@@ -515,6 +515,40 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
        <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model>
        <blockers model='Icelake-Server'>
          <feature name='3dnowprefetch'/>
diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml

index eaaabd40e2efac334eb1bd5067b4f47bac033bfd..17bd1d5c7511037c2db982d430680eae9c8f1369 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -310,7 +310,7 @@
          <feature name='pku'/>
        </blockers>
        <model usable='yes' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -318,7 +318,7 @@
          <feature name='pcid'/>
          <feature name='rtm'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -327,19 +327,49 @@
          <feature name='rtm'/>
          <feature name='spec-ctrl'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='spec-ctrl'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
        <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model>
        <blockers model='Icelake-Server'>
          <feature name='avx512-vpopcntdq'/>
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 5f16ac097d392a4cd9aca6526b03209793c769cb..9e69036f903106f33eab1c75021aff923503cd09 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
@@ -311,7 +311,7 @@
          <feature name='pku'/>
        </blockers>
        <model usable='yes' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -319,7 +319,7 @@
          <feature name='pcid'/>
          <feature name='rtm'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -328,19 +328,49 @@
          <feature name='rtm'/>
          <feature name='spec-ctrl'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='spec-ctrl'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
        <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model>
        <blockers model='Icelake-Server'>
          <feature name='avx512-vpopcntdq'/>
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 49514145275d4f7fed6a6e191683875b01c1f4c1..3192c6cd1f72f3794fee2069bd0679db53e7cec1 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -484,7 +484,7 @@
          <feature name='xsaveerptr'/>
          <feature name='xsaves'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='hle'/>
          <feature name='invpcid'/>
@@ -493,7 +493,7 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='hle'/>
          <feature name='invpcid'/>
@@ -503,14 +503,14 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='invpcid'/>
          <feature name='pcid'/>
@@ -518,6 +518,40 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
        <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model>
        <blockers model='Icelake-Server'>
          <feature name='3dnowprefetch'/>
diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml

index e90833b2815c1f9424ee45a817aea23dfd0a5a7c..79e5eeddc6521bc29d6ef92b25db522683e0cf0f 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
@@ -310,7 +310,7 @@
          <feature name='pku'/>
        </blockers>
        <model usable='yes' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -318,7 +318,7 @@
          <feature name='pcid'/>
          <feature name='rtm'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -327,19 +327,49 @@
          <feature name='rtm'/>
          <feature name='spec-ctrl'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='spec-ctrl'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
        <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model>
        <blockers model='Icelake-Server'>
          <feature name='avx512-vpopcntdq'/>
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 708cfb621cf029756a89c1f601fec97839a78e0e..dfbaeb4d7af7444f93908163c40b7a39d978c680 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
@@ -447,7 +447,7 @@
          <feature name='xfd'/>
          <feature name='xsaves'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -455,7 +455,7 @@
          <feature name='pcid'/>
          <feature name='rtm'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -464,19 +464,49 @@
          <feature name='rtm'/>
          <feature name='spec-ctrl'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='spec-ctrl'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
        <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model>
        <blockers model='Icelake-Server'>
          <feature name='avx512-vpopcntdq'/>
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 468a78e05ac9876db3ff1d16eb9c2bd42de95d89..035eb24b030908d57f1377a3b6d99c6064565057 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -517,7 +517,7 @@
          <feature name='xsavec'/>
          <feature name='xsaves'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='hle'/>
          <feature name='invpcid'/>
@@ -526,7 +526,7 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='hle'/>
          <feature name='invpcid'/>
@@ -536,14 +536,14 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='invpcid'/>
          <feature name='pcid'/>
@@ -551,6 +551,40 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
        <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model>
        <blockers model='Icelake-Server'>
          <feature name='avx512-vpopcntdq'/>
diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml

index 54320ebc71874c51e81e2ee981c0f3e6b8a8cd02..13aa743b8aebabf327e381ab6a01a933aef5cb4b 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
@@ -446,7 +446,7 @@
          <feature name='xfd'/>
          <feature name='xsaves'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -454,7 +454,7 @@
          <feature name='pcid'/>
          <feature name='rtm'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -463,19 +463,49 @@
          <feature name='rtm'/>
          <feature name='spec-ctrl'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='spec-ctrl'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
        <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model>
        <blockers model='Icelake-Server'>
          <feature name='avx512-vpopcntdq'/>
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 8df44a2e659e4e5b326ceb4147871cad99d56bb9..649abc64fc55bc06887cb2a302a1b73c864e34c5 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
@@ -448,7 +448,7 @@
          <feature name='xfd'/>
          <feature name='xsaves'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -456,7 +456,7 @@
          <feature name='pcid'/>
          <feature name='rtm'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -465,19 +465,49 @@
          <feature name='rtm'/>
          <feature name='spec-ctrl'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='spec-ctrl'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
        <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model>
        <blockers model='Icelake-Server'>
          <feature name='avx512-vpopcntdq'/>
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 8767ab287204e52511d93dfc4daf43859f78d253..9451fc7a44761a506a4ec95917bb54b5c9a9a8f0 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -509,7 +509,7 @@
          <feature name='xsavec'/>
          <feature name='xsaves'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='hle'/>
          <feature name='invpcid'/>
@@ -518,7 +518,7 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='hle'/>
          <feature name='invpcid'/>
@@ -528,14 +528,14 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='invpcid'/>
          <feature name='pcid'/>
@@ -543,6 +543,40 @@
          <feature name='tsc-deadline'/>
          <feature name='x2apic'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
        <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model>
        <blockers model='Icelake-Server'>
          <feature name='avx512-vpopcntdq'/>
diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml

index f6959a66ebf40442f20f2436d669a275ae6061e7..b8d4756e68bd436daa03a2ef903f43e230e5791b 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
@@ -447,7 +447,7 @@
          <feature name='xfd'/>
          <feature name='xsaves'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -455,7 +455,7 @@
          <feature name='pcid'/>
          <feature name='rtm'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -464,19 +464,49 @@
          <feature name='rtm'/>
          <feature name='spec-ctrl'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='spec-ctrl'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
        <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model>
        <blockers model='Icelake-Server'>
          <feature name='avx512-vpopcntdq'/>
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 f338a2a0f4190dd3c0477220e4be17c6f2978416..dfcacf6e6f5eddc38f008027de9c70bae4294101 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
@@ -448,7 +448,7 @@
          <feature name='xfd'/>
          <feature name='xsaves'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -456,7 +456,7 @@
          <feature name='pcid'/>
          <feature name='rtm'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -465,19 +465,49 @@
          <feature name='rtm'/>
          <feature name='spec-ctrl'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='spec-ctrl'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
        <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model>
        <blockers model='Icelake-Server'>
          <feature name='avx512-vpopcntdq'/>
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 3b799a6c96734a5bdd61ae12d239224d3a620a45..17b0727063b56e64b3f9449ba9e7fe22680cd875 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
@@ -491,7 +491,7 @@
          <feature name='xsavec'/>
          <feature name='xsaves'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='hle'/>
          <feature name='invpcid'/>
@@ -499,7 +499,7 @@
          <feature name='rtm'/>
          <feature name='tsc-deadline'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='hle'/>
          <feature name='invpcid'/>
@@ -508,19 +508,49 @@
          <feature name='spec-ctrl'/>
          <feature name='tsc-deadline'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='tsc-deadline'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='spec-ctrl'/>
          <feature name='tsc-deadline'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='tsc-deadline'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='tsc-deadline'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+      </blockers>
        <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model>
        <blockers model='Icelake-Server'>
          <feature name='avx512-vpopcntdq'/>
diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml

index cbffd21e13bf58752f539658751946b1f2cd287c..b378b9120101e8288ddade087db447b4ea1fe23c 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
@@ -447,7 +447,7 @@
          <feature name='xfd'/>
          <feature name='xsaves'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -455,7 +455,7 @@
          <feature name='pcid'/>
          <feature name='rtm'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -464,19 +464,49 @@
          <feature name='rtm'/>
          <feature name='spec-ctrl'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='spec-ctrl'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
        <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model>
        <blockers model='Icelake-Server'>
          <feature name='avx512-vpopcntdq'/>
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 3f59106b1a25cfb1db984f21577a1cc175174a3c..e48cdd2a2e58ceb370b53645d925c7038cf286cf 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
@@ -452,7 +452,7 @@
          <feature name='xfd'/>
          <feature name='xsaves'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -460,7 +460,7 @@
          <feature name='pcid'/>
          <feature name='rtm'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -469,19 +469,49 @@
          <feature name='rtm'/>
          <feature name='spec-ctrl'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='spec-ctrl'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
        <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model>
        <blockers model='Icelake-Server'>
          <feature name='avx512-vpopcntdq'/>
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 42a0c34a346c2436364a35f0960a14be7958b606..08d7cc0ca79119885494defe346d8b56208ba757 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
@@ -490,7 +490,7 @@
          <feature name='xsavec'/>
          <feature name='xsaves'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='hle'/>
          <feature name='invpcid'/>
@@ -498,7 +498,7 @@
          <feature name='rtm'/>
          <feature name='tsc-deadline'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='hle'/>
          <feature name='invpcid'/>
@@ -507,19 +507,49 @@
          <feature name='spec-ctrl'/>
          <feature name='tsc-deadline'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='tsc-deadline'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='spec-ctrl'/>
          <feature name='tsc-deadline'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='tsc-deadline'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='tsc-deadline'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+      </blockers>
        <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model>
        <blockers model='Icelake-Server'>
          <feature name='avx512-vpopcntdq'/>
diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml

index f3f3b54a8f701773781c127f452cf1cafb95954d..684c342df6d7558bef276a65a82f29f7cbd243e2 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
@@ -451,7 +451,7 @@
          <feature name='xfd'/>
          <feature name='xsaves'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -459,7 +459,7 @@
          <feature name='pcid'/>
          <feature name='rtm'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -468,19 +468,49 @@
          <feature name='rtm'/>
          <feature name='spec-ctrl'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='spec-ctrl'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
        <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model>
        <blockers model='Icelake-Server'>
          <feature name='avx512-vpopcntdq'/>
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 f8dfc27dc3b62a4af14c3a2be5a5c158b4bc0641..2d670ffaf4006c10877a66aa2a4110a2916707eb 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
@@ -452,7 +452,7 @@
          <feature name='xfd'/>
          <feature name='xsaves'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -460,7 +460,7 @@
          <feature name='pcid'/>
          <feature name='rtm'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -469,19 +469,49 @@
          <feature name='rtm'/>
          <feature name='spec-ctrl'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='spec-ctrl'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
        <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model>
        <blockers model='Icelake-Server'>
          <feature name='avx512-vpopcntdq'/>
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 223eaaf68d593fdf8ebb0f91af3395132a3102ad..9823a24b7d28fbf6961ce8c9afd9f13ffab63d3a 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
@@ -490,7 +490,7 @@
          <feature name='xsavec'/>
          <feature name='xsaves'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='hle'/>
          <feature name='invpcid'/>
@@ -498,7 +498,7 @@
          <feature name='rtm'/>
          <feature name='tsc-deadline'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='hle'/>
          <feature name='invpcid'/>
@@ -507,19 +507,49 @@
          <feature name='spec-ctrl'/>
          <feature name='tsc-deadline'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='tsc-deadline'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='spec-ctrl'/>
          <feature name='tsc-deadline'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='tsc-deadline'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='tsc-deadline'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+      </blockers>
        <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model>
        <blockers model='Icelake-Server'>
          <feature name='avx512-vpopcntdq'/>
diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml

index 21e1746110f3d5aa3b35bb6df639d1651eed9691..ce834cb4d5dc05eef9ddaa21c30ced745eb3bfbb 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
@@ -451,7 +451,7 @@
          <feature name='xfd'/>
          <feature name='xsaves'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model>
        <blockers model='Haswell'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -459,7 +459,7 @@
          <feature name='pcid'/>
          <feature name='rtm'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v3'>Haswell-IBRS</model>
        <blockers model='Haswell-IBRS'>
          <feature name='erms'/>
          <feature name='hle'/>
@@ -468,19 +468,49 @@
          <feature name='rtm'/>
          <feature name='spec-ctrl'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v2'>Haswell-noTSX</model>
        <blockers model='Haswell-noTSX'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
        </blockers>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='Haswell-v4'>Haswell-noTSX-IBRS</model>
        <blockers model='Haswell-noTSX-IBRS'>
          <feature name='erms'/>
          <feature name='invpcid'/>
          <feature name='pcid'/>
          <feature name='spec-ctrl'/>
        </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v1</model>
+      <blockers model='Haswell-v1'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v2</model>
+      <blockers model='Haswell-v2'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v3</model>
+      <blockers model='Haswell-v3'>
+        <feature name='erms'/>
+        <feature name='hle'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='rtm'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>Haswell-v4</model>
+      <blockers model='Haswell-v4'>
+        <feature name='erms'/>
+        <feature name='invpcid'/>
+        <feature name='pcid'/>
+        <feature name='spec-ctrl'/>
+      </blockers>
        <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model>
        <blockers model='Icelake-Server'>
          <feature name='avx512-vpopcntdq'/>
author	Jiri Denemark <jdenemar@redhat.com>
	Tue, 22 Oct 2024 09:46:25 +0000 (11:46 +0200)
committer	Jiri Denemark <jdenemar@redhat.com>
	Tue, 26 Nov 2024 12:04:35 +0000 (13:04 +0100)
src/cpu_map/index.xml		patch \| blob \| blame \| history
src/cpu_map/meson.build		patch \| blob \| blame \| history
src/cpu_map/x86_Haswell-v1.xml	[new file with mode: 0644]	patch \| blob
src/cpu_map/x86_Haswell-v2.xml	[new file with mode: 0644]	patch \| blob
src/cpu_map/x86_Haswell-v3.xml	[new file with mode: 0644]	patch \| blob
src/cpu_map/x86_Haswell-v4.xml	[new file with mode: 0644]	patch \| blob
tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml		patch \| blob \| blame \| history
tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml		patch \| blob \| blame \| history
tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml		patch \| blob \| blame \| history
tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml		patch \| blob \| blame \| history
tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml		patch \| blob \| blame \| history
tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_5.2.0.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_6.0.0.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_6.1.0.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_6.2.0.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_7.0.0.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_7.1.0.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_7.2.0.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_8.0.0.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_8.1.0.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_8.2.0.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_9.0.0.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_9.1.0.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml		patch \| blob \| blame \| history
tests/domaincapsdata/qemu_9.2.0.x86_64.xml		patch \| blob \| blame \| history