mirror of
https://github.com/torvalds/linux.git
synced 2026-03-08 10:05:08 +01:00
tools/power turbostat: Print "nan" for out of range percentages
Sometimes counters return junk. For the cases where values > 100% is invalid, print "nan". Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown
parent
951845d51d
commit
8808292799
1 changed files with 53 additions and 39 deletions
|
|
@ -2999,6 +2999,25 @@ void print_header(char *delim)
|
|||
outp += sprintf(outp, "\n");
|
||||
}
|
||||
|
||||
/*
|
||||
* pct()
|
||||
*
|
||||
* If absolute value is < 1.1, return percentage
|
||||
* otherwise, return nan
|
||||
*
|
||||
* return value is appropriate for printing percentages with %f
|
||||
* while flagging some obvious erroneous values.
|
||||
*/
|
||||
double pct(double d)
|
||||
{
|
||||
|
||||
double abs = fabs(d);
|
||||
|
||||
if (abs < 1.10)
|
||||
return (100.0 * d);
|
||||
return nan("");
|
||||
}
|
||||
|
||||
int dump_counters(PER_THREAD_PARAMS)
|
||||
{
|
||||
int i;
|
||||
|
|
@ -3026,7 +3045,7 @@ int dump_counters(PER_THREAD_PARAMS)
|
|||
|
||||
outp += sprintf(outp, "LLC refs: %lld", t->llc.references);
|
||||
outp += sprintf(outp, "LLC miss: %lld", t->llc.misses);
|
||||
outp += sprintf(outp, "LLC Hit%%: %.2f", 100.0 * (t->llc.references - t->llc.misses) / t->llc.references);
|
||||
outp += sprintf(outp, "LLC Hit%%: %.2f", pct((t->llc.references - t->llc.misses) / t->llc.references));
|
||||
|
||||
for (i = 0, mp = sys.tp; mp; i++, mp = mp->next) {
|
||||
outp +=
|
||||
|
|
@ -3248,7 +3267,7 @@ int format_counters(PER_THREAD_PARAMS)
|
|||
outp += sprintf(outp, "%s%.0f", (printed++ ? delim : ""), 1.0 / units * t->aperf / interval_float);
|
||||
|
||||
if (DO_BIC(BIC_Busy))
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), 100.0 * t->mperf / tsc);
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(t->mperf / tsc));
|
||||
|
||||
if (DO_BIC(BIC_Bzy_MHz)) {
|
||||
if (has_base_hz)
|
||||
|
|
@ -3291,7 +3310,7 @@ int format_counters(PER_THREAD_PARAMS)
|
|||
outp += sprintf(outp, "%s%.0f", (printed++ ? delim : ""), t->llc.references / interval_float / 1000);
|
||||
|
||||
if (DO_BIC(BIC_LLC_HIT))
|
||||
outp += sprintf(outp, fmt8, (printed++ ? delim : ""), 100.0 * (t->llc.references - t->llc.misses) / t->llc.references);
|
||||
outp += sprintf(outp, fmt8, (printed++ ? delim : ""), pct((t->llc.references - t->llc.misses) / t->llc.references));
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -3305,7 +3324,7 @@ int format_counters(PER_THREAD_PARAMS)
|
|||
if (mp->type == COUNTER_USEC)
|
||||
outp += print_float_value(&printed, delim, t->counter[i] / interval_float / 10000);
|
||||
else
|
||||
outp += print_float_value(&printed, delim, 100.0 * t->counter[i] / tsc);
|
||||
outp += print_float_value(&printed, delim, pct(t->counter[i] / tsc));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -3319,7 +3338,7 @@ int format_counters(PER_THREAD_PARAMS)
|
|||
if (pp->type == COUNTER_USEC)
|
||||
outp += print_float_value(&printed, delim, t->perf_counter[i] / interval_float / 10000);
|
||||
else
|
||||
outp += print_float_value(&printed, delim, 100.0 * t->perf_counter[i] / tsc);
|
||||
outp += print_float_value(&printed, delim, pct(t->perf_counter[i] / tsc));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -3333,34 +3352,34 @@ int format_counters(PER_THREAD_PARAMS)
|
|||
break;
|
||||
|
||||
case PMT_TYPE_XTAL_TIME:
|
||||
value_converted = 100.0 * value_raw / crystal_hz / interval_float;
|
||||
value_converted = pct(value_raw / crystal_hz / interval_float);
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), value_converted);
|
||||
break;
|
||||
|
||||
case PMT_TYPE_TCORE_CLOCK:
|
||||
value_converted = 100.0 * value_raw / tcore_clock_freq_hz / interval_float;
|
||||
value_converted = pct(value_raw / tcore_clock_freq_hz / interval_float);
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), value_converted);
|
||||
}
|
||||
}
|
||||
|
||||
/* C1 */
|
||||
if (DO_BIC(BIC_CPU_c1))
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), 100.0 * t->c1 / tsc);
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(t->c1 / tsc));
|
||||
|
||||
/* print per-core data only for 1st thread in core */
|
||||
if (!is_cpu_first_thread_in_core(t, c))
|
||||
goto done;
|
||||
|
||||
if (DO_BIC(BIC_CPU_c3))
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), 100.0 * c->c3 / tsc);
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(c->c3 / tsc));
|
||||
if (DO_BIC(BIC_CPU_c6))
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), 100.0 * c->c6 / tsc);
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(c->c6 / tsc));
|
||||
if (DO_BIC(BIC_CPU_c7))
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), 100.0 * c->c7 / tsc);
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(c->c7 / tsc));
|
||||
|
||||
/* Mod%c6 */
|
||||
if (DO_BIC(BIC_Mod_c6))
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), 100.0 * c->mc6_us / tsc);
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(c->mc6_us / tsc));
|
||||
|
||||
if (DO_BIC(BIC_CoreTmp))
|
||||
outp += sprintf(outp, "%s%d", (printed++ ? delim : ""), c->core_temp_c);
|
||||
|
|
@ -3376,7 +3395,7 @@ int format_counters(PER_THREAD_PARAMS)
|
|||
else if (mp->format == FORMAT_DELTA || mp->format == FORMAT_AVERAGE)
|
||||
outp += print_decimal_value(mp->width, &printed, delim, c->counter[i]);
|
||||
else if (mp->format == FORMAT_PERCENT)
|
||||
outp += print_float_value(&printed, delim, 100.0 * c->counter[i] / tsc);
|
||||
outp += print_float_value(&printed, delim, pct(c->counter[i] / tsc));
|
||||
}
|
||||
|
||||
/* Added perf Core counters */
|
||||
|
|
@ -3386,7 +3405,7 @@ int format_counters(PER_THREAD_PARAMS)
|
|||
else if (pp->format == FORMAT_DELTA || mp->format == FORMAT_AVERAGE)
|
||||
outp += print_decimal_value(pp->width, &printed, delim, c->perf_counter[i]);
|
||||
else if (pp->format == FORMAT_PERCENT)
|
||||
outp += print_float_value(&printed, delim, 100.0 * c->perf_counter[i] / tsc);
|
||||
outp += print_float_value(&printed, delim, pct(c->perf_counter[i] / tsc));
|
||||
}
|
||||
|
||||
/* Added PMT Core counters */
|
||||
|
|
@ -3399,12 +3418,12 @@ int format_counters(PER_THREAD_PARAMS)
|
|||
break;
|
||||
|
||||
case PMT_TYPE_XTAL_TIME:
|
||||
value_converted = 100.0 * value_raw / crystal_hz / interval_float;
|
||||
value_converted = pct(value_raw / crystal_hz / interval_float);
|
||||
outp += print_float_value(&printed, delim, value_converted);
|
||||
break;
|
||||
|
||||
case PMT_TYPE_TCORE_CLOCK:
|
||||
value_converted = 100.0 * value_raw / tcore_clock_freq_hz / interval_float;
|
||||
value_converted = pct(value_raw / tcore_clock_freq_hz / interval_float);
|
||||
outp += print_float_value(&printed, delim, value_converted);
|
||||
}
|
||||
}
|
||||
|
|
@ -3463,46 +3482,41 @@ int format_counters(PER_THREAD_PARAMS)
|
|||
|
||||
/* Totl%C0, Any%C0 GFX%C0 CPUGFX% */
|
||||
if (DO_BIC(BIC_Totl_c0))
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), 100.0 * p->pkg_wtd_core_c0 / tsc);
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), 100 * p->pkg_wtd_core_c0 / tsc); /* can exceed 100% */
|
||||
if (DO_BIC(BIC_Any_c0))
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), 100.0 * p->pkg_any_core_c0 / tsc);
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->pkg_any_core_c0 / tsc));
|
||||
if (DO_BIC(BIC_GFX_c0))
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), 100.0 * p->pkg_any_gfxe_c0 / tsc);
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->pkg_any_gfxe_c0 / tsc));
|
||||
if (DO_BIC(BIC_CPUGFX))
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), 100.0 * p->pkg_both_core_gfxe_c0 / tsc);
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->pkg_both_core_gfxe_c0 / tsc));
|
||||
|
||||
if (DO_BIC(BIC_Pkgpc2))
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), 100.0 * p->pc2 / tsc);
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->pc2 / tsc));
|
||||
if (DO_BIC(BIC_Pkgpc3))
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), 100.0 * p->pc3 / tsc);
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->pc3 / tsc));
|
||||
if (DO_BIC(BIC_Pkgpc6))
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), 100.0 * p->pc6 / tsc);
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->pc6 / tsc));
|
||||
if (DO_BIC(BIC_Pkgpc7))
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), 100.0 * p->pc7 / tsc);
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->pc7 / tsc));
|
||||
if (DO_BIC(BIC_Pkgpc8))
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), 100.0 * p->pc8 / tsc);
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->pc8 / tsc));
|
||||
if (DO_BIC(BIC_Pkgpc9))
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), 100.0 * p->pc9 / tsc);
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->pc9 / tsc));
|
||||
if (DO_BIC(BIC_Pkgpc10))
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), 100.0 * p->pc10 / tsc);
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->pc10 / tsc));
|
||||
|
||||
if (DO_BIC(BIC_Diec6))
|
||||
outp +=
|
||||
sprintf(outp, "%s%.2f", (printed++ ? delim : ""), 100.0 * p->die_c6 / crystal_hz / interval_float);
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->die_c6 / crystal_hz / interval_float));
|
||||
|
||||
if (DO_BIC(BIC_CPU_LPI)) {
|
||||
if (p->cpu_lpi >= 0)
|
||||
outp +=
|
||||
sprintf(outp, "%s%.2f", (printed++ ? delim : ""),
|
||||
100.0 * p->cpu_lpi / 1000000.0 / interval_float);
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->cpu_lpi / 1000000.0 / interval_float));
|
||||
else
|
||||
outp += sprintf(outp, "%s(neg)", (printed++ ? delim : ""));
|
||||
}
|
||||
if (DO_BIC(BIC_SYS_LPI)) {
|
||||
if (p->sys_lpi >= 0)
|
||||
outp +=
|
||||
sprintf(outp, "%s%.2f", (printed++ ? delim : ""),
|
||||
100.0 * p->sys_lpi / 1000000.0 / interval_float);
|
||||
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), pct(p->sys_lpi / 1000000.0 / interval_float));
|
||||
else
|
||||
outp += sprintf(outp, "%s(neg)", (printed++ ? delim : ""));
|
||||
}
|
||||
|
|
@ -3556,7 +3570,7 @@ int format_counters(PER_THREAD_PARAMS)
|
|||
else if (mp->format == FORMAT_DELTA || mp->format == FORMAT_AVERAGE)
|
||||
outp += print_decimal_value(mp->width, &printed, delim, p->counter[i]);
|
||||
else if (mp->format == FORMAT_PERCENT)
|
||||
outp += print_float_value(&printed, delim, 100.0 * p->counter[i] / tsc);
|
||||
outp += print_float_value(&printed, delim, pct(p->counter[i] / tsc));
|
||||
}
|
||||
|
||||
/* Added perf Package Counters */
|
||||
|
|
@ -3569,7 +3583,7 @@ int format_counters(PER_THREAD_PARAMS)
|
|||
else if (pp->format == FORMAT_DELTA || mp->format == FORMAT_AVERAGE)
|
||||
outp += print_decimal_value(pp->width, &printed, delim, p->perf_counter[i]);
|
||||
else if (pp->format == FORMAT_PERCENT)
|
||||
outp += print_float_value(&printed, delim, 100.0 * p->perf_counter[i] / tsc);
|
||||
outp += print_float_value(&printed, delim, pct(p->perf_counter[i] / tsc));
|
||||
}
|
||||
|
||||
/* Added PMT Package Counters */
|
||||
|
|
@ -3582,12 +3596,12 @@ int format_counters(PER_THREAD_PARAMS)
|
|||
break;
|
||||
|
||||
case PMT_TYPE_XTAL_TIME:
|
||||
value_converted = 100.0 * value_raw / crystal_hz / interval_float;
|
||||
value_converted = pct(value_raw / crystal_hz / interval_float);
|
||||
outp += print_float_value(&printed, delim, value_converted);
|
||||
break;
|
||||
|
||||
case PMT_TYPE_TCORE_CLOCK:
|
||||
value_converted = 100.0 * value_raw / tcore_clock_freq_hz / interval_float;
|
||||
value_converted = pct(value_raw / tcore_clock_freq_hz / interval_float);
|
||||
outp += print_float_value(&printed, delim, value_converted);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue