Commit 9972d5d8 authored by Chen Yu's avatar Chen Yu Committed by Len Brown
Browse files

tools/power turbostat: Enable accumulate RAPL display 



Enable the accumulated RAPL display by default.

Signed-off-by: default avatarChen Yu <yu.c.chen@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 87e15da9

tools/power/x86/turbostat/turbostat.c

+16 −22
Original line number Diff line number Diff line
@@ -1169,14 +1169,7 @@ int format_counters(struct thread_data *t, struct core_data *c, 
		}

	}



	/*

	 * If measurement interval exceeds minimum RAPL Joule Counter range,

	 * indicate that results are suspect by printing "**" in fraction place.

	 */

	if (interval_float < rapl_joule_counter_range)

	fmt8 = "%s%.2f";

	else

		fmt8 = "%6.0f**";



	if (DO_BIC(BIC_CorWatt) && (do_rapl & RAPL_PER_CORE_ENERGY))

		outp += sprintf(outp, fmt8, (printed++ ? delim : ""), c->core_energy * rapl_energy_units / interval_float);
@@ -2069,39 +2062,39 @@ int get_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p) 
		p->sys_lpi = cpuidle_cur_sys_lpi_us;



	if (do_rapl & RAPL_PKG) {

		if (get_msr(cpu, MSR_PKG_ENERGY_STATUS, &msr))

		if (get_msr_sum(cpu, MSR_PKG_ENERGY_STATUS, &msr))

			return -13;

		p->energy_pkg = msr & 0xFFFFFFFF;

		p->energy_pkg = msr;

	}

	if (do_rapl & RAPL_CORES_ENERGY_STATUS) {

		if (get_msr(cpu, MSR_PP0_ENERGY_STATUS, &msr))

		if (get_msr_sum(cpu, MSR_PP0_ENERGY_STATUS, &msr))

			return -14;

		p->energy_cores = msr & 0xFFFFFFFF;

		p->energy_cores = msr;

	}

	if (do_rapl & RAPL_DRAM) {

		if (get_msr(cpu, MSR_DRAM_ENERGY_STATUS, &msr))

		if (get_msr_sum(cpu, MSR_DRAM_ENERGY_STATUS, &msr))

			return -15;

		p->energy_dram = msr & 0xFFFFFFFF;

		p->energy_dram = msr;

	}

	if (do_rapl & RAPL_GFX) {

		if (get_msr(cpu, MSR_PP1_ENERGY_STATUS, &msr))

		if (get_msr_sum(cpu, MSR_PP1_ENERGY_STATUS, &msr))

			return -16;

		p->energy_gfx = msr & 0xFFFFFFFF;

		p->energy_gfx = msr;

	}

	if (do_rapl & RAPL_PKG_PERF_STATUS) {

		if (get_msr(cpu, MSR_PKG_PERF_STATUS, &msr))

		if (get_msr_sum(cpu, MSR_PKG_PERF_STATUS, &msr))

			return -16;

		p->rapl_pkg_perf_status = msr & 0xFFFFFFFF;

		p->rapl_pkg_perf_status = msr;

	}

	if (do_rapl & RAPL_DRAM_PERF_STATUS) {

		if (get_msr(cpu, MSR_DRAM_PERF_STATUS, &msr))

		if (get_msr_sum(cpu, MSR_DRAM_PERF_STATUS, &msr))

			return -16;

		p->rapl_dram_perf_status = msr & 0xFFFFFFFF;

		p->rapl_dram_perf_status = msr;

	}

	if (do_rapl & RAPL_AMD_F17H) {

		if (get_msr(cpu, MSR_PKG_ENERGY_STAT, &msr))

		if (get_msr_sum(cpu, MSR_PKG_ENERGY_STAT, &msr))

			return -13;

		p->energy_pkg = msr & 0xFFFFFFFF;

		p->energy_pkg = msr;

	}

	if (DO_BIC(BIC_PkgTmp)) {

		if (get_msr(cpu, MSR_IA32_PACKAGE_THERM_STATUS, &msr))
@@ -6101,6 +6094,7 @@ int main(int argc, char **argv) 
		return 0;

	}



	msr_sum_record();

	/*

	 * if any params left, it must be a command to fork

	 */