cpu: Add Skylake-Client x86 CPU model

The CPU model was implemented in QEMU by commit f6f949e929.

The change to i7-5600U is wrong since it's a 5th generation CPU, i.e.,
Broadwell rather than Skylake, but that's just the result of our CPU
detection code (which is fixed by the following commit).

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
index a623f37002bf2d60bc844850b65f216a84483a46..0918f751e643b06f118b90d9e4a2959f95934b57 100644 (file)
--- a/src/cpu/cpu_map.xml
+++ b/src/cpu/cpu_map.xml
@@ -1161,6 +1161,73 @@
       <feature name='xsave'/>
     </model>
 
+    <model name='Skylake-Client'>
+      <vendor name='Intel'/>
+      <feature name='3dnowprefetch'/>
+      <feature name='abm'/>
+      <feature name='adx'/>
+      <feature name='aes'/>
+      <feature name='apic'/>
+      <feature name='arat'/>
+      <feature name='avx'/>
+      <feature name='avx2'/>
+      <feature name='bmi1'/>
+      <feature name='bmi2'/>
+      <feature name='clflush'/>
+      <feature name='cmov'/>
+      <feature name='cx16'/>
+      <feature name='cx8'/>
+      <feature name='de'/>
+      <feature name='erms'/>
+      <feature name='f16c'/>
+      <feature name='fma'/>
+      <feature name='fpu'/>
+      <feature name='fsgsbase'/>
+      <feature name='fxsr'/>
+      <feature name='hle'/>
+      <feature name='invpcid'/>
+      <feature name='lahf_lm'/>
+      <feature name='lm'/>
+      <feature name='mca'/>
+      <feature name='mce'/>
+      <feature name='mmx'/>
+      <feature name='movbe'/>
+      <feature name='mpx'/>
+      <feature name='msr'/>
+      <feature name='mtrr'/>
+      <feature name='nx'/>
+      <feature name='pae'/>
+      <feature name='pat'/>
+      <feature name='pcid'/>
+      <feature name='pclmuldq'/>
+      <feature name='pge'/>
+      <feature name='pni'/>
+      <feature name='popcnt'/>
+      <feature name='pse'/>
+      <feature name='pse36'/>
+      <feature name='rdrand'/>
+      <feature name='rdseed'/>
+      <feature name='rdtscp'/>
+      <feature name='rtm'/>
+      <feature name='sep'/>
+      <feature name='smap'/>
+      <feature name='smep'/>
+      <feature name='sse'/>
+      <feature name='sse2'/>
+      <feature name='sse4.1'/>
+      <feature name='sse4.2'/>
+      <feature name='ssse3'/>
+      <feature name='syscall'/>
+      <feature name='tsc'/>
+      <feature name='tsc-deadline'/>
+      <feature name='vme'/>
+      <feature name='x2apic'/>
+      <feature name='xgetbv1'/>
+      <feature name='xsave'/>
+      <feature name='xsavec'/>
+      <feature name='xsaveopt'/>
+    </model>
+
     <!-- AMD CPUs -->
     <model name='athlon'>
       <vendor name='AMD'/>

diff --git a/tests/cputestdata/x86-cpuid-Core-i5-6600-guest.xml b/tests/cputestdata/x86-cpuid-Core-i5-6600-guest.xml
index 363601afa873718be8544317b364159f5873b9d1..0ab5a7a7b1978df58a51f260bdd388962b126355 100644 (file)
--- a/tests/cputestdata/x86-cpuid-Core-i5-6600-guest.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i5-6600-guest.xml
@@ -1,8 +1,7 @@
 <cpu mode='custom' match='exact'>
   <arch>x86_64</arch>
-  <model fallback='forbid'>Broadwell</model>
+  <model fallback='forbid'>Skylake-Client</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
   <feature policy='require' name='ds'/>
   <feature policy='require' name='acpi'/>
   <feature policy='require' name='ss'/>
@@ -19,17 +18,9 @@
   <feature policy='require' name='xtpr'/>
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='osxsave'/>
-  <feature policy='require' name='f16c'/>
-  <feature policy='require' name='rdrand'/>
-  <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
-  <feature policy='require' name='mpx'/>
   <feature policy='require' name='clflushopt'/>
-  <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='xsavec'/>
-  <feature policy='require' name='xgetbv1'/>
   <feature policy='require' name='xsaves'/>
   <feature policy='require' name='pdpe1gb'/>
-  <feature policy='require' name='abm'/>
   <feature policy='require' name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i5-6600-host.xml b/tests/cputestdata/x86-cpuid-Core-i5-6600-host.xml
