render / rpms / libvirt

Forked from rpms/libvirt 9 months ago
Clone
0a7476
From f1269c8165b8c805e57e37179f893d3f2a1d4f95 Mon Sep 17 00:00:00 2001
0a7476
Message-Id: <f1269c8165b8c805e57e37179f893d3f2a1d4f95@dist-git>
0a7476
From: Jiri Denemark <jdenemar@redhat.com>
0a7476
Date: Tue, 9 Apr 2019 09:38:39 +0200
0a7476
Subject: [PATCH] cpu_map: Add features for Icelake CPUs
0a7476
MIME-Version: 1.0
0a7476
Content-Type: text/plain; charset=UTF-8
0a7476
Content-Transfer-Encoding: 8bit
0a7476
0a7476
QEMU commits:
0a7476
0a7476
    e37a5c7fa4 (v2.12.0)
0a7476
        i386: Add Intel Processor Trace feature support
0a7476
0a7476
    c2f193b538 (v2.7.0)
0a7476
        target-i386: Add support for UMIP and RDPID CPUID bits
0a7476
0a7476
    aff9e6e46a (v2.12.0)
0a7476
        x86/cpu: Enable new SSE/AVX/AVX512 cpu features
0a7476
0a7476
    f77543772d (v2.9.0)
0a7476
        x86: add AVX512_VPOPCNTDQ features
0a7476
0a7476
    5131dc433d (v3.1.0)
0a7476
        i386: Add CPUID bit for PCONFIG
0a7476
0a7476
    59a80a19ca (v3.1.0)
0a7476
        i386: Add CPUID bit for WBNOINVD
0a7476
0a7476
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
0a7476
(cherry picked from commit 9813081119b6727c8b6067a783465addef06525e)
0a7476
0a7476
https://bugzilla.redhat.com/show_bug.cgi?id=1526624
0a7476
https://bugzilla.redhat.com/show_bug.cgi?id=1527659
0a7476
0a7476
Conflicts:
0a7476
	src/cpu_map/x86_features.xml
0a7476
            - no CPU map split downstream
0a7476
0a7476
	tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml
0a7476
	tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml
0a7476
	tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
0a7476
	tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml
0a7476
            - the "stibp" feature added upstream by commit eb1b551d21e
0a7476
              to libvirt 5.0.0 is already in RHEL-7 thanks to "RHEL:
0a7476
              cpu: Add downstream only CPU features for CVE-2017-5715"
0a7476
0a7476
	tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml
0a7476
            - upstream commit e7e1e3003d5 "cpu_map: Add more signatures
0a7476
              for Broadwell CPU models" is already backported to RHEL-7
0a7476
0a7476
	tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml
0a7476
	tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml
0a7476
	tests/cputestdata/x86_64-cpuid-Core-i7-7600U-json.xml
0a7476
	tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml
0a7476
	tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
0a7476
	tests/cputestdata/x86_64-cpuid-Core-i7-8700-json.xml
0a7476
            - these tests were added upstream later, but they are
0a7476
              already backported to RHEL-7
0a7476
0a7476
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
0a7476
Message-Id: <cb4c0855a285ea0c9f8ed17216c3f022adc27b69.1554795361.git.jdenemar@redhat.com>
0a7476
Reviewed-by: Ján Tomko <jtomko@redhat.com>
0a7476
---
0a7476
 src/cpu/cpu_map.xml                           | 33 +++++++++++++++++++
0a7476
 .../x86_64-cpuid-Core-i5-6600-guest.xml       |  1 +
0a7476
 .../x86_64-cpuid-Core-i5-6600-host.xml        |  1 +
0a7476
 .../x86_64-cpuid-Core-i7-5600U-arat-guest.xml |  1 +
0a7476
 .../x86_64-cpuid-Core-i7-5600U-arat-host.xml  |  1 +
0a7476
 .../x86_64-cpuid-Core-i7-5600U-guest.xml      |  1 +
0a7476
 .../x86_64-cpuid-Core-i7-5600U-host.xml       |  1 +
0a7476
 .../x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml |  1 +
0a7476
 .../x86_64-cpuid-Core-i7-5600U-ibrs-host.xml  |  1 +
0a7476
 .../x86_64-cpuid-Core-i7-7600U-guest.xml      |  1 +
