cpu: Sort CPU map features on eax_in

As a side effect this changes the order of CPU features in XMLs
generated by libvirt, but that's not a big deal since the order there is
insignificant.

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

diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
index e99e72fc63a3eb9ae1cf81188f01b0525a88a6bc..b742122983cdf85abc3292aa4510dbc29572ecd6 100644 (file)
--- a/src/cpu/cpu_map.xml
+++ b/src/cpu/cpu_map.xml
@@ -188,6 +188,65 @@
       <cpuid eax_in='0x01' ecx='0x80000000'/>
     </feature>
 
+    <!-- cpuid function 0x7 ecx 0x0 features -->
+    <feature name='fsgsbase'>
+      <cpuid eax_in='0x07' ebx='0x00000001'/>
+    </feature>
+    <feature name='tsc_adjust'>
+      <cpuid eax_in='0x07' ebx='0x00000002'/>
+    </feature>
+    <feature name='bmi1'>
+      <cpuid eax_in='0x07' ebx='0x00000008'/>
+    </feature>
+    <feature name='hle'>
+      <cpuid eax_in='0x07' ebx='0x00000010'/>
+    </feature>
+    <feature name='avx2'>
+      <cpuid eax_in='0x07' ebx='0x00000020'/>
+    </feature>
+    <feature name='smep'>
+      <cpuid eax_in='0x07' ebx='0x00000080'/>
+    </feature>
+    <feature name='bmi2'>
+      <cpuid eax_in='0x07' ebx='0x00000100'/>
+    </feature>
+    <feature name='erms'>
+      <cpuid eax_in='0x07' ebx='0x00000200'/>
+    </feature>
+    <feature name='invpcid'>
+      <cpuid eax_in='0x07' ebx='0x00000400'/>
+    </feature>
+    <feature name='rtm'>
+      <cpuid eax_in='0x07' ebx='0x00000800'/>
+    </feature>
+    <feature name='mpx'>
+      <cpuid eax_in='0x07' ebx='0x00004000'/>
+    </feature>
+    <feature name='avx512f'> <!-- AVX-512 Foundation -->
+      <cpuid eax_in='0x07' ebx='0x00010000'/>
+    </feature>
+    <feature name='rdseed'>
+      <cpuid eax_in='0x07' ebx='0x00040000'/>
+    </feature>
+    <feature name='adx'>
+      <cpuid eax_in='0x07' ebx='0x00080000'/>
+    </feature>
+    <feature name='smap'>
+      <cpuid eax_in='0x07' ebx='0x00100000'/>
+    </feature>
+    <feature name='clflushopt'>
+      <cpuid eax_in='0x07' ebx='0x00800000'/>
+    </feature>
+    <feature name='avx512pf'> <!-- AVX-512 Prefetch -->
+      <cpuid eax_in='0x07' ebx='0x04000000'/>
+    </feature>
+    <feature name='avx512er'> <!-- AVX-512 Exponential and Reciprocal -->
+      <cpuid eax_in='0x07' ebx='0x08000000'/>
+    </feature>
+    <feature name='avx512cd'> <!-- AVX-512 Conflict Detection -->
+      <cpuid eax_in='0x07' ebx='0x10000000'/>
+    </feature>
+
     <!-- extended features, EDX -->
     <feature name='syscall'> <!-- CPUID_EXT2_SYSCALL -->
       <cpuid eax_in='0x80000001' edx='0x00000800'/>
@@ -288,65 +347,6 @@
       <cpuid eax_in='0x80000001' ecx='0x01000000'/>
     </feature>
 
