Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3044318f authored by Andi Kleen's avatar Andi Kleen Committed by Ingo Molnar
Browse files

perf/x86/intel: Add Haswell PEBS support 



Add simple PEBS support for Haswell.

The constraints are similar to SandyBridge with a few new
events.

Reviewed-by: default avatarStephane Eranian <eranian@google.com>
Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Cc: Andi Kleen <ak@linux.jf.intel.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Link: http://lkml.kernel.org/r/1371515812-9646-4-git-send-email-andi@firstfloor.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 3a632cb2

arch/x86/kernel/cpu/perf_event.h

+2 −0
Original line number Diff line number Diff line
@@ -636,6 +636,8 @@ extern struct event_constraint intel_snb_pebs_event_constraints[]; 


extern struct event_constraint intel_ivb_pebs_event_constraints[];



extern struct event_constraint intel_hsw_pebs_event_constraints[];



struct event_constraint *intel_pebs_constraints(struct perf_event *event);



void intel_pmu_pebs_enable(struct perf_event *event);

arch/x86/kernel/cpu/perf_event_intel.c

+4 −2
Original line number Diff line number Diff line
@@ -889,7 +889,8 @@ static inline bool intel_pmu_needs_lbr_smpl(struct perf_event *event) 
		return true;



	/* implicit branch sampling to correct PEBS skid */

	if (x86_pmu.intel_cap.pebs_trap && event->attr.precise_ip > 1)

	if (x86_pmu.intel_cap.pebs_trap && event->attr.precise_ip > 1 &&

	    x86_pmu.intel_cap.pebs_format < 2)

		return true;



	return false;
@@ -2265,8 +2266,9 @@ __init int intel_pmu_init(void) 
		intel_pmu_lbr_init_snb();



		x86_pmu.event_constraints = intel_hsw_event_constraints;



		x86_pmu.pebs_constraints = intel_hsw_pebs_event_constraints;

		x86_pmu.extra_regs = intel_snb_extra_regs;

		x86_pmu.pebs_aliases = intel_pebs_aliases_snb;

		/* all extra regs are per-cpu when HT is on */

		x86_pmu.er_flags |= ERF_HAS_RSP_1;

		x86_pmu.er_flags |= ERF_NO_HT_SHARING;

arch/x86/kernel/cpu/perf_event_intel_ds.c

+36 −0
Original line number Diff line number Diff line
@@ -564,6 +564,42 @@ struct event_constraint intel_ivb_pebs_event_constraints[] = { 
        EVENT_CONSTRAINT_END

};



struct event_constraint intel_hsw_pebs_event_constraints[] = {

	INTEL_UEVENT_CONSTRAINT(0x01c0, 0x2), /* INST_RETIRED.PRECDIST */

	INTEL_UEVENT_CONSTRAINT(0x01c2, 0xf), /* UOPS_RETIRED.ALL */

	INTEL_UEVENT_CONSTRAINT(0x02c2, 0xf), /* UOPS_RETIRED.RETIRE_SLOTS */

	INTEL_EVENT_CONSTRAINT(0xc4, 0xf),    /* BR_INST_RETIRED.* */

	INTEL_UEVENT_CONSTRAINT(0x01c5, 0xf), /* BR_MISP_RETIRED.CONDITIONAL */

	INTEL_UEVENT_CONSTRAINT(0x04c5, 0xf), /* BR_MISP_RETIRED.ALL_BRANCHES */

	INTEL_UEVENT_CONSTRAINT(0x20c5, 0xf), /* BR_MISP_RETIRED.NEAR_TAKEN */

	INTEL_EVENT_CONSTRAINT(0xcd, 0x8),    /* MEM_TRANS_RETIRED.* */

	/* MEM_UOPS_RETIRED.STLB_MISS_LOADS */

	INTEL_UEVENT_CONSTRAINT(0x11d0, 0xf),

	/* MEM_UOPS_RETIRED.STLB_MISS_STORES */

	INTEL_UEVENT_CONSTRAINT(0x12d0, 0xf),

	INTEL_UEVENT_CONSTRAINT(0x21d0, 0xf), /* MEM_UOPS_RETIRED.LOCK_LOADS */

	INTEL_UEVENT_CONSTRAINT(0x41d0, 0xf), /* MEM_UOPS_RETIRED.SPLIT_LOADS */

	/* MEM_UOPS_RETIRED.SPLIT_STORES */

	INTEL_UEVENT_CONSTRAINT(0x42d0, 0xf),

	INTEL_UEVENT_CONSTRAINT(0x81d0, 0xf), /* MEM_UOPS_RETIRED.ALL_LOADS */

	INTEL_UEVENT_CONSTRAINT(0x82d0, 0xf), /* MEM_UOPS_RETIRED.ALL_STORES */

	INTEL_UEVENT_CONSTRAINT(0x01d1, 0xf), /* MEM_LOAD_UOPS_RETIRED.L1_HIT */

	INTEL_UEVENT_CONSTRAINT(0x02d1, 0xf), /* MEM_LOAD_UOPS_RETIRED.L2_HIT */

	INTEL_UEVENT_CONSTRAINT(0x04d1, 0xf), /* MEM_LOAD_UOPS_RETIRED.L3_HIT */

	/* MEM_LOAD_UOPS_RETIRED.HIT_LFB */

	INTEL_UEVENT_CONSTRAINT(0x40d1, 0xf),

	/* MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_MISS */

	INTEL_UEVENT_CONSTRAINT(0x01d2, 0xf),

	/* MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HIT */

	INTEL_UEVENT_CONSTRAINT(0x02d2, 0xf),

	/* MEM_LOAD_UOPS_LLC_MISS_RETIRED.LOCAL_DRAM */

	INTEL_UEVENT_CONSTRAINT(0x01d3, 0xf),

	INTEL_UEVENT_CONSTRAINT(0x04c8, 0xf), /* HLE_RETIRED.Abort */

	INTEL_UEVENT_CONSTRAINT(0x04c9, 0xf), /* RTM_RETIRED.Abort */



	EVENT_CONSTRAINT_END

};



struct event_constraint *intel_pebs_constraints(struct perf_event *event)

{

	struct event_constraint *c;