From 61be05a00fd383f11070761fac5ae28272b784dd Mon Sep 17 00:00:00 2001
From: Jiri Denemark <jdenemar@redhat.com>
Date: Tue, 26 Feb 2019 09:22:36 +0100
Subject: [PATCH] cpu_map: Add hex representation of signatures
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
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>
---
 src/cpu_map/x86_Broadwell-IBRS.xml       | 2 +-
 src/cpu_map/x86_Broadwell-noTSX-IBRS.xml | 2 +-
 src/cpu_map/x86_Broadwell-noTSX.xml      | 2 +-
 src/cpu_map/x86_Broadwell.xml            | 2 +-
 src/cpu_map/x86_Conroe.xml               | 2 +-
 src/cpu_map/x86_EPYC-IBRS.xml            | 2 +-
 src/cpu_map/x86_EPYC.xml                 | 2 +-
 src/cpu_map/x86_Haswell-IBRS.xml         | 2 +-
 src/cpu_map/x86_Haswell-noTSX-IBRS.xml   | 2 +-
 src/cpu_map/x86_Haswell-noTSX.xml        | 2 +-
 src/cpu_map/x86_Haswell.xml              | 2 +-
 src/cpu_map/x86_Icelake-Client.xml       | 2 +-
 src/cpu_map/x86_Icelake-Server.xml       | 2 +-
 src/cpu_map/x86_IvyBridge-IBRS.xml       | 2 +-
 src/cpu_map/x86_IvyBridge.xml            | 2 +-
 src/cpu_map/x86_Nehalem-IBRS.xml         | 2 +-
 src/cpu_map/x86_Nehalem.xml              | 2 +-
 src/cpu_map/x86_Opteron_G1.xml           | 2 +-
 src/cpu_map/x86_Opteron_G2.xml           | 2 +-
 src/cpu_map/x86_Opteron_G3.xml           | 2 +-
 src/cpu_map/x86_Opteron_G4.xml           | 2 +-
 src/cpu_map/x86_Opteron_G5.xml           | 2 +-
 src/cpu_map/x86_Penryn.xml               | 2 +-
 src/cpu_map/x86_SandyBridge-IBRS.xml     | 2 +-
 src/cpu_map/x86_SandyBridge.xml          | 2 +-
 src/cpu_map/x86_Skylake-Client-IBRS.xml  | 2 +-
 src/cpu_map/x86_Skylake-Client.xml       | 2 +-
 src/cpu_map/x86_Skylake-Server-IBRS.xml  | 2 +-
 src/cpu_map/x86_Skylake-Server.xml       | 2 +-
 src/cpu_map/x86_Westmere-IBRS.xml        | 2 +-
 src/cpu_map/x86_Westmere.xml             | 2 +-
 31 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/cpu_map/x86_Broadwell-IBRS.xml b/src/cpu_map/x86_Broadwell-IBRS.xml
index fc7a3371a5..efaa5c9b70 100644
--- a/src/cpu_map/x86_Broadwell-IBRS.xml
+++ b/src/cpu_map/x86_Broadwell-IBRS.xml
@@ -1,6 +1,6 @@
 <cpus>
   <model name='Broadwell-IBRS'>
-    <signature family='6' model='61'/>
+    <signature family='6' model='61'/> <!-- 0306d0 -->
     <vendor name='Intel'/>
     <feature name='3dnowprefetch'/>
     <feature name='adx'/>
diff --git a/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml b/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml
index 19949cb6ca..fb1cf55a4f 100644
--- a/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml
+++ b/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml
@@ -1,6 +1,6 @@
 <cpus>
   <model name='Broadwell-noTSX-IBRS'>
-    <signature family='6' model='61'/>
+    <signature family='6' model='61'/> <!-- 0306d0 -->
     <vendor name='Intel'/>
     <feature name='3dnowprefetch'/>
     <feature name='adx'/>
diff --git a/src/cpu_map/x86_Broadwell-noTSX.xml b/src/cpu_map/x86_Broadwell-noTSX.xml
index 6219bd4102..8e9cff14ad 100644
--- a/src/cpu_map/x86_Broadwell-noTSX.xml
+++ b/src/cpu_map/x86_Broadwell-noTSX.xml
@@ -1,6 +1,6 @@
 <cpus>
   <model name='Broadwell-noTSX'>