index fb231ae164fad426600c4d367910df8b8c46b34b..c799394eaf159bee35e674d1675ae31e371e2acc 100644 (file)
--- a/tests/cputestdata/x86-cpuid-Core-i5-6600-host.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i5-6600-host.xml
@@ -1,8 +1,7 @@
 <cpu>
   <arch>x86_64</arch>
-  <model>Broadwell</model>
+  <model>Skylake-Client</model>
   <vendor>Intel</vendor>
-  <feature name='vme'/>
   <feature name='ds'/>
   <feature name='acpi'/>
   <feature name='ss'/>
@@ -19,17 +18,9 @@
   <feature name='xtpr'/>
   <feature name='pdcm'/>
   <feature name='osxsave'/>
-  <feature name='f16c'/>
-  <feature name='rdrand'/>
-  <feature name='arat'/>
   <feature name='tsc_adjust'/>
-  <feature name='mpx'/>
   <feature name='clflushopt'/>
-  <feature name='xsaveopt'/>
-  <feature name='xsavec'/>
-  <feature name='xgetbv1'/>
   <feature name='xsaves'/>
   <feature name='pdpe1gb'/>
-  <feature name='abm'/>
   <feature name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i5-6600-json.xml b/tests/cputestdata/x86-cpuid-Core-i5-6600-json.xml
index 94de2187c7c2f99d06f68074d655680158859208..171b482c3402487b74bec24a7fc7115b78516b77 100644 (file)
--- a/tests/cputestdata/x86-cpuid-Core-i5-6600-json.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i5-6600-json.xml
@@ -1,19 +1,10 @@
 <cpu mode='custom' match='exact'>
   <arch>x86_64</arch>
-  <model fallback='forbid'>Broadwell</model>
-  <feature policy='require' name='vme'/>
+  <model fallback='forbid'>Skylake-Client</model>
   <feature policy='require' name='ss'/>
-  <feature policy='require' name='f16c'/>
-  <feature policy='require' name='rdrand'/>
   <feature policy='require' name='hypervisor'/>
-  <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
-  <feature policy='require' name='mpx'/>
   <feature policy='require' name='clflushopt'/>
-  <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='xsavec'/>
-  <feature policy='require' name='xgetbv1'/>
   <feature policy='require' name='xsaves'/>
   <feature policy='require' name='pdpe1gb'/>
-  <feature policy='require' name='abm'/>
 </cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-5600U-guest.xml b/tests/cputestdata/x86-cpuid-Core-i7-5600U-guest.xml
index cd7b4bb8e2fdd45e8543dfc9f39b8311f96fe9d6..78bc0a64a81fd24c4cabf4e5e37ed2cd697852ae 100644 (file)
--- a/tests/cputestdata/x86-cpuid-Core-i7-5600U-guest.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i7-5600U-guest.xml
@@ -1,8 +1,7 @@
 <cpu mode='custom' match='exact'>
   <arch>x86_64</arch>
-  <model fallback='forbid'>Broadwell</model>
+  <model fallback='forbid'>Skylake-Client</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
   <feature policy='require' name='ds'/>
   <feature policy='require' name='acpi'/>
   <feature policy='require' name='ss'/>
@@ -19,12 +18,10 @@
   <feature policy='require' name='xtpr'/>
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='osxsave'/>
-  <feature policy='require' name='f16c'/>
-  <feature policy='require' name='rdrand'/>
-  <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
-  <feature policy='require' name='xsaveopt'/>
   <feature policy='require' name='pdpe1gb'/>
-  <feature policy='require' name='abm'/>
   <feature policy='require' name='invtsc'/>
+  <feature policy='disable' name='mpx'/>
+  <feature policy='disable' name='xsavec'/>
+  <feature policy='disable' name='xgetbv1'/>
 </cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-5600U-json.xml b/tests/cputestdata/x86-cpuid-Core-i7-5600U-json.xml
index 8a6b8283fe9ff0de9aa0a688ac8b9a1993434c0c..15979717810bae3914b8fbc60245461787453703 100644 (file)
--- a/tests/cputestdata/x86-cpuid-Core-i7-5600U-json.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i7-5600U-json.xml
@@ -1,15 +1,12 @@
 <cpu mode='custom' match='exact'>
   <arch>x86_64</arch>
-  <model fallback='forbid'>Broadwell</model>
-  <feature policy='require' name='vme'/>
+  <model fallback='forbid'>Skylake-Client</model>
   <feature policy='require' name='ss'/>
   <feature policy='require' name='vmx'/>
