|
@@ -98,6 +98,12 @@ unsigned int crystal_hz;
|
|
unsigned long long tsc_hz;
|
|
unsigned long long tsc_hz;
|
|
int base_cpu;
|
|
int base_cpu;
|
|
double discover_bclk(unsigned int family, unsigned int model);
|
|
double discover_bclk(unsigned int family, unsigned int model);
|
|
|
|
+unsigned int has_hwp; /* IA32_PM_ENABLE, IA32_HWP_CAPABILITIES */
|
|
|
|
+ /* IA32_HWP_REQUEST, IA32_HWP_STATUS */
|
|
|
|
+unsigned int has_hwp_notify; /* IA32_HWP_INTERRUPT */
|
|
|
|
+unsigned int has_hwp_activity_window; /* IA32_HWP_REQUEST[bits 41:32] */
|
|
|
|
+unsigned int has_hwp_epp; /* IA32_HWP_REQUEST[bits 31:24] */
|
|
|
|
+unsigned int has_hwp_pkg; /* IA32_HWP_REQUEST_PKG */
|
|
|
|
|
|
#define RAPL_PKG (1 << 0)
|
|
#define RAPL_PKG (1 << 0)
|
|
/* 0x610 MSR_PKG_POWER_LIMIT */
|
|
/* 0x610 MSR_PKG_POWER_LIMIT */
|
|
@@ -2041,6 +2047,97 @@ int print_epb(struct thread_data *t, struct core_data *c, struct pkg_data *p)
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
+/*
|
|
|
|
+ * print_hwp()
|
|
|
|
+ * Decode the MSR_HWP_CAPABILITIES
|
|
|
|
+ */
|
|
|
|
+int print_hwp(struct thread_data *t, struct core_data *c, struct pkg_data *p)
|
|
|
|
+{
|
|
|
|
+ unsigned long long msr;
|
|
|
|
+ int cpu;
|
|
|
|
+
|
|
|
|
+ if (!has_hwp)
|
|
|
|
+ return 0;
|
|
|
|
+
|
|
|
|
+ cpu = t->cpu_id;
|
|
|
|
+
|
|
|
|
+ /* MSR_HWP_CAPABILITIES is per-package */
|
|
|
|
+ if (!(t->flags & CPU_IS_FIRST_THREAD_IN_CORE) || !(t->flags & CPU_IS_FIRST_CORE_IN_PACKAGE))
|
|
|
|
+ return 0;
|
|
|
|
+
|
|
|
|
+ if (cpu_migrate(cpu)) {
|
|
|
|
+ fprintf(stderr, "Could not migrate to CPU %d\n", cpu);
|
|
|
|
+ return -1;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (get_msr(cpu, MSR_PM_ENABLE, &msr))
|
|
|
|
+ return 0;
|
|
|
|
+
|
|
|
|
+ fprintf(stderr, "cpu%d: MSR_PM_ENABLE: 0x%08llx (%sHWP)\n",
|
|
|
|
+ cpu, msr, (msr & (1 << 0)) ? "" : "No-");
|
|
|
|
+
|
|
|
|
+ /* MSR_PM_ENABLE[1] == 1 if HWP is enabled and MSRs visible */
|
|
|
|
+ if ((msr & (1 << 0)) == 0)
|
|
|
|
+ return 0;
|
|
|
|
+
|
|
|
|
+ if (get_msr(cpu, MSR_HWP_CAPABILITIES, &msr))
|
|
|
|
+ return 0;
|
|
|
|
+
|
|
|
|
+ fprintf(stderr, "cpu%d: MSR_HWP_CAPABILITIES: 0x%08llx "
|
|
|
|
+ "(high 0x%x guar 0x%x eff 0x%x low 0x%x)\n",
|
|
|
|
+ cpu, msr,
|
|
|
|
+ (unsigned int)HWP_HIGHEST_PERF(msr),
|
|
|
|
+ (unsigned int)HWP_GUARANTEED_PERF(msr),
|
|
|
|
+ (unsigned int)HWP_MOSTEFFICIENT_PERF(msr),
|
|
|
|
+ (unsigned int)HWP_LOWEST_PERF(msr));
|
|
|
|
+
|
|
|
|
+ if (get_msr(cpu, MSR_HWP_REQUEST, &msr))
|
|
|
|
+ return 0;
|
|
|
|
+
|
|
|
|
+ fprintf(stderr, "cpu%d: MSR_HWP_REQUEST: 0x%08llx "
|
|
|
|
+ "(min 0x%x max 0x%x des 0x%x epp 0x%x window 0x%x pkg 0x%x)\n",
|
|
|
|
+ cpu, msr,
|
|
|
|
+ (unsigned int)(((msr) >> 0) & 0xff),
|
|
|
|
+ (unsigned int)(((msr) >> 8) & 0xff),
|
|
|
|
+ (unsigned int)(((msr) >> 16) & 0xff),
|
|
|
|
+ (unsigned int)(((msr) >> 24) & 0xff),
|
|
|
|
+ (unsigned int)(((msr) >> 32) & 0xff3),
|
|
|
|
+ (unsigned int)(((msr) >> 42) & 0x1));
|
|
|
|
+
|
|
|
|
+ if (has_hwp_pkg) {
|
|
|
|
+ if (get_msr(cpu, MSR_HWP_REQUEST_PKG, &msr))
|
|
|
|
+ return 0;
|
|
|
|
+
|
|
|
|
+ fprintf(stderr, "cpu%d: MSR_HWP_REQUEST_PKG: 0x%08llx "
|
|
|
|
+ "(min 0x%x max 0x%x des 0x%x epp 0x%x window 0x%x)\n",
|
|
|
|
+ cpu, msr,
|
|
|
|
+ (unsigned int)(((msr) >> 0) & 0xff),
|
|
|
|
+ (unsigned int)(((msr) >> 8) & 0xff),
|
|
|
|
+ (unsigned int)(((msr) >> 16) & 0xff),
|
|
|
|
+ (unsigned int)(((msr) >> 24) & 0xff),
|
|
|
|
+ (unsigned int)(((msr) >> 32) & 0xff3));
|
|
|
|
+ }
|
|
|
|
+ if (has_hwp_notify) {
|
|
|
|
+ if (get_msr(cpu, MSR_HWP_INTERRUPT, &msr))
|
|
|
|
+ return 0;
|
|
|
|
+
|
|
|
|
+ fprintf(stderr, "cpu%d: MSR_HWP_INTERRUPT: 0x%08llx "
|
|
|
|
+ "(%s_Guaranteed_Perf_Change, %s_Excursion_Min)\n",
|
|
|
|
+ cpu, msr,
|
|
|
|
+ ((msr) & 0x1) ? "EN" : "Dis",
|
|
|
|
+ ((msr) & 0x2) ? "EN" : "Dis");
|
|
|
|
+ }
|
|
|
|
+ if (get_msr(cpu, MSR_HWP_STATUS, &msr))
|
|
|
|
+ return 0;
|
|
|
|
+
|
|
|
|
+ fprintf(stderr, "cpu%d: MSR_HWP_STATUS: 0x%08llx "
|
|
|
|
+ "(%sGuaranteed_Perf_Change, %sExcursion_Min)\n",
|
|
|
|
+ cpu, msr,
|
|
|
|
+ ((msr) & 0x1) ? "" : "No-",
|
|
|
|
+ ((msr) & 0x2) ? "" : "No-");
|
|
|
|
+
|
|
|
|
+ return 0;
|
|
|
|
+}
|
|
|
|
|
|
/*
|
|
/*
|
|
* print_perf_limit()
|
|
* print_perf_limit()
|
|
@@ -2686,6 +2783,7 @@ void decode_misc_enable_msr(void)
|
|
msr & (1 << 18) ? "MONITOR" : "");
|
|
msr & (1 << 18) ? "MONITOR" : "");
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
void process_cpuid()
|
|
void process_cpuid()
|
|
{
|
|
{
|
|
unsigned int eax, ebx, ecx, edx, max_level, max_extended_level;
|
|
unsigned int eax, ebx, ecx, edx, max_level, max_extended_level;
|
|
@@ -2753,14 +2851,25 @@ void process_cpuid()
|
|
has_aperf = ecx & (1 << 0);
|
|
has_aperf = ecx & (1 << 0);
|
|
do_dts = eax & (1 << 0);
|
|
do_dts = eax & (1 << 0);
|
|
do_ptm = eax & (1 << 6);
|
|
do_ptm = eax & (1 << 6);
|
|
|
|
+ has_hwp = eax & (1 << 7);
|
|
|
|
+ has_hwp_notify = eax & (1 << 8);
|
|
|
|
+ has_hwp_activity_window = eax & (1 << 9);
|
|
|
|
+ has_hwp_epp = eax & (1 << 10);
|
|
|
|
+ has_hwp_pkg = eax & (1 << 11);
|
|
has_epb = ecx & (1 << 3);
|
|
has_epb = ecx & (1 << 3);
|
|
|
|
|
|
if (debug)
|
|
if (debug)
|
|
- fprintf(stderr, "CPUID(6): %sAPERF, %sDTS, %sPTM, %sEPB\n",
|
|
|
|
- has_aperf ? "" : "No ",
|
|
|
|
- do_dts ? "" : "No ",
|
|
|
|
- do_ptm ? "" : "No ",
|
|
|
|
- has_epb ? "" : "No ");
|
|
|
|
|
|
+ fprintf(stderr, "CPUID(6): %sAPERF, %sDTS, %sPTM, %sHWP, "
|
|
|
|
+ "%sHWPnotify, %sHWPwindow, %sHWPepp, %sHWPpkg, %sEPB\n",
|
|
|
|
+ has_aperf ? "" : "No-",
|
|
|
|
+ do_dts ? "" : "No-",
|
|
|
|
+ do_ptm ? "" : "No-",
|
|
|
|
+ has_hwp ? "" : "No-",
|
|
|
|
+ has_hwp_notify ? "" : "No-",
|
|
|
|
+ has_hwp_activity_window ? "" : "No-",
|
|
|
|
+ has_hwp_epp ? "" : "No-",
|
|
|
|
+ has_hwp_pkg ? "" : "No-",
|
|
|
|
+ has_epb ? "" : "No-");
|
|
|
|
|
|
if (debug)
|
|
if (debug)
|
|
decode_misc_enable_msr();
|
|
decode_misc_enable_msr();
|
|
@@ -3087,6 +3196,9 @@ void turbostat_init()
|
|
process_cpuid();
|
|
process_cpuid();
|
|
|
|
|
|
|
|
|
|
|
|
+ if (debug)
|
|
|
|
+ for_all_cpus(print_hwp, ODD_COUNTERS);
|
|
|
|
+
|
|
if (debug)
|
|
if (debug)
|
|
for_all_cpus(print_epb, ODD_COUNTERS);
|
|
for_all_cpus(print_epb, ODD_COUNTERS);
|
|
|
|
|
|
@@ -3164,7 +3276,7 @@ int get_and_dump_counters(void)
|
|
}
|
|
}
|
|
|
|
|
|
void print_version() {
|
|
void print_version() {
|
|
- fprintf(stderr, "turbostat version 4.9 22 Nov, 2015"
|
|
|
|
|
|
+ fprintf(stderr, "turbostat version 4.10 10 Dec, 2015"
|
|
" - Len Brown <lenb@kernel.org>\n");
|
|
" - Len Brown <lenb@kernel.org>\n");
|
|
}
|
|
}
|
|
|
|
|