-    <signature family='6' model='61'/>
+    <signature family='6' model='61'/> <!-- 0306d0 -->
     <vendor name='Intel'/>
     <feature name='3dnowprefetch'/>
     <feature name='adx'/>
diff --git a/src/cpu_map/x86_Broadwell.xml b/src/cpu_map/x86_Broadwell.xml
index 1511394f0b..a9850c9126 100644
--- a/src/cpu_map/x86_Broadwell.xml
+++ b/src/cpu_map/x86_Broadwell.xml
@@ -1,6 +1,6 @@
 <cpus>
   <model name='Broadwell'>
-    <signature family='6' model='61'/>
+    <signature family='6' model='61'/> <!-- 0306d0 -->
     <vendor name='Intel'/>
     <feature name='3dnowprefetch'/>
     <feature name='adx'/>
diff --git a/src/cpu_map/x86_Conroe.xml b/src/cpu_map/x86_Conroe.xml
index ebcab7be31..0055e5005a 100644
--- a/src/cpu_map/x86_Conroe.xml
+++ b/src/cpu_map/x86_Conroe.xml
@@ -1,6 +1,6 @@
 <cpus>
   <model name='Conroe'>
-    <signature family='6' model='15'/>
+    <signature family='6' model='15'/> <!-- 0006f0 -->
     <vendor name='Intel'/>
     <feature name='apic'/>
     <feature name='clflush'/>
diff --git a/src/cpu_map/x86_EPYC-IBRS.xml b/src/cpu_map/x86_EPYC-IBRS.xml
index 219ead70df..283697ebd1 100644
--- a/src/cpu_map/x86_EPYC-IBRS.xml
+++ b/src/cpu_map/x86_EPYC-IBRS.xml
@@ -1,6 +1,6 @@
 <cpus>
   <model name='EPYC-IBPB'>
-    <signature family='23' model='1'/>
+    <signature family='23' model='1'/> <!-- 800f10 -->
     <vendor name='AMD'/>
     <feature name='3dnowprefetch'/>
     <feature name='abm'/>
diff --git a/src/cpu_map/x86_EPYC.xml b/src/cpu_map/x86_EPYC.xml
index 6458dc820c..f0601392fd 100644
--- a/src/cpu_map/x86_EPYC.xml
+++ b/src/cpu_map/x86_EPYC.xml
@@ -1,6 +1,6 @@
 <cpus>
   <model name='EPYC'>
-    <signature family='23' model='1'/>
+    <signature family='23' model='1'/> <!-- 800f10 -->
     <vendor name='AMD'/>
     <feature name='3dnowprefetch'/>
     <feature name='abm'/>
diff --git a/src/cpu_map/x86_Haswell-IBRS.xml b/src/cpu_map/x86_Haswell-IBRS.xml
index 01bab7b803..dea43ad71d 100644
--- a/src/cpu_map/x86_Haswell-IBRS.xml
+++ b/src/cpu_map/x86_Haswell-IBRS.xml
@@ -1,6 +1,6 @@
 <cpus>
   <model name='Haswell-IBRS'>
-    <signature family='6' model='60'/>
+    <signature family='6' model='60'/> <!-- 0306c0 -->
     <vendor name='Intel'/>
     <feature name='aes'/>
     <feature name='apic'/>
diff --git a/src/cpu_map/x86_Haswell-noTSX-IBRS.xml b/src/cpu_map/x86_Haswell-noTSX-IBRS.xml
index 7b53b7be29..7013540428 100644
--- a/src/cpu_map/x86_Haswell-noTSX-IBRS.xml
+++ b/src/cpu_map/x86_Haswell-noTSX-IBRS.xml
@@ -1,6 +1,6 @@
 <cpus>
   <model name='Haswell-noTSX-IBRS'>
-    <signature family='6' model='60'/>
+    <signature family='6' model='60'/> <!-- 0306c0 -->
     <vendor name='Intel'/>
     <feature name='aes'/>
     <feature name='apic'/>
diff --git a/src/cpu_map/x86_Haswell-noTSX.xml b/src/cpu_map/x86_Haswell-noTSX.xml
index 10b460818a..e183364f3b 100644
--- a/src/cpu_map/x86_Haswell-noTSX.xml
+++ b/src/cpu_map/x86_Haswell-noTSX.xml
@@ -1,6 +1,6 @@
 <cpus>
   <model name='Haswell-noTSX'>
-    <signature family='6' model='60'/>
+    <signature family='6' model='60'/> <!-- 0306c0 -->
     <vendor name='Intel'/>
     <feature name='aes'/>
     <feature name='apic'/>