0a7476
 .../x86_64-cpuid-Core-i7-7600U-host.xml       |  1 +
0a7476
 .../x86_64-cpuid-Core-i7-7600U-json.xml       |  1 +
0a7476
 .../x86_64-cpuid-Core-i7-7700-guest.xml       |  1 +
0a7476
 .../x86_64-cpuid-Core-i7-7700-host.xml        |  1 +
0a7476
 .../x86_64-cpuid-Core-i7-8700-guest.xml       |  1 +
0a7476
 .../x86_64-cpuid-Core-i7-8700-host.xml        |  1 +
0a7476
 .../x86_64-cpuid-Core-i7-8700-json.xml        |  1 +
0a7476
 .../x86_64-cpuid-Xeon-E3-1245-v5-guest.xml    |  1 +
0a7476
 .../x86_64-cpuid-Xeon-E3-1245-v5-host.xml     |  1 +
0a7476
 .../x86_64-cpuid-Xeon-E5-2623-v4-guest.xml    |  1 +
0a7476
 .../x86_64-cpuid-Xeon-E5-2623-v4-host.xml     |  1 +
0a7476
 .../x86_64-cpuid-Xeon-E5-2630-v4-guest.xml    |  1 +
0a7476
 .../x86_64-cpuid-Xeon-E5-2630-v4-host.xml     |  1 +
0a7476
 .../x86_64-cpuid-Xeon-E5-2650-v4-guest.xml    |  1 +
0a7476
 .../x86_64-cpuid-Xeon-E5-2650-v4-host.xml     |  1 +
0a7476
 .../x86_64-cpuid-Xeon-Gold-5115-guest.xml     |  1 +
0a7476
 .../x86_64-cpuid-Xeon-Gold-5115-host.xml      |  1 +
0a7476
 .../x86_64-cpuid-Xeon-Gold-6148-guest.xml     |  1 +
0a7476
 .../x86_64-cpuid-Xeon-Gold-6148-host.xml      |  1 +
0a7476
 29 files changed, 61 insertions(+)
0a7476
0a7476
diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
0a7476
index 1382c29cd1..234c62781b 100644
0a7476
--- a/src/cpu/cpu_map.xml
0a7476
+++ b/src/cpu/cpu_map.xml
0a7476
@@ -257,6 +257,9 @@
0a7476
     <feature name='clwb'>
0a7476
       <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x01000000'/>
0a7476
     </feature>
0a7476
+    <feature name='intel-pt'>
0a7476
+      <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x02000000'/>
0a7476
+    </feature>
0a7476
     <feature name='avx512pf'>
0a7476
       <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x04000000'/>
0a7476
     </feature>
0a7476
@@ -279,12 +282,36 @@
0a7476
     <feature name='avx512vbmi'>
0a7476
       <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000002'/>
0a7476
     </feature>
0a7476
+    <feature name='umip'>
0a7476
+      <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000004'/>
0a7476
+    </feature>
0a7476
     <feature name='pku'>
0a7476
       <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000008'/>
0a7476
     </feature>
0a7476
     <feature name='ospke'>
0a7476
       <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000010'/>
0a7476
     </feature>
0a7476
+    <feature name='avx512vbmi2'>
0a7476
+      <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000040'/>
0a7476
+    </feature>
0a7476
+    <feature name='gfni'>
0a7476
+      <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000100'/>
0a7476
+    </feature>
0a7476
+    <feature name='vaes'>
0a7476
+      <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000200'/>
0a7476
+    </feature>
0a7476
+    <feature name='vpclmulqdq'>
0a7476
+      <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000400'/>
0a7476
+    </feature>
0a7476
+    <feature name='avx512vnni'>
0a7476
+      <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000800'/>
0a7476
+    </feature>
0a7476
+    <feature name='avx512bitalg'>
0a7476
+      <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00001000'/>
0a7476
+    </feature>
0a7476
+    <feature name='avx512-vpopcntdq'>
0a7476
+      <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00004000'/>
0a7476
+    </feature>
0a7476
     <feature name='la57'>
0a7476
       <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00010000'/>
0a7476
     </feature>
0a7476
@@ -295,6 +322,9 @@
0a7476
     <feature name='avx512-4fmaps'>