-    <!-- cpuid function 0x7 ecx 0x0 features -->
-    <feature name='fsgsbase'>
-      <cpuid eax_in='0x07' ebx='0x00000001'/>
-    </feature>
-    <feature name='tsc_adjust'>
-      <cpuid eax_in='0x07' ebx='0x00000002'/>
-    </feature>
-    <feature name='bmi1'>
-      <cpuid eax_in='0x07' ebx='0x00000008'/>
-    </feature>
-    <feature name='hle'>
-      <cpuid eax_in='0x07' ebx='0x00000010'/>
-    </feature>
-    <feature name='avx2'>
-      <cpuid eax_in='0x07' ebx='0x00000020'/>
-    </feature>
-    <feature name='smep'>
-      <cpuid eax_in='0x07' ebx='0x00000080'/>
-    </feature>
-    <feature name='bmi2'>
-      <cpuid eax_in='0x07' ebx='0x00000100'/>
-    </feature>
-    <feature name='erms'>
-      <cpuid eax_in='0x07' ebx='0x00000200'/>
-    </feature>
-    <feature name='invpcid'>
-      <cpuid eax_in='0x07' ebx='0x00000400'/>
-    </feature>
-    <feature name='rtm'>
-      <cpuid eax_in='0x07' ebx='0x00000800'/>
-    </feature>
-    <feature name='mpx'>
-      <cpuid eax_in='0x07' ebx='0x00004000'/>
-    </feature>
-    <feature name='avx512f'> <!-- AVX-512 Foundation -->
-      <cpuid eax_in='0x07' ebx='0x00010000'/>
-    </feature>
-    <feature name='rdseed'>
-      <cpuid eax_in='0x07' ebx='0x00040000'/>
-    </feature>
-    <feature name='adx'>
-      <cpuid eax_in='0x07' ebx='0x00080000'/>
-    </feature>
-    <feature name='smap'>
-      <cpuid eax_in='0x07' ebx='0x00100000'/>
-    </feature>
-    <feature name='clflushopt'>
-      <cpuid eax_in='0x07' ebx='0x00800000'/>
-    </feature>
-    <feature name='avx512pf'> <!-- AVX-512 Prefetch -->
-      <cpuid eax_in='0x07' ebx='0x04000000'/>
-    </feature>
-    <feature name='avx512er'> <!-- AVX-512 Exponential and Reciprocal -->
-      <cpuid eax_in='0x07' ebx='0x08000000'/>
-    </feature>
-    <feature name='avx512cd'> <!-- AVX-512 Conflict Detection -->
-      <cpuid eax_in='0x07' ebx='0x10000000'/>
-    </feature>
-
     <!-- Advanced Power Management edx features -->
     <feature name='invtsc' migratable='no'>
       <cpuid eax_in='0x80000007' edx='0x00000100'/>

diff --git a/tests/cputestdata/x86-cpuid-A10-5800K-guest.xml b/tests/cputestdata/x86-cpuid-A10-5800K-guest.xml
index ded7b308132ddba717a1197fe998046b0adf1c3f..dacf1d0ebcf66e4cd50a6c3a8bfab332c10ff3c6 100644 (file)
--- a/tests/cputestdata/x86-cpuid-A10-5800K-guest.xml
+++ b/tests/cputestdata/x86-cpuid-A10-5800K-guest.xml
@@ -6,6 +6,7 @@
   <feature policy='require' name='ht'/>
   <feature policy='require' name='monitor'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='bmi1'/>
   <feature policy='require' name='mmxext'/>
   <feature policy='require' name='fxsr_opt'/>
   <feature policy='require' name='cmp_legacy'/>
@@ -21,6 +22,5 @@
   <feature policy='require' name='topoext'/>
   <feature policy='require' name='perfctr_core'/>
   <feature policy='require' name='perfctr_nb'/>
-  <feature policy='require' name='bmi1'/>
   <feature policy='require' name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86-cpuid-A10-5800K-host.xml b/tests/cputestdata/x86-cpuid-A10-5800K-host.xml
index 4ee57d2ddccdf4baa9fdd15e720f732e5cc7e95d..cb90c967a3a42e9e821946c7eef8dbb4bc6108f9 100644 (file)
--- a/tests/cputestdata/x86-cpuid-A10-5800K-host.xml
+++ b/tests/cputestdata/x86-cpuid-A10-5800K-host.xml
@@ -6,6 +6,7 @@
   <feature name='ht'/>
   <feature name='monitor'/>
   <feature name='osxsave'/>
+  <feature name='bmi1'/>
   <feature name='mmxext'/>
   <feature name='fxsr_opt'/>
   <feature name='cmp_legacy'/>
