cpu: Add clwb/pcommit CPU features

The features were added to QEMU by commit v2.4.0-1690-gf7fda28094 as
Skylake Server features.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
index 6243fbe902475cbb3303e9cc34750b9f9fef0d23..c1aee0abc9a16863e3e829613d5e7fc3f35acc9c 100644 (file)
--- a/src/cpu/cpu_map.xml
+++ b/src/cpu/cpu_map.xml
@@ -248,9 +248,15 @@
     <feature name='avx512ifma'>
       <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00200000'/>
     </feature>
+    <feature name='pcommit'>
+      <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00400000'/>
+    </feature>
     <feature name='clflushopt'>
       <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00800000'/>
     </feature>
+    <feature name='clwb'>
+      <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x01000000'/>
+    </feature>
     <feature name='avx512pf'>
       <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x04000000'/>
     </feature>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
index 705caf60300213d101b593fe236dd175b18a04cf..874f77105dac82f19466d4adf40e9a48a9c7f6c3 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
@@ -23,6 +23,7 @@
   <feature policy='require' name='avx512f'/>
   <feature policy='require' name='avx512dq'/>
   <feature policy='require' name='clflushopt'/>
+  <feature policy='require' name='clwb'/>
   <feature policy='require' name='avx512cd'/>
   <feature policy='require' name='avx512bw'/>
   <feature policy='require' name='avx512vl'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
index 114b03e0e15c544d4cc6aca92bb4c7654308493f..0d14e888913ee44c7cfefccd424c295fd3f582a7 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
@@ -24,6 +24,7 @@
   <feature name='avx512f'/>
   <feature name='avx512dq'/>
   <feature name='clflushopt'/>
+  <feature name='clwb'/>
   <feature name='avx512cd'/>
   <feature name='avx512bw'/>
   <feature name='avx512vl'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-json.xml
index c5ff67af960c54b32b3e29fbf47774542a2d1be3..f10a7dec204ad7d7f14f420a8f4a4bc5ac259cbd 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-json.xml
@@ -7,6 +7,7 @@
   <feature policy='require' name='avx512f'/>
   <feature policy='require' name='avx512dq'/>
   <feature policy='require' name='clflushopt'/>
+  <feature policy='require' name='clwb'/>
   <feature policy='require' name='avx512cd'/>
   <feature policy='require' name='avx512bw'/>
   <feature policy='require' name='avx512vl'/>

diff --git a/tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml b/tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml
index af606493aa89d4f807df2054fa35b85c2317d7bb..7ff998907df81ec5407966a243e0b36f264fb2c5 100644 (file)
--- a/tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml
+++ b/tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml
@@ -38,7 +38,9 @@
       <feature policy='require' name='mpx'/>
       <feature policy='require' name='adx'/>
       <feature policy='require' name='smap'/>
+      <feature policy='require' name='pcommit'/>
       <feature policy='require' name='clflushopt'/>
+      <feature policy='require' name='clwb'/>
       <feature policy='require' name='pku'/>
       <feature policy='require' name='ospke'/>
       <feature policy='require' name='xsaveopt'/>