Commit f2c1dba3 authored by Len Brown's avatar Len Brown
Browse files

tools/power/turbostat: bugfix "--show IPC" 



turbostat --show IPC

displays "inf" for the IPC column

turbostat was missing the explicit dependency of IPC on APERF,
and thus neglected to collect APERF when only IPC was requested.

typcial use:

turbostat --quiet --show CPU,IPC

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 956dbd3d

tools/power/x86/turbostat/turbostat.c

+4 −2
Original line number Diff line number Diff line
@@ -2202,7 +2202,8 @@ int delta_thread(struct thread_data *new, struct thread_data *old, struct core_d 


	old->c1 = new->c1 - old->c1;



	if (DO_BIC(BIC_Avg_MHz) || DO_BIC(BIC_Busy) || DO_BIC(BIC_Bzy_MHz) || soft_c1_residency_display(BIC_Avg_MHz)) {

	if (DO_BIC(BIC_Avg_MHz) || DO_BIC(BIC_Busy) || DO_BIC(BIC_Bzy_MHz) || DO_BIC(BIC_IPC)

	    || soft_c1_residency_display(BIC_Avg_MHz)) {

		if ((new->aperf > old->aperf) && (new->mperf > old->mperf)) {

			old->aperf = new->aperf - old->aperf;

			old->mperf = new->mperf - old->mperf;
@@ -2724,7 +2725,8 @@ int get_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p) 
retry:

	t->tsc = rdtsc();	/* we are running on local CPU of interest */



	if (DO_BIC(BIC_Avg_MHz) || DO_BIC(BIC_Busy) || DO_BIC(BIC_Bzy_MHz) || soft_c1_residency_display(BIC_Avg_MHz)) {

	if (DO_BIC(BIC_Avg_MHz) || DO_BIC(BIC_Busy) || DO_BIC(BIC_Bzy_MHz) || DO_BIC(BIC_IPC)

	    || soft_c1_residency_display(BIC_Avg_MHz)) {

		unsigned long long tsc_before, tsc_between, tsc_after, aperf_time, mperf_time;



		/*