@@ -21,6 +22,5 @@
   <feature name='topoext'/>
   <feature name='perfctr_core'/>
   <feature name='perfctr_nb'/>
-  <feature name='bmi1'/>
   <feature name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86-cpuid-A10-5800K-json.xml b/tests/cputestdata/x86-cpuid-A10-5800K-json.xml
index 6ebef6046c9d80df2e9e8c8348f66c2f3c7e485c..7a38f0fd4a36414fcf93727ae2e678807dbc5382 100644 (file)
--- a/tests/cputestdata/x86-cpuid-A10-5800K-json.xml
+++ b/tests/cputestdata/x86-cpuid-A10-5800K-json.xml
@@ -4,13 +4,13 @@
   <feature policy='require' name='vme'/>
   <feature policy='require' name='x2apic'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='bmi1'/>
   <feature policy='require' name='mmxext'/>
   <feature policy='require' name='fxsr_opt'/>
   <feature policy='require' name='cmp_legacy'/>
   <feature policy='require' name='cr8legacy'/>
   <feature policy='require' name='osvw'/>
-  <feature policy='require' name='tsc_adjust'/>
-  <feature policy='require' name='bmi1'/>
   <feature policy='disable' name='rdtscp'/>
   <feature policy='disable' name='svm'/>
 </cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i5-4670T-guest.xml b/tests/cputestdata/x86-cpuid-Core-i5-4670T-guest.xml
index 77b1a18c5e1533762103762897052b4dcff927fa..66ef1e347bf4a4b620f2953e3b261eb2634cd12f 100644 (file)
--- a/tests/cputestdata/x86-cpuid-Core-i5-4670T-guest.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i5-4670T-guest.xml
@@ -21,8 +21,8 @@
   <feature policy='require' name='osxsave'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
+  <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
-  <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i5-4670T-host.xml b/tests/cputestdata/x86-cpuid-Core-i5-4670T-host.xml
index 32051e4f1daf59ffc3f4c03455a4f09789f18423..31211c1fb6f5485cb32dffc9db0d360be8591fd8 100644 (file)
--- a/tests/cputestdata/x86-cpuid-Core-i5-4670T-host.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i5-4670T-host.xml
@@ -21,8 +21,8 @@
   <feature name='osxsave'/>
   <feature name='f16c'/>
   <feature name='rdrand'/>
+  <feature name='tsc_adjust'/>
   <feature name='pdpe1gb'/>
   <feature name='abm'/>
-  <feature name='tsc_adjust'/>
   <feature name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i5-4670T-json.xml b/tests/cputestdata/x86-cpuid-Core-i5-4670T-json.xml
index 32b86a10004a5a0cce1f20fa8ce852c587b0e907..1c2aad31e6a51eb3c48ee3cceda2360f2ede9f5e 100644 (file)
--- a/tests/cputestdata/x86-cpuid-Core-i5-4670T-json.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i5-4670T-json.xml
@@ -7,7 +7,7 @@
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
-  <feature policy='require' name='tsc_adjust'/>
 </cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i5-6600-guest.xml b/tests/cputestdata/x86-cpuid-Core-i5-6600-guest.xml
index 0001b2dabd1e1ca8cbbb61ccafcb57fbe708d80c..782000781e65abee31ad1b38ddbd777165d85182 100644 (file)
--- a/tests/cputestdata/x86-cpuid-Core-i5-6600-guest.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i5-6600-guest.xml
@@ -21,10 +21,10 @@
   <feature policy='require' name='osxsave'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
-  <feature policy='require' name='pdpe1gb'/>
-  <feature policy='require' name='abm'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='mpx'/>
   <feature policy='require' name='clflushopt'/>
+  <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 0c2aaee6864546dcc766f359bf02a2aeefc75012..bdf38d9b25dda60a2bc3d278d5e0169233cb4b74 100644 (file)
--- a/tests/cputestdata/x86-cpuid-Core-i5-6600-host.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i5-6600-host.xml
@@ -21,10 +21,10 @@
   <feature name='osxsave'/>
   <feature name='f16c'/>
   <feature name='rdrand'/>
