Commit 2d2ccd57 authored by Len Brown's avatar Len Brown
Browse files

tools/power turbostat: enhance -D (debug counter dump) output 



Eliminate redundant debug output for core and package scope counters.

Include name and path for all "ADDED" counters.

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

tools/power/x86/turbostat/turbostat.c

+11 −5
Original line number Diff line number Diff line
@@ -1673,11 +1673,13 @@ int dump_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p 
			outp += sprintf(outp, "SMI: %d\n", t->smi_count);



		for (i = 0, mp = sys.tp; mp; i++, mp = mp->next) {

			outp += sprintf(outp, "tADDED [%d] msr0x%x: %08llX\n", i, mp->msr_num, t->counter[i]);

			outp +=

			    sprintf(outp, "tADDED [%d] %8s msr0x%x: %08llX %s\n", i, mp->name, mp->msr_num,

				    t->counter[i], mp->path);

		}

	}



	if (c) {

	if (c && is_cpu_first_thread_in_core(t, c, p)) {

		outp += sprintf(outp, "core: %d\n", c->core_id);

		outp += sprintf(outp, "c3: %016llX\n", c->c3);

		outp += sprintf(outp, "c6: %016llX\n", c->c6);
@@ -1687,12 +1689,14 @@ int dump_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p 
		outp += sprintf(outp, "Joules: %0X\n", c->core_energy);



		for (i = 0, mp = sys.cp; mp; i++, mp = mp->next) {

			outp += sprintf(outp, "cADDED [%d] msr0x%x: %08llX\n", i, mp->msr_num, c->counter[i]);

			outp +=

			    sprintf(outp, "cADDED [%d] %8s msr0x%x: %08llX %s\n", i, mp->name, mp->msr_num,

				    c->counter[i], mp->path);

		}

		outp += sprintf(outp, "mc6_us: %016llX\n", c->mc6_us);

	}



	if (p) {

	if (p && is_cpu_first_core_in_package(t, c, p)) {

		outp += sprintf(outp, "package: %d\n", p->package_id);



		outp += sprintf(outp, "Weighted cores: %016llX\n", p->pkg_wtd_core_c0);
@@ -1721,7 +1725,9 @@ int dump_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p 
		outp += sprintf(outp, "PTM: %dC\n", p->pkg_temp_c);



		for (i = 0, mp = sys.pp; mp; i++, mp = mp->next) {

			outp += sprintf(outp, "pADDED [%d] msr0x%x: %08llX\n", i, mp->msr_num, p->counter[i]);

			outp +=

			    sprintf(outp, "pADDED [%d] %8s msr0x%x: %08llX %s\n", i, mp->name, mp->msr_num,

				    p->counter[i], mp->path);

		}

	}