diff --git a/src/cpu_map/x86_Haswell.xml b/src/cpu_map/x86_Haswell.xml
index 84275b1bdf..eee98264b2 100644
--- a/src/cpu_map/x86_Haswell.xml
+++ b/src/cpu_map/x86_Haswell.xml
@@ -1,6 +1,6 @@
 <cpus>
   <model name='Haswell'>
-    <signature family='6' model='60'/>
+    <signature family='6' model='60'/> <!-- 0306c0 -->
     <vendor name='Intel'/>
     <feature name='aes'/>
     <feature name='apic'/>
diff --git a/src/cpu_map/x86_Icelake-Client.xml b/src/cpu_map/x86_Icelake-Client.xml
index bdd46ee96e..0b16bbcc5e 100644
--- a/src/cpu_map/x86_Icelake-Client.xml
+++ b/src/cpu_map/x86_Icelake-Client.xml
@@ -1,6 +1,6 @@
 <cpus>
   <model name='Icelake-Client'>
-    <signature family='6' model='126'/>
+    <signature family='6' model='126'/> <!-- 0706e0 -->
     <vendor name='Intel'/>
     <feature name='3dnowprefetch'/>
     <feature name='abm'/>
diff --git a/src/cpu_map/x86_Icelake-Server.xml b/src/cpu_map/x86_Icelake-Server.xml
index 0c02c9fca8..fb15977a59 100644
--- a/src/cpu_map/x86_Icelake-Server.xml
+++ b/src/cpu_map/x86_Icelake-Server.xml
@@ -1,6 +1,6 @@
 <cpus>
   <model name='Icelake-Server'>
-    <signature family='6' model='134'/>
+    <signature family='6' model='134'/> <!-- 080660 -->
     <vendor name='Intel'/>
     <feature name='3dnowprefetch'/>
     <feature name='abm'/>
diff --git a/src/cpu_map/x86_IvyBridge-IBRS.xml b/src/cpu_map/x86_IvyBridge-IBRS.xml
index 27eb120a8a..4a4bc0c97b 100644
--- a/src/cpu_map/x86_IvyBridge-IBRS.xml
+++ b/src/cpu_map/x86_IvyBridge-IBRS.xml
@@ -1,6 +1,6 @@
 <cpus>
   <model name='IvyBridge-IBRS'>
-    <signature family='6' model='58'/>
+    <signature family='6' model='58'/> <!-- 0306a0 -->
     <vendor name='Intel'/>
     <feature name='aes'/>
     <feature name='apic'/>
diff --git a/src/cpu_map/x86_IvyBridge.xml b/src/cpu_map/x86_IvyBridge.xml
index 54f5f55a51..da4792595f 100644
--- a/src/cpu_map/x86_IvyBridge.xml
+++ b/src/cpu_map/x86_IvyBridge.xml
@@ -1,6 +1,6 @@
 <cpus>
   <model name='IvyBridge'>
-    <signature family='6' model='58'/>
+    <signature family='6' model='58'/> <!-- 0306a0 -->
     <vendor name='Intel'/>
     <feature name='aes'/>
     <feature name='apic'/>
diff --git a/src/cpu_map/x86_Nehalem-IBRS.xml b/src/cpu_map/x86_Nehalem-IBRS.xml
index f2230ffa89..f3049e0ba6 100644
--- a/src/cpu_map/x86_Nehalem-IBRS.xml
+++ b/src/cpu_map/x86_Nehalem-IBRS.xml
@@ -1,6 +1,6 @@
 <cpus>
   <model name='Nehalem-IBRS'>
-    <signature family='6' model='26'/>
+    <signature family='6' model='26'/> <!-- 0106a0 -->
     <vendor name='Intel'/>
     <feature name='apic'/>
     <feature name='clflush'/>
diff --git a/src/cpu_map/x86_Nehalem.xml b/src/cpu_map/x86_Nehalem.xml
index 8e0fd5dc49..a05c16f2b1 100644
--- a/src/cpu_map/x86_Nehalem.xml
+++ b/src/cpu_map/x86_Nehalem.xml
@@ -1,6 +1,6 @@
 <cpus>
   <model name='Nehalem'>
-    <signature family='6' model='26'/>
+    <signature family='6' model='26'/> <!-- 0106a0 -->
     <vendor name='Intel'/>
     <feature name='apic'/>
     <feature name='clflush'/>
