Skip to content

L
linux
Commit 0de6c0df authored by Len Brown's avatar Len Brown
Browse files
Options

tools/power turbostat: use wide columns to display large numbers 

When a counter overlfows 7 columns, it shifts the remaining
columns to the right, so they no longer line up under
their column header.

Update turbostat to dectect when it is handling large
numbers, and switch to wider columns where, necessary.
Reported-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent c8ade361
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 13 deletions
tools/power/x86/turbostat/turbostat.c
View file @ 0de6c0df
...@@ -50,6 +50,7 @@ int *fd_percpu; ...@@ -50,6 +50,7 @@ int *fd_percpu;
struct timespec interval_ts = {5, 0}; struct timespec interval_ts = {5, 0};
unsigned int debug; unsigned int debug;
unsigned int quiet; unsigned int quiet;
unsigned int sums_need_wide_columns;
unsigned int rapl_joules; unsigned int rapl_joules;
unsigned int summary_only; unsigned int summary_only;
unsigned int list_header_only; unsigned int list_header_only;
...@@ -154,7 +155,7 @@ struct thread_data { ...@@ -154,7 +155,7 @@ struct thread_data {
unsigned long long aperf; unsigned long long aperf;
unsigned long long mperf; unsigned long long mperf;
unsigned long long c1; unsigned long long c1;
unsigned int irq_count; unsigned long long irq_count;
unsigned int smi_count; unsigned int smi_count;
unsigned int cpu_id; unsigned int cpu_id;
unsigned int flags; unsigned int flags;
...@@ -489,8 +490,13 @@ void print_header(char *delim) ...@@ -489,8 +490,13 @@ void print_header(char *delim)
if (DO_BIC(BIC_TSC_MHz)) if (DO_BIC(BIC_TSC_MHz))
outp += sprintf(outp, "%sTSC_MHz", delim); outp += sprintf(outp, "%sTSC_MHz", delim);
if (DO_BIC(BIC_IRQ)) if (DO_BIC(BIC_IRQ)) {
outp += sprintf(outp, "%sIRQ", delim); if (sums_need_wide_columns)
outp += sprintf(outp, "%s IRQ", delim);
else
outp += sprintf(outp, "%sIRQ", delim);
}
if (DO_BIC(BIC_SMI)) if (DO_BIC(BIC_SMI))
outp += sprintf(outp, "%sSMI", delim); outp += sprintf(outp, "%sSMI", delim);
...@@ -501,7 +507,10 @@ void print_header(char *delim) ...@@ -501,7 +507,10 @@ void print_header(char *delim)
else else
outp += sprintf(outp, "%s%10.10s", delim, mp->name); outp += sprintf(outp, "%s%10.10s", delim, mp->name);
} else { } else {
outp += sprintf(outp, "%s%s", delim, mp->name); if ((mp->type == COUNTER_ITEMS) && sums_need_wide_columns)
outp += sprintf(outp, "%s%8s", delim, mp->name);
else
outp += sprintf(outp, "%s%s", delim, mp->name);
} }
} }
...@@ -527,7 +536,10 @@ void print_header(char *delim) ...@@ -527,7 +536,10 @@ void print_header(char *delim)
else else
outp += sprintf(outp, "%s%10.10s", delim, mp->name); outp += sprintf(outp, "%s%10.10s", delim, mp->name);
} else { } else {
outp += sprintf(outp, "%s%s", delim, mp->name); if ((mp->type == COUNTER_ITEMS) && sums_need_wide_columns)
outp += sprintf(outp, "%s%8s", delim, mp->name);
else
outp += sprintf(outp, "%s%s", delim, mp->name);
} }
} }
...@@ -596,7 +608,10 @@ void print_header(char *delim) ...@@ -596,7 +608,10 @@ void print_header(char *delim)
else else
outp += sprintf(outp, "%s%10.10s", delim, mp->name); outp += sprintf(outp, "%s%10.10s", delim, mp->name);
} else { } else {
outp += sprintf(outp, "%s%s", delim, mp->name); if ((mp->type == COUNTER_ITEMS) && sums_need_wide_columns)
outp += sprintf(outp, "%s%8s", delim, mp->name);
else
outp += sprintf(outp, "%s%s", delim, mp->name);
} }
} }
...@@ -620,7 +635,7 @@ int dump_counters(struct thread_data *t, struct core_data *c, ...@@ -620,7 +635,7 @@ int dump_counters(struct thread_data *t, struct core_data *c,
outp += sprintf(outp, "c1: %016llX\n", t->c1); outp += sprintf(outp, "c1: %016llX\n", t->c1);
if (DO_BIC(BIC_IRQ)) if (DO_BIC(BIC_IRQ))
outp += sprintf(outp, "IRQ: %d\n", t->irq_count); outp += sprintf(outp, "IRQ: %lld\n", t->irq_count);
if (DO_BIC(BIC_SMI)) if (DO_BIC(BIC_SMI))
outp += sprintf(outp, "SMI: %d\n", t->smi_count); outp += sprintf(outp, "SMI: %d\n", t->smi_count);
...@@ -755,8 +770,12 @@ int format_counters(struct thread_data *t, struct core_data *c, ...@@ -755,8 +770,12 @@ int format_counters(struct thread_data *t, struct core_data *c,
outp += sprintf(outp, "\t%.0f", 1.0 * t->tsc/units/interval_float); outp += sprintf(outp, "\t%.0f", 1.0 * t->tsc/units/interval_float);
/* IRQ */ /* IRQ */
if (DO_BIC(BIC_IRQ)) if (DO_BIC(BIC_IRQ)) {
outp += sprintf(outp, "\t%d", t->irq_count); if (sums_need_wide_columns)
outp += sprintf(outp, "\t%8lld", t->irq_count);
else
outp += sprintf(outp, "\t%lld", t->irq_count);
}
/* SMI */ /* SMI */
if (DO_BIC(BIC_SMI)) if (DO_BIC(BIC_SMI))
...@@ -770,7 +789,10 @@ int format_counters(struct thread_data *t, struct core_data *c, ...@@ -770,7 +789,10 @@ int format_counters(struct thread_data *t, struct core_data *c,
else else
outp += sprintf(outp, "\t0x%016llx", t->counter[i]); outp += sprintf(outp, "\t0x%016llx", t->counter[i]);
} else if (mp->format == FORMAT_DELTA) { } else if (mp->format == FORMAT_DELTA) {
outp += sprintf(outp, "\t%lld", t->counter[i]); if ((mp->type == COUNTER_ITEMS) && sums_need_wide_columns)
outp += sprintf(outp, "\t%8lld", t->counter[i]);
else
outp += sprintf(outp, "\t%lld", t->counter[i]);
} else if (mp->format == FORMAT_PERCENT) { } else if (mp->format == FORMAT_PERCENT) {
if (mp->type == COUNTER_USEC) if (mp->type == COUNTER_USEC)
outp += sprintf(outp, "\t%.2f", t->counter[i]/interval_float/10000); outp += sprintf(outp, "\t%.2f", t->counter[i]/interval_float/10000);
...@@ -809,7 +831,10 @@ int format_counters(struct thread_data *t, struct core_data *c, ...@@ -809,7 +831,10 @@ int format_counters(struct thread_data *t, struct core_data *c,
else else
outp += sprintf(outp, "\t0x%016llx", c->counter[i]); outp += sprintf(outp, "\t0x%016llx", c->counter[i]);
} else if (mp->format == FORMAT_DELTA) { } else if (mp->format == FORMAT_DELTA) {
outp += sprintf(outp, "\t%lld", c->counter[i]); if ((mp->type == COUNTER_ITEMS) && sums_need_wide_columns)
outp += sprintf(outp, "\t%8lld", c->counter[i]);
else
outp += sprintf(outp, "\t%lld", c->counter[i]);
} else if (mp->format == FORMAT_PERCENT) { } else if (mp->format == FORMAT_PERCENT) {
outp += sprintf(outp, "\t%.2f", 100.0 * c->counter[i]/tsc); outp += sprintf(outp, "\t%.2f", 100.0 * c->counter[i]/tsc);
} }
...@@ -897,7 +922,10 @@ int format_counters(struct thread_data *t, struct core_data *c, ...@@ -897,7 +922,10 @@ int format_counters(struct thread_data *t, struct core_data *c,
else else
outp += sprintf(outp, "\t0x%016llx", p->counter[i]); outp += sprintf(outp, "\t0x%016llx", p->counter[i]);
} else if (mp->format == FORMAT_DELTA) { } else if (mp->format == FORMAT_DELTA) {
outp += sprintf(outp, "\t%lld", p->counter[i]); if ((mp->type == COUNTER_ITEMS) && sums_need_wide_columns)
outp += sprintf(outp, "\t%8lld", p->counter[i]);
else
outp += sprintf(outp, "\t%lld", p->counter[i]);
} else if (mp->format == FORMAT_PERCENT) { } else if (mp->format == FORMAT_PERCENT) {
outp += sprintf(outp, "\t%.2f", 100.0 * p->counter[i]/tsc); outp += sprintf(outp, "\t%.2f", 100.0 * p->counter[i]/tsc);
} }
...@@ -1272,6 +1300,9 @@ void compute_average(struct thread_data *t, struct core_data *c, ...@@ -1272,6 +1300,9 @@ void compute_average(struct thread_data *t, struct core_data *c,
average.threads.mperf /= topo.num_cpus; average.threads.mperf /= topo.num_cpus;
average.threads.c1 /= topo.num_cpus; average.threads.c1 /= topo.num_cpus;
if (average.threads.irq_count > 9999999)
sums_need_wide_columns = 1;
average.cores.c3 /= topo.num_cores; average.cores.c3 /= topo.num_cores;
average.cores.c6 /= topo.num_cores; average.cores.c6 /= topo.num_cores;
average.cores.c7 /= topo.num_cores; average.cores.c7 /= topo.num_cores;
...@@ -1299,18 +1330,29 @@ void compute_average(struct thread_data *t, struct core_data *c, ...@@ -1299,18 +1330,29 @@ void compute_average(struct thread_data *t, struct core_data *c,
for (i = 0, mp = sys.tp; mp; i++, mp = mp->next) { for (i = 0, mp = sys.tp; mp; i++, mp = mp->next) {
if (mp->format == FORMAT_RAW) if (mp->format == FORMAT_RAW)
continue; continue;
if (mp->flags & SYSFS_PERCPU && mp->type == COUNTER_ITEMS) if (mp->type == COUNTER_ITEMS) {
if (average.threads.counter[i] > 9999999)
sums_need_wide_columns = 1;
continue; continue;
}
average.threads.counter[i] /= topo.num_cpus; average.threads.counter[i] /= topo.num_cpus;
} }
for (i = 0, mp = sys.cp; mp; i++, mp = mp->next) { for (i = 0, mp = sys.cp; mp; i++, mp = mp->next) {
if (mp->format == FORMAT_RAW) if (mp->format == FORMAT_RAW)
continue; continue;
if (mp->type == COUNTER_ITEMS) {
if (average.cores.counter[i] > 9999999)
sums_need_wide_columns = 1;
}
average.cores.counter[i] /= topo.num_cores; average.cores.counter[i] /= topo.num_cores;
} }
for (i = 0, mp = sys.pp; mp; i++, mp = mp->next) { for (i = 0, mp = sys.pp; mp; i++, mp = mp->next) {
if (mp->format == FORMAT_RAW) if (mp->format == FORMAT_RAW)
continue; continue;
if (mp->type == COUNTER_ITEMS) {
if (average.packages.counter[i] > 9999999)
sums_need_wide_columns = 1;
}
average.packages.counter[i] /= topo.num_packages; average.packages.counter[i] /= topo.num_packages;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7