Skip to content

L
linux
Commit 86ba263d authored by Zhang Rui's avatar Zhang Rui
Browse files
Options

tools/power/turbostat: Abstract RAPL MSRs support 

Abstract the support for RAPL MSRs.

Delete CPU model checks in rapl_probe_intel().
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
Reviewed-by: default avatarLen Brown <len.brown@intel.com>
parent a98f8860
Show whitespace changes
Inline Side-by-side
Showing with 85 additions and 104 deletions
tools/power/x86/turbostat/turbostat.c
View file @ 86ba263d
...@@ -288,6 +288,7 @@ struct platform_features { ...@@ -288,6 +288,7 @@ struct platform_features {
bool has_cst_auto_convension; /* AUTOMATIC_CSTATE_CONVERSION bit in MSR_PKG_CST_CONFIG_CONTROL */ bool has_cst_auto_convension; /* AUTOMATIC_CSTATE_CONVERSION bit in MSR_PKG_CST_CONFIG_CONTROL */
int trl_msrs; /* MSR_TURBO_RATIO_LIMIT/LIMIT1/LIMIT2/SECONDARY, Atom TRL MSRs */ int trl_msrs; /* MSR_TURBO_RATIO_LIMIT/LIMIT1/LIMIT2/SECONDARY, Atom TRL MSRs */
int plr_msrs; /* MSR_CORE/GFX/RING_PERF_LIMIT_REASONS */ int plr_msrs; /* MSR_CORE/GFX/RING_PERF_LIMIT_REASONS */
int rapl_msrs; /* RAPL PKG/DRAM/CORE/GFX MSRs, AMD RAPL MSRs */
int tcc_offset_bits; /* TCC Offset bits in MSR_IA32_TEMPERATURE_TARGET */ int tcc_offset_bits; /* TCC Offset bits in MSR_IA32_TEMPERATURE_TARGET */
}; };
...@@ -414,6 +415,7 @@ static const struct platform_features snb_features = { ...@@ -414,6 +415,7 @@ static const struct platform_features snb_features = {
.bclk_freq = BCLK_100MHZ, .bclk_freq = BCLK_100MHZ,
.cst_limit = CST_LIMIT_SNB, .cst_limit = CST_LIMIT_SNB,
.trl_msrs = TRL_BASE, .trl_msrs = TRL_BASE,
.rapl_msrs = RAPL_PKG | RAPL_CORE_ALL | RAPL_GFX | RAPL_PKG_POWER_INFO,
}; };
static const struct platform_features snx_features = { static const struct platform_features snx_features = {
...@@ -423,6 +425,7 @@ static const struct platform_features snx_features = { ...@@ -423,6 +425,7 @@ static const struct platform_features snx_features = {
.bclk_freq = BCLK_100MHZ, .bclk_freq = BCLK_100MHZ,
.cst_limit = CST_LIMIT_SNB, .cst_limit = CST_LIMIT_SNB,
.trl_msrs = TRL_BASE, .trl_msrs = TRL_BASE,
.rapl_msrs = RAPL_PKG_ALL | RAPL_CORE_ALL | RAPL_DRAM_ALL,
}; };
static const struct platform_features ivb_features = { static const struct platform_features ivb_features = {
...@@ -433,6 +436,7 @@ static const struct platform_features ivb_features = { ...@@ -433,6 +436,7 @@ static const struct platform_features ivb_features = {
.bclk_freq = BCLK_100MHZ, .bclk_freq = BCLK_100MHZ,
.cst_limit = CST_LIMIT_SNB, .cst_limit = CST_LIMIT_SNB,
.trl_msrs = TRL_BASE, .trl_msrs = TRL_BASE,
.rapl_msrs = RAPL_PKG | RAPL_CORE_ALL | RAPL_GFX | RAPL_PKG_POWER_INFO,
}; };
static const struct platform_features ivx_features = { static const struct platform_features ivx_features = {
...@@ -442,6 +446,7 @@ static const struct platform_features ivx_features = { ...@@ -442,6 +446,7 @@ static const struct platform_features ivx_features = {
.bclk_freq = BCLK_100MHZ, .bclk_freq = BCLK_100MHZ,
.cst_limit = CST_LIMIT_SNB, .cst_limit = CST_LIMIT_SNB,
.trl_msrs = TRL_BASE | TRL_LIMIT1, .trl_msrs = TRL_BASE | TRL_LIMIT1,
.rapl_msrs = RAPL_PKG_ALL | RAPL_CORE_ALL | RAPL_DRAM_ALL,
}; };
static const struct platform_features hsw_features = { static const struct platform_features hsw_features = {
...@@ -453,6 +458,7 @@ static const struct platform_features hsw_features = { ...@@ -453,6 +458,7 @@ static const struct platform_features hsw_features = {
.cst_limit = CST_LIMIT_HSW, .cst_limit = CST_LIMIT_HSW,
.trl_msrs = TRL_BASE, .trl_msrs = TRL_BASE,
.plr_msrs = PLR_CORE | PLR_GFX | PLR_RING, .plr_msrs = PLR_CORE | PLR_GFX | PLR_RING,
.rapl_msrs = RAPL_PKG | RAPL_CORE_ALL | RAPL_GFX | RAPL_PKG_POWER_INFO,
}; };
static const struct platform_features hsx_features = { static const struct platform_features hsx_features = {
...@@ -464,6 +470,7 @@ static const struct platform_features hsx_features = { ...@@ -464,6 +470,7 @@ static const struct platform_features hsx_features = {
.cst_limit = CST_LIMIT_HSW, .cst_limit = CST_LIMIT_HSW,
.trl_msrs = TRL_BASE | TRL_LIMIT1 | TRL_LIMIT2, .trl_msrs = TRL_BASE | TRL_LIMIT1 | TRL_LIMIT2,
.plr_msrs = PLR_CORE | PLR_RING, .plr_msrs = PLR_CORE | PLR_RING,
.rapl_msrs = RAPL_PKG_ALL | RAPL_DRAM_ALL,
}; };
static const struct platform_features hswl_features = { static const struct platform_features hswl_features = {
...@@ -475,6 +482,7 @@ static const struct platform_features hswl_features = { ...@@ -475,6 +482,7 @@ static const struct platform_features hswl_features = {
.cst_limit = CST_LIMIT_HSW, .cst_limit = CST_LIMIT_HSW,
.trl_msrs = TRL_BASE, .trl_msrs = TRL_BASE,
.plr_msrs = PLR_CORE | PLR_GFX | PLR_RING, .plr_msrs = PLR_CORE | PLR_GFX | PLR_RING,
.rapl_msrs = RAPL_PKG | RAPL_CORE_ALL | RAPL_GFX | RAPL_PKG_POWER_INFO,
}; };
static const struct platform_features hswg_features = { static const struct platform_features hswg_features = {
...@@ -486,6 +494,7 @@ static const struct platform_features hswg_features = { ...@@ -486,6 +494,7 @@ static const struct platform_features hswg_features = {
.cst_limit = CST_LIMIT_HSW, .cst_limit = CST_LIMIT_HSW,
.trl_msrs = TRL_BASE, .trl_msrs = TRL_BASE,
.plr_msrs = PLR_CORE | PLR_GFX | PLR_RING, .plr_msrs = PLR_CORE | PLR_GFX | PLR_RING,
.rapl_msrs = RAPL_PKG | RAPL_CORE_ALL | RAPL_GFX | RAPL_PKG_POWER_INFO,
}; };
static const struct platform_features bdw_features = { static const struct platform_features bdw_features = {
...@@ -496,6 +505,7 @@ static const struct platform_features bdw_features = { ...@@ -496,6 +505,7 @@ static const struct platform_features bdw_features = {
.bclk_freq = BCLK_100MHZ, .bclk_freq = BCLK_100MHZ,
.cst_limit = CST_LIMIT_HSW, .cst_limit = CST_LIMIT_HSW,
.trl_msrs = TRL_BASE, .trl_msrs = TRL_BASE,
.rapl_msrs = RAPL_PKG | RAPL_CORE_ALL | RAPL_GFX | RAPL_PKG_POWER_INFO,
}; };
static const struct platform_features bdwg_features = { static const struct platform_features bdwg_features = {
...@@ -506,6 +516,7 @@ static const struct platform_features bdwg_features = { ...@@ -506,6 +516,7 @@ static const struct platform_features bdwg_features = {
.bclk_freq = BCLK_100MHZ, .bclk_freq = BCLK_100MHZ,
.cst_limit = CST_LIMIT_HSW, .cst_limit = CST_LIMIT_HSW,
.trl_msrs = TRL_BASE, .trl_msrs = TRL_BASE,
.rapl_msrs = RAPL_PKG | RAPL_CORE_ALL | RAPL_GFX | RAPL_PKG_POWER_INFO,
}; };
static const struct platform_features bdx_features = { static const struct platform_features bdx_features = {
...@@ -517,6 +528,7 @@ static const struct platform_features bdx_features = { ...@@ -517,6 +528,7 @@ static const struct platform_features bdx_features = {
.cst_limit = CST_LIMIT_HSW, .cst_limit = CST_LIMIT_HSW,
.has_cst_auto_convension = 1, .has_cst_auto_convension = 1,
.trl_msrs = TRL_BASE, .trl_msrs = TRL_BASE,
.rapl_msrs = RAPL_PKG_ALL | RAPL_DRAM_ALL,
}; };
static const struct platform_features skl_features = { static const struct platform_features skl_features = {
...@@ -529,6 +541,7 @@ static const struct platform_features skl_features = { ...@@ -529,6 +541,7 @@ static const struct platform_features skl_features = {
.cst_limit = CST_LIMIT_HSW, .cst_limit = CST_LIMIT_HSW,
.trl_msrs = TRL_BASE, .trl_msrs = TRL_BASE,
.tcc_offset_bits = 6, .tcc_offset_bits = 6,
.rapl_msrs = RAPL_PKG_ALL | RAPL_CORE_ALL | RAPL_DRAM | RAPL_DRAM_PERF_STATUS | RAPL_GFX,
}; };
static const struct platform_features cnl_features = { static const struct platform_features cnl_features = {
...@@ -540,6 +553,7 @@ static const struct platform_features cnl_features = { ...@@ -540,6 +553,7 @@ static const struct platform_features cnl_features = {
.cst_limit = CST_LIMIT_HSW, .cst_limit = CST_LIMIT_HSW,
.trl_msrs = TRL_BASE, .trl_msrs = TRL_BASE,
.tcc_offset_bits = 6, .tcc_offset_bits = 6,
.rapl_msrs = RAPL_PKG_ALL | RAPL_CORE_ALL | RAPL_DRAM | RAPL_DRAM_PERF_STATUS | RAPL_GFX,
}; };
static const struct platform_features skx_features = { static const struct platform_features skx_features = {
...@@ -551,6 +565,7 @@ static const struct platform_features skx_features = { ...@@ -551,6 +565,7 @@ static const struct platform_features skx_features = {
.cst_limit = CST_LIMIT_SKX, .cst_limit = CST_LIMIT_SKX,
.has_cst_auto_convension = 1, .has_cst_auto_convension = 1,
.trl_msrs = TRL_BASE | TRL_CORECOUNT, .trl_msrs = TRL_BASE | TRL_CORECOUNT,
.rapl_msrs = RAPL_PKG_ALL | RAPL_DRAM_ALL,
}; };
static const struct platform_features icx_features = { static const struct platform_features icx_features = {
...@@ -561,6 +576,7 @@ static const struct platform_features icx_features = { ...@@ -561,6 +576,7 @@ static const struct platform_features icx_features = {
.bclk_freq = BCLK_100MHZ, .bclk_freq = BCLK_100MHZ,
.cst_limit = CST_LIMIT_ICX, .cst_limit = CST_LIMIT_ICX,
.trl_msrs = TRL_BASE | TRL_CORECOUNT, .trl_msrs = TRL_BASE | TRL_CORECOUNT,
.rapl_msrs = RAPL_PKG_ALL | RAPL_DRAM_ALL,
}; };
static const struct platform_features spr_features = { static const struct platform_features spr_features = {
...@@ -571,6 +587,7 @@ static const struct platform_features spr_features = { ...@@ -571,6 +587,7 @@ static const struct platform_features spr_features = {
.bclk_freq = BCLK_100MHZ, .bclk_freq = BCLK_100MHZ,
.cst_limit = CST_LIMIT_SKX, .cst_limit = CST_LIMIT_SKX,
.trl_msrs = TRL_BASE | TRL_CORECOUNT, .trl_msrs = TRL_BASE | TRL_CORECOUNT,
.rapl_msrs = RAPL_PKG_ALL | RAPL_DRAM_ALL,
}; };
static const struct platform_features slv_features = { static const struct platform_features slv_features = {
...@@ -578,6 +595,7 @@ static const struct platform_features slv_features = { ...@@ -578,6 +595,7 @@ static const struct platform_features slv_features = {
.bclk_freq = BCLK_SLV, .bclk_freq = BCLK_SLV,
.cst_limit = CST_LIMIT_SLV, .cst_limit = CST_LIMIT_SLV,
.trl_msrs = TRL_ATOM, .trl_msrs = TRL_ATOM,
.rapl_msrs = RAPL_PKG | RAPL_CORE,
}; };
static const struct platform_features slvd_features = { static const struct platform_features slvd_features = {
...@@ -586,6 +604,7 @@ static const struct platform_features slvd_features = { ...@@ -586,6 +604,7 @@ static const struct platform_features slvd_features = {
.bclk_freq = BCLK_SLV, .bclk_freq = BCLK_SLV,
.cst_limit = CST_LIMIT_SLV, .cst_limit = CST_LIMIT_SLV,
.trl_msrs = TRL_BASE, .trl_msrs = TRL_BASE,
.rapl_msrs = RAPL_PKG | RAPL_CORE,
}; };
static const struct platform_features amt_features = { static const struct platform_features amt_features = {
...@@ -602,6 +621,7 @@ static const struct platform_features gmt_features = { ...@@ -602,6 +621,7 @@ static const struct platform_features gmt_features = {
.crystal_freq = 19200000, .crystal_freq = 19200000,
.cst_limit = CST_LIMIT_GMT, .cst_limit = CST_LIMIT_GMT,
.trl_msrs = TRL_BASE | TRL_CORECOUNT, .trl_msrs = TRL_BASE | TRL_CORECOUNT,
.rapl_msrs = RAPL_PKG | RAPL_PKG_POWER_INFO,
}; };
static const struct platform_features gmtd_features = { static const struct platform_features gmtd_features = {
...@@ -611,6 +631,7 @@ static const struct platform_features gmtd_features = { ...@@ -611,6 +631,7 @@ static const struct platform_features gmtd_features = {
.crystal_freq = 25000000, .crystal_freq = 25000000,
.cst_limit = CST_LIMIT_GMT, .cst_limit = CST_LIMIT_GMT,
.trl_msrs = TRL_BASE | TRL_CORECOUNT, .trl_msrs = TRL_BASE | TRL_CORECOUNT,
.rapl_msrs = RAPL_PKG_ALL | RAPL_DRAM_ALL | RAPL_CORE_ENERGY_STATUS,
}; };
static const struct platform_features gmtp_features = { static const struct platform_features gmtp_features = {
...@@ -620,6 +641,7 @@ static const struct platform_features gmtp_features = { ...@@ -620,6 +641,7 @@ static const struct platform_features gmtp_features = {
.crystal_freq = 19200000, .crystal_freq = 19200000,
.cst_limit = CST_LIMIT_GMT, .cst_limit = CST_LIMIT_GMT,
.trl_msrs = TRL_BASE, .trl_msrs = TRL_BASE,
.rapl_msrs = RAPL_PKG | RAPL_PKG_POWER_INFO,
}; };
static const struct platform_features tmt_features = { static const struct platform_features tmt_features = {
...@@ -628,6 +650,7 @@ static const struct platform_features tmt_features = { ...@@ -628,6 +650,7 @@ static const struct platform_features tmt_features = {
.bclk_freq = BCLK_100MHZ, .bclk_freq = BCLK_100MHZ,
.cst_limit = CST_LIMIT_GMT, .cst_limit = CST_LIMIT_GMT,
.trl_msrs = TRL_BASE, .trl_msrs = TRL_BASE,
.rapl_msrs = RAPL_PKG_ALL | RAPL_CORE_ALL | RAPL_DRAM | RAPL_DRAM_PERF_STATUS | RAPL_GFX,
}; };
static const struct platform_features tmtd_features = { static const struct platform_features tmtd_features = {
...@@ -636,6 +659,7 @@ static const struct platform_features tmtd_features = { ...@@ -636,6 +659,7 @@ static const struct platform_features tmtd_features = {
.bclk_freq = BCLK_100MHZ, .bclk_freq = BCLK_100MHZ,
.cst_limit = CST_LIMIT_GMT, .cst_limit = CST_LIMIT_GMT,
.trl_msrs = TRL_BASE | TRL_CORECOUNT, .trl_msrs = TRL_BASE | TRL_CORECOUNT,
.rapl_msrs = RAPL_PKG_ALL,
}; };
static const struct platform_features knl_features = { static const struct platform_features knl_features = {
...@@ -645,6 +669,7 @@ static const struct platform_features knl_features = { ...@@ -645,6 +669,7 @@ static const struct platform_features knl_features = {
.bclk_freq = BCLK_100MHZ, .bclk_freq = BCLK_100MHZ,
.cst_limit = CST_LIMIT_KNL, .cst_limit = CST_LIMIT_KNL,
.trl_msrs = TRL_KNL, .trl_msrs = TRL_KNL,
.rapl_msrs = RAPL_PKG_ALL | RAPL_DRAM_ALL,
}; };
static const struct platform_features default_features = { static const struct platform_features default_features = {
...@@ -653,6 +678,10 @@ static const struct platform_features default_features = { ...@@ -653,6 +678,10 @@ static const struct platform_features default_features = {
static const struct platform_features amd_features = { static const struct platform_features amd_features = {
}; };
static const struct platform_features amd_features_with_rapl = {
.rapl_msrs = RAPL_AMD_F17H,
};
static const struct platform_data turbostat_pdata[] = { static const struct platform_data turbostat_pdata[] = {
{ INTEL_FAM6_NEHALEM, &nhm_features }, { INTEL_FAM6_NEHALEM, &nhm_features },
{ INTEL_FAM6_NEHALEM_G, &nhm_features }, { INTEL_FAM6_NEHALEM_G, &nhm_features },
...@@ -728,6 +757,17 @@ void probe_platform_features(unsigned int family, unsigned int model) ...@@ -728,6 +757,17 @@ void probe_platform_features(unsigned int family, unsigned int model)
if (authentic_amd || hygon_genuine) { if (authentic_amd || hygon_genuine) {
platform = &amd_features; platform = &amd_features;
if (max_extended_level >= 0x80000007) {
unsigned int eax, ebx, ecx, edx;
__cpuid(0x80000007, eax, ebx, ecx, edx);
/* RAPL (Fam 17h+) */
if ((edx & (1 << 14)) && family >= 0x17) {
platform = &amd_features_with_rapl;
do_rapl = RAPL_PER_CORE_ENERGY;
}
}
return; return;
} }
...@@ -882,7 +922,7 @@ off_t idx_to_offset(int idx) ...@@ -882,7 +922,7 @@ off_t idx_to_offset(int idx)
switch (idx) { switch (idx) {
case IDX_PKG_ENERGY: case IDX_PKG_ENERGY:
if (do_rapl & RAPL_AMD_F17H) if (platform->rapl_msrs & RAPL_AMD_F17H)
offset = MSR_PKG_ENERGY_STAT; offset = MSR_PKG_ENERGY_STAT;
else else
offset = MSR_PKG_ENERGY_STATUS; offset = MSR_PKG_ENERGY_STATUS;
...@@ -942,17 +982,17 @@ int idx_valid(int idx) ...@@ -942,17 +982,17 @@ int idx_valid(int idx)
{ {
switch (idx) { switch (idx) {
case IDX_PKG_ENERGY: case IDX_PKG_ENERGY:
return do_rapl & (RAPL_PKG | RAPL_AMD_F17H); return platform->rapl_msrs & (RAPL_PKG | RAPL_AMD_F17H);
case IDX_DRAM_ENERGY: case IDX_DRAM_ENERGY:
return do_rapl & RAPL_DRAM; return platform->rapl_msrs & RAPL_DRAM;
case IDX_PP0_ENERGY: case IDX_PP0_ENERGY:
return do_rapl & RAPL_CORE_ENERGY_STATUS; return platform->rapl_msrs & RAPL_CORE_ENERGY_STATUS;
case IDX_PP1_ENERGY: case IDX_PP1_ENERGY:
return do_rapl & RAPL_GFX; return platform->rapl_msrs & RAPL_GFX;
case IDX_PKG_PERF: case IDX_PKG_PERF:
return do_rapl & RAPL_PKG_PERF_STATUS; return platform->rapl_msrs & RAPL_PKG_PERF_STATUS;
case IDX_DRAM_PERF: case IDX_DRAM_PERF:
return do_rapl & RAPL_DRAM_PERF_STATUS; return platform->rapl_msrs & RAPL_DRAM_PERF_STATUS;
default: default:
return 0; return 0;
} }
...@@ -1330,10 +1370,10 @@ void print_header(char *delim) ...@@ -1330,10 +1370,10 @@ void print_header(char *delim)
if (DO_BIC(BIC_CORE_THROT_CNT)) if (DO_BIC(BIC_CORE_THROT_CNT))
outp += sprintf(outp, "%sCoreThr", (printed++ ? delim : "")); outp += sprintf(outp, "%sCoreThr", (printed++ ? delim : ""));
if (do_rapl && !rapl_joules) { if (platform->rapl_msrs && !rapl_joules) {
if (DO_BIC(BIC_CorWatt) && (do_rapl & RAPL_PER_CORE_ENERGY)) if (DO_BIC(BIC_CorWatt) && (do_rapl & RAPL_PER_CORE_ENERGY))
outp += sprintf(outp, "%sCorWatt", (printed++ ? delim : "")); outp += sprintf(outp, "%sCorWatt", (printed++ ? delim : ""));
} else if (do_rapl && rapl_joules) { } else if (platform->rapl_msrs && rapl_joules) {
if (DO_BIC(BIC_Cor_J) && (do_rapl & RAPL_PER_CORE_ENERGY)) if (DO_BIC(BIC_Cor_J) && (do_rapl & RAPL_PER_CORE_ENERGY))
outp += sprintf(outp, "%sCor_J", (printed++ ? delim : "")); outp += sprintf(outp, "%sCor_J", (printed++ ? delim : ""));
} }
...@@ -1392,7 +1432,7 @@ void print_header(char *delim) ...@@ -1392,7 +1432,7 @@ void print_header(char *delim)
if (DO_BIC(BIC_SYS_LPI)) if (DO_BIC(BIC_SYS_LPI))
outp += sprintf(outp, "%sSYS%%LPI", (printed++ ? delim : "")); outp += sprintf(outp, "%sSYS%%LPI", (printed++ ? delim : ""));
if (do_rapl && !rapl_joules) { if (platform->rapl_msrs && !rapl_joules) {
if (DO_BIC(BIC_PkgWatt)) if (DO_BIC(BIC_PkgWatt))
outp += sprintf(outp, "%sPkgWatt", (printed++ ? delim : "")); outp += sprintf(outp, "%sPkgWatt", (printed++ ? delim : ""));
if (DO_BIC(BIC_CorWatt) && !(do_rapl & RAPL_PER_CORE_ENERGY)) if (DO_BIC(BIC_CorWatt) && !(do_rapl & RAPL_PER_CORE_ENERGY))
...@@ -1405,7 +1445,7 @@ void print_header(char *delim) ...@@ -1405,7 +1445,7 @@ void print_header(char *delim)
outp += sprintf(outp, "%sPKG_%%", (printed++ ? delim : "")); outp += sprintf(outp, "%sPKG_%%", (printed++ ? delim : ""));
if (DO_BIC(BIC_RAM__)) if (DO_BIC(BIC_RAM__))
outp += sprintf(outp, "%sRAM_%%", (printed++ ? delim : "")); outp += sprintf(outp, "%sRAM_%%", (printed++ ? delim : ""));
} else if (do_rapl && rapl_joules) { } else if (platform->rapl_msrs && rapl_joules) {
if (DO_BIC(BIC_Pkg_J)) if (DO_BIC(BIC_Pkg_J))
outp += sprintf(outp, "%sPkg_J", (printed++ ? delim : "")); outp += sprintf(outp, "%sPkg_J", (printed++ ? delim : ""));
if (DO_BIC(BIC_Cor_J) && !(do_rapl & RAPL_PER_CORE_ENERGY)) if (DO_BIC(BIC_Cor_J) && !(do_rapl & RAPL_PER_CORE_ENERGY))
...@@ -2638,7 +2678,7 @@ int get_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p) ...@@ -2638,7 +2678,7 @@ int get_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p)
if (DO_BIC(BIC_CORE_THROT_CNT)) if (DO_BIC(BIC_CORE_THROT_CNT))
get_core_throt_cnt(cpu, &c->core_throt_cnt); get_core_throt_cnt(cpu, &c->core_throt_cnt);
if (do_rapl & RAPL_AMD_F17H) { if (platform->rapl_msrs & RAPL_AMD_F17H) {
if (get_msr(cpu, MSR_CORE_ENERGY_STAT, &msr)) if (get_msr(cpu, MSR_CORE_ENERGY_STAT, &msr))
return -14; return -14;
c->core_energy = msr & 0xFFFFFFFF; c->core_energy = msr & 0xFFFFFFFF;
...@@ -2703,37 +2743,37 @@ int get_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p) ...@@ -2703,37 +2743,37 @@ int get_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p)
if (DO_BIC(BIC_SYS_LPI)) if (DO_BIC(BIC_SYS_LPI))
p->sys_lpi = cpuidle_cur_sys_lpi_us; p->sys_lpi = cpuidle_cur_sys_lpi_us;
if (do_rapl & RAPL_PKG) { if (platform->rapl_msrs & RAPL_PKG) {
if (get_msr_sum(cpu, MSR_PKG_ENERGY_STATUS, &msr)) if (get_msr_sum(cpu, MSR_PKG_ENERGY_STATUS, &msr))
return -13; return -13;
p->energy_pkg = msr; p->energy_pkg = msr;
} }
if (do_rapl & RAPL_CORE_ENERGY_STATUS) { if (platform->rapl_msrs & RAPL_CORE_ENERGY_STATUS) {
if (get_msr_sum(cpu, MSR_PP0_ENERGY_STATUS, &msr)) if (get_msr_sum(cpu, MSR_PP0_ENERGY_STATUS, &msr))
return -14; return -14;
p->energy_cores = msr; p->energy_cores = msr;
} }
if (do_rapl & RAPL_DRAM) { if (platform->rapl_msrs & RAPL_DRAM) {
if (get_msr_sum(cpu, MSR_DRAM_ENERGY_STATUS, &msr)) if (get_msr_sum(cpu, MSR_DRAM_ENERGY_STATUS, &msr))
return -15; return -15;
p->energy_dram = msr; p->energy_dram = msr;
} }
if (do_rapl & RAPL_GFX) { if (platform->rapl_msrs & RAPL_GFX) {
if (get_msr_sum(cpu, MSR_PP1_ENERGY_STATUS, &msr)) if (get_msr_sum(cpu, MSR_PP1_ENERGY_STATUS, &msr))
return -16; return -16;
p->energy_gfx = msr; p->energy_gfx = msr;
} }
if (do_rapl & RAPL_PKG_PERF_STATUS) { if (platform->rapl_msrs & RAPL_PKG_PERF_STATUS) {
if (get_msr_sum(cpu, MSR_PKG_PERF_STATUS, &msr)) if (get_msr_sum(cpu, MSR_PKG_PERF_STATUS, &msr))
return -16; return -16;
p->rapl_pkg_perf_status = msr; p->rapl_pkg_perf_status = msr;
} }
if (do_rapl & RAPL_DRAM_PERF_STATUS) { if (platform->rapl_msrs & RAPL_DRAM_PERF_STATUS) {
if (get_msr_sum(cpu, MSR_DRAM_PERF_STATUS, &msr)) if (get_msr_sum(cpu, MSR_DRAM_PERF_STATUS, &msr))
return -16; return -16;
p->rapl_dram_perf_status = msr; p->rapl_dram_perf_status = msr;
} }
if (do_rapl & RAPL_AMD_F17H) { if (platform->rapl_msrs & RAPL_AMD_F17H) {
if (get_msr_sum(cpu, MSR_PKG_ENERGY_STAT, &msr)) if (get_msr_sum(cpu, MSR_PKG_ENERGY_STAT, &msr))
return -13; return -13;
p->energy_pkg = msr; p->energy_pkg = msr;
...@@ -4750,7 +4790,7 @@ double get_tdp_intel(unsigned int model) ...@@ -4750,7 +4790,7 @@ double get_tdp_intel(unsigned int model)
{ {
unsigned long long msr; unsigned long long msr;
if (do_rapl & RAPL_PKG_POWER_INFO) if (platform->rapl_msrs & RAPL_PKG_POWER_INFO)
if (!get_msr(base_cpu, MSR_PKG_POWER_INFO, &msr)) if (!get_msr(base_cpu, MSR_PKG_POWER_INFO, &msr))
return ((msr >> 0) & RAPL_POWER_GRANULARITY) * rapl_power_units; return ((msr >> 0) & RAPL_POWER_GRANULARITY) * rapl_power_units;
...@@ -4791,85 +4831,35 @@ static double rapl_dram_energy_units_probe(int model, double rapl_energy_units) ...@@ -4791,85 +4831,35 @@ static double rapl_dram_energy_units_probe(int model, double rapl_energy_units)
} }
} }
void rapl_probe_intel(unsigned int family, unsigned int model) void rapl_probe_intel(unsigned int model)
{ {
unsigned long long msr; unsigned long long msr;
unsigned int time_unit; unsigned int time_unit;
double tdp; double tdp;
if (family != 6)
return;
switch (model) {
case INTEL_FAM6_SANDYBRIDGE:
case INTEL_FAM6_IVYBRIDGE:
case INTEL_FAM6_HASWELL: /* HSW */
case INTEL_FAM6_HASWELL_L: /* HSW */
case INTEL_FAM6_HASWELL_G: /* HSW */
case INTEL_FAM6_BROADWELL: /* BDW */
case INTEL_FAM6_BROADWELL_G: /* BDW */
do_rapl = RAPL_PKG | RAPL_CORE_ALL | RAPL_GFX | RAPL_PKG_POWER_INFO;
break;
case INTEL_FAM6_ATOM_GOLDMONT: /* BXT */
case INTEL_FAM6_ATOM_GOLDMONT_PLUS:
do_rapl = RAPL_PKG | RAPL_PKG_POWER_INFO;
break;
case INTEL_FAM6_ATOM_TREMONT: /* EHL */
do_rapl = RAPL_PKG_ALL | RAPL_CORE_ALL | RAPL_DRAM | RAPL_DRAM_PERF_STATUS | RAPL_GFX;
break;
case INTEL_FAM6_ATOM_TREMONT_D: /* JVL */
do_rapl = RAPL_PKG_ALL;
break;
case INTEL_FAM6_SKYLAKE_L: /* SKL */
case INTEL_FAM6_CANNONLAKE_L: /* CNL */
do_rapl = RAPL_PKG_ALL | RAPL_CORE_ALL | RAPL_DRAM | RAPL_DRAM_PERF_STATUS | RAPL_GFX;
break;
case INTEL_FAM6_HASWELL_X: /* HSX */
case INTEL_FAM6_BROADWELL_X: /* BDX */
case INTEL_FAM6_SKYLAKE_X: /* SKX */
case INTEL_FAM6_ICELAKE_X: /* ICX */
case INTEL_FAM6_SAPPHIRERAPIDS_X: /* SPR */
case INTEL_FAM6_XEON_PHI_KNL: /* KNL */
do_rapl = RAPL_PKG_ALL | RAPL_DRAM_ALL;
break;
case INTEL_FAM6_SANDYBRIDGE_X:
case INTEL_FAM6_IVYBRIDGE_X:
do_rapl = RAPL_PKG_ALL | RAPL_CORE_ALL | RAPL_DRAM_ALL;
break;
case INTEL_FAM6_ATOM_SILVERMONT: /* BYT */
case INTEL_FAM6_ATOM_SILVERMONT_D: /* AVN */
do_rapl = RAPL_PKG | RAPL_CORE;
break;
case INTEL_FAM6_ATOM_GOLDMONT_D: /* DNV */
do_rapl = RAPL_PKG_ALL | RAPL_DRAM_ALL | RAPL_CORE_ENERGY_STATUS;
break;
default:
return;
}
if (rapl_joules) { if (rapl_joules) {
if (do_rapl & RAPL_PKG_ENERGY_STATUS) if (platform->rapl_msrs & RAPL_PKG_ENERGY_STATUS)
BIC_PRESENT(BIC_Pkg_J); BIC_PRESENT(BIC_Pkg_J);
if (do_rapl & RAPL_CORE_ENERGY_STATUS) if (platform->rapl_msrs & RAPL_CORE_ENERGY_STATUS)
BIC_PRESENT(BIC_Cor_J); BIC_PRESENT(BIC_Cor_J);
if (do_rapl & RAPL_DRAM_ENERGY_STATUS) if (platform->rapl_msrs & RAPL_DRAM_ENERGY_STATUS)
BIC_PRESENT(BIC_RAM_J); BIC_PRESENT(BIC_RAM_J);
if (do_rapl & RAPL_GFX_ENERGY_STATUS) if (platform->rapl_msrs & RAPL_GFX_ENERGY_STATUS)
BIC_PRESENT(BIC_GFX_J); BIC_PRESENT(BIC_GFX_J);
} else { } else {
if (do_rapl & RAPL_PKG_ENERGY_STATUS) if (platform->rapl_msrs & RAPL_PKG_ENERGY_STATUS)
BIC_PRESENT(BIC_PkgWatt); BIC_PRESENT(BIC_PkgWatt);
if (do_rapl & RAPL_CORE_ENERGY_STATUS) if (platform->rapl_msrs & RAPL_CORE_ENERGY_STATUS)
BIC_PRESENT(BIC_CorWatt); BIC_PRESENT(BIC_CorWatt);
if (do_rapl & RAPL_DRAM_ENERGY_STATUS) if (platform->rapl_msrs & RAPL_DRAM_ENERGY_STATUS)
BIC_PRESENT(BIC_RAMWatt); BIC_PRESENT(BIC_RAMWatt);
if (do_rapl & RAPL_GFX_ENERGY_STATUS) if (platform->rapl_msrs & RAPL_GFX_ENERGY_STATUS)
BIC_PRESENT(BIC_GFXWatt); BIC_PRESENT(BIC_GFXWatt);
} }
if (do_rapl & RAPL_PKG_PERF_STATUS) if (platform->rapl_msrs & RAPL_PKG_PERF_STATUS)
BIC_PRESENT(BIC_PKG__); BIC_PRESENT(BIC_PKG__);
if (do_rapl & RAPL_DRAM_PERF_STATUS) if (platform->rapl_msrs & RAPL_DRAM_PERF_STATUS)
BIC_PRESENT(BIC_RAM__); BIC_PRESENT(BIC_RAM__);
/* units on package 0, verify later other packages match */ /* units on package 0, verify later other packages match */
...@@ -4900,22 +4890,10 @@ void rapl_probe_intel(unsigned int family, unsigned int model) ...@@ -4900,22 +4890,10 @@ void rapl_probe_intel(unsigned int family, unsigned int model)
void rapl_probe_amd(unsigned int family, unsigned int model) void rapl_probe_amd(unsigned int family, unsigned int model)
{ {
unsigned long long msr; unsigned long long msr;
unsigned int eax, ebx, ecx, edx;
unsigned int has_rapl = 0;
double tdp; double tdp;
UNUSED(model); UNUSED(model);
if (max_extended_level >= 0x80000007) {
__cpuid(0x80000007, eax, ebx, ecx, edx);
/* RAPL (Fam 17h+) */
has_rapl = edx & (1 << 14);
}
if (!has_rapl || family < 0x17)
return;
do_rapl = RAPL_AMD_F17H | RAPL_PER_CORE_ENERGY;
if (rapl_joules) { if (rapl_joules) {
BIC_PRESENT(BIC_Pkg_J); BIC_PRESENT(BIC_Pkg_J);
BIC_PRESENT(BIC_Cor_J); BIC_PRESENT(BIC_Cor_J);
...@@ -4941,12 +4919,15 @@ void rapl_probe_amd(unsigned int family, unsigned int model) ...@@ -4941,12 +4919,15 @@ void rapl_probe_amd(unsigned int family, unsigned int model)
/* /*
* rapl_probe() * rapl_probe()
* *
* sets do_rapl, rapl_power_units, rapl_energy_units, rapl_time_units * sets rapl_power_units, rapl_energy_units, rapl_time_units
*/ */
void rapl_probe(unsigned int family, unsigned int model) void rapl_probe(unsigned int family, unsigned int model)
{ {
if (!platform->rapl_msrs)
return;
if (genuine_intel) if (genuine_intel)
rapl_probe_intel(family, model); rapl_probe_intel(model);
if (authentic_amd || hygon_genuine) if (authentic_amd || hygon_genuine)
rapl_probe_amd(family, model); rapl_probe_amd(family, model);
} }
...@@ -5040,7 +5021,7 @@ int print_rapl(struct thread_data *t, struct core_data *c, struct pkg_data *p) ...@@ -5040,7 +5021,7 @@ int print_rapl(struct thread_data *t, struct core_data *c, struct pkg_data *p)
UNUSED(c); UNUSED(c);
UNUSED(p); UNUSED(p);
if (!do_rapl) if (!platform->rapl_msrs)
return 0; return 0;
/* RAPL counters are per package, so print only for 1st thread/package */ /* RAPL counters are per package, so print only for 1st thread/package */
...@@ -5053,7 +5034,7 @@ int print_rapl(struct thread_data *t, struct core_data *c, struct pkg_data *p) ...@@ -5053,7 +5034,7 @@ int print_rapl(struct thread_data *t, struct core_data *c, struct pkg_data *p)
return -1; return -1;
} }
if (do_rapl & RAPL_AMD_F17H) { if (platform->rapl_msrs & RAPL_AMD_F17H) {
msr_name = "MSR_RAPL_PWR_UNIT"; msr_name = "MSR_RAPL_PWR_UNIT";
if (get_msr(cpu, MSR_RAPL_PWR_UNIT, &msr)) if (get_msr(cpu, MSR_RAPL_PWR_UNIT, &msr))
return -1; return -1;
...@@ -5066,7 +5047,7 @@ int print_rapl(struct thread_data *t, struct core_data *c, struct pkg_data *p) ...@@ -5066,7 +5047,7 @@ int print_rapl(struct thread_data *t, struct core_data *c, struct pkg_data *p)
fprintf(outf, "cpu%d: %s: 0x%08llx (%f Watts, %f Joules, %f sec.)\n", cpu, msr_name, msr, fprintf(outf, "cpu%d: %s: 0x%08llx (%f Watts, %f Joules, %f sec.)\n", cpu, msr_name, msr,
rapl_power_units, rapl_energy_units, rapl_time_units); rapl_power_units, rapl_energy_units, rapl_time_units);
if (do_rapl & RAPL_PKG_POWER_INFO) { if (platform->rapl_msrs & RAPL_PKG_POWER_INFO) {
if (get_msr(cpu, MSR_PKG_POWER_INFO, &msr)) if (get_msr(cpu, MSR_PKG_POWER_INFO, &msr))
return -5; return -5;
...@@ -5079,7 +5060,7 @@ int print_rapl(struct thread_data *t, struct core_data *c, struct pkg_data *p) ...@@ -5079,7 +5060,7 @@ int print_rapl(struct thread_data *t, struct core_data *c, struct pkg_data *p)
((msr >> 48) & RAPL_TIME_GRANULARITY) * rapl_time_units); ((msr >> 48) & RAPL_TIME_GRANULARITY) * rapl_time_units);
} }
if (do_rapl & RAPL_PKG) { if (platform->rapl_msrs & RAPL_PKG) {
if (get_msr(cpu, MSR_PKG_POWER_LIMIT, &msr)) if (get_msr(cpu, MSR_PKG_POWER_LIMIT, &msr))
return -9; return -9;
...@@ -5103,7 +5084,7 @@ int print_rapl(struct thread_data *t, struct core_data *c, struct pkg_data *p) ...@@ -5103,7 +5084,7 @@ int print_rapl(struct thread_data *t, struct core_data *c, struct pkg_data *p)
cpu, ((msr >> 0) & 0x1FFF) * rapl_power_units, (msr >> 31) & 1 ? "" : "UN"); cpu, ((msr >> 0) & 0x1FFF) * rapl_power_units, (msr >> 31) & 1 ? "" : "UN");
} }
if (do_rapl & RAPL_DRAM_POWER_INFO) { if (platform->rapl_msrs & RAPL_DRAM_POWER_INFO) {
if (get_msr(cpu, MSR_DRAM_POWER_INFO, &msr)) if (get_msr(cpu, MSR_DRAM_POWER_INFO, &msr))
return -6; return -6;
...@@ -5114,7 +5095,7 @@ int print_rapl(struct thread_data *t, struct core_data *c, struct pkg_data *p) ...@@ -5114,7 +5095,7 @@ int print_rapl(struct thread_data *t, struct core_data *c, struct pkg_data *p)
((msr >> 32) & RAPL_POWER_GRANULARITY) * rapl_power_units, ((msr >> 32) & RAPL_POWER_GRANULARITY) * rapl_power_units,
((msr >> 48) & RAPL_TIME_GRANULARITY) * rapl_time_units); ((msr >> 48) & RAPL_TIME_GRANULARITY) * rapl_time_units);
} }
if (do_rapl & RAPL_DRAM) { if (platform->rapl_msrs & RAPL_DRAM) {
if (get_msr(cpu, MSR_DRAM_POWER_LIMIT, &msr)) if (get_msr(cpu, MSR_DRAM_POWER_LIMIT, &msr))
return -9; return -9;
fprintf(outf, "cpu%d: MSR_DRAM_POWER_LIMIT: 0x%08llx (%slocked)\n", fprintf(outf, "cpu%d: MSR_DRAM_POWER_LIMIT: 0x%08llx (%slocked)\n",
...@@ -5122,20 +5103,20 @@ int print_rapl(struct thread_data *t, struct core_data *c, struct pkg_data *p) ...@@ -5122,20 +5103,20 @@ int print_rapl(struct thread_data *t, struct core_data *c, struct pkg_data *p)
print_power_limit_msr(cpu, msr, "DRAM Limit"); print_power_limit_msr(cpu, msr, "DRAM Limit");
} }
if (do_rapl & RAPL_CORE_POLICY) { if (platform->rapl_msrs & RAPL_CORE_POLICY) {
if (get_msr(cpu, MSR_PP0_POLICY, &msr)) if (get_msr(cpu, MSR_PP0_POLICY, &msr))
return -7; return -7;
fprintf(outf, "cpu%d: MSR_PP0_POLICY: %lld\n", cpu, msr & 0xF); fprintf(outf, "cpu%d: MSR_PP0_POLICY: %lld\n", cpu, msr & 0xF);
} }
if (do_rapl & RAPL_CORE_POWER_LIMIT) { if (platform->rapl_msrs & RAPL_CORE_POWER_LIMIT) {
if (get_msr(cpu, MSR_PP0_POWER_LIMIT, &msr)) if (get_msr(cpu, MSR_PP0_POWER_LIMIT, &msr))
return -9; return -9;
fprintf(outf, "cpu%d: MSR_PP0_POWER_LIMIT: 0x%08llx (%slocked)\n", fprintf(outf, "cpu%d: MSR_PP0_POWER_LIMIT: 0x%08llx (%slocked)\n",
cpu, msr, (msr >> 31) & 1 ? "" : "UN"); cpu, msr, (msr >> 31) & 1 ? "" : "UN");
print_power_limit_msr(cpu, msr, "Cores Limit"); print_power_limit_msr(cpu, msr, "Cores Limit");
} }
if (do_rapl & RAPL_GFX) { if (platform->rapl_msrs & RAPL_GFX) {
if (get_msr(cpu, MSR_PP1_POLICY, &msr)) if (get_msr(cpu, MSR_PP1_POLICY, &msr))
return -8; return -8;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7