perf/x86/intel: Update ICL Core and Package C-state event counters
Subsystems (2)
PATCH 1/1 perf/x86/intel: Update ICL Core and Package C-state event counters
Ice Lake microarchitecture inherits Cannon Lake, it has CC1/PC8/PC9/PC10 residency counters.
Update the list of Ice Lake PMU event counters from the snb_cstates[] list of events to the cnl_cstates[] list of events, which keeps all previously supported events and also adds the CORE_C1, PKG_C8, PKG_C9, and PKG_C10 residency counters.
This benefits users to profile them through the perf interface.
---
arch/x86/events/intel/cstate.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-)
arch/x86/events/intel/cstate.c +14 -12
@@ -40,51 +40,53 @@* Model specific counters: * MSR_CORE_C1_RES: CORE C1 Residency Counter * perf code: 0x00 -* Available model: SLM,AMT,GLM,CNL +* Available model: SLM,AMT,GLM,CNL,ICL * Scope: Core (each processor core has a MSR) * MSR_CORE_C3_RESIDENCY: CORE C3 Residency Counter * perf code: 0x01 * Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,GLM, -CNL +CNL,ICL * Scope: Core * MSR_CORE_C6_RESIDENCY: CORE C6 Residency Counter * perf code: 0x02 * Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW, -* SKL,KNL,GLM,CNL +* SKL,KNL,GLM,CNL,ICL * Scope: Core * MSR_CORE_C7_RESIDENCY: CORE C7 Residency Counter * perf code: 0x03 -* Available model: SNB,IVB,HSW,BDW,SKL,CNL +* Available model: SNB,IVB,HSW,BDW,SKL,CNL,ICL * Scope: Core * MSR_PKG_C2_RESIDENCY: Package C2 Residency Counter. * perf code: 0x00 -* Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL +* Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL, +ICL * Scope: Package (physical package) * MSR_PKG_C3_RESIDENCY: Package C3 Residency Counter. * perf code: 0x01 * Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,KNL, -* GLM,CNL +* GLM,CNL,ICL * Scope: Package (physical package) * MSR_PKG_C6_RESIDENCY: Package C6 Residency Counter. * perf code: 0x02 * Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW -* SKL,KNL,GLM,CNL +* SKL,KNL,GLM,CNL,ICL * Scope: Package (physical package) * MSR_PKG_C7_RESIDENCY: Package C7 Residency Counter. * perf code: 0x03 * Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,CNL +ICL * Scope: Package (physical package) * MSR_PKG_C8_RESIDENCY: Package C8 Residency Counter. * perf code: 0x04 -* Available model: HSW ULT,KBL,CNL +* Available model: HSW ULT,KBL,CNL,ICL * Scope: Package (physical package) * MSR_PKG_C9_RESIDENCY: Package C9 Residency Counter. * perf code: 0x05 -* Available model: HSW ULT,KBL,CNL +* Available model: HSW ULT,KBL,CNL,ICL * Scope: Package (physical package) * MSR_PKG_C10_RESIDENCY: Package C10 Residency Counter. * perf code: 0x06 -* Available model: HSW ULT,KBL,GLM,CNL +* Available model: HSW ULT,KBL,GLM,CNL,ICL * Scope: Package (physical package) * */
@@ -625,8 +627,8 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {X86_CSTATES_MODEL (INTEL_FAM6_ATOM_GOLDMONT_PLUS , glm_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_ICELAKE_MOBILE , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_ICELAKE_DESKTOP , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_ICELAKE_MOBILE , cnl_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_ICELAKE_DESKTOP , cnl_cstates), { }, };MODULE_DEVICE_TABLE (x86cpu, intel_cstates_match);
Signature · 1 line
2.20.1
Peter Zijlstra
maintainerQuoted 23 lines · Harry Pan
Ice Lake microarchitecture inherits Cannon Lake, it has CC1/PC8/PC9/PC10 residency counters.
Update the list of Ice Lake PMU event counters from the snb_cstates[] list of events to the cnl_cstates[] list of events, which keeps all previously supported events and also adds the
CORE_C1,PKG_C8,PKG_C9, andPKG_C10residency counters.This benefits users to profile them through the perf interface.
Signed-off-by Harry Pan <[email protected]>---
arch/x86/events/intel/cstate.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-)arch/x86/events/intel/cstate.c +0
-0@@ -40,51 +40,53 @@* Model specific counters:
arch/x86/events/intel/cstate.c line 48
Quoted 10 lines
arch/x86/events/intel/cstate.c +2
-2* MSR_CORE_C1_RES: CORE C1 Residency Counter * perf code: 0x00 -* Available model: SLM,AMT,GLM,CNL +* Available model: SLM,AMT,GLM,CNL,ICL * Scope: Core (each processor core has a MSR) * MSR_CORE_C3_RESIDENCY: CORE C3 Residency Counter * perf code: 0x01 * Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,GLM, -CNL +CNL,ICL
That has a missing * introduced by the last such patch. Please take this opportunity to put it back in.
Thank you Peter for pointing out my miss, I appreciate that sincerely.
arch/x86/events/intel/cstate.c line 48
Quoted 5 lines
*
MSR_CORE_C3_RESIDENCY: CORE C3 Residency Counter
* perf code:0x01
* Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,GLM,arch/x86/events/intel/cstate.c +1
-1-CNL +CNL ,ICL
That has a missing * introduced by the last such patch. Please take this opportunity to put it back in.
PATCH v2 1/1 perf/x86/intel: Update ICL Core and Package C-state event counters
In reply to Harry PanIce Lake microarchitecture inherits Cannon Lake, it has CC1/PC8/PC9/PC10 residency counters.
Update the list of Ice Lake PMU event counters from the snb_cstates[] list of events to the cnl_cstates[] list of events, which keeps all previously supported events and also adds the CORE_C1, PKG_C8, PKG_C9, and PKG_C10 residency counters.
This benefits users to profile them through the perf interface.
---
arch/x86/events/intel/cstate.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-)
arch/x86/events/intel/cstate.c +17 -15
@@ -35,56 +35,58 @@* The counters include PKG_C*_RESIDENCY. * * All of these counters are specified in the Intel® 64 and IA-32 -* Architectures Software Developer.s Manual Vol3b. +* Architectures Software Developer's Manual Vol4. * * Model specific counters: * MSR_CORE_C1_RES: CORE C1 Residency Counter * perf code: 0x00 -* Available model: SLM,AMT,GLM,CNL +* Available model: SLM,AMT,GLM,CNL,ICL * Scope: Core (each processor core has a MSR) * MSR_CORE_C3_RESIDENCY: CORE C3 Residency Counter * perf code: 0x01 * Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,GLM, -CNL +* CNL,ICL * Scope: Core * MSR_CORE_C6_RESIDENCY: CORE C6 Residency Counter * perf code: 0x02 * Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW, -* SKL,KNL,GLM,CNL +* SKL,KNL,GLM,CNL,ICL * Scope: Core * MSR_CORE_C7_RESIDENCY: CORE C7 Residency Counter * perf code: 0x03 -* Available model: SNB,IVB,HSW,BDW,SKL,CNL +* Available model: SNB,IVB,HSW,BDW,SKL,CNL,ICL * Scope: Core * MSR_PKG_C2_RESIDENCY: Package C2 Residency Counter. * perf code: 0x00 -* Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL +* Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL, +* ICL * Scope: Package (physical package) * MSR_PKG_C3_RESIDENCY: Package C3 Residency Counter. * perf code: 0x01 * Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,KNL, -* GLM,CNL +* GLM,CNL,ICL * Scope: Package (physical package) * MSR_PKG_C6_RESIDENCY: Package C6 Residency Counter. * perf code: 0x02 -* Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW -* SKL,KNL,GLM,CNL +* Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW, +* SKL,KNL,GLM,CNL,ICL * Scope: Package (physical package) * MSR_PKG_C7_RESIDENCY: Package C7 Residency Counter. * perf code: 0x03 -* Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,CNL +* Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,CNL, +* ICL * Scope: Package (physical package) * MSR_PKG_C8_RESIDENCY: Package C8 Residency Counter. * perf code: 0x04 -* Available model: HSW ULT,KBL,CNL +* Available model: HSW ULT,KBL,CNL,ICL * Scope: Package (physical package) * MSR_PKG_C9_RESIDENCY: Package C9 Residency Counter. * perf code: 0x05 -* Available model: HSW ULT,KBL,CNL +* Available model: HSW ULT,KBL,CNL,ICL * Scope: Package (physical package) * MSR_PKG_C10_RESIDENCY: Package C10 Residency Counter. * perf code: 0x06 -* Available model: HSW ULT,KBL,GLM,CNL +* Available model: HSW ULT,KBL,GLM,CNL,ICL * Scope: Package (physical package) * */
@@ -625,8 +627,8 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {X86_CSTATES_MODEL (INTEL_FAM6_ATOM_GOLDMONT_PLUS , glm_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_ICELAKE_MOBILE , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_ICELAKE_DESKTOP , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_ICELAKE_MOBILE , cnl_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_ICELAKE_DESKTOP , cnl_cstates), { }, };MODULE_DEVICE_TABLE (x86cpu, intel_cstates_match);
Signature · 1 line
2.21.0