0a7476
       <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000008'/>
0a7476
     </feature>
0a7476
+    <feature name='pconfig'>
0a7476
+      <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00040000'/>
0a7476
+    </feature>
0a7476
     <feature name='spec-ctrl'>
0a7476
       <cpuid eax_in='0x07' ecx_in='0x00' edx='0x04000000'/>
0a7476
     </feature>
0a7476
@@ -436,6 +466,9 @@
0a7476
     </feature>
0a7476
 
0a7476
     
0a7476
+    <feature name='wbnoinvd'>
0a7476
+      <cpuid eax_in='0x80000008' ebx='0x00000200'/>
0a7476
+    </feature>
0a7476
     <feature name='ibpb'>
0a7476
       <cpuid eax_in='0x80000008' ebx='0x00001000'/>
0a7476
     </feature>
0a7476
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
0a7476
index c3561d5971..5777a0bfba 100644
0a7476
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
0a7476
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
0a7476
@@ -19,6 +19,7 @@
0a7476
   <feature policy='require' name='osxsave'/>
0a7476
   <feature policy='require' name='tsc_adjust'/>
0a7476
   <feature policy='require' name='clflushopt'/>
0a7476
+  <feature policy='require' name='intel-pt'/>
0a7476
   <feature policy='require' name='xsaves'/>
0a7476
   <feature policy='require' name='pdpe1gb'/>
0a7476
   <feature policy='require' name='invtsc'/>
0a7476
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml
0a7476
index c799394eaf..faaa07f19b 100644
0a7476
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml
0a7476
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml
0a7476
@@ -20,6 +20,7 @@
0a7476
   <feature name='osxsave'/>
0a7476
   <feature name='tsc_adjust'/>
0a7476
   <feature name='clflushopt'/>
0a7476
+  <feature name='intel-pt'/>
0a7476
   <feature name='xsaves'/>
0a7476
   <feature name='pdpe1gb'/>
0a7476
   <feature name='invtsc'/>
0a7476
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml
0a7476
index 877895cf15..e825e2a0fb 100644
0a7476
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml
0a7476
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml
0a7476
@@ -22,6 +22,7 @@
0a7476
   <feature policy='require' name='rdrand'/>
0a7476
   <feature policy='require' name='arat'/>
0a7476
   <feature policy='require' name='tsc_adjust'/>
0a7476
+  <feature policy='require' name='intel-pt'/>
0a7476
   <feature policy='require' name='xsaveopt'/>
0a7476
   <feature policy='require' name='pdpe1gb'/>
0a7476
   <feature policy='require' name='abm'/>
0a7476
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml
0a7476
index 9b24941e0e..ea622c87c7 100644
0a7476
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml
0a7476
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml
0a7476
@@ -23,6 +23,7 @@
0a7476
   <feature name='rdrand'/>
0a7476
   <feature name='arat'/>
0a7476
   <feature name='tsc_adjust'/>
0a7476
+  <feature name='intel-pt'/>
0a7476
   <feature name='xsaveopt'/>
0a7476
   <feature name='pdpe1gb'/>
0a7476
   <feature name='abm'/>
0a7476
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
0a7476
index 877895cf15..e825e2a0fb 100644
0a7476
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
0a7476
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
0a7476
@@ -22,6 +22,7 @@
0a7476
   <feature policy='require' name='rdrand'/>
0a7476
   <feature policy='require' name='arat'/>
0a7476
   <feature policy='require' name='tsc_adjust'/>
0a7476
+  <feature policy='require' name='intel-pt'/>
0a7476
   <feature policy='require' name='xsaveopt'/>
0a7476
   <feature policy='require' name='pdpe1gb'/>
0a7476
   <feature policy='require' name='abm'/>
0a7476
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
0a7476
index 9b24941e0e..ea622c87c7 100644
0a7476
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
0a7476
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
0a7476
@@ -23,6 +23,7 @@
0a7476
   <feature name='rdrand'/>
0a7476
   <feature name='arat'/>
0a7476
   <feature name='tsc_adjust'/>
0a7476
+  <feature name='intel-pt'/>
0a7476
   <feature name='xsaveopt'/>
0a7476
   <feature name='pdpe1gb'/>
0a7476
   <feature name='abm'/>