-  <feature name='pdpe1gb'/>
-  <feature name='abm'/>
   <feature name='tsc_adjust'/>
   <feature name='mpx'/>
   <feature name='clflushopt'/>
+  <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 bd54d9d4584a782cf8308a1e7f766a3a616818b3..5409852391ee8a7819281de5062525a3179c4d40 100644 (file)
--- a/tests/cputestdata/x86-cpuid-Core-i5-6600-json.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i5-6600-json.xml
@@ -6,9 +6,9 @@
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
   <feature policy='require' name='hypervisor'/>
-  <feature policy='require' name='pdpe1gb'/>
-  <feature policy='require' name='abm'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='mpx'/>
   <feature policy='require' name='clflushopt'/>
+  <feature policy='require' name='pdpe1gb'/>
+  <feature policy='require' name='abm'/>
 </cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-4600U-guest.xml b/tests/cputestdata/x86-cpuid-Core-i7-4600U-guest.xml
index 89c95a81bf4c6dc690426e1f0d8bed419094cbfe..40cf4c2b3d0c8fe1e70c0c6c4481095dc5e09bb0 100644 (file)
--- a/tests/cputestdata/x86-cpuid-Core-i7-4600U-guest.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i7-4600U-guest.xml
@@ -21,8 +21,8 @@
   <feature policy='require' name='osxsave'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
+  <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
-  <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-4600U-host.xml b/tests/cputestdata/x86-cpuid-Core-i7-4600U-host.xml
index 6edbf8ff9b3104b6ee83ff4528e91c0e7bf29458..c5a410cdde81c69551eafe0491241083058e53e3 100644 (file)
--- a/tests/cputestdata/x86-cpuid-Core-i7-4600U-host.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i7-4600U-host.xml
@@ -21,8 +21,8 @@
   <feature name='osxsave'/>
   <feature name='f16c'/>
   <feature name='rdrand'/>
+  <feature name='tsc_adjust'/>
   <feature name='pdpe1gb'/>
   <feature name='abm'/>
-  <feature name='tsc_adjust'/>
   <feature name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-4600U-json.xml b/tests/cputestdata/x86-cpuid-Core-i7-4600U-json.xml
index 2f6a9258993f57567068ff95a56b8ccf41cb978c..ef49a38e58c9d78e5951ba8cccd9dc38ac1c5e79 100644 (file)
--- a/tests/cputestdata/x86-cpuid-Core-i7-4600U-json.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i7-4600U-json.xml
@@ -7,7 +7,7 @@
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
-  <feature policy='require' name='tsc_adjust'/>
 </cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-5600U-guest.xml b/tests/cputestdata/x86-cpuid-Core-i7-5600U-guest.xml
index 012946dbb4dc127d7d55eca2cd9a8d058f08dc0e..a538f74c349654d5631553a817f0906f6502c680 100644 (file)
--- a/tests/cputestdata/x86-cpuid-Core-i7-5600U-guest.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i7-5600U-guest.xml
@@ -21,8 +21,8 @@
   <feature policy='require' name='osxsave'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
+  <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
-  <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-5600U-host.xml b/tests/cputestdata/x86-cpuid-Core-i7-5600U-host.xml
index 04e7e7837feac4629ada1897b27f939923592a8f..9c7c791cf508b2ee2c4d4ec3375097ffc4a73d27 100644 (file)
--- a/tests/cputestdata/x86-cpuid-Core-i7-5600U-host.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i7-5600U-host.xml
@@ -21,8 +21,8 @@
   <feature name='osxsave'/>
   <feature name='f16c'/>
   <feature name='rdrand'/>
+  <feature name='tsc_adjust'/>
   <feature name='pdpe1gb'/>
   <feature name='abm'/>
-  <feature name='tsc_adjust'/>
   <feature name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-5600U-json.xml b/tests/cputestdata/x86-cpuid-Core-i7-5600U-json.xml
index 9a13e6e7c243202cf266c42db5fe868be9b85d1d..bbe5c77bc68ca69b2ba17279b090bf8ccfc4b6e9 100644 (file)
--- a/tests/cputestdata/x86-cpuid-Core-i7-5600U-json.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i7-5600U-json.xml
@@ -7,7 +7,7 @@
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
-  <feature policy='require' name='tsc_adjust'/>
 </cpu>

