perf/x86/intel: Fix PEBS memory access info encoding for ADL
Subsystems (2)
PATCH 1/2 perf/x86/intel: Fix PEBS memory access info encoding for ADL
From: Kan Liang <[email protected]>
The PEBS memory access latency encoding for the e-core is slightly different from the p-core. The bit 4 is Lock, while the bit 5 is TLB access.
Add flag pebs_adl_atom_dse to indicate this case. Swap the ld_stlb_miss and ld_locked for the e-core of ADL.
--- arch/x86/events/intel/core.c | 1 + arch/x86/events/intel/ds.c | 32 ++++++++++++++++++++++++++++---- arch/x86/events/perf_event.h | 3 ++- 3 files changed, 31 insertions(+), 5 deletions(-)
arch/x86/events/intel/core.c +1 -0
@@ -6233,6 +6233,7 @@ __init int intel_pmu_init(void) x86_pmu.pebs_aliases =NULL ; x86_pmu.pebs_prec_dist = true; x86_pmu.pebs_block = true; + x86_pmu.pebs_adl_atom_dse = true; x86_pmu.flags |=PMU_FL_HAS_RSP_1 ; x86_pmu.flags |=PMU_FL_NO_HT_SHARING ; x86_pmu.flags |=PMU_FL_PEBS_ALL ;
arch/x86/events/intel/ds.c +28 -4
@@ -171,7 +171,24 @@ static u64 precise_datala_hsw(struct perf_event *event, u64 status)return dse.val; } -static u64 load_latency_data (u64 status) +static inline void pebs_dse_adl (struct perf_event *event, +union intel_x86_pebs_dse *dse) +{ +struct x86_hybrid_pmu *pmu =hybrid_pmu (event->pmu); + +if (pmu->cpu_type == hybrid_big) +return ; +/* +* For the atom core on ADL, bit 4: lock, bit 5: TLB access. +* Swap the ld_stlb_miss and ld_locked. +*/ +if (dse->ld_stlb_miss != dse->ld_locked) { + dse->ld_stlb_miss = !dse->ld_stlb_miss; + dse->ld_locked = !dse->ld_locked; + } +} + +static u64 load_latency_data (struct perf_event *event,u64 status) {union intel_x86_pebs_dse dse;u64 val;
@@ -190,6 +207,10 @@ static u64 load_latency_data(u64 status) val |=P (TLB ,NA ) |P (LOCK ,NA );return val; } + +if (x86_pmu.pebs_adl_atom_dse) +pebs_dse_adl (event, &dse); +/* * bit 4: TLB access * 0 = did not miss 2nd level TLB
@@ -233,7 +254,7 @@ static u64 load_latency_data(u64 status)return val; } -static u64 store_latency_data (u64 status) +static u64 store_latency_data (struct perf_event *event,u64 status) {union intel_x86_pebs_dse dse;u64 val;
@@ -245,6 +266,9 @@ static u64 store_latency_data(u64 status)*/ val = pebs_data_source[dse.st_lat_dse]; +if (x86_pmu.pebs_adl_atom_dse) +pebs_dse_adl (event, &dse); +/* * bit 4: TLB access * 0 = did not miss 2nd level TLB
@@ -1443,9 +1467,9 @@ static u64 get_data_src(struct perf_event *event, u64 aux)bool fst = fl & (PERF_X86_EVENT_PEBS_ST |PERF_X86_EVENT_PEBS_HSW_PREC );if (fl &PERF_X86_EVENT_PEBS_LDLAT ) - val =load_latency_data (aux); + val =load_latency_data (event, aux);else if (fl &PERF_X86_EVENT_PEBS_STLAT ) - val =store_latency_data (aux); + val =store_latency_data (event, aux);else if (fst && (fl &PERF_X86_EVENT_PEBS_HSW_PREC )) val =precise_datala_hsw (event, aux);else if (fst)
arch/x86/events/perf_event.h +2 -1
@@ -815,7 +815,8 @@ struct x86_pmu { pebs_prec_dist :1, pebs_no_tlb :1, pebs_no_isolation :1, - pebs_block :1; + pebs_block :1, + pebs_adl_atom_dse :1;int pebs_record_size;int pebs_buffer_size;int max_pebs_events;
Signature · 1 line
2.35.1
PATCH 2/2 perf/x86/intel: Fix PEBS data source encoding for ADL
From: Kan Liang <[email protected]>
The PEBS data source encoding for the e-core is different from the p-core.
Add the pebs_data_source[] in the struct x86_hybrid_pmu to store the data source encoding for each type of the core.
Add intel_pmu_pebs_data_source_grt() for the e-core. There is nothing changed for the data source encoding of the p-core, which still reuse the intel_pmu_pebs_data_source_skl().
--- arch/x86/events/intel/core.c | 2 +- arch/x86/events/intel/ds.c | 41 +++++++++++++++++++++++++++++------- arch/x86/events/perf_event.h | 6 ++++++ 3 files changed, 40 insertions(+), 9 deletions(-)
arch/x86/events/intel/core.c +1 -1
@@ -6240,7 +6240,7 @@ __init int intel_pmu_init(void) 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_skl (false); +intel_pmu_pebs_data_source_adl (); x86_pmu.num_topdown_events =8 ; x86_pmu.update_topdown_event = adl_update_topdown_event; x86_pmu.set_topdown_event_period = adl_set_topdown_event_period;
arch/x86/events/intel/ds.c +33 -8
62 lines not on this page · raw message
arch/x86/events/perf_event.h +6 -0
@@ -635,6 +635,8 @@ enum { x86_lbr_exclusive_max, }; +#define PERF_PEBS_DATA_SOURCE_MAX 0x10 +struct x86_hybrid_pmu {struct pmu pmu;const char *name;
@@ -662,6 +664,8 @@ struct x86_hybrid_pmu { unsigned int late_ack :1, mid_ack :1, enabled_ack :1; + +u64 pebs_data_source[PERF_PEBS_DATA_SOURCE_MAX ]; }; static __always_inline struct x86_hybrid_pmu *hybrid_pmu(struct pmu *pmu)
@@ -1407,6 +1411,8 @@ void intel_pmu_pebs_data_source_nhm(void);void intel_pmu_pebs_data_source_skl (bool pmem); +void intel_pmu_pebs_data_source_adl (void ); +int intel_pmu_setup_lbr_filter (struct perf_event *event);void intel_pt_interrupt (void );
Signature · 1 line
2.35.1