0a7476
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml
0a7476
index 538bfe16ab..5d3093cec1 100644
0a7476
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml
0a7476
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml
0a7476
@@ -22,6 +22,7 @@
0a7476
   <feature policy='require' name='rdrand'/>
0a7476
   <feature policy='require' name='arat'/>
0a7476
   <feature policy='require' name='tsc_adjust'/>
0a7476
+  <feature policy='require' name='intel-pt'/>
0a7476
   <feature policy='require' name='stibp'/>
0a7476
   <feature policy='require' name='xsaveopt'/>
0a7476
   <feature policy='require' name='pdpe1gb'/>
0a7476
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml
0a7476
index 004423ee57..a534d2dec5 100644
0a7476
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml
0a7476
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml
0a7476
@@ -23,6 +23,7 @@
0a7476
   <feature name='rdrand'/>
0a7476
   <feature name='arat'/>
0a7476
   <feature name='tsc_adjust'/>
0a7476
+  <feature name='intel-pt'/>
0a7476
   <feature name='stibp'/>
0a7476
   <feature name='xsaveopt'/>
0a7476
   <feature name='pdpe1gb'/>
0a7476
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml
0a7476
index 141c01c841..70a0fc3286 100644
0a7476
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml
0a7476
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml
0a7476
@@ -19,6 +19,7 @@
0a7476
   <feature policy='require' name='osxsave'/>
0a7476
   <feature policy='require' name='tsc_adjust'/>
0a7476
   <feature policy='require' name='clflushopt'/>
0a7476
+  <feature policy='require' name='intel-pt'/>
0a7476
   <feature policy='require' name='stibp'/>
0a7476
   <feature policy='require' name='ssbd'/>
0a7476
   <feature policy='require' name='xsaves'/>
0a7476
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml
0a7476
index 53bfc9728d..bbdfb6aa61 100644
0a7476
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml
0a7476
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml
0a7476
@@ -20,6 +20,7 @@
0a7476
   <feature name='osxsave'/>
0a7476
   <feature name='tsc_adjust'/>
0a7476
   <feature name='clflushopt'/>
0a7476
+  <feature name='intel-pt'/>
0a7476
   <feature name='stibp'/>
0a7476
   <feature name='ssbd'/>
0a7476
   <feature name='xsaves'/>
0a7476
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-json.xml
0a7476
index f2c23b6b19..48089c6003 100644
0a7476
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-json.xml
0a7476
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-json.xml
0a7476
@@ -6,6 +6,7 @@
0a7476
   <feature policy='require' name='hypervisor'/>
0a7476
   <feature policy='require' name='tsc_adjust'/>
0a7476
   <feature policy='require' name='clflushopt'/>
0a7476
+  <feature policy='require' name='umip'/>
0a7476
   <feature policy='require' name='ssbd'/>
0a7476
   <feature policy='require' name='xsaves'/>
0a7476
   <feature policy='require' name='pdpe1gb'/>
0a7476
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml
0a7476
index c3561d5971..5777a0bfba 100644
0a7476
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml
0a7476
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml
0a7476
@@ -19,6 +19,7 @@
0a7476
   <feature policy='require' name='osxsave'/>
0a7476
   <feature policy='require' name='tsc_adjust'/>
0a7476
   <feature policy='require' name='clflushopt'/>
0a7476
+  <feature policy='require' name='intel-pt'/>
0a7476
   <feature policy='require' name='xsaves'/>
0a7476
   <feature policy='require' name='pdpe1gb'/>
0a7476
   <feature policy='require' name='invtsc'/>
0a7476
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml
0a7476
index c799394eaf..faaa07f19b 100644
0a7476
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml
0a7476
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml
0a7476
@@ -20,6 +20,7 @@
0a7476
   <feature name='osxsave'/>
0a7476
   <feature name='tsc_adjust'/>
0a7476
   <feature name='clflushopt'/>
0a7476
+  <feature name='intel-pt'/>
0a7476
   <feature name='xsaves'/>
0a7476
   <feature name='pdpe1gb'/>
0a7476
   <feature name='invtsc'/>
0a7476
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml
0a7476
index 141c01c841..70a0fc3286 100644
0a7476
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml
0a7476
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml
0a7476
@@ -19,6 +19,7 @@
0a7476
   <feature policy='require' name='osxsave'/>