diff --git a/src/cpu_map/x86_Opteron_G1.xml b/src/cpu_map/x86_Opteron_G1.xml
index 8d043fe889..73cf1de71e 100644
--- a/src/cpu_map/x86_Opteron_G1.xml
+++ b/src/cpu_map/x86_Opteron_G1.xml
@@ -1,6 +1,6 @@
 <cpus>
   <model name='Opteron_G1'>
-    <signature family='15' model='6'/>
+    <signature family='15' model='6'/> <!-- 100e60 -->
     <vendor name='AMD'/>
     <feature name='apic'/>
     <feature name='clflush'/>
diff --git a/src/cpu_map/x86_Opteron_G2.xml b/src/cpu_map/x86_Opteron_G2.xml
index 774e86462f..342105730e 100644
--- a/src/cpu_map/x86_Opteron_G2.xml
+++ b/src/cpu_map/x86_Opteron_G2.xml
@@ -1,6 +1,6 @@
 <cpus>
   <model name='Opteron_G2'>
-    <signature family='15' model='6'/>
+    <signature family='15' model='6'/> <!-- 100e60 -->
     <vendor name='AMD'/>
     <feature name='apic'/>
     <feature name='clflush'/>
diff --git a/src/cpu_map/x86_Opteron_G3.xml b/src/cpu_map/x86_Opteron_G3.xml
index 5d27e635dc..7fbf8ac9e9 100644
--- a/src/cpu_map/x86_Opteron_G3.xml
+++ b/src/cpu_map/x86_Opteron_G3.xml
@@ -1,6 +1,6 @@
 <cpus>
   <model name='Opteron_G3'>
-    <signature family='15' model='6'/>
+    <signature family='15' model='6'/> <!-- 100e60 -->
     <vendor name='AMD'/>
     <feature name='abm'/>
     <feature name='apic'/>
diff --git a/src/cpu_map/x86_Opteron_G4.xml b/src/cpu_map/x86_Opteron_G4.xml
index d77cc286ff..463b3676a0 100644
--- a/src/cpu_map/x86_Opteron_G4.xml
+++ b/src/cpu_map/x86_Opteron_G4.xml
@@ -1,6 +1,6 @@
 <cpus>
   <model name='Opteron_G4'>
-    <signature family='21' model='1'/>
+    <signature family='21' model='1'/> <!-- 600f10 -->
     <vendor name='AMD'/>
     <feature name='3dnowprefetch'/>
     <feature name='abm'/>
diff --git a/src/cpu_map/x86_Opteron_G5.xml b/src/cpu_map/x86_Opteron_G5.xml
index 9a5ecbd4da..0f8fe32c87 100644
--- a/src/cpu_map/x86_Opteron_G5.xml
+++ b/src/cpu_map/x86_Opteron_G5.xml
@@ -1,6 +1,6 @@
 <cpus>
   <model name='Opteron_G5'>
-    <signature family='21' model='2'/>
+    <signature family='21' model='2'/> <!-- 600f20 -->
     <vendor name='AMD'/>
     <feature name='3dnowprefetch'/>
     <feature name='abm'/>
diff --git a/src/cpu_map/x86_Penryn.xml b/src/cpu_map/x86_Penryn.xml
index 9b0c0cfd0e..41febb2ddf 100644
--- a/src/cpu_map/x86_Penryn.xml
+++ b/src/cpu_map/x86_Penryn.xml
@@ -1,6 +1,6 @@
 <cpus>
   <model name='Penryn'>
-    <signature family='6' model='23'/>
+    <signature family='6' model='23'/> <!-- 010670 -->
     <vendor name='Intel'/>
     <feature name='apic'/>
     <feature name='clflush'/>
diff --git a/src/cpu_map/x86_SandyBridge-IBRS.xml b/src/cpu_map/x86_SandyBridge-IBRS.xml
index 1f56b4bc81..6d9af68146 100644
--- a/src/cpu_map/x86_SandyBridge-IBRS.xml
+++ b/src/cpu_map/x86_SandyBridge-IBRS.xml
@@ -1,6 +1,6 @@
 <cpus>
   <model name='SandyBridge-IBRS'>
-    <signature family='6' model='42'/>
+    <signature family='6' model='42'/> <!-- 0206a0 -->
     <vendor name='Intel'/>
     <feature name='aes'/>
     <feature name='apic'/>