diff --git a/tests/cputestdata/x86-cpuid-Opteron-6234-json.xml b/tests/cputestdata/x86-cpuid-Opteron-6234-json.xml
index 2bb59a39473a73bb622c05148a8aea43abcb1664..dded6fa1f816e2f58ac312f6c78a84e3896a2f8d 100644 (file)
--- a/tests/cputestdata/x86-cpuid-Opteron-6234-json.xml
+++ b/tests/cputestdata/x86-cpuid-Opteron-6234-json.xml
@@ -5,12 +5,12 @@
   <feature policy='require' name='x2apic'/>
   <feature policy='require' name='tsc-deadline'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='mmxext'/>
   <feature policy='require' name='fxsr_opt'/>
   <feature policy='require' name='cmp_legacy'/>
   <feature policy='require' name='cr8legacy'/>
   <feature policy='require' name='osvw'/>
-  <feature policy='require' name='tsc_adjust'/>
   <feature policy='disable' name='rdtscp'/>
   <feature policy='disable' name='svm'/>
 </cpu>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-E3-1245-guest.xml b/tests/cputestdata/x86-cpuid-Xeon-E3-1245-guest.xml
index 0001b2dabd1e1ca8cbbb61ccafcb57fbe708d80c..782000781e65abee31ad1b38ddbd777165d85182 100644 (file)
--- a/tests/cputestdata/x86-cpuid-Xeon-E3-1245-guest.xml
+++ b/tests/cputestdata/x86-cpuid-Xeon-E3-1245-guest.xml
@@ -21,10 +21,10 @@
   <feature policy='require' name='osxsave'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
-  <feature policy='require' name='pdpe1gb'/>
-  <feature policy='require' name='abm'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='mpx'/>
   <feature policy='require' name='clflushopt'/>
+  <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 0c2aaee6864546dcc766f359bf02a2aeefc75012..bdf38d9b25dda60a2bc3d278d5e0169233cb4b74 100644 (file)
--- a/tests/cputestdata/x86-cpuid-Xeon-E3-1245-host.xml
+++ b/tests/cputestdata/x86-cpuid-Xeon-E3-1245-host.xml
@@ -21,10 +21,10 @@
   <feature name='osxsave'/>
   <feature name='f16c'/>
   <feature name='rdrand'/>
-  <feature name='pdpe1gb'/>
-  <feature name='abm'/>
   <feature name='tsc_adjust'/>
   <feature name='mpx'/>
   <feature name='clflushopt'/>
+  <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 81a41fb0266c84ca545a894ea4e3d8d17d67bb50..93483349e0be42cb59e6448ebc46cf6954046c65 100644 (file)
--- a/tests/cputestdata/x86-cpuid-Xeon-E3-1245-json.xml
+++ b/tests/cputestdata/x86-cpuid-Xeon-E3-1245-json.xml
@@ -7,9 +7,9 @@
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
   <feature policy='require' name='hypervisor'/>
-  <feature policy='require' name='pdpe1gb'/>
-  <feature policy='require' name='abm'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='mpx'/>
   <feature policy='require' name='clflushopt'/>
+  <feature policy='require' name='pdpe1gb'/>
+  <feature policy='require' name='abm'/>
 </cpu>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2630-guest.xml b/tests/cputestdata/x86-cpuid-Xeon-E5-2630-guest.xml
index ce5aa79a75b192cb2b1c0bab6c458ed96b8b2ef9..048161e70d6bf83e94bcf99a3cbd56ecfe707177 100644 (file)
--- a/tests/cputestdata/x86-cpuid-Xeon-E5-2630-guest.xml
+++ b/tests/cputestdata/x86-cpuid-Xeon-E5-2630-guest.xml
@@ -22,8 +22,8 @@
   <feature policy='require' name='osxsave'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
