tools/power turbostat: Show module_id column

Get the "module_id" from the Linux topology "cluster_id".
If the there is more than one id, show it by default.

Module joins Die etc. in the "topology" group.

Display in hex, as it is usually based mask of the APIC-id

Signed-off-by: Len Brown <len.brown@intel.com>

diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index b27227414dc73181b7f38fd0aa5131b3189f3c21..f8e9aa8c9e541bb7dca453711527414e4f9ad0ba 100644 (file)
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -191,6 +191,7 @@ struct msr_counter bic[] = {
        { 0x0, "Any%C0", NULL, 0, 0, 0, NULL, 0 },
        { 0x0, "GFX%C0", NULL, 0, 0, 0, NULL, 0 },
        { 0x0, "CPUGFX%", NULL, 0, 0, 0, NULL, 0 },
+       { 0x0, "Module", NULL, 0, 0, 0, NULL, 0 },
        { 0x0, "Core", NULL, 0, 0, 0, NULL, 0 },
        { 0x0, "CPU", NULL, 0, 0, 0, NULL, 0 },
        { 0x0, "APIC", NULL, 0, 0, 0, NULL, 0 },
@@ -264,6 +265,7 @@ enum bic_names {
        BIC_Any_c0,
        BIC_GFX_c0,
        BIC_CPUGFX,
+       BIC_Module,
        BIC_Core,
        BIC_CPU,
        BIC_APIC,
@@ -364,6 +366,7 @@ static void bic_groups_init(void)
        SET_BIC(BIC_Node, &bic_group_topology);
        SET_BIC(BIC_CoreCnt, &bic_group_topology);
        SET_BIC(BIC_PkgCnt, &bic_group_topology);
+       SET_BIC(BIC_Module, &bic_group_topology);
        SET_BIC(BIC_Core, &bic_group_topology);
        SET_BIC(BIC_CPU, &bic_group_topology);
        SET_BIC(BIC_Die, &bic_group_topology);
@@ -2383,6 +2386,7 @@ struct platform_counters {
 struct cpu_topology {
        int cpu_id;
        int core_id;            /* unique within a package */
+       int module_id;
        int package_id;
        int die_id;
        int l3_id;
@@ -2404,6 +2408,8 @@ struct topo_params {
        int allowed_cores;
        int max_cpu_num;
        int max_core_id;        /* within a package */
+       int min_module_id;      /* system wide */
+       int max_module_id;      /* system wide */
        int max_package_id;
        int max_die_id;
        int max_l3_id;
@@ -2919,6 +2925,8 @@ void print_header(char *delim)
                outp += sprintf(outp, "%sL3", (printed++ ? delim : ""));
        if (DO_BIC(BIC_Node))
                outp += sprintf(outp, "%sNode", (printed++ ? delim : ""));
+       if (DO_BIC(BIC_Module))
+               outp += sprintf(outp, "%sModule", (printed++ ? delim : ""));
        if (DO_BIC(BIC_Core))
                outp += sprintf(outp, "%sCore", (printed++ ? delim : ""));
        if (DO_BIC(BIC_CPU))
@@ -3388,6 +3396,8 @@ int format_counters(PER_THREAD_PARAMS)
                        outp += sprintf(outp, "%s-", (printed++ ? delim : ""));
                if (DO_BIC(BIC_Node))
                        outp += sprintf(outp, "%s-", (printed++ ? delim : ""));
+               if (DO_BIC(BIC_Module))
+                       outp += sprintf(outp, "%s-", (printed++ ? delim : ""));
                if (DO_BIC(BIC_Core))
                        outp += sprintf(outp, "%s-", (printed++ ? delim : ""));
                if (DO_BIC(BIC_CPU))
@@ -3421,6 +3431,12 @@ int format_counters(PER_THREAD_PARAMS)
                        else
                                outp += sprintf(outp, "%s-", (printed++ ? delim : ""));
                }
+               if (DO_BIC(BIC_Module)) {
+                       if (c)
+                               outp += sprintf(outp, "%s0x%x", (printed++ ? delim : ""), cpus[t->cpu_id].module_id);
+                       else
+                               outp += sprintf(outp, "%s-", (printed++ ? delim : ""));
+               }
                if (DO_BIC(BIC_Core)) {
                        if (c)
                                outp += sprintf(outp, "%s0x%x", (printed++ ? delim : ""), cpus[t->cpu_id].core_id);
@@ -6079,6 +6095,11 @@ int get_l3_id(int cpu)
        return parse_int_file("/sys/devices/system/cpu/cpu%d/cache/index3/id", cpu);
 }
 
+int get_module_id(int cpu)
+{
+       return parse_int_file("/sys/devices/system/cpu/cpu%d/topology/cluster_id", cpu);
+}
+
 int get_core_id(int cpu)
 {
        return parse_int_file("/sys/devices/system/cpu/cpu%d/topology/core_id", cpu);
@@ -9641,6 +9662,7 @@ void topology_probe(bool startup)
         * For online cpus
         * find max_core_id, max_package_id, num_cores (per system)
         */
+       topo.min_module_id = 0x7FFFFFFF;
        for (i = 0; i <= topo.max_cpu_num; ++i) {
                int siblings;
 
@@ -9672,6 +9694,13 @@ void topology_probe(bool startup)
                if (cpus[i].physical_node_id > topo.max_node_num)
                        topo.max_node_num = cpus[i].physical_node_id;
 
+               /* get module information */
+               cpus[i].module_id = get_module_id(i);
+               if (cpus[i].module_id > topo.max_module_id)
+                       topo.max_module_id = cpus[i].module_id;
+               if (cpus[i].module_id < topo.min_module_id)
+                       topo.min_module_id = cpus[i].module_id;
+
                /* get core information */
                cpus[i].core_id = get_core_id(i);
                if (cpus[i].core_id > max_core_id)
@@ -9693,6 +9722,11 @@ void topology_probe(bool startup)
        if (!summary_only)
                BIC_PRESENT(BIC_Core);
 
+       if (debug > 1)
+               fprintf(outf, "min_module_id %d max_module_id %d\n", topo.min_module_id, topo.max_module_id);
+       if (!summary_only && (topo.min_module_id != topo.max_module_id))
+               BIC_PRESENT(BIC_Module);
+
        topo.num_die = topo.max_die_id + 1;
        if (debug > 1)
                fprintf(outf, "max_die_id %d, sizing for %d die\n", topo.max_die_id, topo.num_die);
@@ -9727,9 +9761,9 @@ void topology_probe(bool startup)
                if (cpu_is_not_present(i))
                        continue;
                fprintf(outf,
-                       "cpu %d pkg %d die %d l3 %d node %d lnode %d core %d ht_id %d",
+                       "cpu %d pkg %d die %d l3 %d node %d lnode %d module 0x%x core %d ht_id %d",
                        i, cpus[i].package_id, cpus[i].die_id, cpus[i].l3_id,
-                       cpus[i].physical_node_id, cpus[i].logical_node_id, cpus[i].core_id, cpus[i].ht_id);
+                       cpus[i].physical_node_id, cpus[i].logical_node_id, cpus[i].module_id, cpus[i].core_id, cpus[i].ht_id);
                fprintf(outf, " siblings");
                for (ht_id = 0; ht_id <= MAX_HT_ID; ++ht_id)
                        fprintf(outf, " %d", cpus[i].ht_sibling_cpu_id[ht_id]);