0a7476
   <feature policy='require' name='tsc_adjust'/>
0a7476
   <feature policy='require' name='clflushopt'/>
0a7476
+  <feature policy='require' name='intel-pt'/>
0a7476
   <feature policy='require' name='stibp'/>
0a7476
   <feature policy='require' name='ssbd'/>
0a7476
   <feature policy='require' name='xsaves'/>
0a7476
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
0a7476
index 53bfc9728d..bbdfb6aa61 100644
0a7476
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
0a7476
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
0a7476
@@ -20,6 +20,7 @@
0a7476
   <feature name='osxsave'/>
0a7476
   <feature name='tsc_adjust'/>
0a7476
   <feature name='clflushopt'/>
0a7476
+  <feature name='intel-pt'/>
0a7476
   <feature name='stibp'/>
0a7476
   <feature name='ssbd'/>
0a7476
   <feature name='xsaves'/>
0a7476
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-json.xml
0a7476
index bf79d435a3..fd7539f7ce 100644
0a7476
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-json.xml
0a7476
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-json.xml
0a7476
@@ -5,6 +5,7 @@
0a7476
   <feature policy='require' name='hypervisor'/>
0a7476
   <feature policy='require' name='tsc_adjust'/>
0a7476
   <feature policy='require' name='clflushopt'/>
0a7476
+  <feature policy='require' name='umip'/>
0a7476
   <feature policy='require' name='ssbd'/>
0a7476
   <feature policy='require' name='xsaves'/>
0a7476
   <feature policy='require' name='pdpe1gb'/>
0a7476
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml
0a7476
index c3561d5971..5777a0bfba 100644
0a7476
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml
0a7476
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml
0a7476
@@ -19,6 +19,7 @@
0a7476
   <feature policy='require' name='osxsave'/>
0a7476
   <feature policy='require' name='tsc_adjust'/>
0a7476
   <feature policy='require' name='clflushopt'/>
0a7476
+  <feature policy='require' name='intel-pt'/>
0a7476
   <feature policy='require' name='xsaves'/>
0a7476
   <feature policy='require' name='pdpe1gb'/>
0a7476
   <feature policy='require' name='invtsc'/>
0a7476
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml
0a7476
index c799394eaf..faaa07f19b 100644
0a7476
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml
0a7476
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml
0a7476
@@ -20,6 +20,7 @@
0a7476
   <feature name='osxsave'/>
0a7476
   <feature name='tsc_adjust'/>
0a7476
   <feature name='clflushopt'/>
0a7476
+  <feature name='intel-pt'/>
0a7476
   <feature name='xsaves'/>
0a7476
   <feature name='pdpe1gb'/>
0a7476
   <feature name='invtsc'/>
0a7476
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
0a7476
index e2ad344497..a5c6d9b471 100644
0a7476
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
0a7476
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
0a7476
@@ -24,6 +24,7 @@
0a7476
   <feature policy='require' name='arat'/>
0a7476
   <feature policy='require' name='tsc_adjust'/>
0a7476
   <feature policy='require' name='cmt'/>
0a7476
+  <feature policy='require' name='intel-pt'/>
0a7476
   <feature policy='require' name='stibp'/>
0a7476
   <feature policy='require' name='xsaveopt'/>
0a7476
   <feature policy='require' name='mbm_total'/>
0a7476
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml
0a7476
index 60a7a9339d..43a0b93ab4 100644
0a7476
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml
0a7476
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml
0a7476
@@ -25,6 +25,7 @@
0a7476
   <feature name='arat'/>
0a7476
   <feature name='tsc_adjust'/>
0a7476
   <feature name='cmt'/>
0a7476
+  <feature name='intel-pt'/>
0a7476
   <feature name='stibp'/>
0a7476
   <feature name='xsaveopt'/>
0a7476
   <feature name='mbm_total'/>
0a7476
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
0a7476
index c670b1f4df..e2999db8e9 100644
0a7476
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
0a7476
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
0a7476
@@ -24,6 +24,7 @@
0a7476
   <feature policy='require' name='arat'/>
0a7476
   <feature policy='require' name='tsc_adjust'/>
0a7476
   <feature policy='require' name='cmt'/>
