toplev: Report CFL/KBL as CFL/KBL instead of Skylake

For #339

Author: Andi Kleen

tl_output.py

@@ -61,7 +61,7 @@ def __init__(self, logfile, version, cpu, args):
         self.version = version
         self.unitlen = 12
         self.belowlen = 0
-        self.version = "%s on %s [%s]" % (version, cpu.name, cpu.cpu)
+        self.version = "%s on %s [%s]" % (version, cpu.name, cpu.true_name)
         self.curname = ""
         self.curname_nologf = ""
         self.printedversion = set()

toplev.py

@@ -62,6 +62,11 @@
     ("icl", (126, )),
 )
 
+cpu_extra_name = {
+    142: "kbl",
+    158: "cfl",
+}
+
 tsx_cpus = ("hsw", "hsx", "bdw", "skl", "skx", "clx", "icl")
 
 fixed_to_num = {
@@ -673,6 +678,7 @@ def check_ratio(l):
     return 0 - MAX_ERROR < l < 1 + MAX_ERROR
 
 cpu = tl_cpu.CPU(known_cpus, nocheck=event_nocheck, env=env)
+cpu.true_name = cpu_extra_name[cpu.model] if cpu.model in cpu_extra_name else cpu.cpu
 
 if args.xlsx and not forced_per_socket and cpu.sockets == 1:
     args.per_socket = False