From 83a1114820c95f9cd98789b14044a229dcc090a7 Mon Sep 17 00:00:00 2001

Message-Id: <83a1114820c95f9cd98789b14044a229dcc090a7@dist-git>

From: Jiri Denemark <jdenemar@redhat.com>

Date: Fri, 21 Jun 2019 09:25:07 +0200

Subject: [PATCH] cpu_map: Add hex representation of signatures

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

The family/model numbers are nice for humans or for comparing with

/proc/cpuinfo, but sometimes there's a need to see the CPUID

representation of the signature. Let's add it into a comment for each

signature in out cpu_map XMLs as the conversion is not exactly

straightforward.

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

Reviewed-by: Ján Tomko <jtomko@redhat.com>

(cherry picked from commit 61be05a00fd383f11070761fac5ae28272b784dd)

https://bugzilla.redhat.com/show_bug.cgi?id=1686895

Conflicts:

        src/cpu/cpu_map.xml

            - the cpu_map split was not backported

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

Message-Id: <e8e2e0bdf183bec170df5252cf927ff5fbe0ef47.1561068591.git.jdenemar@redhat.com>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

---

 src/cpu/cpu_map.xml | 62 ++++++++++++++++++++++-----------------------

 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml

index a9f284fbbe..a5a5290a09 100644

--- a/src/cpu/cpu_map.xml

+++ b/src/cpu/cpu_map.xml

@@ -828,7 +828,7 @@

     <model name='Conroe'>

-      <signature family='6' model='15'/>

+      <signature family='6' model='15'/> 

       <vendor name='Intel'/>

       <feature name='apic'/>

       <feature name='clflush'/>

@@ -860,7 +860,7 @@

     </model>

     <model name='Penryn'>

-      <signature family='6' model='23'/>

+      <signature family='6' model='23'/> 

       <vendor name='Intel'/>

       <feature name='apic'/>

       <feature name='clflush'/>

@@ -894,7 +894,7 @@

     </model>

     <model name='Nehalem'>

-      <signature family='6' model='26'/>

+      <signature family='6' model='26'/> 

       <vendor name='Intel'/>

       <feature name='apic'/>

       <feature name='clflush'/>

@@ -930,7 +930,7 @@

     </model>

     <model name='Nehalem-IBRS'>

-      <signature family='6' model='26'/>

+      <signature family='6' model='26'/> 

       <vendor name='Intel'/>

       <feature name='apic'/>

       <feature name='clflush'/>

@@ -967,7 +967,7 @@

     </model>

     <model name='Westmere'>

-      <signature family='6' model='44'/>

+      <signature family='6' model='44'/> 

       <vendor name='Intel'/>

       <feature name='aes'/>

       <feature name='apic'/>

@@ -1004,7 +1004,7 @@

     </model>

     <model name='Westmere-IBRS'>

-      <signature family='6' model='44'/>

+      <signature family='6' model='44'/> 

       <vendor name='Intel'/>

       <feature name='aes'/>

       <feature name='apic'/>

@@ -1042,7 +1042,7 @@

     </model>

     <model name='SandyBridge'>

-      <signature family='6' model='42'/>

+      <signature family='6' model='42'/> 

       <vendor name='Intel'/>

       <feature name='aes'/>

       <feature name='apic'/>

@@ -1085,7 +1085,7 @@

     </model>

     <model name='SandyBridge-IBRS'>

-      <signature family='6' model='42'/>

+      <signature family='6' model='42'/> 

       <vendor name='Intel'/>

       <feature name='aes'/>

       <feature name='apic'/>

@@ -1129,7 +1129,7 @@

     </model>

     <model name='IvyBridge'>

-      <signature family='6' model='58'/>

+      <signature family='6' model='58'/> 

       <vendor name='Intel'/>

       <feature name='aes'/>

       <feature name='apic'/>

@@ -1178,7 +1178,7 @@

     </model>

     <model name='IvyBridge-IBRS'>

-      <signature family='6' model='58'/>

+      <signature family='6' model='58'/> 

       <vendor name='Intel'/>

       <feature name='aes'/>

       <feature name='apic'/>

@@ -1228,7 +1228,7 @@

     </model>

     <model name='Haswell-noTSX'>

-      <signature family='6' model='60'/>

+      <signature family='6' model='60'/> 

       <vendor name='Intel'/>

       <feature name='aes'/>

       <feature name='apic'/>

@@ -1281,7 +1281,7 @@

     </model>

     <model name='Haswell-noTSX-IBRS'>

-      <signature family='6' model='60'/>

+      <signature family='6' model='60'/> 

       <vendor name='Intel'/>

       <feature name='aes'/>

       <feature name='apic'/>

@@ -1335,7 +1335,7 @@

     </model>

     <model name='Haswell'>

-      <signature family='6' model='60'/>

+      <signature family='6' model='60'/> 

       <vendor name='Intel'/>

       <feature name='aes'/>

       <feature name='apic'/>

@@ -1390,7 +1390,7 @@

     </model>

     <model name='Haswell-IBRS'>

-      <signature family='6' model='60'/>

