perf: Add PMU_FORMAT_ATTR_SHOW
Subsystems (2)
PATCH v2 1/9 perf: Add PMU_FORMAT_ATTR_SHOW
From: Kan Liang <[email protected]>
The macro PMU_FORMAT_ATTR facilitates the definition of both the "show" function and "format_attr". But it only works for a non-hybrid platform. For a hybrid platform, the name "format_attr_hybrid_" is used.
The definition of the "show" function can be shared between a non-hybrid platform and a hybrid platform. Add a new macro PMU_FORMAT_ATTR_SHOW.
No functional change. The PMU_FORMAT_ATTR_SHOW will be used in the following patch.
---
No change since V1
include/linux/perf_event.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
include/linux/perf_event.h +4 -1
@@ -1724,7 +1724,7 @@ static struct perf_pmu_events_attr _var = { \ .id = _id, } \ })[0].attr.attr) -#define PMU_FORMAT_ATTR (_name, _format) \ +#define PMU_FORMAT_ATTR_SHOW (_name, _format) \ static ssize_t \ _name##_show(struct device *dev, \ struct device_attribute *attr, \
@@ -1733,6 +1733,9 @@ _name##_show(struct device *dev, \BUILD_BUG_ON (sizeof (_format) >=PAGE_SIZE ); \return sprintf (page, _format"\n" ); \ } \ + +#define PMU_FORMAT_ATTR (_name, _format) \ + PMU_FORMAT_ATTR_SHOW(_name, _format) \ \ static struct device_attribute format_attr_##_name = __ATTR_RO(_name)
Signature · 1 line
2.35.1
PATCH v2 2/9 perf/x86: Add Meteor Lake support
From: Kan Liang <[email protected]>
From PMU's perspective, Meteor Lake is similar to Alder Lake. Both are hybrid platforms, with e-core and p-core.
The key differences include:
- The e-core supports 2 PDIST GP counters (GP0 & GP1)
- New MSRs for the Module Snoop Response Events on the e-core.
- New Data Source fields are introduced for the e-core.
- There are 8 GP counters for the e-core.
- The load latency AUX event is not required for the p-core anymore.
- Retire Latency (Support in a separate patch) for both cores.
Since most of the code in the intel_pmu_init() should be the same as Alder Lake, to avoid code duplication, share the path with Alder Lake.
Add new specific functions of extra_regs, and get_event_constraints to support the OCR events, Module Snoop Response Events and 2 PDIST GP counters on e-core.
Add new MTL specific mem_attrs which drops the load latency AUX event.
The Data Source field is extended to 4:0, which can contains max 32 sources.
The Retire Latency is implemented with a separate patch.
---
No change since V1
arch/x86/events/intel/core.c | 141 ++++++++++++++++++++++++++++--- arch/x86/events/intel/ds.c | 70 ++++++++++++--- arch/x86/events/perf_event.h | 21 +++-- arch/x86/include/asm/msr-index.h | 3 + 4 files changed, 203 insertions(+), 32 deletions(-)
arch/x86/events/intel/core.c +127 -14
@@ -2119,6 +2119,16 @@ static struct extra_reg intel_grt_extra_regs[] __read_mostly = { EVENT_EXTRA_END }; +static struct extra_reg intel_cmt_extra_regs[]__read_mostly = { +/* must define OFFCORE_RSP_X first, see intel_fixup_er() */ +INTEL_UEVENT_EXTRA_REG (0x01b7 ,MSR_OFFCORE_RSP_0 ,0x800ff3ffffffffffull ,RSP_0 ), +INTEL_UEVENT_EXTRA_REG (0x02b7 ,MSR_OFFCORE_RSP_1 ,0xff3ffffffffffull ,RSP_1 ), +INTEL_UEVENT_PEBS_LDLAT_EXTRA_REG (0x5d0 ), +INTEL_UEVENT_EXTRA_REG (0x0127 ,MSR_SNOOP_RSP_0 ,0xffffffffffffffffull ,SNOOP_0 ), +INTEL_UEVENT_EXTRA_REG (0x0227 ,MSR_SNOOP_RSP_1 ,0xffffffffffffffffull ,SNOOP_1 ), +EVENT_EXTRA_END +}; +#define KNL_OT_L2_HITE BIT_ULL(19)/* Other Tile L2 Hit */ #define KNL_OT_L2_HITF BIT_ULL(20)/* Other Tile L2 Hit */ #define KNL_MCDRAM_LOCAL BIT_ULL(21)
@@ -4182,6 +4192,12 @@ static int hsw_hw_config(struct perf_event *event)static struct event_constraint counter0_constraint =INTEL_ALL_EVENT_CONSTRAINT (0 ,0x1 ); +static struct event_constraint counter1_constraint = +INTEL_ALL_EVENT_CONSTRAINT (0 ,0x2 ); + +static struct event_constraint counter0_1_constraint = +INTEL_ALL_EVENT_CONSTRAINT (0 ,0x3 ); +static struct event_constraint counter2_constraint =EVENT_CONSTRAINT (0 ,0x4 ,0 );
@@ -4191,6 +4207,9 @@ static struct event_constraint fixed0_constraint =static struct event_constraint fixed0_counter0_constraint =INTEL_ALL_EVENT_CONSTRAINT (0 ,0x100000001ULL ); +static struct event_constraint fixed0_counter0_1_constraint = +INTEL_ALL_EVENT_CONSTRAINT (0 ,0x100000003ULL ); +static struct event_constraint *hsw_get_event_constraints (struct cpu_hw_events *cpuc,int idx,struct perf_event *event)
@@ -4322,6 +4341,54 @@ adl_get_event_constraints(struct cpu_hw_events *cpuc, int idx,return &emptyconstraint; } +static struct event_constraint * +cmt_get_event_constraints (struct cpu_hw_events *cpuc,int idx, +struct perf_event *event) +{ +struct event_constraint *c; + + c =intel_get_event_constraints (cpuc, idx, event); + +/* +* The :ppp indicates the Precise Distribution (PDist) facility, which +* is only supported on the GP counter 0 & 1 and Fixed counter 0. +* If a :ppp event which is not available on the above eligible counters, +* error out. +*/ +if (event->attr.precise_ip ==3 ) { +/* Force instruction:ppp on PMC0, 1 and Fixed counter 0 */ +if (constraint_match (&fixed0_constraint, event->hw.config)) +return &fixed0_counter0_1_constraint; + +switch (c->idxmsk64 &0x3ull ) { +case 0x1 : +return &counter0_constraint; +case 0x2 : +return &counter1_constraint; +case 0x3 : +return &counter0_1_constraint; + } +return &emptyconstraint; + } + +return c; +} + +static struct event_constraint * +mtl_get_event_constraints (struct cpu_hw_events *cpuc,int idx, +struct perf_event *event) +{ +struct x86_hybrid_pmu *pmu =hybrid_pmu (event->pmu); + +if (pmu->cpu_type == hybrid_big) +return spr_get_event_constraints (cpuc, idx, event); +if (pmu->cpu_type == hybrid_small) +return cmt_get_event_constraints (cpuc, idx, event); + +WARN_ON (1 ); +return &emptyconstraint; +} +static int adl_hw_config (struct perf_event *event) {struct x86_hybrid_pmu *pmu =hybrid_pmu (event->pmu);
@@ -5463,6 +5530,12 @@ static struct attribute *adl_hybrid_mem_attrs[] = { NULL, }; +static struct attribute *mtl_hybrid_mem_attrs[] = { +EVENT_PTR (mem_ld_adl), +EVENT_PTR (mem_st_adl), +NULL +}; +EVENT_ATTR_STR_HYBRID (tx-start, tx_start_adl,"event=0xc9,umask=0x1" , hybrid_big);EVENT_ATTR_STR_HYBRID (tx-commit, tx_commit_adl,"event=0xc9,umask=0x2" , hybrid_big);EVENT_ATTR_STR_HYBRID (tx-abort, tx_abort_adl,"event=0xc9,umask=0x4" , hybrid_big);
@@ -5490,20 +5563,40 @@ FORMAT_ATTR_HYBRID(offcore_rsp, hybrid_big_small);FORMAT_ATTR_HYBRID (ldlat, hybrid_big_small);FORMAT_ATTR_HYBRID (frontend, hybrid_big); +#define ADL_HYBRID_RTM_FORMAT_ATTR \ + FORMAT_HYBRID_PTR(in_tx), \ + FORMAT_HYBRID_PTR(in_tx_cp) + +#define ADL_HYBRID_FORMAT_ATTR \ + FORMAT_HYBRID_PTR(offcore_rsp), \ + FORMAT_HYBRID_PTR(ldlat), \ + FORMAT_HYBRID_PTR(frontend) +static struct attribute *adl_hybrid_extra_attr_rtm[] = { -FORMAT_HYBRID_PTR (in_tx), -FORMAT_HYBRID_PTR (in_tx_cp), -FORMAT_HYBRID_PTR (offcore_rsp), -FORMAT_HYBRID_PTR (ldlat), -FORMAT_HYBRID_PTR (frontend), -NULL , +ADL_HYBRID_RTM_FORMAT_ATTR , +ADL_HYBRID_FORMAT_ATTR , +NULL };static struct attribute *adl_hybrid_extra_attr[] = { -FORMAT_HYBRID_PTR (offcore_rsp), -FORMAT_HYBRID_PTR (ldlat), -FORMAT_HYBRID_PTR (frontend), -NULL , +ADL_HYBRID_FORMAT_ATTR , +NULL +}; + +PMU_FORMAT_ATTR_SHOW (snoop_rsp,"config1:0-63" ); +FORMAT_ATTR_HYBRID (snoop_rsp, hybrid_small); + +static struct attribute *mtl_hybrid_extra_attr_rtm[] = { +ADL_HYBRID_RTM_FORMAT_ATTR , +ADL_HYBRID_FORMAT_ATTR , +FORMAT_HYBRID_PTR (snoop_rsp), +NULL +}; + +static struct attribute *mtl_hybrid_extra_attr[] = { +ADL_HYBRID_FORMAT_ATTR , +FORMAT_HYBRID_PTR (snoop_rsp), +NULL };static bool is_attr_for_this_pmu (struct kobject *kobj,struct attribute *attr)
@@ -5725,6 +5818,12 @@ static void intel_pmu_check_hybrid_pmus(u64 fixed_mask) } } +static __always_inline bool is_mtl(u8 x86_model) +{ +return (x86_model ==INTEL_FAM6_METEORLAKE ) || + (x86_model ==INTEL_FAM6_METEORLAKE_L ); +} +__init int intel_pmu_init (void ) {struct attribute **extra_skl_attr = &empty_attrs;
@@ -6381,6 +6480,8 @@ __init int intel_pmu_init(void)case INTEL_FAM6_RAPTORLAKE :case INTEL_FAM6_RAPTORLAKE_P :case INTEL_FAM6_RAPTORLAKE_S : +case INTEL_FAM6_METEORLAKE : +case INTEL_FAM6_METEORLAKE_L :/* * Alder Lake has 2 types of CPU, core and atom. *
@@ -6400,9 +6501,7 @@ __init int intel_pmu_init(void) x86_pmu.flags |=PMU_FL_HAS_RSP_1 ; x86_pmu.flags |=PMU_FL_NO_HT_SHARING ; x86_pmu.flags |=PMU_FL_INSTR_LATENCY ; - x86_pmu.flags |=PMU_FL_MEM_LOADS_AUX ; x86_pmu.lbr_pt_coexist = true; -intel_pmu_pebs_data_source_adl (); x86_pmu.pebs_latency_data = adl_latency_data_small; x86_pmu.num_topdown_events =8 ; static_call_update(intel_pmu_update_topdown_event,
@@ -6489,8 +6588,22 @@ __init int intel_pmu_init(void) pmu->event_constraints = intel_slm_event_constraints; pmu->pebs_constraints = intel_grt_pebs_event_constraints; pmu->extra_regs = intel_grt_extra_regs; -pr_cont ("Alderlake Hybrid events, " ); - name ="alderlake_hybrid" ; +if (is_mtl (boot_cpu_data.x86_model)) { + x86_pmu.pebs_latency_data = mtl_latency_data_small; + extra_attr =boot_cpu_has (X86_FEATURE_RTM ) ? + mtl_hybrid_extra_attr_rtm : mtl_hybrid_extra_attr; + mem_attr = mtl_hybrid_mem_attrs; +intel_pmu_pebs_data_source_mtl (); + x86_pmu.get_event_constraints = mtl_get_event_constraints; + pmu->extra_regs = intel_cmt_extra_regs; +pr_cont ("Meteorlake Hybrid events, " ); + name ="meteorlake_hybrid" ; + }else { + x86_pmu.flags |=PMU_FL_MEM_LOADS_AUX ; +intel_pmu_pebs_data_source_adl (); +pr_cont ("Alderlake Hybrid events, " ); + name ="alderlake_hybrid" ; + }break ;default :
arch/x86/events/intel/ds.c +59 -11
101 lines not on this page · raw message
arch/x86/events/perf_event.h +14 -7
@@ -35,15 +35,17 @@* per-core reg tables. */ enum extra_reg_type { -EXTRA_REG_NONE =-1 ,/* not used */ +EXTRA_REG_NONE =-1 ,/* not used */ -EXTRA_REG_RSP_0 =0 ,/* offcore_response_0 */ -EXTRA_REG_RSP_1 =1 ,/* offcore_response_1 */ -EXTRA_REG_LBR =2 ,/* lbr_select */ -EXTRA_REG_LDLAT =3 ,/* ld_lat_threshold */ -EXTRA_REG_FE =4 ,/* fe_* */ +EXTRA_REG_RSP_0 =0 ,/* offcore_response_0 */ +EXTRA_REG_RSP_1 =1 ,/* offcore_response_1 */ +EXTRA_REG_LBR =2 ,/* lbr_select */ +EXTRA_REG_LDLAT =3 ,/* ld_lat_threshold */ +EXTRA_REG_FE =4 ,/* fe_* */ +EXTRA_REG_SNOOP_0 =5 ,/* snoop response 0 */ +EXTRA_REG_SNOOP_1 =6 ,/* snoop response 1 */ -EXTRA_REG_MAX /* number of entries needed */ +EXTRA_REG_MAX /* number of entries needed */ };struct event_constraint {
@@ -647,6 +649,7 @@ enum { };#define PERF_PEBS_DATA_SOURCE_MAX 0x10 +#define PERF_PEBS_DATA_SOURCE_MASK (PERF_PEBS_DATA_SOURCE_MAX - 1)struct x86_hybrid_pmu {struct pmu pmu;
@@ -1486,6 +1489,8 @@ int intel_pmu_drain_bts_buffer(void);u64 adl_latency_data_small (struct perf_event *event,u64 status); +u64 mtl_latency_data_small (struct perf_event *event,u64 status); +extern struct event_constraint intel_core2_pebs_event_constraints[];extern struct event_constraint intel_atom_pebs_event_constraints[];
@@ -1597,6 +1602,8 @@ void intel_pmu_pebs_data_source_adl(void);void intel_pmu_pebs_data_source_grt (void ); +void intel_pmu_pebs_data_source_mtl (void ); +int intel_pmu_setup_lbr_filter (struct perf_event *event);void intel_pt_interrupt (void );
arch/x86/include/asm/msr-index.h +3 -0
@@ -189,6 +189,9 @@#define MSR_TURBO_RATIO_LIMIT1 0x000001ae#define MSR_TURBO_RATIO_LIMIT2 0x000001af +#define MSR_SNOOP_RSP_0 0x00001328 +#define MSR_SNOOP_RSP_1 0x00001329 +#define MSR_LBR_SELECT 0x000001c8#define MSR_LBR_TOS 0x000001c9
Signature · 1 line
2.35.1
[tip: perf/core] perf/x86: Add Meteor Lake support
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 38aaf921e92dc5cf87e4a6c5a4b24dd99155cace Gitweb: https://git.kernel.org/tip/38aaf921e92dc5cf87e4a6c5a4b24dd99155cace Author: Kan Liang <[email protected]> AuthorDate: Wed, 04 Jan 2023 12:13:42 -08:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Mon, 09 Jan 2023 12:22:07 +01:00
perf/x86: Add Meteor Lake support
Quoted 1 line
From PMU's perspective, Meteor Lake is similar to Alder Lake. Both are
hybrid platforms, with e-core and p-core.
The key differences include:
- The e-core supports 2 PDIST GP counters (GP0 & GP1)
- New MSRs for the Module Snoop Response Events on the e-core.
- New Data Source fields are introduced for the e-core.
- There are 8 GP counters for the e-core.
- The load latency AUX event is not required for the p-core anymore.
- Retire Latency (Support in a separate patch) for both cores.
Since most of the code in the intel_pmu_init() should be the same as Alder Lake, to avoid code duplication, share the path with Alder Lake.
Add new specific functions of extra_regs, and get_event_constraints to support the OCR events, Module Snoop Response Events and 2 PDIST GP counters on e-core.
Add new MTL specific mem_attrs which drops the load latency AUX event.
The Data Source field is extended to 4:0, which can contains max 32 sources.
The Retire Latency is implemented with a separate patch.
--- arch/x86/events/intel/core.c | 141 +++++++++++++++++++++++++++--- arch/x86/events/intel/ds.c | 70 ++++++++++++--- arch/x86/events/perf_event.h | 21 ++-- arch/x86/include/asm/msr-index.h | 3 +- 4 files changed, 203 insertions(+), 32 deletions(-)
arch/x86/events/intel/core.c +127 -14
@@ -2119,6 +2119,16 @@ static struct extra_reg intel_grt_extra_regs[] __read_mostly = { EVENT_EXTRA_END }; +static struct extra_reg intel_cmt_extra_regs[]__read_mostly = { +/* must define OFFCORE_RSP_X first, see intel_fixup_er() */ +INTEL_UEVENT_EXTRA_REG (0x01b7 ,MSR_OFFCORE_RSP_0 ,0x800ff3ffffffffffull ,RSP_0 ), +INTEL_UEVENT_EXTRA_REG (0x02b7 ,MSR_OFFCORE_RSP_1 ,0xff3ffffffffffull ,RSP_1 ), +INTEL_UEVENT_PEBS_LDLAT_EXTRA_REG (0x5d0 ), +INTEL_UEVENT_EXTRA_REG (0x0127 ,MSR_SNOOP_RSP_0 ,0xffffffffffffffffull ,SNOOP_0 ), +INTEL_UEVENT_EXTRA_REG (0x0227 ,MSR_SNOOP_RSP_1 ,0xffffffffffffffffull ,SNOOP_1 ), +EVENT_EXTRA_END +}; +#define KNL_OT_L2_HITE BIT_ULL(19)/* Other Tile L2 Hit */ #define KNL_OT_L2_HITF BIT_ULL(20)/* Other Tile L2 Hit */ #define KNL_MCDRAM_LOCAL BIT_ULL(21)
@@ -4182,6 +4192,12 @@ static int hsw_hw_config(struct perf_event *event)static struct event_constraint counter0_constraint =INTEL_ALL_EVENT_CONSTRAINT (0 ,0x1 ); +static struct event_constraint counter1_constraint = +INTEL_ALL_EVENT_CONSTRAINT (0 ,0x2 ); + +static struct event_constraint counter0_1_constraint = +INTEL_ALL_EVENT_CONSTRAINT (0 ,0x3 ); +static struct event_constraint counter2_constraint =EVENT_CONSTRAINT (0 ,0x4 ,0 );
@@ -4191,6 +4207,9 @@ static struct event_constraint fixed0_constraint =static struct event_constraint fixed0_counter0_constraint =INTEL_ALL_EVENT_CONSTRAINT (0 ,0x100000001ULL ); +static struct event_constraint fixed0_counter0_1_constraint = +INTEL_ALL_EVENT_CONSTRAINT (0 ,0x100000003ULL ); +static struct event_constraint *hsw_get_event_constraints (struct cpu_hw_events *cpuc,int idx,struct perf_event *event)
@@ -4322,6 +4341,54 @@ adl_get_event_constraints(struct cpu_hw_events *cpuc, int idx,return &emptyconstraint; } +static struct event_constraint * +cmt_get_event_constraints (struct cpu_hw_events *cpuc,int idx, +struct perf_event *event) +{ +struct event_constraint *c; + + c =intel_get_event_constraints (cpuc, idx, event); + +/* +* The :ppp indicates the Precise Distribution (PDist) facility, which +* is only supported on the GP counter 0 & 1 and Fixed counter 0. +* If a :ppp event which is not available on the above eligible counters, +* error out. +*/ +if (event->attr.precise_ip ==3 ) { +/* Force instruction:ppp on PMC0, 1 and Fixed counter 0 */ +if (constraint_match (&fixed0_constraint, event->hw.config)) +return &fixed0_counter0_1_constraint; + +switch (c->idxmsk64 &0x3ull ) { +case 0x1 : +return &counter0_constraint; +case 0x2 : +return &counter1_constraint; +case 0x3 : +return &counter0_1_constraint; + } +return &emptyconstraint; + } + +return c; +} + +static struct event_constraint * +mtl_get_event_constraints (struct cpu_hw_events *cpuc,int idx, +struct perf_event *event) +{ +struct x86_hybrid_pmu *pmu =hybrid_pmu (event->pmu); + +if (pmu->cpu_type == hybrid_big) +return spr_get_event_constraints (cpuc, idx, event); +if (pmu->cpu_type == hybrid_small) +return cmt_get_event_constraints (cpuc, idx, event); + +WARN_ON (1 ); +return &emptyconstraint; +} +static int adl_hw_config (struct perf_event *event) {struct x86_hybrid_pmu *pmu =hybrid_pmu (event->pmu);
@@ -5463,6 +5530,12 @@ static struct attribute *adl_hybrid_mem_attrs[] = { NULL, }; +static struct attribute *mtl_hybrid_mem_attrs[] = { +EVENT_PTR (mem_ld_adl), +EVENT_PTR (mem_st_adl), +NULL +}; +EVENT_ATTR_STR_HYBRID (tx-start, tx_start_adl,"event=0xc9,umask=0x1" , hybrid_big);EVENT_ATTR_STR_HYBRID (tx-commit, tx_commit_adl,"event=0xc9,umask=0x2" , hybrid_big);EVENT_ATTR_STR_HYBRID (tx-abort, tx_abort_adl,"event=0xc9,umask=0x4" , hybrid_big);
@@ -5490,20 +5563,40 @@ FORMAT_ATTR_HYBRID(offcore_rsp, hybrid_big_small);FORMAT_ATTR_HYBRID (ldlat, hybrid_big_small);FORMAT_ATTR_HYBRID (frontend, hybrid_big); +#define ADL_HYBRID_RTM_FORMAT_ATTR \ + FORMAT_HYBRID_PTR(in_tx), \ + FORMAT_HYBRID_PTR(in_tx_cp) + +#define ADL_HYBRID_FORMAT_ATTR \ + FORMAT_HYBRID_PTR(offcore_rsp), \ + FORMAT_HYBRID_PTR(ldlat), \ + FORMAT_HYBRID_PTR(frontend) +static struct attribute *adl_hybrid_extra_attr_rtm[] = { -FORMAT_HYBRID_PTR (in_tx), -FORMAT_HYBRID_PTR (in_tx_cp), -FORMAT_HYBRID_PTR (offcore_rsp), -FORMAT_HYBRID_PTR (ldlat), -FORMAT_HYBRID_PTR (frontend), -NULL , +ADL_HYBRID_RTM_FORMAT_ATTR , +ADL_HYBRID_FORMAT_ATTR , +NULL };static struct attribute *adl_hybrid_extra_attr[] = { -FORMAT_HYBRID_PTR (offcore_rsp), -FORMAT_HYBRID_PTR (ldlat), -FORMAT_HYBRID_PTR (frontend), -NULL , +ADL_HYBRID_FORMAT_ATTR , +NULL +}; + +PMU_FORMAT_ATTR_SHOW (snoop_rsp,"config1:0-63" ); +FORMAT_ATTR_HYBRID (snoop_rsp, hybrid_small); + +static struct attribute *mtl_hybrid_extra_attr_rtm[] = { +ADL_HYBRID_RTM_FORMAT_ATTR , +ADL_HYBRID_FORMAT_ATTR , +FORMAT_HYBRID_PTR (snoop_rsp), +NULL +}; + +static struct attribute *mtl_hybrid_extra_attr[] = { +ADL_HYBRID_FORMAT_ATTR , +FORMAT_HYBRID_PTR (snoop_rsp), +NULL };static bool is_attr_for_this_pmu (struct kobject *kobj,struct attribute *attr)
@@ -5725,6 +5818,12 @@ static void intel_pmu_check_hybrid_pmus(u64 fixed_mask) } } +static __always_inline bool is_mtl(u8 x86_model) +{ +return (x86_model ==INTEL_FAM6_METEORLAKE ) || + (x86_model ==INTEL_FAM6_METEORLAKE_L ); +} +__init int intel_pmu_init (void ) {struct attribute **extra_skl_attr = &empty_attrs;
@@ -6381,6 +6480,8 @@ __init int intel_pmu_init(void)case INTEL_FAM6_RAPTORLAKE :case INTEL_FAM6_RAPTORLAKE_P :case INTEL_FAM6_RAPTORLAKE_S : +case INTEL_FAM6_METEORLAKE : +case INTEL_FAM6_METEORLAKE_L :/* * Alder Lake has 2 types of CPU, core and atom. *
@@ -6400,9 +6501,7 @@ __init int intel_pmu_init(void) x86_pmu.flags |=PMU_FL_HAS_RSP_1 ; x86_pmu.flags |=PMU_FL_NO_HT_SHARING ; x86_pmu.flags |=PMU_FL_INSTR_LATENCY ; - x86_pmu.flags |=PMU_FL_MEM_LOADS_AUX ; x86_pmu.lbr_pt_coexist = true; -intel_pmu_pebs_data_source_adl (); x86_pmu.pebs_latency_data = adl_latency_data_small; x86_pmu.num_topdown_events =8 ; static_call_update(intel_pmu_update_topdown_event,
@@ -6489,8 +6588,22 @@ __init int intel_pmu_init(void) pmu->event_constraints = intel_slm_event_constraints; pmu->pebs_constraints = intel_grt_pebs_event_constraints; pmu->extra_regs = intel_grt_extra_regs; -pr_cont ("Alderlake Hybrid events, " ); - name ="alderlake_hybrid" ; +if (is_mtl (boot_cpu_data.x86_model)) { + x86_pmu.pebs_latency_data = mtl_latency_data_small; + extra_attr =boot_cpu_has (X86_FEATURE_RTM ) ? + mtl_hybrid_extra_attr_rtm : mtl_hybrid_extra_attr; + mem_attr = mtl_hybrid_mem_attrs; +intel_pmu_pebs_data_source_mtl (); + x86_pmu.get_event_constraints = mtl_get_event_constraints; + pmu->extra_regs = intel_cmt_extra_regs; +pr_cont ("Meteorlake Hybrid events, " ); + name ="meteorlake_hybrid" ; + }else { + x86_pmu.flags |=PMU_FL_MEM_LOADS_AUX ; +intel_pmu_pebs_data_source_adl (); +pr_cont ("Alderlake Hybrid events, " ); + name ="alderlake_hybrid" ; + }break ;default :
arch/x86/events/intel/ds.c +59 -11
101 lines not on this page · raw message
arch/x86/events/perf_event.h +14 -7
@@ -35,15 +35,17 @@* per-core reg tables. */ enum extra_reg_type { -EXTRA_REG_NONE =-1 ,/* not used */ +EXTRA_REG_NONE =-1 ,/* not used */ -EXTRA_REG_RSP_0 =0 ,/* offcore_response_0 */ -EXTRA_REG_RSP_1 =1 ,/* offcore_response_1 */ -EXTRA_REG_LBR =2 ,/* lbr_select */ -EXTRA_REG_LDLAT =3 ,/* ld_lat_threshold */ -EXTRA_REG_FE =4 ,/* fe_* */ +EXTRA_REG_RSP_0 =0 ,/* offcore_response_0 */ +EXTRA_REG_RSP_1 =1 ,/* offcore_response_1 */ +EXTRA_REG_LBR =2 ,/* lbr_select */ +EXTRA_REG_LDLAT =3 ,/* ld_lat_threshold */ +EXTRA_REG_FE =4 ,/* fe_* */ +EXTRA_REG_SNOOP_0 =5 ,/* snoop response 0 */ +EXTRA_REG_SNOOP_1 =6 ,/* snoop response 1 */ -EXTRA_REG_MAX /* number of entries needed */ +EXTRA_REG_MAX /* number of entries needed */ };struct event_constraint {
@@ -647,6 +649,7 @@ enum { };#define PERF_PEBS_DATA_SOURCE_MAX 0x10 +#define PERF_PEBS_DATA_SOURCE_MASK (PERF_PEBS_DATA_SOURCE_MAX - 1)struct x86_hybrid_pmu {struct pmu pmu;
@@ -1486,6 +1489,8 @@ int intel_pmu_drain_bts_buffer(void);u64 adl_latency_data_small (struct perf_event *event,u64 status); +u64 mtl_latency_data_small (struct perf_event *event,u64 status); +extern struct event_constraint intel_core2_pebs_event_constraints[];extern struct event_constraint intel_atom_pebs_event_constraints[];
@@ -1597,6 +1602,8 @@ void intel_pmu_pebs_data_source_adl(void);void intel_pmu_pebs_data_source_grt (void ); +void intel_pmu_pebs_data_source_mtl (void ); +int intel_pmu_setup_lbr_filter (struct perf_event *event);void intel_pt_interrupt (void );
arch/x86/include/asm/msr-index.h +3 -0
@@ -189,6 +189,9 @@#define MSR_TURBO_RATIO_LIMIT1 0x000001ae#define MSR_TURBO_RATIO_LIMIT2 0x000001af +#define MSR_SNOOP_RSP_0 0x00001328 +#define MSR_SNOOP_RSP_1 0x00001329 +#define MSR_LBR_SELECT 0x000001c8#define MSR_LBR_TOS 0x000001c9
PATCH v2 3/9 perf/x86: Support Retire Latency
In reply to [email protected]From: Kan Liang <[email protected]>
Retire Latency reports the number of elapsed core clocks between the retirement of the instruction indicated by the Instruction Pointer field of the PEBS record and the retirement of the prior instruction. It's enumerated by the IA32_PERF_CAPABILITIES.PEBS_TIMING_INFO[17].
Add flag PMU_FL_RETIRE_LATENCY to indicate the availability of the feature.
The Retire Latency is not supported by the fixed counter 0 on p-core of MTL.
---
No change since V1
arch/x86/events/intel/core.c | 32 +++++++++++++++++++++++++++++++- arch/x86/events/intel/ds.c | 4 ++++ arch/x86/events/perf_event.h | 2 ++ 3 files changed, 37 insertions(+), 1 deletion(-)
arch/x86/events/intel/core.c +31 -1
@@ -4210,6 +4210,9 @@ static struct event_constraint fixed0_counter0_constraint =static struct event_constraint fixed0_counter0_1_constraint =INTEL_ALL_EVENT_CONSTRAINT (0 ,0x100000003ULL ); +static struct event_constraint counters_1_7_constraint = +INTEL_ALL_EVENT_CONSTRAINT (0 ,0xfeULL ); +static struct event_constraint *hsw_get_event_constraints (struct cpu_hw_events *cpuc,int idx,struct perf_event *event)
@@ -4374,6 +4377,30 @@ cmt_get_event_constraints(struct cpu_hw_events *cpuc, int idx,return c; } +static struct event_constraint * +rwc_get_event_constraints (struct cpu_hw_events *cpuc,int idx, +struct perf_event *event) +{ +struct event_constraint *c; + + c =spr_get_event_constraints (cpuc, idx, event); + +/* The Retire Latency is not supported by the fixed counter 0. */ +if (event->attr.precise_ip && + (event->attr.sample_type &PERF_SAMPLE_WEIGHT_TYPE ) && +constraint_match (&fixed0_constraint, event->hw.config)) { +/* +* The Instruction PDIR is only available +* on the fixed counter 0. Error out for this case. +*/ +if (event->attr.precise_ip ==3 ) +return &emptyconstraint; +return &counters_1_7_constraint; + } + +return c; +} +static struct event_constraint *mtl_get_event_constraints (struct cpu_hw_events *cpuc,int idx,struct perf_event *event)
@@ -4381,7 +4408,7 @@ mtl_get_event_constraints(struct cpu_hw_events *cpuc, int idx,struct x86_hybrid_pmu *pmu =hybrid_pmu (event->pmu);if (pmu->cpu_type == hybrid_big) -return spr_get_event_constraints (cpuc, idx, event); +return rwc_get_event_constraints (cpuc, idx, event);if (pmu->cpu_type == hybrid_small)return cmt_get_event_constraints (cpuc, idx, event);
@@ -6718,6 +6745,9 @@ __init int intel_pmu_init(void)if (is_hybrid ())intel_pmu_check_hybrid_pmus ((u64 )fixed_mask); +if (x86_pmu.intel_cap.pebs_timing_info) + x86_pmu.flags |=PMU_FL_RETIRE_LATENCY ; +intel_aux_output_init ();return 0 ;
arch/x86/events/intel/ds.c +4 -0
@@ -1753,6 +1753,7 @@ static void adaptive_pebs_save_regs(struct pt_regs *regs,#define PEBS_LATENCY_MASK 0xffff#define PEBS_CACHE_LATENCY_OFFSET 32 +#define PEBS_RETIRE_LATENCY_OFFSET 32/* * With adaptive PEBS the layout depends on what fields are configured.
@@ -1804,6 +1805,9 @@ static void setup_pebs_adaptive_sample_data(struct perf_event *event,set_linear_ip (regs, basic->ip); regs->flags =PERF_EFLAGS_EXACT ; +if ((sample_type &PERF_SAMPLE_WEIGHT_STRUCT ) && (x86_pmu.flags &PMU_FL_RETIRE_LATENCY )) + data->weight.var3_w = format_size >>PEBS_RETIRE_LATENCY_OFFSET &PEBS_LATENCY_MASK ; +/* * The record for MEMINFO is in front of GP * But PERF_SAMPLE_TRANSACTION needs gprs->ax.
arch/x86/events/perf_event.h +2 -0
@@ -608,6 +608,7 @@ union perf_capabilities { u64 pebs_baseline:1; u64 perf_metrics:1; u64 pebs_output_pt_available:1; + u64 pebs_timing_info:1; u64 anythread_deprecated:1; };u64 capabilities;
@@ -1003,6 +1004,7 @@ do { \#define PMU_FL_PAIR 0x40/* merge counters for large incr. events */ #define PMU_FL_INSTR_LATENCY 0x80/* Support Instruction Latency in PEBS Memory Info Record */ #define PMU_FL_MEM_LOADS_AUX 0x100/* Require an auxiliary event for the complete memory info */ +#define PMU_FL_RETIRE_LATENCY 0x200/* Support Retire Latency in PEBS */ #define EVENT_VAR (_id) event_attr_##_id#define EVENT_PTR (_id) &event_attr_##_id.attr.attr
Signature · 1 line
2.35.1
[tip: perf/core] perf/x86: Support Retire Latency
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: c87a31093c707eb0b8c48aab89922c1d0bf4bd90 Gitweb: https://git.kernel.org/tip/c87a31093c707eb0b8c48aab89922c1d0bf4bd90 Author: Kan Liang <[email protected]> AuthorDate: Wed, 04 Jan 2023 12:13:43 -08:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Mon, 09 Jan 2023 12:22:07 +01:00
perf/x86: Support Retire Latency
Retire Latency reports the number of elapsed core clocks between the retirement of the instruction indicated by the Instruction Pointer field of the PEBS record and the retirement of the prior instruction. It's enumerated by the IA32_PERF_CAPABILITIES.PEBS_TIMING_INFO[17].
Add flag PMU_FL_RETIRE_LATENCY to indicate the availability of the feature.
The Retire Latency is not supported by the fixed counter 0 on p-core of MTL.
--- arch/x86/events/intel/core.c | 32 +++++++++++++++++++++++++++++++- arch/x86/events/intel/ds.c | 4 ++++ arch/x86/events/perf_event.h | 2 ++ 3 files changed, 37 insertions(+), 1 deletion(-)
arch/x86/events/intel/core.c +31 -1
@@ -4210,6 +4210,9 @@ static struct event_constraint fixed0_counter0_constraint =static struct event_constraint fixed0_counter0_1_constraint =INTEL_ALL_EVENT_CONSTRAINT (0 ,0x100000003ULL ); +static struct event_constraint counters_1_7_constraint = +INTEL_ALL_EVENT_CONSTRAINT (0 ,0xfeULL ); +static struct event_constraint *hsw_get_event_constraints (struct cpu_hw_events *cpuc,int idx,struct perf_event *event)
@@ -4375,13 +4378,37 @@ cmt_get_event_constraints(struct cpu_hw_events *cpuc, int idx, }static struct event_constraint * +rwc_get_event_constraints (struct cpu_hw_events *cpuc,int idx, +struct perf_event *event) +{ +struct event_constraint *c; + + c =spr_get_event_constraints (cpuc, idx, event); + +/* The Retire Latency is not supported by the fixed counter 0. */ +if (event->attr.precise_ip && + (event->attr.sample_type &PERF_SAMPLE_WEIGHT_TYPE ) && +constraint_match (&fixed0_constraint, event->hw.config)) { +/* +* The Instruction PDIR is only available +* on the fixed counter 0. Error out for this case. +*/ +if (event->attr.precise_ip ==3 ) +return &emptyconstraint; +return &counters_1_7_constraint; + } + +return c; +} + +static struct event_constraint *mtl_get_event_constraints (struct cpu_hw_events *cpuc,int idx,struct perf_event *event) {struct x86_hybrid_pmu *pmu =hybrid_pmu (event->pmu);if (pmu->cpu_type == hybrid_big) -return spr_get_event_constraints (cpuc, idx, event); +return rwc_get_event_constraints (cpuc, idx, event);if (pmu->cpu_type == hybrid_small)return cmt_get_event_constraints (cpuc, idx, event);
@@ -6718,6 +6745,9 @@ __init int intel_pmu_init(void)if (is_hybrid ())intel_pmu_check_hybrid_pmus ((u64 )fixed_mask); +if (x86_pmu.intel_cap.pebs_timing_info) + x86_pmu.flags |=PMU_FL_RETIRE_LATENCY ; +intel_aux_output_init ();return 0 ;
arch/x86/events/intel/ds.c +4 -0
@@ -1753,6 +1753,7 @@ static void adaptive_pebs_save_regs(struct pt_regs *regs,#define PEBS_LATENCY_MASK 0xffff#define PEBS_CACHE_LATENCY_OFFSET 32 +#define PEBS_RETIRE_LATENCY_OFFSET 32/* * With adaptive PEBS the layout depends on what fields are configured.
@@ -1804,6 +1805,9 @@ static void setup_pebs_adaptive_sample_data(struct perf_event *event,set_linear_ip (regs, basic->ip); regs->flags =PERF_EFLAGS_EXACT ; +if ((sample_type &PERF_SAMPLE_WEIGHT_STRUCT ) && (x86_pmu.flags &PMU_FL_RETIRE_LATENCY )) + data->weight.var3_w = format_size >>PEBS_RETIRE_LATENCY_OFFSET &PEBS_LATENCY_MASK ; +/* * The record for MEMINFO is in front of GP * But PERF_SAMPLE_TRANSACTION needs gprs->ax.
arch/x86/events/perf_event.h +2 -0
@@ -608,6 +608,7 @@ union perf_capabilities { u64 pebs_baseline:1; u64 perf_metrics:1; u64 pebs_output_pt_available:1; + u64 pebs_timing_info:1; u64 anythread_deprecated:1; };u64 capabilities;
@@ -1003,6 +1004,7 @@ do { \#define PMU_FL_PAIR 0x40/* merge counters for large incr. events */ #define PMU_FL_INSTR_LATENCY 0x80/* Support Instruction Latency in PEBS Memory Info Record */ #define PMU_FL_MEM_LOADS_AUX 0x100/* Require an auxiliary event for the complete memory info */ +#define PMU_FL_RETIRE_LATENCY 0x200/* Support Retire Latency in PEBS */ #define EVENT_VAR (_id) event_attr_##_id#define EVENT_PTR (_id) &event_attr_##_id.attr.attr
PATCH v2 4/9 x86/cpufeatures: Add Architectural PerfMon Extension bit
In reply to [email protected]From: Kan Liang <[email protected]>
CPUID.(EAX=07H, ECX=1):EAX[8] indicates whether the Architectural PerfMon Extension leaf (CPUID leaf 23) is supported.
The "X86_FEATURE_..., word 12" is already mirrored from CPUID "0x00000007:1 (EAX)". Add X86_FEATURE_ARCH_PERFMON_EXT under the "word 12" section.
The new Architectural PerfMon Extension leaf (CPUID leaf 23) will be supported in the perf_events subsystem later.
The feature will not appear in /proc/cpuinfo.
---
Change since V1
- Rebase on top of 6.2-rc1
arch/x86/include/asm/cpufeatures.h | 1 + 1 file changed, 1 insertion(+)
arch/x86/include/asm/cpufeatures.h +1 -0
@@ -312,6 +312,7 @@#define X86_FEATURE_AVX_VNNI (12*32+ 4)/* AVX VNNI instructions */ #define X86_FEATURE_AVX512_BF16 (12*32+ 5)/* AVX512 BFLOAT16 instructions */ #define X86_FEATURE_CMPCCXADD (12*32+ 7)/* "" CMPccXADD instructions */ +#define X86_FEATURE_ARCH_PERFMON_EXT (12*32+ 8)/* "" Intel Architectural PerfMon Extension */ #define X86_FEATURE_AMX_FP16 (12*32+21)/* "" AMX fp16 Support */ #define X86_FEATURE_AVX_IFMA (12*32+23)/* "" Support for VPMADD52[H,L]UQ */
Signature · 1 line
2.35.1
[tip: perf/core] x86/cpufeatures: Add Architectural PerfMon Extension bit
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: a018d2e3d4b1abc4a3cb64415c5d204fc5d2eafd Gitweb: https://git.kernel.org/tip/a018d2e3d4b1abc4a3cb64415c5d204fc5d2eafd Author: Kan Liang <[email protected]> AuthorDate: Wed, 04 Jan 2023 12:13:44 -08:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Mon, 09 Jan 2023 12:22:08 +01:00
x86/cpufeatures: Add Architectural PerfMon Extension bit
CPUID.(EAX=07H, ECX=1):EAX[8] indicates whether the Architectural PerfMon Extension leaf (CPUID leaf 23) is supported.
The "X86_FEATURE_..., word 12" is already mirrored from CPUID "0x00000007:1 (EAX)". Add X86_FEATURE_ARCH_PERFMON_EXT under the "word 12" section.
The new Architectural PerfMon Extension leaf (CPUID leaf 23) will be supported in the perf_events subsystem later.
The feature will not appear in /proc/cpuinfo.
--- arch/x86/include/asm/cpufeatures.h | 1 + 1 file changed, 1 insertion(+)
arch/x86/include/asm/cpufeatures.h +1 -0
@@ -312,6 +312,7 @@#define X86_FEATURE_AVX_VNNI (12*32+ 4)/* AVX VNNI instructions */ #define X86_FEATURE_AVX512_BF16 (12*32+ 5)/* AVX512 BFLOAT16 instructions */ #define X86_FEATURE_CMPCCXADD (12*32+ 7)/* "" CMPccXADD instructions */ +#define X86_FEATURE_ARCH_PERFMON_EXT (12*32+ 8)/* "" Intel Architectural PerfMon Extension */ #define X86_FEATURE_AMX_FP16 (12*32+21)/* "" AMX fp16 Support */ #define X86_FEATURE_AVX_IFMA (12*32+23)/* "" Support for VPMADD52[H,L]UQ */
PATCH v2 5/9 perf/x86/intel: Support Architectural PerfMon Extension leaf
In reply to [email protected]From: Kan Liang <[email protected]>
The new CPUID leaf 0x23 reports the "true view" of PMU resources.
The sub-leaf 1 reports the available general-purpose counters and fixed counters. Update the number of counters and fixed counters when the sub-leaf is detected.
---
No change since V1
arch/x86/events/intel/core.c | 22 ++++++++++++++++++++++ arch/x86/include/asm/perf_event.h | 8 ++++++++ 2 files changed, 30 insertions(+)
arch/x86/events/intel/core.c +22 -0
@@ -4588,6 +4588,25 @@ static void flip_smm_bit(void *data) } } +static void intel_pmu_check_num_counters (int *num_counters, +int *num_counters_fixed, +u64 *intel_ctrl,u64 fixed_mask); + +static void update_pmu_cap (struct x86_hybrid_pmu *pmu) +{ +unsigned int sub_bitmaps =cpuid_eax (ARCH_PERFMON_EXT_LEAF ); +unsigned int eax, ebx, ecx, edx; + +if (sub_bitmaps &ARCH_PERFMON_NUM_COUNTER_LEAF_BIT ) { +cpuid_count (ARCH_PERFMON_EXT_LEAF ,ARCH_PERFMON_NUM_COUNTER_LEAF , + &eax, &ebx, &ecx, &edx); + pmu->num_counters =fls (eax); + pmu->num_counters_fixed =fls (ebx); +intel_pmu_check_num_counters (&pmu->num_counters, &pmu->num_counters_fixed, + &pmu->intel_ctrl, ebx); + } +} +static bool init_hybrid_pmu (int cpu) {struct cpu_hw_events *cpuc = &per_cpu (cpu_hw_events, cpu);
@@ -4613,6 +4632,9 @@ static bool init_hybrid_pmu(int cpu)if (!cpumask_empty (&pmu->supported_cpus)) goto end; +if (this_cpu_has (X86_FEATURE_ARCH_PERFMON_EXT )) +update_pmu_cap (pmu); +if (!check_hw_exists (&pmu->pmu, pmu->num_counters, pmu->num_counters_fixed))return false;
arch/x86/include/asm/perf_event.h +8 -0
@@ -159,6 +159,14 @@ union cpuid10_edx {unsigned int full; }; +/* +* Intel "Architectural Performance Monitoring extension" CPUID +* detection/enumeration details: +*/ +#define ARCH_PERFMON_EXT_LEAF 0x00000023 +#define ARCH_PERFMON_NUM_COUNTER_LEAF_BIT 0x1 +#define ARCH_PERFMON_NUM_COUNTER_LEAF 0x1 +/* * Intel Architectural LBR CPUID detection/enumeration details: */
Signature · 1 line
2.35.1
[tip: perf/core] perf/x86/intel: Support Architectural PerfMon Extension leaf
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: eb467aaac21e133a3d01c48c0a6bf43756b06e78 Gitweb: https://git.kernel.org/tip/eb467aaac21e133a3d01c48c0a6bf43756b06e78 Author: Kan Liang <[email protected]> AuthorDate: Wed, 04 Jan 2023 12:13:45 -08:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Mon, 09 Jan 2023 12:22:08 +01:00
perf/x86/intel: Support Architectural PerfMon Extension leaf
The new CPUID leaf 0x23 reports the "true view" of PMU resources.
The sub-leaf 1 reports the available general-purpose counters and fixed counters. Update the number of counters and fixed counters when the sub-leaf is detected.
--- arch/x86/events/intel/core.c | 22 ++++++++++++++++++++++ arch/x86/include/asm/perf_event.h | 8 ++++++++ 2 files changed, 30 insertions(+)
arch/x86/events/intel/core.c +22 -0
@@ -4588,6 +4588,25 @@ static void flip_smm_bit(void *data) } } +static void intel_pmu_check_num_counters (int *num_counters, +int *num_counters_fixed, +u64 *intel_ctrl,u64 fixed_mask); + +static void update_pmu_cap (struct x86_hybrid_pmu *pmu) +{ +unsigned int sub_bitmaps =cpuid_eax (ARCH_PERFMON_EXT_LEAF ); +unsigned int eax, ebx, ecx, edx; + +if (sub_bitmaps &ARCH_PERFMON_NUM_COUNTER_LEAF_BIT ) { +cpuid_count (ARCH_PERFMON_EXT_LEAF ,ARCH_PERFMON_NUM_COUNTER_LEAF , + &eax, &ebx, &ecx, &edx); + pmu->num_counters =fls (eax); + pmu->num_counters_fixed =fls (ebx); +intel_pmu_check_num_counters (&pmu->num_counters, &pmu->num_counters_fixed, + &pmu->intel_ctrl, ebx); + } +} +static bool init_hybrid_pmu (int cpu) {struct cpu_hw_events *cpuc = &per_cpu (cpu_hw_events, cpu);
@@ -4613,6 +4632,9 @@ static bool init_hybrid_pmu(int cpu)if (!cpumask_empty (&pmu->supported_cpus)) goto end; +if (this_cpu_has (X86_FEATURE_ARCH_PERFMON_EXT )) +update_pmu_cap (pmu); +if (!check_hw_exists (&pmu->pmu, pmu->num_counters, pmu->num_counters_fixed))return false;
arch/x86/include/asm/perf_event.h +8 -0
@@ -160,6 +160,14 @@ union cpuid10_edx { };/* +* Intel "Architectural Performance Monitoring extension" CPUID +* detection/enumeration details: +*/ +#define ARCH_PERFMON_EXT_LEAF 0x00000023 +#define ARCH_PERFMON_NUM_COUNTER_LEAF_BIT 0x1 +#define ARCH_PERFMON_NUM_COUNTER_LEAF 0x1 + +/* * Intel Architectural LBR CPUID detection/enumeration details: */ union cpuid28_eax {
PATCH v2 6/9 perf/x86/cstate: Add Meteor Lake support
In reply to [email protected]From: Kan Liang <[email protected]>
Meteor Lake is Intel's successor to Raptor lake. From the perspective of Intel cstate residency counters, there is nothing changed compared with Raptor lake.
Share adl_cstates with Raptor lake.
Update the comments for Meteor Lake.
---
No change since V1
arch/x86/events/intel/cstate.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
arch/x86/events/intel/cstate.c +12 -9
@@ -41,6 +41,7 @@* MSR_CORE_C1_RES: CORE C1 Residency Counter * perf code: 0x00 * Available model: SLM,AMT,GLM,CNL,ICX,TNT,ADL,RPL +* MTL * Scope: Core (each processor core has a MSR) * MSR_CORE_C3_RESIDENCY: CORE C3 Residency Counter * perf code: 0x01
@@ -51,50 +52,50 @@* perf code: 0x02 * Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW, * SKL,KNL,GLM,CNL,KBL,CML,ICL,ICX, -* TGL,TNT,RKL,ADL,RPL,SPR +* TGL,TNT,RKL,ADL,RPL,SPR,MTL * Scope: Core * MSR_CORE_C7_RESIDENCY: CORE C7 Residency Counter * perf code: 0x03 * Available model: SNB,IVB,HSW,BDW,SKL,CNL,KBL,CML, -* ICL,TGL,RKL,ADL,RPL +* ICL,TGL,RKL,ADL,RPL,MTL * Scope: Core * MSR_PKG_C2_RESIDENCY: Package C2 Residency Counter. * perf code: 0x00 * Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL, * KBL,CML,ICL,ICX,TGL,TNT,RKL,ADL, -* RPL,SPR +* RPL,SPR,MTL * 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,KBL,CML,ICL,TGL,TNT,RKL, -* ADL,RPL +* ADL,RPL,MTL * 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,KBL,CML,ICL,ICX, -* TGL,TNT,RKL,ADL,RPL,SPR +* TGL,TNT,RKL,ADL,RPL,SPR,MTL * 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, -* KBL,CML,ICL,TGL,RKL,ADL,RPL +* KBL,CML,ICL,TGL,RKL,ADL,RPL,MTL * Scope: Package (physical package) * MSR_PKG_C8_RESIDENCY: Package C8 Residency Counter. * perf code: 0x04 * Available model: HSW ULT,KBL,CNL,CML,ICL,TGL,RKL, -* ADL,RPL +* ADL,RPL,MTL * Scope: Package (physical package) * MSR_PKG_C9_RESIDENCY: Package C9 Residency Counter. * perf code: 0x05 * Available model: HSW ULT,KBL,CNL,CML,ICL,TGL,RKL, -* ADL,RPL +* ADL,RPL,MTL * Scope: Package (physical package) * MSR_PKG_C10_RESIDENCY: Package C10 Residency Counter. * perf code: 0x06 * Available model: HSW ULT,KBL,GLM,CNL,CML,ICL,TGL, -* TNT,RKL,ADL,RPL +* TNT,RKL,ADL,RPL,MTL * Scope: Package (physical package) * */
@@ -686,6 +687,8 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE , &adl_cstates),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE_P , &adl_cstates),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE_S , &adl_cstates), +X86_MATCH_INTEL_FAM6_MODEL (METEORLAKE , &adl_cstates), +X86_MATCH_INTEL_FAM6_MODEL (METEORLAKE_L , &adl_cstates), { }, };MODULE_DEVICE_TABLE (x86cpu, intel_cstates_match);
Signature · 1 line
2.35.1
[tip: perf/urgent] perf/x86/cstate: Add Meteor Lake support
The following commit has been merged into the perf/urgent branch of tip:
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 01f2ea5bcf89dbd7a6530dbce7f2fb4e327e7006 Gitweb: https://git.kernel.org/tip/01f2ea5bcf89dbd7a6530dbce7f2fb4e327e7006 Author: Kan Liang <[email protected]> AuthorDate: Wed, 04 Jan 2023 12:13:46 -08:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Mon, 09 Jan 2023 12:00:51 +01:00
perf/x86/cstate: Add Meteor Lake support
Meteor Lake is Intel's successor to Raptor lake. From the perspective of Intel cstate residency counters, there is nothing changed compared with Raptor lake.
Share adl_cstates with Raptor lake.
Update the comments for Meteor Lake.
--- arch/x86/events/intel/cstate.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
arch/x86/events/intel/cstate.c +12 -9
@@ -41,6 +41,7 @@* MSR_CORE_C1_RES: CORE C1 Residency Counter * perf code: 0x00 * Available model: SLM,AMT,GLM,CNL,ICX,TNT,ADL,RPL +* MTL * Scope: Core (each processor core has a MSR) * MSR_CORE_C3_RESIDENCY: CORE C3 Residency Counter * perf code: 0x01
@@ -51,50 +52,50 @@* perf code: 0x02 * Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW, * SKL,KNL,GLM,CNL,KBL,CML,ICL,ICX, -* TGL,TNT,RKL,ADL,RPL,SPR +* TGL,TNT,RKL,ADL,RPL,SPR,MTL * Scope: Core * MSR_CORE_C7_RESIDENCY: CORE C7 Residency Counter * perf code: 0x03 * Available model: SNB,IVB,HSW,BDW,SKL,CNL,KBL,CML, -* ICL,TGL,RKL,ADL,RPL +* ICL,TGL,RKL,ADL,RPL,MTL * Scope: Core * MSR_PKG_C2_RESIDENCY: Package C2 Residency Counter. * perf code: 0x00 * Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL, * KBL,CML,ICL,ICX,TGL,TNT,RKL,ADL, -* RPL,SPR +* RPL,SPR,MTL * 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,KBL,CML,ICL,TGL,TNT,RKL, -* ADL,RPL +* ADL,RPL,MTL * 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,KBL,CML,ICL,ICX, -* TGL,TNT,RKL,ADL,RPL,SPR +* TGL,TNT,RKL,ADL,RPL,SPR,MTL * 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, -* KBL,CML,ICL,TGL,RKL,ADL,RPL +* KBL,CML,ICL,TGL,RKL,ADL,RPL,MTL * Scope: Package (physical package) * MSR_PKG_C8_RESIDENCY: Package C8 Residency Counter. * perf code: 0x04 * Available model: HSW ULT,KBL,CNL,CML,ICL,TGL,RKL, -* ADL,RPL +* ADL,RPL,MTL * Scope: Package (physical package) * MSR_PKG_C9_RESIDENCY: Package C9 Residency Counter. * perf code: 0x05 * Available model: HSW ULT,KBL,CNL,CML,ICL,TGL,RKL, -* ADL,RPL +* ADL,RPL,MTL * Scope: Package (physical package) * MSR_PKG_C10_RESIDENCY: Package C10 Residency Counter. * perf code: 0x06 * Available model: HSW ULT,KBL,GLM,CNL,CML,ICL,TGL, -* TNT,RKL,ADL,RPL +* TNT,RKL,ADL,RPL,MTL * Scope: Package (physical package) * */
@@ -686,6 +687,8 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE , &adl_cstates),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE_P , &adl_cstates),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE_S , &adl_cstates), +X86_MATCH_INTEL_FAM6_MODEL (METEORLAKE , &adl_cstates), +X86_MATCH_INTEL_FAM6_MODEL (METEORLAKE_L , &adl_cstates), { }, };MODULE_DEVICE_TABLE (x86cpu, intel_cstates_match);
[tip: perf/core] perf/x86/cstate: Add Meteor Lake support
In reply to [email protected]The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: eaef048c281bf7eaecdfde96d9b305b8644c9f66 Gitweb: https://git.kernel.org/tip/eaef048c281bf7eaecdfde96d9b305b8644c9f66 Author: Kan Liang <[email protected]> AuthorDate: Wed, 04 Jan 2023 12:13:46 -08:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Mon, 09 Jan 2023 12:22:08 +01:00
perf/x86/cstate: Add Meteor Lake support
Meteor Lake is Intel's successor to Raptor lake. From the perspective of Intel cstate residency counters, there is nothing changed compared with Raptor lake.
Share adl_cstates with Raptor lake.
Update the comments for Meteor Lake.
--- arch/x86/events/intel/cstate.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
arch/x86/events/intel/cstate.c +12 -9
@@ -41,6 +41,7 @@* MSR_CORE_C1_RES: CORE C1 Residency Counter * perf code: 0x00 * Available model: SLM,AMT,GLM,CNL,ICX,TNT,ADL,RPL +* MTL * Scope: Core (each processor core has a MSR) * MSR_CORE_C3_RESIDENCY: CORE C3 Residency Counter * perf code: 0x01
@@ -51,50 +52,50 @@* perf code: 0x02 * Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW, * SKL,KNL,GLM,CNL,KBL,CML,ICL,ICX, -* TGL,TNT,RKL,ADL,RPL,SPR +* TGL,TNT,RKL,ADL,RPL,SPR,MTL * Scope: Core * MSR_CORE_C7_RESIDENCY: CORE C7 Residency Counter * perf code: 0x03 * Available model: SNB,IVB,HSW,BDW,SKL,CNL,KBL,CML, -* ICL,TGL,RKL,ADL,RPL +* ICL,TGL,RKL,ADL,RPL,MTL * Scope: Core * MSR_PKG_C2_RESIDENCY: Package C2 Residency Counter. * perf code: 0x00 * Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL, * KBL,CML,ICL,ICX,TGL,TNT,RKL,ADL, -* RPL,SPR +* RPL,SPR,MTL * 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,KBL,CML,ICL,TGL,TNT,RKL, -* ADL,RPL +* ADL,RPL,MTL * 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,KBL,CML,ICL,ICX, -* TGL,TNT,RKL,ADL,RPL,SPR +* TGL,TNT,RKL,ADL,RPL,SPR,MTL * 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, -* KBL,CML,ICL,TGL,RKL,ADL,RPL +* KBL,CML,ICL,TGL,RKL,ADL,RPL,MTL * Scope: Package (physical package) * MSR_PKG_C8_RESIDENCY: Package C8 Residency Counter. * perf code: 0x04 * Available model: HSW ULT,KBL,CNL,CML,ICL,TGL,RKL, -* ADL,RPL +* ADL,RPL,MTL * Scope: Package (physical package) * MSR_PKG_C9_RESIDENCY: Package C9 Residency Counter. * perf code: 0x05 * Available model: HSW ULT,KBL,CNL,CML,ICL,TGL,RKL, -* ADL,RPL +* ADL,RPL,MTL * Scope: Package (physical package) * MSR_PKG_C10_RESIDENCY: Package C10 Residency Counter. * perf code: 0x06 * Available model: HSW ULT,KBL,GLM,CNL,CML,ICL,TGL, -* TNT,RKL,ADL,RPL +* TNT,RKL,ADL,RPL,MTL * Scope: Package (physical package) * */
@@ -686,6 +687,8 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE , &adl_cstates),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE_P , &adl_cstates),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE_S , &adl_cstates), +X86_MATCH_INTEL_FAM6_MODEL (METEORLAKE , &adl_cstates), +X86_MATCH_INTEL_FAM6_MODEL (METEORLAKE_L , &adl_cstates), { }, };MODULE_DEVICE_TABLE (x86cpu, intel_cstates_match);
PATCH v2 7/9 perf/x86/msr: Add Meteor Lake support
In reply to [email protected]From: Kan Liang <[email protected]>
Meteor Lake is Intel's successor to Raptor lake. PPERF and SMI_COUNT MSRs are also supported.
---
No change since V1
arch/x86/events/msr.c | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/events/msr.c +2 -0
@@ -107,6 +107,8 @@ static bool test_intel(int idx, void *data)case INTEL_FAM6_RAPTORLAKE :case INTEL_FAM6_RAPTORLAKE_P :case INTEL_FAM6_RAPTORLAKE_S : +case INTEL_FAM6_METEORLAKE : +case INTEL_FAM6_METEORLAKE_L :if (idx ==PERF_MSR_SMI || idx ==PERF_MSR_PPERF )return true;break ;
Signature · 1 line
2.35.1
[tip: perf/urgent] perf/x86/msr: Add Meteor Lake support
The following commit has been merged into the perf/urgent branch of tip:
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 6887a4d3aede084bf08b70fbc9736c69fce05d7f Gitweb: https://git.kernel.org/tip/6887a4d3aede084bf08b70fbc9736c69fce05d7f Author: Kan Liang <[email protected]> AuthorDate: Wed, 04 Jan 2023 12:13:47 -08:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Mon, 09 Jan 2023 12:00:52 +01:00
perf/x86/msr: Add Meteor Lake support
Meteor Lake is Intel's successor to Raptor lake. PPERF and SMI_COUNT MSRs are also supported.
--- arch/x86/events/msr.c | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/events/msr.c +2 -0
@@ -107,6 +107,8 @@ static bool test_intel(int idx, void *data)case INTEL_FAM6_RAPTORLAKE :case INTEL_FAM6_RAPTORLAKE_P :case INTEL_FAM6_RAPTORLAKE_S : +case INTEL_FAM6_METEORLAKE : +case INTEL_FAM6_METEORLAKE_L :if (idx ==PERF_MSR_SMI || idx ==PERF_MSR_PPERF )return true;break ;
[tip: perf/core] perf/x86/msr: Add Meteor Lake support
In reply to [email protected]The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: b0bd3336d87f3403094fbadc7803c1d5bf3df4f7 Gitweb: https://git.kernel.org/tip/b0bd3336d87f3403094fbadc7803c1d5bf3df4f7 Author: Kan Liang <[email protected]> AuthorDate: Wed, 04 Jan 2023 12:13:47 -08:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Mon, 09 Jan 2023 12:22:09 +01:00
perf/x86/msr: Add Meteor Lake support
Meteor Lake is Intel's successor to Raptor lake. PPERF and SMI_COUNT MSRs are also supported.
--- arch/x86/events/msr.c | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/events/msr.c +2 -0
@@ -107,6 +107,8 @@ static bool test_intel(int idx, void *data)case INTEL_FAM6_RAPTORLAKE :case INTEL_FAM6_RAPTORLAKE_P :case INTEL_FAM6_RAPTORLAKE_S : +case INTEL_FAM6_METEORLAKE : +case INTEL_FAM6_METEORLAKE_L :if (idx ==PERF_MSR_SMI || idx ==PERF_MSR_PPERF )return true;break ;
Arnaldo Carvalho de Melo
maintainerRe: [PATCH V2 7/9] perf/x86/msr: Add Meteor Lake support
In reply to [email protected]Em Wed, Jan 04, 2023 at 12:13:47PM -0800, [email protected] escreveu:
Quoted 8 lines
From: Kan Liang <[email protected]>
Meteor Lake is Intel's successor to Raptor lake. PPERF and
SMI_COUNTMSRs are also supported.Reviewed-by Andi Kleen <[email protected]>Signed-off-by Kan Liang <[email protected]>---
Did the kernel bits land upstream?
- Arnaldo
Quoted 20 lines
No change since V1
arch/x86/events/msr.c | 2 ++ 1 file changed, 2 insertions(+)arch/x86/events/msr.c +2
-0@@ -107,6 +107,8 @@ static bool test_intel(int idx, void *data)case INTEL_FAM6_RAPTORLAKE :case INTEL_FAM6_RAPTORLAKE_P :case INTEL_FAM6_RAPTORLAKE_S : +case INTEL_FAM6_METEORLAKE : +case INTEL_FAM6_METEORLAKE_L :if (idx ==PERF_MSR_SMI || idx ==PERF_MSR_PPERF )return true;break ;Signature · 1 line
2.35.1
Signature · 1 line
- Arnaldo
Re: [PATCH V2 7/9] perf/x86/msr: Add Meteor Lake support
Hi Arnaldo,
Quoted 11 lines · Arnaldo Carvalho de Melo
Em Wed, Jan 04, 2023 at 12:13:47PM -0800, [email protected] escreveu:
Quoted 8 lines
From: Kan Liang <[email protected]>
Meteor Lake is Intel's successor to Raptor lake. PPERF and
SMI_COUNTMSRs are also supported.Reviewed-by Andi Kleen <[email protected]>Signed-off-by Kan Liang <[email protected]>---
Did the kernel bits land upstream?
Yes, the kernel part has been merged into the tip.git perf/core branch.
Thanks for checking the status. There are two perf tool patches in this series, which hasn't been merged. Should I resend them?
Thanks,
Kan
Quoted 24 lines
- Arnaldo
Quoted 20 lines
No change since V1
arch/x86/events/msr.c | 2 ++ 1 file changed, 2 insertions(+)arch/x86/events/msr.c +2
-0@@ -107,6 +107,8 @@ static bool test_intel(int idx, void *data)case INTEL_FAM6_RAPTORLAKE :case INTEL_FAM6_RAPTORLAKE_P :case INTEL_FAM6_RAPTORLAKE_S : +case INTEL_FAM6_METEORLAKE : +case INTEL_FAM6_METEORLAKE_L :if (idx ==PERF_MSR_SMI || idx ==PERF_MSR_PPERF )return true;break ;Signature · 1 line
2.35.1
Re: [PATCH V2 7/9] perf/x86/msr: Add Meteor Lake support
Quoted 13 lines · Kan
Hi Arnaldo,
Quoted 10 lines · Arnaldo Carvalho de Melo
Em Wed, Jan 04, 2023 at 12:13:47PM -0800, [email protected] escreveu:
Quoted 8 lines
From: Kan Liang <[email protected]>
Meteor Lake is Intel's successor to Raptor lake. PPERF and
SMI_COUNTMSRs are also supported.Reviewed-by Andi Kleen <[email protected]>Signed-off-by Kan Liang <[email protected]>---
Quoted 5 lines
Quoted 1 line
Did the kernel bits land upstream?
Yes, the kernel part has been merged into the tip.git perf/core branch.
Thanks for checking the status. There are two perf tool patches in this series, which hasn't been merged. Should I resend them?
Please, try rebasing it on the tmp.perf/core in my tree.
- Arnaldo
Quoted 24 lines
Quoted 24 lines
Quoted 23 lines
No change since V1
arch/x86/events/msr.c | 2 ++ 1 file changed, 2 insertions(+)arch/x86/events/msr.c +2
-0@@ -107,6 +107,8 @@ static bool test_intel(int idx, void *data)case INTEL_FAM6_RAPTORLAKE :case INTEL_FAM6_RAPTORLAKE_P :case INTEL_FAM6_RAPTORLAKE_S : +case INTEL_FAM6_METEORLAKE : +case INTEL_FAM6_METEORLAKE_L :if (idx ==PERF_MSR_SMI || idx ==PERF_MSR_PPERF )return true;break ;Signature · 1 line
2.35.1
Arnaldo Carvalho de Melo
maintainerRe: [PATCH V2 7/9] perf/x86/msr: Add Meteor Lake support
In reply to Liang, KanEm Thu, Feb 02, 2023 at 09:34:02AM -0500, Liang, Kan escreveu:
Quoted 13 lines
Hi Arnaldo,
Quoted 10 lines · Arnaldo Carvalho de Melo
Em Wed, Jan 04, 2023 at 12:13:47PM -0800, [email protected] escreveu:
Quoted 8 lines
From: Kan Liang <[email protected]>
Meteor Lake is Intel's successor to Raptor lake. PPERF and
SMI_COUNTMSRs are also supported.Reviewed-by Andi Kleen <[email protected]>Signed-off-by Kan Liang <[email protected]>---
Quoted 5 lines
Quoted 1 line
Did the kernel bits land upstream?
Yes, the kernel part has been merged into the tip.git perf/core branch.
Thanks for checking the status. There are two perf tool patches in this series, which hasn't been merged. Should I resend them?
Lemme try cherry-picking just the tooling bits from this series.
Quoted 26 lines
Thanks,
KanQuoted 24 lines
- Arnaldo
Quoted 20 lines
No change since V1
arch/x86/events/msr.c | 2 ++ 1 file changed, 2 insertions(+)arch/x86/events/msr.c +2
-0@@ -107,6 +107,8 @@ static bool test_intel(int idx, void *data)case INTEL_FAM6_RAPTORLAKE :case INTEL_FAM6_RAPTORLAKE_P :case INTEL_FAM6_RAPTORLAKE_S : +case INTEL_FAM6_METEORLAKE : +case INTEL_FAM6_METEORLAKE_L :if (idx ==PERF_MSR_SMI || idx ==PERF_MSR_PPERF )return true;break ;Signature · 1 line
2.35.1
Signature · 1 line
- Arnaldo
Arnaldo Carvalho de Melo
maintainerRe: [PATCH V2 7/9] perf/x86/msr: Add Meteor Lake support
Em Fri, Feb 03, 2023 at 05:21:15PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 14 lines
Em Thu, Feb 02, 2023 at 09:34:02AM -0500, Liang, Kan escreveu:
Quoted 13 lines
Hi Arnaldo,
Quoted 10 lines · Arnaldo Carvalho de Melo
Em Wed, Jan 04, 2023 at 12:13:47PM -0800, [email protected] escreveu:
Quoted 8 lines
From: Kan Liang <[email protected]>
Meteor Lake is Intel's successor to Raptor lake. PPERF and
SMI_COUNTMSRs are also supported.Reviewed-by Andi Kleen <[email protected]>Signed-off-by Kan Liang <[email protected]>---
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
Did the kernel bits land upstream?
Yes, the kernel part has been merged into the tip.git perf/core branch.
Thanks for checking the status. There are two perf tool patches in this series, which hasn't been merged. Should I resend them?
Lemme try cherry-picking just the tooling bits from this series.
There was a clash with:
commit 3fd7a168bf51497909dbfb7347af28b5c57e74a6
Author: Namhyung Kim <[email protected]> Date: Thu Jan 26 13:36:10 2023 -0800
perf script: Add 'cgroup' field for output
And a minor fuzz on the first patch, I applied manually and resolved the conflict,
Thanks,
- Arnaldo
Quoted 30 lines
Quoted 26 lines
Thanks,
KanQuoted 24 lines
- Arnaldo
Quoted 20 lines
No change since V1
arch/x86/events/msr.c | 2 ++ 1 file changed, 2 insertions(+)arch/x86/events/msr.c +2
-0@@ -107,6 +107,8 @@ static bool test_intel(int idx, void *data)case INTEL_FAM6_RAPTORLAKE :case INTEL_FAM6_RAPTORLAKE_P :case INTEL_FAM6_RAPTORLAKE_S : +case INTEL_FAM6_METEORLAKE : +case INTEL_FAM6_METEORLAKE_L :if (idx ==PERF_MSR_SMI || idx ==PERF_MSR_PPERF )return true;break ;Signature · 1 line
2.35.1Signature · 1 line
- Arnaldo
Signature · 1 line
- Arnaldo
Re: [PATCH V2 7/9] perf/x86/msr: Add Meteor Lake support
Quoted 23 lines · Arnaldo Carvalho de Melo
Em Fri, Feb 03, 2023 at 05:21:15PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 21 lines
Em Thu, Feb 02, 2023 at 09:34:02AM -0500, Liang, Kan escreveu:
Quoted 13 lines
Hi Arnaldo,
Quoted 10 lines · Arnaldo Carvalho de Melo
Em Wed, Jan 04, 2023 at 12:13:47PM -0800, [email protected] escreveu:
Quoted 8 lines
From: Kan Liang <[email protected]>
Meteor Lake is Intel's successor to Raptor lake. PPERF and
SMI_COUNTMSRs are also supported.Reviewed-by Andi Kleen <[email protected]>Signed-off-by Kan Liang <[email protected]>---
Quoted 5 lines
Quoted 1 line
Did the kernel bits land upstream?
Yes, the kernel part has been merged into the tip.git perf/core branch.
Thanks for checking the status. There are two perf tool patches in this series, which hasn't been merged. Should I resend them?
Lemme try cherry-picking just the tooling bits from this series.
Sorry, I forgot to mention it in this thread.
I sent V3 with only perf tool patches.
https://lore.kernel.org/lkml/[email protected]/
Quoted 10 lines
There was a clash with:
commit
3fd7a168bf51497909dbfb7347af28b5c57e74a6Author: Namhyung Kim <[email protected]> Date: Thu Jan 26 13:36:10 2023 -0800perf script: Add 'cgroup' field for output
And a minor fuzz on the first patch, I applied manually and resolved the conflict,
The V3 add a perf test case for the new field. Could you please apply it as well?
Sorry for the inconvenience.
Thanks,
Kan
Quoted 36 lines
Thanks,
- Arnaldo
Quoted 30 lines
Quoted 26 lines
Thanks,
KanQuoted 24 lines
- Arnaldo
Quoted 20 lines
No change since V1
arch/x86/events/msr.c | 2 ++ 1 file changed, 2 insertions(+)arch/x86/events/msr.c +2
-0@@ -107,6 +107,8 @@ static bool test_intel(int idx, void *data)case INTEL_FAM6_RAPTORLAKE :case INTEL_FAM6_RAPTORLAKE_P :case INTEL_FAM6_RAPTORLAKE_S : +case INTEL_FAM6_METEORLAKE : +case INTEL_FAM6_METEORLAKE_L :if (idx ==PERF_MSR_SMI || idx ==PERF_MSR_PPERF )return true;break ;Signature · 1 line
2.35.1Signature · 1 line
- Arnaldo
Arnaldo Carvalho de Melo
maintainerRe: [PATCH V2 7/9] perf/x86/msr: Add Meteor Lake support
Em Mon, Feb 06, 2023 at 09:32:00AM -0500, Liang, Kan escreveu:
Quoted 41 lines · Arnaldo Carvalho de Melo
Quoted 23 lines
Em Fri, Feb 03, 2023 at 05:21:15PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 21 lines
Em Thu, Feb 02, 2023 at 09:34:02AM -0500, Liang, Kan escreveu:
Quoted 13 lines
Hi Arnaldo,
Quoted 10 lines · Arnaldo Carvalho de Melo
Em Wed, Jan 04, 2023 at 12:13:47PM -0800, [email protected] escreveu:
Quoted 8 lines
From: Kan Liang <[email protected]>
Meteor Lake is Intel's successor to Raptor lake. PPERF and
SMI_COUNTMSRs are also supported.Reviewed-by Andi Kleen <[email protected]>Signed-off-by Kan Liang <[email protected]>---
Quoted 5 lines
Quoted 1 line
Did the kernel bits land upstream?
Yes, the kernel part has been merged into the tip.git perf/core branch.
Thanks for checking the status. There are two perf tool patches in this series, which hasn't been merged. Should I resend them?
Lemme try cherry-picking just the tooling bits from this series.
Sorry, I forgot to mention it in this thread.
I sent V3 with only perf tool patches.https://lore.kernel.org/lkml/[email protected]/
Quoted 8 lines
There was a clash with:
commit
3fd7a168bf51497909dbfb7347af28b5c57e74a6Author: Namhyung Kim <[email protected]> Date: Thu Jan 26 13:36:10 2023 -0800perf script: Add 'cgroup' field for output
Quoted 7 lines
Quoted 2 lines
And a minor fuzz on the first patch, I applied manually and resolved the conflict,
The V3 add a perf test case for the new field. Could you please apply it as well?
Sorry for the inconvenience.
np, I'll pick the test and apply it as well,
Thanks for letting me know,
- Arnaldo
PATCH v2 8/9 perf report: Support Retire Latency
In reply to [email protected]From: Kan Liang <[email protected]>
The Retire Latency field is added in the var3_w of the PERF_SAMPLE_WEIGHT_STRUCT. The Retire Latency reports pipeline stall of this instruction compared to the previous instruction in cycles. That's quite useful to display the information with perf mem report.
The p_stage_cyc for Power is also from the var3_w. Union the p_stage_cyc and retire_lat to share the code.
Implement X86 specific codes to display the X86 specific header.
Add a new sort key retire_lat for the Retire Latency.
---
Change since V1
- Rebase on top of 6.2-rc1
tools/perf/Documentation/perf-report.txt | 2 ++ tools/perf/arch/x86/util/event.c | 20 ++++++++++++++++++++ tools/perf/util/sample.h | 5 ++++- tools/perf/util/sort.c | 2 ++ tools/perf/util/sort.h | 2 ++ 5 files changed, 30 insertions(+), 1 deletion(-)
tools/perf/Documentation/perf-report.txt +2 -0
@@ -115,6 +115,8 @@ OPTIONS - p_stage_cyc: On powerpc, this presents the number of cycles spent in a pipeline stage. And currently supported only on powerpc. - addr: (Full) virtual address of the sampled instruction + - retire_lat: On X86, this reports pipeline stall of this instruction compared + to the previous instruction in cycles. And currently supported only on X86 By default, comm, dso and symbol keys are used. (i.e. --sort comm,dso,symbol)
tools/perf/arch/x86/util/event.c +20 -0
@@ -89,6 +89,7 @@ void arch_perf_parse_sample_weight(struct perf_sample *data,else { data->weight = weight.var1_dw; data->ins_lat = weight.var2_w; + data->retire_lat = weight.var3_w; } }
@@ -102,3 +103,22 @@ void arch_perf_synthesize_sample_weight(const struct perf_sample *data, *array |= ((u64 )data->ins_lat <<32 ); } } + +const char *arch_perf_header_entry (const char *se_header) +{ +if (!strcmp (se_header,"Local Pipeline Stage Cycle" )) +return "Local Retire Latency" ; +else if (!strcmp (se_header,"Pipeline Stage Cycle" )) +return "Retire Latency" ; + +return se_header; +} + +int arch_support_sort_key (const char *sort_key) +{ +if (!strcmp (sort_key,"p_stage_cyc" )) +return 1 ; +if (!strcmp (sort_key,"local_p_stage_cyc" )) +return 1 ; +return 0 ; +}
tools/perf/util/sample.h +4 -1
@@ -92,7 +92,10 @@ struct perf_sample {u8 cpumode;u16 misc;u16 ins_lat; -u16 p_stage_cyc; +union { +u16 p_stage_cyc; +u16 retire_lat; + };bool no_hw_idx;/* No hw_idx collected in branch_stack */ char insn[MAX_INSN ];void *raw_data;
tools/perf/util/sort.c +2 -0
@@ -2132,6 +2132,8 @@ static struct sort_dimension common_sort_dimensions[] = {DIM (SORT_LOCAL_PIPELINE_STAGE_CYC ,"local_p_stage_cyc" , sort_local_p_stage_cyc),DIM (SORT_GLOBAL_PIPELINE_STAGE_CYC ,"p_stage_cyc" , sort_global_p_stage_cyc),DIM (SORT_ADDR ,"addr" , sort_addr), +DIM (SORT_LOCAL_RETIRE_LAT ,"local_retire_lat" , sort_local_p_stage_cyc), + DIM(SORT_GLOBAL_RETIRE_LAT, "retire_lat", sort_global_p_stage_cyc), };#undef DIM
tools/perf/util/sort.h +2 -0
@@ -237,6 +237,8 @@ enum sort_type {SORT_LOCAL_PIPELINE_STAGE_CYC ,SORT_GLOBAL_PIPELINE_STAGE_CYC ,SORT_ADDR , +SORT_LOCAL_RETIRE_LAT , +SORT_GLOBAL_RETIRE_LAT ,/* branch stack specific sort keys */ __SORT_BRANCH_STACK,
Signature · 1 line
2.35.1
PATCH v2 9/9 perf script: Support Retire Latency
In reply to [email protected]From: Kan Liang <[email protected]>
The Retire Latency field is added in the var3_w of the PERF_SAMPLE_WEIGHT_STRUCT. The Retire Latency reports the number of elapsed core clocks between the retirement of the instruction indicated by the Instruction Pointer field of the PEBS record and the retirement of the prior instruction. That's quite useful to display the information with perf script.
Add a new field retire_lat for the Retire Latency information.
---
Change since V1
- Rebase on top of 6.2-rc1
tools/perf/builtin-script.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
tools/perf/builtin-script.c +11 -2
@@ -130,6 +130,7 @@ enum perf_output_field {PERF_OUTPUT_BRSTACKINSNLEN =1ULL <<36 ,PERF_OUTPUT_MACHINE_PID =1ULL <<37 ,PERF_OUTPUT_VCPU =1ULL <<38 , + PERF_OUTPUT_RETIRE_LAT = 1ULL << 39, }; struct perf_script {
@@ -200,6 +201,7 @@ struct output_option { {.str = "brstackinsnlen", .field = PERF_OUTPUT_BRSTACKINSNLEN}, {.str = "machine_pid", .field = PERF_OUTPUT_MACHINE_PID}, {.str = "vcpu", .field = PERF_OUTPUT_VCPU}, + {.str = "retire_lat", .field = PERF_OUTPUT_RETIRE_LAT}, }; enum {
@@ -275,7 +277,7 @@ static struct {PERF_OUTPUT_ADDR |PERF_OUTPUT_DATA_SRC |PERF_OUTPUT_WEIGHT |PERF_OUTPUT_PHYS_ADDR |PERF_OUTPUT_DATA_PAGE_SIZE |PERF_OUTPUT_CODE_PAGE_SIZE | - PERF_OUTPUT_INS_LAT, + PERF_OUTPUT_INS_LAT | PERF_OUTPUT_RETIRE_LAT, .invalid_fields = PERF_OUTPUT_TRACE | PERF_OUTPUT_BPF_OUTPUT, },
@@ -542,6 +544,10 @@ static int evsel__check_attr(struct evsel *evsel, struct perf_session *session) evsel__check_stype(evsel, PERF_SAMPLE_WEIGHT_STRUCT, "WEIGHT_STRUCT", PERF_OUTPUT_INS_LAT)) return -EINVAL; +if (PRINT_FIELD (RETIRE_LAT ) && +evsel__check_stype (evsel,PERF_SAMPLE_WEIGHT_STRUCT ,"WEIGHT_STRUCT" ,PERF_OUTPUT_RETIRE_LAT )) +return -EINVAL ; +return 0 ; }
@@ -2178,6 +2184,9 @@ static void process_event(struct perf_script *script,if (PRINT_FIELD (INS_LAT ))fprintf (fp,"%16" PRIu16, sample->ins_lat); +if (PRINT_FIELD (RETIRE_LAT )) +fprintf (fp,"%16" PRIu16, sample->retire_lat); +if (PRINT_FIELD (IP )) {struct callchain_cursor *cursor =NULL ;
@@ -3856,7 +3865,7 @@ int cmd_script(int argc, const char **argv) "brstacksym,flags,data_src,weight,bpf-output,brstackinsn," "brstackinsnlen,brstackoff,callindent,insn,insnlen,synth," "phys_addr,metric,misc,srccode,ipc,tod,data_page_size," - "code_page_size,ins_lat", + "code_page_size,ins_lat,retire_lat", parse_output_fields),OPT_BOOLEAN ('a' ,"all-cpus" , &system_wide, "system-wide collection from all CPUs"),
Signature · 1 line
2.35.1
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: b6c00fb9949fbd073e651a77aa75faca978cf2a6 Gitweb: https://git.kernel.org/tip/b6c00fb9949fbd073e651a77aa75faca978cf2a6 Author: Kan Liang <[email protected]> AuthorDate: Wed, 04 Jan 2023 12:13:41 -08:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Mon, 09 Jan 2023 12:22:07 +01:00
perf: Add PMU_FORMAT_ATTR_SHOW
The macro PMU_FORMAT_ATTR facilitates the definition of both the "show" function and "format_attr". But it only works for a non-hybrid platform. For a hybrid platform, the name "format_attr_hybrid_" is used.
The definition of the "show" function can be shared between a non-hybrid platform and a hybrid platform. Add a new macro PMU_FORMAT_ATTR_SHOW.
No functional change. The PMU_FORMAT_ATTR_SHOW will be used in the following patch.
--- include/linux/perf_event.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
include/linux/perf_event.h +4 -1
@@ -1724,7 +1724,7 @@ static struct perf_pmu_events_attr _var = { \ .id = _id, } \ })[0].attr.attr) -#define PMU_FORMAT_ATTR (_name, _format) \ +#define PMU_FORMAT_ATTR_SHOW (_name, _format) \ static ssize_t \ _name##_show(struct device *dev, \ struct device_attribute *attr, \
@@ -1733,6 +1733,9 @@ _name##_show(struct device *dev, \BUILD_BUG_ON (sizeof (_format) >=PAGE_SIZE ); \return sprintf (page, _format"\n" ); \ } \ + +#define PMU_FORMAT_ATTR (_name, _format) \ + PMU_FORMAT_ATTR_SHOW(_name, _format) \ \ static struct device_attribute format_attr_##_name = __ATTR_RO(_name)