+  <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
-  <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2630-host.xml b/tests/cputestdata/x86-cpuid-Xeon-E5-2630-host.xml
index 26a3b904a6d7dc940bc4d5bfb825432bd14586f6..f2cf8ccbeb2626d3a62c3a190f95c474b3e7ed34 100644 (file)
--- a/tests/cputestdata/x86-cpuid-Xeon-E5-2630-host.xml
+++ b/tests/cputestdata/x86-cpuid-Xeon-E5-2630-host.xml
@@ -22,8 +22,8 @@
   <feature name='osxsave'/>
   <feature name='f16c'/>
   <feature name='rdrand'/>
+  <feature name='tsc_adjust'/>
   <feature name='pdpe1gb'/>
   <feature name='abm'/>
-  <feature name='tsc_adjust'/>
   <feature name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2630-json.xml b/tests/cputestdata/x86-cpuid-Xeon-E5-2630-json.xml
index 4cf361e960fdc440995f4c60c65614c33bc8791d..62aa9a1710fa18412e9a9191f01b1713e272cf94 100644 (file)
--- a/tests/cputestdata/x86-cpuid-Xeon-E5-2630-json.xml
+++ b/tests/cputestdata/x86-cpuid-Xeon-E5-2630-json.xml
@@ -6,7 +6,7 @@
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
-  <feature policy='require' name='tsc_adjust'/>
 </cpu>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2650-guest.xml b/tests/cputestdata/x86-cpuid-Xeon-E5-2650-guest.xml
index ce5aa79a75b192cb2b1c0bab6c458ed96b8b2ef9..048161e70d6bf83e94bcf99a3cbd56ecfe707177 100644 (file)
--- a/tests/cputestdata/x86-cpuid-Xeon-E5-2650-guest.xml
+++ b/tests/cputestdata/x86-cpuid-Xeon-E5-2650-guest.xml
@@ -22,8 +22,8 @@
   <feature policy='require' name='osxsave'/>
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
+  <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
-  <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2650-host.xml b/tests/cputestdata/x86-cpuid-Xeon-E5-2650-host.xml
index 26a3b904a6d7dc940bc4d5bfb825432bd14586f6..f2cf8ccbeb2626d3a62c3a190f95c474b3e7ed34 100644 (file)
--- a/tests/cputestdata/x86-cpuid-Xeon-E5-2650-host.xml
+++ b/tests/cputestdata/x86-cpuid-Xeon-E5-2650-host.xml
@@ -22,8 +22,8 @@
   <feature name='osxsave'/>
   <feature name='f16c'/>
   <feature name='rdrand'/>
+  <feature name='tsc_adjust'/>
   <feature name='pdpe1gb'/>
   <feature name='abm'/>
-  <feature name='tsc_adjust'/>
   <feature name='invtsc'/>
 </cpu>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-E7-4820-json.xml b/tests/cputestdata/x86-cpuid-Xeon-E7-4820-json.xml
index 67b1dc7d27d9996e73dbed9d4c4a3be1da0b5643..ff6ab65d913a2392291c5ce36e3a9a9f5ccdcee2 100644 (file)
--- a/tests/cputestdata/x86-cpuid-Xeon-E7-4820-json.xml
+++ b/tests/cputestdata/x86-cpuid-Xeon-E7-4820-json.xml
@@ -5,8 +5,8 @@
   <feature policy='require' name='ss'/>
   <feature policy='require' name='pcid'/>
   <feature policy='require' name='hypervisor'/>
-  <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='pdpe1gb'/>
   <feature policy='disable' name='xsave'/>
   <feature policy='disable' name='avx'/>
 </cpu>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-W3520-json.xml b/tests/cputestdata/x86-cpuid-Xeon-W3520-json.xml
index 3292264153f5f0dedf8db0eff74a5483d655e4aa..1aadbf3d27ebce99197e4150a3da201b5311b4b9 100644 (file)
--- a/tests/cputestdata/x86-cpuid-Xeon-W3520-json.xml
+++ b/tests/cputestdata/x86-cpuid-Xeon-W3520-json.xml
@@ -5,6 +5,6 @@
   <feature policy='require' name='ss'/>
   <feature policy='require' name='x2apic'/>
   <feature policy='require' name='hypervisor'/>
-  <feature policy='require' name='rdtscp'/>
   <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='rdtscp'/>
 </cpu>