+      <signature family='6' model='60'/> 

       <vendor name='Intel'/>

       <feature name='aes'/>

       <feature name='apic'/>

@@ -1446,7 +1446,7 @@

     </model>

     <model name='Broadwell-noTSX'>

-      <signature family='6' model='61'/>

+      <signature family='6' model='61'/> 

       <vendor name='Intel'/>

       <feature name='3dnowprefetch'/>

       <feature name='adx'/>

@@ -1503,7 +1503,7 @@

     </model>

     <model name='Broadwell-noTSX-IBRS'>

-      <signature family='6' model='61'/>

+      <signature family='6' model='61'/> 

       <vendor name='Intel'/>

       <feature name='3dnowprefetch'/>

       <feature name='adx'/>

@@ -1561,7 +1561,7 @@

     </model>

     <model name='Broadwell'>

-      <signature family='6' model='61'/>

+      <signature family='6' model='61'/> 

       <vendor name='Intel'/>

       <feature name='3dnowprefetch'/>

       <feature name='adx'/>

@@ -1620,7 +1620,7 @@

     </model>

     <model name='Broadwell-IBRS'>

-      <signature family='6' model='61'/>

+      <signature family='6' model='61'/> 

       <vendor name='Intel'/>

       <feature name='3dnowprefetch'/>

       <feature name='adx'/>

@@ -1680,7 +1680,7 @@

     </model>

     <model name='Skylake-Client'>

-      <signature family='6' model='94'/>

+      <signature family='6' model='94'/> 

       <vendor name='Intel'/>

       <feature name='3dnowprefetch'/>

       <feature name='abm'/>

@@ -1748,7 +1748,7 @@

     </model>

     <model name='Skylake-Client-IBRS'>

-      <signature family='6' model='94'/>

+      <signature family='6' model='94'/> 

       <vendor name='Intel'/>

       <feature name='3dnowprefetch'/>

       <feature name='abm'/>

@@ -1817,7 +1817,7 @@

     </model>

     <model name='Skylake-Server'>

-      <signature family='6' model='85'/>

+      <signature family='6' model='85'/> 

       <vendor name='Intel'/>

       <feature name='3dnowprefetch'/>

       <feature name='abm'/>

@@ -1892,7 +1892,7 @@

     </model>

     <model name='Skylake-Server-IBRS'>

-      <signature family='6' model='85'/>

+      <signature family='6' model='85'/> 

       <vendor name='Intel'/>

       <feature name='3dnowprefetch'/>

       <feature name='abm'/>

@@ -1968,7 +1968,7 @@

     </model>

     <model name='Icelake-Client'>

-      <signature family='6' model='126'/>

+      <signature family='6' model='126'/> 

       <vendor name='Intel'/>

       <feature name='3dnowprefetch'/>

       <feature name='abm'/>

@@ -2052,7 +2052,7 @@

     </model>

     <model name='Icelake-Server'>

-      <signature family='6' model='134'/>

+      <signature family='6' model='134'/> 

       <vendor name='Intel'/>

       <feature name='3dnowprefetch'/>

       <feature name='abm'/>

@@ -2209,7 +2209,7 @@

     </model>

     <model name='Opteron_G1'>

-      <signature family='15' model='6'/>

+      <signature family='15' model='6'/> 

       <vendor name='AMD'/>

       <feature name='apic'/>

       <feature name='clflush'/>

@@ -2239,7 +2239,7 @@

     </model>

     <model name='Opteron_G2'>

-      <signature family='15' model='6'/>

+      <signature family='15' model='6'/> 

       <vendor name='AMD'/>

       <feature name='apic'/>

       <feature name='clflush'/>

@@ -2273,7 +2273,7 @@

     </model>

     <model name='Opteron_G3'>

-      <signature family='15' model='6'/>

+      <signature family='15' model='6'/> 

       <vendor name='AMD'/>

       <feature name='abm'/>

       <feature name='apic'/>

@@ -2312,7 +2312,7 @@

     </model>

     <model name='Opteron_G4'>

-      <signature family='21' model='1'/>

+      <signature family='21' model='1'/> 

       <vendor name='AMD'/>

       <feature name='3dnowprefetch'/>

       <feature name='abm'/>

@@ -2361,7 +2361,7 @@

     </model>

     <model name='Opteron_G5'>

-      <signature family='21' model='2'/>

+      <signature family='21' model='2'/> 

       <vendor name='AMD'/>

       <feature name='3dnowprefetch'/>

       <feature name='abm'/>

@@ -2413,7 +2413,7 @@

     </model>

     <model name='EPYC'>

-      <signature family='23' model='1'/>

+      <signature family='23' model='1'/> 

       <vendor name='AMD'/>

       <feature name='3dnowprefetch'/>

       <feature name='abm'/>

@@ -2484,7 +2484,7 @@

     </model>

     <model name='EPYC-IBPB'>

-      <signature family='23' model='1'/>

+      <signature family='23' model='1'/> 

       <vendor name='AMD'/>

       <feature name='3dnowprefetch'/>

       <feature name='abm'/>

-- 

2.22.0