perf, x86: Fix Haswell CYCLE_ACTIVITY.* counter constraints
Subsystems (2)
PATCH 1/1 perf, x86: Fix Haswell CYCLE_ACTIVITY.* counter constraints
From: Andi Kleen <[email protected]>
Some of the CYCLE_ACTIVITY.* events can only be scheduled on counter 2. Due to a typo Haswell matched those with INTEL_EVENT_CONSTRAINT, which lead to the events never matching as the comparison does not expect anything in the umask too. Fix the typo.
--- arch/x86/kernel/cpu/perf_event_intel.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/kernel/cpu/perf_event_intel.c +3 -3
@@ -212,11 +212,11 @@ static struct event_constraint intel_hsw_event_constraints[] = {INTEL_UEVENT_CONSTRAINT (0x01c0 ,0x2 ),/* INST_RETIRED.PREC_DIST */ INTEL_EVENT_CONSTRAINT (0xcd ,0x8 ),/* MEM_TRANS_RETIRED.LOAD_LATENCY */ /* CYCLE_ACTIVITY.CYCLES_L1D_PENDING */ -INTEL_EVENT_CONSTRAINT (0x08a3 ,0x4 ), +INTEL_UEVENT_CONSTRAINT (0x08a3 ,0x4 ),/* CYCLE_ACTIVITY.STALLS_L1D_PENDING */ -INTEL_EVENT_CONSTRAINT (0x0ca3 ,0x4 ), +INTEL_UEVENT_CONSTRAINT (0x0ca3 ,0x4 ),/* CYCLE_ACTIVITY.CYCLES_NO_EXECUTE */ -INTEL_EVENT_CONSTRAINT (0x04a3 ,0xf ), +INTEL_UEVENT_CONSTRAINT (0x04a3 ,0xf ), EVENT_CONSTRAINT_END };
Signature · 1 line
1.9.3
tip-bot for Andi Kleen
merge bot[tip:perf/core] perf/x86/intel: Fix Haswell CYCLE_ACTIVITY.* counter constraints
perf/x86/intel: Fix Haswell CYCLE_ACTIVITY.* counter constraints
Commit-ID: c420f19b9cdc59662dbb56677417487efc1729ec Gitweb: http://git.kernel.org/tip/c420f19b9cdc59662dbb56677417487efc1729ec Author: Andi Kleen <[email protected]> AuthorDate: Mon, 9 Mar 2015 11:20:22 -0700 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 2 Apr 2015 17:07:43 +0200
perf/x86/intel: Fix Haswell CYCLE_ACTIVITY.* counter constraints
Some of the CYCLE_ACTIVITY.* events can only be scheduled on counter 2. Due to a typo Haswell matched those with INTEL_EVENT_CONSTRAINT, which lead to the events never matching as the comparison does not expect anything in the umask too. Fix the typo.
--- arch/x86/kernel/cpu/perf_event_intel.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/kernel/cpu/perf_event_intel.c +3 -3
@@ -212,11 +212,11 @@ static struct event_constraint intel_hsw_event_constraints[] = {INTEL_UEVENT_CONSTRAINT (0x01c0 ,0x2 ),/* INST_RETIRED.PREC_DIST */ INTEL_EVENT_CONSTRAINT (0xcd ,0x8 ),/* MEM_TRANS_RETIRED.LOAD_LATENCY */ /* CYCLE_ACTIVITY.CYCLES_L1D_PENDING */ -INTEL_EVENT_CONSTRAINT (0x08a3 ,0x4 ), +INTEL_UEVENT_CONSTRAINT (0x08a3 ,0x4 ),/* CYCLE_ACTIVITY.STALLS_L1D_PENDING */ -INTEL_EVENT_CONSTRAINT (0x0ca3 ,0x4 ), +INTEL_UEVENT_CONSTRAINT (0x0ca3 ,0x4 ),/* CYCLE_ACTIVITY.CYCLES_NO_EXECUTE */ -INTEL_EVENT_CONSTRAINT (0x04a3 ,0xf ), +INTEL_UEVENT_CONSTRAINT (0x04a3 ,0xf ), EVENT_CONSTRAINT_END };