0a7476
+  <feature policy='require' name='intel-pt'/>
0a7476
   <feature policy='require' name='xsaveopt'/>
0a7476
   <feature policy='require' name='mbm_total'/>
0a7476
   <feature policy='require' name='mbm_local'/>
0a7476
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml
0a7476
index f482864a98..5dd8d749de 100644
0a7476
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml
0a7476
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml
0a7476
@@ -25,6 +25,7 @@
0a7476
   <feature name='arat'/>
0a7476
   <feature name='tsc_adjust'/>
0a7476
   <feature name='cmt'/>
0a7476
+  <feature name='intel-pt'/>
0a7476
   <feature name='xsaveopt'/>
0a7476
   <feature name='mbm_total'/>
0a7476
   <feature name='mbm_local'/>
0a7476
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml
0a7476
index c670b1f4df..e2999db8e9 100644
0a7476
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml
0a7476
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml
0a7476
@@ -24,6 +24,7 @@
0a7476
   <feature policy='require' name='arat'/>
0a7476
   <feature policy='require' name='tsc_adjust'/>
0a7476
   <feature policy='require' name='cmt'/>
0a7476
+  <feature policy='require' name='intel-pt'/>
0a7476
   <feature policy='require' name='xsaveopt'/>
0a7476
   <feature policy='require' name='mbm_total'/>
0a7476
   <feature policy='require' name='mbm_local'/>
0a7476
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml
0a7476
index f482864a98..5dd8d749de 100644
0a7476
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml
0a7476
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml
0a7476
@@ -25,6 +25,7 @@
0a7476
   <feature name='arat'/>
0a7476
   <feature name='tsc_adjust'/>
0a7476
   <feature name='cmt'/>
0a7476
+  <feature name='intel-pt'/>
0a7476
   <feature name='xsaveopt'/>
0a7476
   <feature name='mbm_total'/>
0a7476
   <feature name='mbm_local'/>
0a7476
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml
0a7476
index 64b69dea56..8f014f6e28 100644
0a7476
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml
0a7476
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml
0a7476
@@ -21,6 +21,7 @@
0a7476
   <feature policy='require' name='tsc_adjust'/>
0a7476
   <feature policy='require' name='cmt'/>
0a7476
   <feature policy='require' name='clflushopt'/>
0a7476
+  <feature policy='require' name='intel-pt'/>
0a7476
   <feature policy='require' name='pku'/>
0a7476
   <feature policy='require' name='stibp'/>
0a7476
   <feature policy='require' name='xsaves'/>
0a7476
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
0a7476
index 00e8da7512..9de76fd640 100644
0a7476
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
0a7476
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
0a7476
@@ -22,6 +22,7 @@
0a7476
   <feature name='tsc_adjust'/>
0a7476
   <feature name='cmt'/>
0a7476
   <feature name='clflushopt'/>
0a7476
+  <feature name='intel-pt'/>
0a7476
   <feature name='pku'/>
0a7476
   <feature name='stibp'/>
0a7476
   <feature name='xsaves'/>
0a7476
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
0a7476
index f72bcea68b..f31ca1ffc5 100644
0a7476
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
0a7476
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
0a7476
@@ -21,6 +21,7 @@
0a7476
   <feature policy='require' name='tsc_adjust'/>
0a7476
   <feature policy='require' name='cmt'/>
0a7476
   <feature policy='require' name='clflushopt'/>
0a7476
+  <feature policy='require' name='intel-pt'/>
0a7476
   <feature policy='require' name='pku'/>
0a7476
   <feature policy='require' name='xsaves'/>
0a7476
   <feature policy='require' name='mbm_total'/>
0a7476
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
0a7476
index 1a68e35c19..b18ceddc60 100644
0a7476
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
0a7476
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
0a7476
@@ -22,6 +22,7 @@
0a7476
   <feature name='tsc_adjust'/>
0a7476
   <feature name='cmt'/>
0a7476
   <feature name='clflushopt'/>
0a7476
+  <feature name='intel-pt'/>
0a7476
   <feature name='pku'/>
0a7476
   <feature name='xsaves'/>
0a7476
   <feature name='mbm_total'/>
0a7476
-- 
0a7476
2.21.0
0a7476