-  <feature policy='require' name='f16c'/>
-  <feature policy='require' name='rdrand'/>
   <feature policy='require' name='hypervisor'/>
-  <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
-  <feature policy='require' name='xsaveopt'/>
   <feature policy='require' name='pdpe1gb'/>
-  <feature policy='require' name='abm'/>
+  <feature policy='disable' name='mpx'/>
+  <feature policy='disable' name='xsavec'/>
+  <feature policy='disable' name='xgetbv1'/>
 </cpu>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-E3-1245-guest.xml b/tests/cputestdata/x86-cpuid-Xeon-E3-1245-guest.xml
index 363601afa873718be8544317b364159f5873b9d1..0ab5a7a7b1978df58a51f260bdd388962b126355 100644 (file)
--- a/tests/cputestdata/x86-cpuid-Xeon-E3-1245-guest.xml
+++ b/tests/cputestdata/x86-cpuid-Xeon-E3-1245-guest.xml
@@ -1,8 +1,7 @@
 <cpu mode='custom' match='exact'>
   <arch>x86_64</arch>
-  <model fallback='forbid'>Broadwell</model>
+  <model fallback='forbid'>Skylake-Client</model>
   <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
   <feature policy='require' name='ds'/>
   <feature policy='require' name='acpi'/>
   <feature policy='require' name='ss'/>
@@ -19,17 +18,9 @@
   <feature policy='require' name='xtpr'/>
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='osxsave'/>
-  <feature policy='require' name='f16c'/>
-  <feature policy='require' name='rdrand'/>
-  <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
-  <feature policy='require' name='mpx'/>
   <feature policy='require' name='clflushopt'/>
-  <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='xsavec'/>
-  <feature policy='require' name='xgetbv1'/>
   <feature policy='require' name='xsaves'/>
   <feature policy='require' name='pdpe1gb'/>
-  <feature policy='require' name='abm'/>
   <feature policy='require' name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-E3-1245-host.xml b/tests/cputestdata/x86-cpuid-Xeon-E3-1245-host.xml
index fb231ae164fad426600c4d367910df8b8c46b34b..c799394eaf159bee35e674d1675ae31e371e2acc 100644 (file)
--- a/tests/cputestdata/x86-cpuid-Xeon-E3-1245-host.xml
+++ b/tests/cputestdata/x86-cpuid-Xeon-E3-1245-host.xml
@@ -1,8 +1,7 @@
 <cpu>
   <arch>x86_64</arch>
-  <model>Broadwell</model>
+  <model>Skylake-Client</model>
   <vendor>Intel</vendor>
-  <feature name='vme'/>
   <feature name='ds'/>
   <feature name='acpi'/>
   <feature name='ss'/>
@@ -19,17 +18,9 @@
   <feature name='xtpr'/>
   <feature name='pdcm'/>
   <feature name='osxsave'/>
-  <feature name='f16c'/>
-  <feature name='rdrand'/>
-  <feature name='arat'/>
   <feature name='tsc_adjust'/>
-  <feature name='mpx'/>
   <feature name='clflushopt'/>
-  <feature name='xsaveopt'/>
-  <feature name='xsavec'/>
-  <feature name='xgetbv1'/>
   <feature name='xsaves'/>
   <feature name='pdpe1gb'/>
-  <feature name='abm'/>
   <feature name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-E3-1245-json.xml b/tests/cputestdata/x86-cpuid-Xeon-E3-1245-json.xml
index 3d12f4009a44b51d28b42d064fbd8f857e602662..7a8246e5c97f8ce0d1291c5f542dab67b3383991 100644 (file)
--- a/tests/cputestdata/x86-cpuid-Xeon-E3-1245-json.xml
+++ b/tests/cputestdata/x86-cpuid-Xeon-E3-1245-json.xml
@@ -1,19 +1,10 @@
 <cpu mode='custom' match='exact'>
   <arch>x86_64</arch>
-  <model fallback='forbid'>Broadwell</model>
-  <feature policy='require' name='vme'/>
+  <model fallback='forbid'>Skylake-Client</model>
   <feature policy='require' name='ss'/>
   <feature policy='require' name='vmx'/>
-  <feature policy='require' name='f16c'/>
-  <feature policy='require' name='rdrand'/>
   <feature policy='require' name='hypervisor'/>
-  <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
-  <feature policy='require' name='mpx'/>
   <feature policy='require' name='clflushopt'/>
-  <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='xsavec'/>
-  <feature policy='require' name='xgetbv1'/>
   <feature policy='require' name='pdpe1gb'/>
-  <feature policy='require' name='abm'/>
 </cpu>