212 lines
7.5 KiB
Diff
212 lines
7.5 KiB
Diff
From 6d31e77ae83bb2b29d3bff5bd08742ee4c611e25 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <6d31e77ae83bb2b29d3bff5bd08742ee4c611e25@dist-git>
|
|
From: Jiri Denemark <jdenemar@redhat.com>
|
|
Date: Fri, 21 Jun 2019 09:25:21 +0200
|
|
Subject: [PATCH] cpu_map: Add Cascadelake-Server CPU model
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Introduced in QEMU 3.1.0 by commit
|
|
c7a88b52f62b30c04158eeb07f73e3f72221b6a8
|
|
|
|
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
(cherry picked from commit 2878278c74cc450a7e28a3830ed0ceff3126f12f)
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1693433
|
|
|
|
Conflicts:
|
|
src/cpu_map/index.xml
|
|
src/cpu_map/x86_Cascadelake-Server.xml
|
|
- cpu_map split not backported
|
|
|
|
tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml
|
|
tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml
|
|
- test data missing
|
|
|
|
tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
|
|
tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
|
|
- md-clear feature did not exist at the time of the original
|
|
patch, but downstream already has it
|
|
|
|
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
Message-Id: <d99c9ab500eb9a482450ba87dec52f5f3cf03429.1561068591.git.jdenemar@redhat.com>
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
---
|
|
src/cpu/cpu_map.xml | 81 +++++++++++++++++++
|
|
.../x86_64-cpuid-Xeon-Platinum-8268-guest.xml | 5 +-
|
|
.../x86_64-cpuid-Xeon-Platinum-8268-host.xml | 5 +-
|
|
.../x86_64-cpuid-Xeon-Platinum-8268-json.xml | 5 +-
|
|
4 files changed, 84 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
|
|
index b2eb07b832..9b289556e8 100644
|
|
--- a/src/cpu/cpu_map.xml
|
|
+++ b/src/cpu/cpu_map.xml
|
|
@@ -2193,6 +2193,87 @@
|
|
<feature name='xsaveopt'/>
|
|
</model>
|
|
|
|
+ <model name='Cascadelake-Server'>
|
|
+ <signature family='6' model='85'/> <!-- 050654 -->
|
|
+ <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='avx512bw'/>
|
|
+ <feature name='avx512cd'/>
|
|
+ <feature name='avx512dq'/>
|
|
+ <feature name='avx512f'/>
|
|
+ <feature name='avx512vl'/>
|
|
+ <feature name='avx512vnni'/>
|
|
+ <feature name='bmi1'/>
|
|
+ <feature name='bmi2'/>
|
|
+ <feature name='clflush'/>
|
|
+ <feature name='clflushopt'/>
|
|
+ <feature name='clwb'/>
|
|
+ <feature name='cmov'/>
|
|
+ <feature name='cx16'/>
|
|
+ <feature name='cx8'/>
|
|
+ <feature name='de'/>
|
|
+ <feature name='erms'/>
|
|
+ <feature name='f16c'/>
|
|
+ <feature name='fma'/>
|
|
+ <feature name='fpu'/>
|
|
+ <feature name='fsgsbase'/>
|
|
+ <feature name='fxsr'/>
|
|
+ <feature name='hle'/>
|
|
+ <feature name='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'/>
|
|
+ <!-- 'ospke' is a dynamic feature and cannot be enabled manually
|
|
+ see QEMU's commit 9ccb9784b57 for more details -->
|
|
+ <feature name='pae'/>
|
|
+ <feature name='pat'/>
|
|
+ <feature name='pcid'/>
|
|
+ <feature name='pclmuldq'/>
|
|
+ <feature name='pdpe1gb'/>
|
|
+ <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='spec-ctrl'/>
|
|
+ <feature name='ssbd'/>
|
|
+ <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_64-cpuid-Xeon-Platinum-8268-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
|
|
index 2836481454..c7e8a1fccf 100644
|
|
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
|
|
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
|
|
@@ -1,5 +1,5 @@
|
|
<cpu mode='custom' match='exact'>
|
|
- <model fallback='forbid'>Skylake-Server-IBRS</model>
|
|
+ <model fallback='forbid'>Cascadelake-Server</model>
|
|
<vendor>Intel</vendor>
|
|
<feature policy='require' name='ds'/>
|
|
<feature policy='require' name='acpi'/>
|
|
@@ -20,15 +20,12 @@
|
|
<feature policy='require' name='osxsave'/>
|
|
<feature policy='require' name='tsc_adjust'/>
|
|
<feature policy='require' name='cmt'/>
|
|
- <feature policy='require' name='clflushopt'/>
|
|
<feature policy='require' name='intel-pt'/>
|
|
<feature policy='require' name='pku'/>
|
|
<feature policy='require' name='ospke'/>
|
|
- <feature policy='require' name='avx512vnni'/>
|
|
<feature policy='require' name='md-clear'/>
|
|
<feature policy='require' name='stibp'/>
|
|
<feature policy='require' name='arch-capabilities'/>
|
|
- <feature policy='require' name='ssbd'/>
|
|
<feature policy='require' name='xsaves'/>
|
|
<feature policy='require' name='mbm_total'/>
|
|
<feature policy='require' name='mbm_local'/>
|
|
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
|
|
index 032d8ffeca..d7482751b4 100644
|
|
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
|
|
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
|
|
@@ -1,6 +1,6 @@
|
|
<cpu>
|
|
<arch>x86_64</arch>
|
|
- <model>Skylake-Server-IBRS</model>
|
|
+ <model>Cascadelake-Server</model>
|
|
<vendor>Intel</vendor>
|
|
<feature name='ds'/>
|
|
<feature name='acpi'/>
|
|
@@ -21,15 +21,12 @@
|
|
<feature name='osxsave'/>
|
|
<feature name='tsc_adjust'/>
|
|
<feature name='cmt'/>
|
|
- <feature name='clflushopt'/>
|
|
<feature name='intel-pt'/>
|
|
<feature name='pku'/>
|
|
<feature name='ospke'/>
|
|
- <feature name='avx512vnni'/>
|
|
<feature name='md-clear'/>
|
|
<feature name='stibp'/>
|
|
<feature name='arch-capabilities'/>
|
|
- <feature name='ssbd'/>
|
|
<feature name='xsaves'/>
|
|
<feature name='mbm_total'/>
|
|
<feature name='mbm_local'/>
|
|
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml
|
|
index 12431de213..b7d12dced7 100644
|
|
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml
|
|
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml
|
|
@@ -1,13 +1,10 @@
|
|
<cpu mode='custom' match='exact'>
|
|
- <model fallback='forbid'>Skylake-Server-IBRS</model>
|
|
+ <model fallback='forbid'>Cascadelake-Server</model>
|
|
<vendor>Intel</vendor>
|
|
<feature policy='require' name='ss'/>
|
|
<feature policy='require' name='hypervisor'/>
|
|
<feature policy='require' name='tsc_adjust'/>
|
|
- <feature policy='require' name='clflushopt'/>
|
|
<feature policy='require' name='umip'/>
|
|
<feature policy='require' name='pku'/>
|
|
- <feature policy='require' name='avx512vnni'/>
|
|
- <feature policy='require' name='ssbd'/>
|
|
<feature policy='require' name='xsaves'/>
|
|
</cpu>
|
|
--
|
|
2.22.0
|
|
|