perf: Add Tremont support
Subsystems (2)
v2 cover perf: Add Tremont support
From: Kan Liang <[email protected]>
The patch series intends to add Tremont support for Linux perf.
The patch series is on top of Icelake V5 patch series (with Peter's cleanup patch).
https://lkml.org/lkml/2019/4/8/630
PATCH 1: A fix for Icelake V5 patch series (with Peter's cleanup patch).
It can be merged back into "Subject: perf/x86/intel: Add Icelake support"
PATCH 2: Tremont core PMU support.
Changes since V1:
- The previous patch "perf/x86/intel: Support adaptive PEBS for fixed counters" will be merged back.
- New patch to fix the checking for instruction event.
- Allow instruction:ppp on generic purpose counter 0
Kan Liang (2):
perf/x86/intel: Fix the checking for instruction event perf/x86/intel: Add Tremont core PMU support
arch/x86/events/intel/core.c | 96 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 95 insertions(+), 1 deletion(-)
Signature · 1 line
2.7.4
PATCH v2 1/2 perf/x86/intel: Fix the checking for instruction event
From: Kan Liang <[email protected]>
Some bits must be masked before checking X86_CONFIG(.event=0xc0), e.g. ARCH_PERFMON_EVENTSEL_INT, ARCH_PERFMON_EVENTSEL_USR and ARCH_PERFMON_EVENTSEL_OS. Those bits will be set in hw_config(). Otherwise the condition will never be met.
Other fields, e.g the INV, ANY, E, or CMASK fields are not allowed for the reduced Skid PEBS.
---
New patch to fix a bug on top of Icelake V5 patch series (with Peter's cleanup patch).
The patch may be merged back into:
Subject: perf/x86/intel: Add Icelake support
arch/x86/events/intel/core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/x86/events/intel/core.c +4 -1
@@ -3421,6 +3421,9 @@ hsw_get_event_constraints(struct cpu_hw_events *cpuc, int idx,return c; } +#define EVENT_CONFIG (config) \ + (config & (X86_ALL_EVENT_FLAGS | INTEL_ARCH_EVENT_MASK)) +static struct event_constraint *icl_get_event_constraints (struct cpu_hw_events *cpuc,int idx,struct perf_event *event)
@@ -3430,7 +3433,7 @@ icl_get_event_constraints(struct cpu_hw_events *cpuc, int idx,* Force instruction:ppp in Fixed counter 0 */ if ((event->attr.precise_ip ==3 ) && - (event->hw.config == X86_CONFIG(.event=0xc0))) + (EVENT_CONFIG(event->hw.config) == X86_CONFIG(.event=0xc0)))return &fixed_counter0_constraint;return hsw_get_event_constraints (cpuc, idx, event);
Signature · 1 line
2.7.4
PATCH v2 2/2 perf/x86/intel: Add Tremont core PMU support
In reply to [email protected]From: Kan Liang <[email protected]>
Add perf core PMU support for Intel Tremont CPU.
The init code is based on Goldmont plus.
The generic purpose counter 0 and fixed counter 0 have less skid. Force :ppp events on generic purpose counter 0.
Force instruction:ppp on generic purpose counter 0 and fixed counter 0.
Updates LLC cache event table and OFFCORE_RESPONSE mask.
The adaptive PEBS, which is already enabled on ICL, is also supported on Tremont. No extra codes required.
---
Changes since v1:
- Allow instruction:ppp on generic purpose counter 0
- Fix the checking for instruction event.
arch/x86/events/intel/core.c | 91 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+)
arch/x86/events/intel/core.c +91 -0
@@ -1856,6 +1856,45 @@ static __initconst const u64 glp_hw_cache_extra_regs }, }; +#define TNT_LOCAL_DRAM BIT_ULL(26) +#define TNT_DEMAND_READ GLM_DEMAND_DATA_RD +#define TNT_DEMAND_WRITE GLM_DEMAND_RFO +#define TNT_LLC_ACCESS GLM_ANY_RESPONSE +#define TNT_SNP_ANY (SNB_SNP_NOT_NEEDED|SNB_SNP_MISS| \ + SNB_NO_FWD|SNB_SNP_FWD|SNB_HITM) +#define TNT_LLC_MISS (TNT_SNP_ANY|SNB_NON_DRAM|TNT_LOCAL_DRAM) + +static __initconst const u64 tnt_hw_cache_extra_regs + [PERF_COUNT_HW_CACHE_MAX ] + [PERF_COUNT_HW_CACHE_OP_MAX ] + [PERF_COUNT_HW_CACHE_RESULT_MAX ] = { + [C (LL )] = { + [C (OP_READ )] = { + [C (RESULT_ACCESS )] =TNT_DEMAND_READ | +TNT_LLC_ACCESS , + [C (RESULT_MISS )] =TNT_DEMAND_READ | +TNT_LLC_MISS , + }, + [C (OP_WRITE )] = { + [C (RESULT_ACCESS )] =TNT_DEMAND_WRITE | +TNT_LLC_ACCESS , + [C (RESULT_MISS )] =TNT_DEMAND_WRITE | +TNT_LLC_MISS , + }, + [C (OP_PREFETCH )] = { + [C (RESULT_ACCESS )] =0x0 , + [C (RESULT_MISS )] =0x0 , + }, + }, +}; + +static struct extra_reg intel_tnt_extra_regs[]__read_mostly = { +/* must define OFFCORE_RSP_X first, see intel_fixup_er() */ +INTEL_UEVENT_EXTRA_REG (0x01b7 ,MSR_OFFCORE_RSP_0 ,0xffffff9fffull ,RSP_0 ), +INTEL_UEVENT_EXTRA_REG (0x02b7 ,MSR_OFFCORE_RSP_1 ,0xffffff9fffull ,RSP_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)
@@ -3403,6 +3442,9 @@ static struct event_constraint counter2_constraint =static struct event_constraint fixed_counter0_constraint =FIXED_EVENT_CONSTRAINT (0x00c0 ,0 ); +static struct event_constraint fixed0_counter0_constraint = +INTEL_ALL_EVENT_CONSTRAINT (0 ,0x100000001ULL ); +static struct event_constraint *hsw_get_event_constraints (struct cpu_hw_events *cpuc,int idx,struct perf_event *event)
@@ -3454,6 +3496,29 @@ glp_get_event_constraints(struct cpu_hw_events *cpuc, int idx,return c; } +static struct event_constraint * +tnt_get_event_constraints (struct cpu_hw_events *cpuc,int idx, +struct perf_event *event) +{ +struct event_constraint *c; + +/* +* :ppp means to do reduced skid PEBS, +* which is available on PMC0 and fixed counter 0. +*/ +if (event->attr.precise_ip ==3 ) { +/* Force instruction:ppp on PMC0 and Fixed counter 0 */ + if (EVENT_CONFIG(event->hw.config) == X86_CONFIG(.event=0xc0)) +return &fixed0_counter0_constraint; + +return &counter0_constraint; + } + + c =intel_get_event_constraints (cpuc, idx, event); + +return c; +} +static bool allow_tsx_force_abort = true; static struct event_constraint *
@@ -4533,6 +4598,32 @@ __init int intel_pmu_init(void) name ="goldmont_plus" ;break ; +case INTEL_FAM6_ATOM_TREMONT_X : + x86_pmu.late_ack = true; +memcpy (hw_cache_event_ids, glp_hw_cache_event_ids, +sizeof (hw_cache_event_ids)); +memcpy (hw_cache_extra_regs, tnt_hw_cache_extra_regs, +sizeof (hw_cache_extra_regs)); + hw_cache_event_ids[C (ITLB )][C (OP_READ )][C (RESULT_ACCESS )] =-1 ; + +intel_pmu_lbr_init_skl (); + + x86_pmu.event_constraints = intel_slm_event_constraints; + x86_pmu.extra_regs = intel_tnt_extra_regs; +/* +* It's recommended to use CPU_CLK_UNHALTED.CORE_P + NPEBS +* for precise cycles. +*/ + x86_pmu.pebs_aliases =NULL ; + x86_pmu.pebs_prec_dist = true; + x86_pmu.lbr_pt_coexist = true; + x86_pmu.flags |=PMU_FL_HAS_RSP_1 ; + x86_pmu.get_event_constraints = tnt_get_event_constraints; + extra_attr = slm_format_attr; +pr_cont ("Tremont events, " ); + name ="Tremont" ; +break ; +case INTEL_FAM6_WESTMERE :case INTEL_FAM6_WESTMERE_EP :case INTEL_FAM6_WESTMERE_EX :
Signature · 1 line
2.7.4
Peter Zijlstra
maintainerRe: [PATCH V2 2/2] perf/x86/intel: Add Tremont core PMU support
Review
Quoted 3 lines · On Wed, Apr 10, 2019 at 11:57:09AM -0700, [email protected] wrote:
(quoted diff) +3
-0+static struct event_constraint * +tnt_get_event_constraints(struct cpu_hw_events *cpuc, int idx, + struct perf_event *event)
That 'tnt' still cracks me up, I keep seeing explosions.
Quoted 9 lines
(quoted diff) +9
-0+{ + struct event_constraint *c; + + /* + * :ppp means to do reduced skid PEBS, + * which is available on PMC0 and fixed counter 0. + */ + if (event->attr.precise_ip == 3) { + /* Force instruction:ppp on PMC0 and Fixed counter 0 */
Review
Quoted 10 lines
(quoted diff) +10
-0+ if (EVENT_CONFIG(event->hw.config) == X86_CONFIG(.event=0xc0)) + return &fixed0_counter0_constraint; + + return &counter0_constraint; + } + + c = intel_get_event_constraints(cpuc, idx, event); + + return c; +}
I changed that like so:
arch/x86/events/intel/core.c +1 -1
@@ -3508,7 +3508,7 @@ tnt_get_event_constraints(struct cpu_hw_*/ if (event->attr.precise_ip ==3 ) {/* Force instruction:ppp on PMC0 and Fixed counter 0 */ - if (EVENT_CONFIG(event->hw.config) == X86_CONFIG(.event=0xc0)) +if (constraint_match (&fixed_counter0_constraint, event->hw.config))return &fixed0_counter0_constraint;return &counter0_constraint;
And maybe we should do:
s/fixed_counter0_constraint/fixed0_constraint/'
Those two constraints only differ by a single character, that's bad for reading comprehension.
In fact, I just did that too.
Re: [PATCH V2 2/2] perf/x86/intel: Add Tremont core PMU support
Quoted 7 lines · Peter Zijlstra
Review
Quoted 3 lines · On Wed, Apr 10, 2019 at 11:57:09AM -0700, [email protected] wrote:
(quoted diff) +3
-0+static struct event_constraint * +tnt_get_event_constraints(struct cpu_hw_events *cpuc, int idx, + struct perf_event *event)That 'tnt' still cracks me up, I keep seeing explosions.
Boom!
Quoted 25 lines
Quoted 9 lines
(quoted diff) +9
-0+{ + struct event_constraint *c; + + /* + * :ppp means to do reduced skid PEBS, + * which is available on PMC0 and fixed counter 0. + */ + if (event->attr.precise_ip == 3) { + /* Force instruction:ppp on PMC0 and Fixed counter 0 */Review
Quoted 10 lines
(quoted diff) +10
-0+ if (EVENT_CONFIG(event->hw.config) == X86_CONFIG(.event=0xc0)) + return &fixed0_counter0_constraint; + + return &counter0_constraint; + } + + c = intel_get_event_constraints(cpuc, idx, event); + + return c; +}I changed that like so:
arch/x86/events/intel/core.c tnt_get_event_constraints(struct cpu_hw_ · line 3511
Quoted 5 lines
arch/x86/events/intel/core.c +1
-1@@ -3508,7 +3508,7 @@ tnt_get_event_constraints(struct cpu_hw_*/ if (event->attr.precise_ip ==3 ) {/* Force instruction:ppp on PMC0 and Fixed counter 0 */ - if (EVENT_CONFIG(event->hw.config) == X86_CONFIG(.event=0xc0)) +if (constraint_match (&fixed_counter0_constraint, event->hw.config))
Should be
if (constraint_match(&fixed0_counter0_constraint, event->hw.config))
Quoted 9 lines
arch/x86/events/intel/core.c +0
-0return &fixed0_counter0_constraint;return &counter0_constraint;And maybe we should do:
s/fixed_counter0_constraint/fixed0_constraint/'
Yes, definitely. It has already caused confusions. :)
Thanks,
Kan
Quoted 5 lines
Those two constraints only differ by a single character, that's bad for reading comprehension.
In fact, I just did that too.
Peter Zijlstra
maintainerRe: [PATCH V2 2/2] perf/x86/intel: Add Tremont core PMU support
Quoted 12 lines · Kan
arch/x86/events/intel/core.c tnt_get_event_constraints(struct cpu_hw_ · line 3511
Quoted 10 lines
I changed that like so:
arch/x86/events/intel/core.c +1
-1@@ -3508,7 +3508,7 @@ tnt_get_event_constraints(struct cpu_hw_*/ if (event->attr.precise_ip ==3 ) {/* Force instruction:ppp on PMC0 and Fixed counter 0 */ - if (EVENT_CONFIG(event->hw.config) == X86_CONFIG(.event=0xc0)) +if (constraint_match (&fixed_counter0_constraint, event->hw.config))Should be
Quoted 1 line
if (constraint_match(&fixed0_counter0_constraint, event->hw.config))
No, because fixed0_counter0_constraint doesn't set an event.
The logic as I proposed checks if it fits the fixed0 constraint, and if so, allows f0-c0, otherwise only c0.
Quoted 3 lines
Quoted 3 lines
arch/x86/events/intel/core.c +0
-0return &fixed0_counter0_constraint;return &counter0_constraint;
Re: [PATCH V2 2/2] perf/x86/intel: Add Tremont core PMU support
Quoted 16 lines · Peter Zijlstra
Quoted 12 lines · Kan
arch/x86/events/intel/core.c tnt_get_event_constraints(struct cpu_hw_ · line 3511
Quoted 10 lines
I changed that like so:
arch/x86/events/intel/core.c +1
-1@@ -3508,7 +3508,7 @@ tnt_get_event_constraints(struct cpu_hw_*/ if (event->attr.precise_ip ==3 ) {/* Force instruction:ppp on PMC0 and Fixed counter 0 */ - if (EVENT_CONFIG(event->hw.config) == X86_CONFIG(.event=0xc0)) +if (constraint_match (&fixed_counter0_constraint, event->hw.config))Should be
Quoted 1 line
if (constraint_match(&fixed0_counter0_constraint, event->hw.config))
Quoted 2 lines
No, because
fixed0_counter0_constraintdoesn't set an event.
Right, it will mistakenly allow other events to use fixed0.
Quoted 2 lines
The logic as I proposed checks if it fits the fixed0 constraint, and if so, allows f0-c0, otherwise only c0.
It looks good.
Thanks,
Kan
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
arch/x86/events/intel/core.c +0
-0return &fixed0_counter0_constraint;return &counter0_constraint;
tip-bot for Kan Liang
merge bot[tip:perf/core] perf/x86/intel: Add Tremont core PMU support
In reply to [email protected]perf/x86/intel: Add Tremont core PMU support
Commit-ID: 6daeb8737f8a93c6d3a3ae57e23dd3dbe8b239da Gitweb: https://git.kernel.org/tip/6daeb8737f8a93c6d3a3ae57e23dd3dbe8b239da Author: Kan Liang <[email protected]> AuthorDate: Wed, 10 Apr 2019 11:57:09 -0700 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 16 Apr 2019 12:26:19 +0200
perf/x86/intel: Add Tremont core PMU support
Add perf core PMU support for Intel Tremont CPU.
The init code is based on Goldmont plus.
The generic purpose counter 0 and fixed counter 0 have less skid. Force :ppp events on generic purpose counter 0.
Force instruction:ppp on generic purpose counter 0 and fixed counter 0.
Updates LLC cache event table and OFFCORE_RESPONSE mask.
Adaptive PEBS, which is already enabled on ICL, is also supported on Tremont. No extra code required.
--- arch/x86/events/intel/core.c | 91 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+)
arch/x86/events/intel/core.c +91 -0
@@ -1856,6 +1856,45 @@ static __initconst const u64 glp_hw_cache_extra_regs }, }; +#define TNT_LOCAL_DRAM BIT_ULL(26) +#define TNT_DEMAND_READ GLM_DEMAND_DATA_RD +#define TNT_DEMAND_WRITE GLM_DEMAND_RFO +#define TNT_LLC_ACCESS GLM_ANY_RESPONSE +#define TNT_SNP_ANY (SNB_SNP_NOT_NEEDED|SNB_SNP_MISS| \ + SNB_NO_FWD|SNB_SNP_FWD|SNB_HITM) +#define TNT_LLC_MISS (TNT_SNP_ANY|SNB_NON_DRAM|TNT_LOCAL_DRAM) + +static __initconst const u64 tnt_hw_cache_extra_regs + [PERF_COUNT_HW_CACHE_MAX ] + [PERF_COUNT_HW_CACHE_OP_MAX ] + [PERF_COUNT_HW_CACHE_RESULT_MAX ] = { + [C (LL )] = { + [C (OP_READ )] = { + [C (RESULT_ACCESS )] =TNT_DEMAND_READ | +TNT_LLC_ACCESS , + [C (RESULT_MISS )] =TNT_DEMAND_READ | +TNT_LLC_MISS , + }, + [C (OP_WRITE )] = { + [C (RESULT_ACCESS )] =TNT_DEMAND_WRITE | +TNT_LLC_ACCESS , + [C (RESULT_MISS )] =TNT_DEMAND_WRITE | +TNT_LLC_MISS , + }, + [C (OP_PREFETCH )] = { + [C (RESULT_ACCESS )] =0x0 , + [C (RESULT_MISS )] =0x0 , + }, + }, +}; + +static struct extra_reg intel_tnt_extra_regs[]__read_mostly = { +/* must define OFFCORE_RSP_X first, see intel_fixup_er() */ +INTEL_UEVENT_EXTRA_REG (0x01b7 ,MSR_OFFCORE_RSP_0 ,0xffffff9fffull ,RSP_0 ), +INTEL_UEVENT_EXTRA_REG (0x02b7 ,MSR_OFFCORE_RSP_1 ,0xffffff9fffull ,RSP_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)
@@ -3406,6 +3445,9 @@ static struct event_constraint counter2_constraint =static struct event_constraint fixed0_constraint =FIXED_EVENT_CONSTRAINT (0x00c0 ,0 ); +static struct event_constraint fixed0_counter0_constraint = +INTEL_ALL_EVENT_CONSTRAINT (0 ,0x100000001ULL ); +static struct event_constraint *hsw_get_event_constraints (struct cpu_hw_events *cpuc,int idx,struct perf_event *event)
@@ -3454,6 +3496,29 @@ glp_get_event_constraints(struct cpu_hw_events *cpuc, int idx,return c; } +static struct event_constraint * +tnt_get_event_constraints (struct cpu_hw_events *cpuc,int idx, +struct perf_event *event) +{ +struct event_constraint *c; + +/* +* :ppp means to do reduced skid PEBS, +* which is available on PMC0 and fixed counter 0. +*/ +if (event->attr.precise_ip ==3 ) { +/* Force instruction:ppp on PMC0 and Fixed counter 0 */ +if (constraint_match (&fixed0_constraint, event->hw.config)) +return &fixed0_counter0_constraint; + +return &counter0_constraint; + } + + c =intel_get_event_constraints (cpuc, idx, event); + +return c; +} +static bool allow_tsx_force_abort = true; static struct event_constraint *
@@ -4585,6 +4650,32 @@ __init int intel_pmu_init(void) name ="goldmont_plus" ;break ; +case INTEL_FAM6_ATOM_TREMONT_X : + x86_pmu.late_ack = true; +memcpy (hw_cache_event_ids, glp_hw_cache_event_ids, +sizeof (hw_cache_event_ids)); +memcpy (hw_cache_extra_regs, tnt_hw_cache_extra_regs, +sizeof (hw_cache_extra_regs)); + hw_cache_event_ids[C (ITLB )][C (OP_READ )][C (RESULT_ACCESS )] =-1 ; + +intel_pmu_lbr_init_skl (); + + x86_pmu.event_constraints = intel_slm_event_constraints; + x86_pmu.extra_regs = intel_tnt_extra_regs; +/* +* It's recommended to use CPU_CLK_UNHALTED.CORE_P + NPEBS +* for precise cycles. +*/ + x86_pmu.pebs_aliases =NULL ; + x86_pmu.pebs_prec_dist = true; + x86_pmu.lbr_pt_coexist = true; + x86_pmu.flags |=PMU_FL_HAS_RSP_1 ; + x86_pmu.get_event_constraints = tnt_get_event_constraints; + extra_attr = slm_format_attr; +pr_cont ("Tremont events, " ); + name ="Tremont" ; +break ; +case INTEL_FAM6_WESTMERE :case INTEL_FAM6_WESTMERE_EP :case INTEL_FAM6_WESTMERE_EX :