diff --git a/src/cpu_map/x86_SandyBridge.xml b/src/cpu_map/x86_SandyBridge.xml
index eea85fc3f3..d335c71a31 100644
--- a/src/cpu_map/x86_SandyBridge.xml
+++ b/src/cpu_map/x86_SandyBridge.xml
@@ -1,6 +1,6 @@
 <cpus>
   <model name='SandyBridge'>
-    <signature family='6' model='42'/>
+    <signature family='6' model='42'/> <!-- 0206a0 -->
     <vendor name='Intel'/>
     <feature name='aes'/>
     <feature name='apic'/>
diff --git a/src/cpu_map/x86_Skylake-Client-IBRS.xml b/src/cpu_map/x86_Skylake-Client-IBRS.xml
index 1603bb8c13..c8e15ef974 100644
--- a/src/cpu_map/x86_Skylake-Client-IBRS.xml
+++ b/src/cpu_map/x86_Skylake-Client-IBRS.xml
@@ -1,6 +1,6 @@
 <cpus>
   <model name='Skylake-Client-IBRS'>
-    <signature family='6' model='94'/>
+    <signature family='6' model='94'/> <!-- 0506e0 -->
     <vendor name='Intel'/>
     <feature name='3dnowprefetch'/>
     <feature name='abm'/>
diff --git a/src/cpu_map/x86_Skylake-Client.xml b/src/cpu_map/x86_Skylake-Client.xml
index c0286b9fa5..1cfeb9196e 100644
--- a/src/cpu_map/x86_Skylake-Client.xml
+++ b/src/cpu_map/x86_Skylake-Client.xml
@@ -1,6 +1,6 @@
 <cpus>
   <model name='Skylake-Client'>
-    <signature family='6' model='94'/>
+    <signature family='6' model='94'/> <!-- 0506e0 -->
     <vendor name='Intel'/>
     <feature name='3dnowprefetch'/>
     <feature name='abm'/>
diff --git a/src/cpu_map/x86_Skylake-Server-IBRS.xml b/src/cpu_map/x86_Skylake-Server-IBRS.xml
index 45350792a0..71179f9f74 100644
--- a/src/cpu_map/x86_Skylake-Server-IBRS.xml
+++ b/src/cpu_map/x86_Skylake-Server-IBRS.xml
@@ -1,6 +1,6 @@
 <cpus>
   <model name='Skylake-Server-IBRS'>
-    <signature family='6' model='85'/>
+    <signature family='6' model='85'/> <!-- 050654 -->
     <vendor name='Intel'/>
     <feature name='3dnowprefetch'/>
     <feature name='abm'/>
diff --git a/src/cpu_map/x86_Skylake-Server.xml b/src/cpu_map/x86_Skylake-Server.xml
index 0119428357..2da69e0dfc 100644
--- a/src/cpu_map/x86_Skylake-Server.xml
+++ b/src/cpu_map/x86_Skylake-Server.xml
@@ -1,6 +1,6 @@
 <cpus>
   <model name='Skylake-Server'>
-    <signature family='6' model='85'/>
+    <signature family='6' model='85'/> <!-- 050654 -->
     <vendor name='Intel'/>
     <feature name='3dnowprefetch'/>
     <feature name='abm'/>
diff --git a/src/cpu_map/x86_Westmere-IBRS.xml b/src/cpu_map/x86_Westmere-IBRS.xml
index dea7a73dcd..3baf56f47a 100644
--- a/src/cpu_map/x86_Westmere-IBRS.xml
+++ b/src/cpu_map/x86_Westmere-IBRS.xml
@@ -1,6 +1,6 @@
 <cpus>
   <model name='Westmere-IBRS'>
-    <signature family='6' model='44'/>
+    <signature family='6' model='44'/> <!-- 0206c0 -->
     <vendor name='Intel'/>
     <feature name='aes'/>
     <feature name='apic'/>
diff --git a/src/cpu_map/x86_Westmere.xml b/src/cpu_map/x86_Westmere.xml
index f5c31449e0..14f17f588a 100644
--- a/src/cpu_map/x86_Westmere.xml
+++ b/src/cpu_map/x86_Westmere.xml
@@ -1,6 +1,6 @@
 <cpus>
   <model name='Westmere'>
-    <signature family='6' model='44'/>
+    <signature family='6' model='44'/> <!-- 0206c0 -->
     <vendor name='Intel'/>
     <feature name='aes'/>
     <feature name='apic'/>
-- 
2.39.5