x86, perf: Make CYCLE_ACTIVITY.* constraint on Broadwell more specific
Subsystems (2)
PATCH 1/1 x86, perf: Make CYCLE_ACTIVITY.* constraint on Broadwell more specific
From: Andi Kleen <[email protected]>
The counter constraint for CYCLE_ACTIVITY.* on Broadwell covered all CYCLE_ACTIVITY.* sub events, and forced them on counter 2. But actually only one sub event (umask 8) needs to be on counter 2, all others do not have any constraint.
Only force that subevent. This fixes groups with multiple CYCLE_ACTIVITY.* events, for example:
% perf stat -x, -e '{cpu/event=0xa3,umask=0x6,cmask=6/,\
cpu/event=0xa2,umask=0x8/,\
cpu/event=0xa3,umask=0x4,cmask=4/,cpu/event=0xb1,umask=0x1,cmask=1/}' true 122150,,cpu/event=0xa3,umask=0x6,cmask=6/,846486,100.00 16483,,cpu/event=0xa2,umask=0x8/,846486,100.00 252280,,cpu/event=0xa3,umask=0x4,cmask=4/,846486,100.00 233604,,cpu/event=0xb1,umask=0x1,cmask=1/,846486,100.00
%
Without this patch the third result would be <unsupported>
--- arch/x86/kernel/cpu/perf_event_intel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/cpu/perf_event_intel.c +1 -1
@@ -250,7 +250,7 @@ struct event_constraint intel_bdw_event_constraints[] = {FIXED_EVENT_CONSTRAINT (0x003c ,1 ),/* CPU_CLK_UNHALTED.CORE */ FIXED_EVENT_CONSTRAINT (0x0300 ,2 ),/* CPU_CLK_UNHALTED.REF */ INTEL_UEVENT_CONSTRAINT (0x148 ,0x4 ),/* L1D_PEND_MISS.PENDING */ -INTEL_EVENT_CONSTRAINT (0xa3 ,0x4 ),/* CYCLE_ACTIVITY.* */ +INTEL_UEVENT_CONSTRAINT (0x8a3 ,0x4 ),/* CYCLE_ACTIVITY.CYCLES_L1D_MISS */ EVENT_CONSTRAINT_END };
Signature · 1 line
2.4.3
tip-bot for Andi Kleen
merge bot[tip:perf/core] perf/x86/intel: Make the CYCLE_ACTIVITY.* constraint on Broadwell more specific
perf/x86/intel: Make the CYCLE_ACTIVITY.* constraint on Broadwell more specific
Commit-ID: 5e176213a6b2bc5146820c79542d37290434a3c4 Gitweb: http://git.kernel.org/tip/5e176213a6b2bc5146820c79542d37290434a3c4 Author: Andi Kleen <[email protected]> AuthorDate: Mon, 14 Sep 2015 14:47:02 -0700 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 18 Sep 2015 09:20:21 +0200
perf/x86/intel: Make the CYCLE_ACTIVITY.* constraint on Broadwell more specific
The counter constraint for CYCLE_ACTIVITY.* on Broadwell covered all CYCLE_ACTIVITY.* sub events, and forced them on counter 2. But actually only one sub event (umask 8) needs to be on counter 2, all others do not have any constraint.
Only force that subevent. This fixes groups with multiple CYCLE_ACTIVITY.* events, for example:
% perf stat -x, -e '{cpu/event=0xa3,umask=0x6,cmask=6/,\
cpu/event=0xa2,umask=0x8/,\
cpu/event=0xa3,umask=0x4,cmask=4/,cpu/event=0xb1,umask=0x1,cmask=1/}' true
122150,,cpu/event=0xa3,umask=0x6,cmask=6/,846486,100.00
16483,,cpu/event=0xa2,umask=0x8/,846486,100.00
252280,,cpu/event=0xa3,umask=0x4,cmask=4/,846486,100.00
233604,,cpu/event=0xb1,umask=0x1,cmask=1/,846486,100.00
%Without this patch the third result would be <unsupported>
--- arch/x86/kernel/cpu/perf_event_intel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/cpu/perf_event_intel.c +1 -1
@@ -250,7 +250,7 @@ struct event_constraint intel_bdw_event_constraints[] = {FIXED_EVENT_CONSTRAINT (0x003c ,1 ),/* CPU_CLK_UNHALTED.CORE */ FIXED_EVENT_CONSTRAINT (0x0300 ,2 ),/* CPU_CLK_UNHALTED.REF */ INTEL_UEVENT_CONSTRAINT (0x148 ,0x4 ),/* L1D_PEND_MISS.PENDING */ -INTEL_EVENT_CONSTRAINT (0xa3 ,0x4 ),/* CYCLE_ACTIVITY.* */ +INTEL_UEVENT_CONSTRAINT (0x8a3 ,0x4 ),/* CYCLE_ACTIVITY.CYCLES_L1D_MISS */ EVENT_CONSTRAINT_END };