summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/cpu
diff options
context:
space:
mode:
authorCyrill Gorcunov <gorcunov@openvz.org>2010-03-15 04:58:22 (GMT)
committerIngo Molnar <mingo@elte.hu>2010-03-15 07:14:34 (GMT)
commite4495262826d1eabca3529fa6ac22394eb348132 (patch)
tree61ed42e15b785c20e0a1b3a9518d4699ce240199 /arch/x86/kernel/cpu
parent8576e1971663ffdb6139041de97cdd2e1d4791cc (diff)
downloadlinux-fsl-qoriq-e4495262826d1eabca3529fa6ac22394eb348132.tar.xz
perf, x86: Enable not tagged retired instruction counting on P4s
This should turn on instruction counting on P4s, which was missing in the first version of the new PMU driver. It's inaccurate for now, we still need dependant event to tag mops before we can count them precisely. The result is that the number of instruction may be lifted up. Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by: Lin Ming <ming.m.lin@intel.com> Cc: Peter Zijlstra <peterz@infradead.org> LKML-Reference: <1268629102.3355.11.camel@minggr.sh.intel.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/cpu')
-rw-r--r--arch/x86/kernel/cpu/perf_event_p4.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_p4.c b/arch/x86/kernel/cpu/perf_event_p4.c
index ef861da1..a11ce73 100644
--- a/arch/x86/kernel/cpu/perf_event_p4.c
+++ b/arch/x86/kernel/cpu/perf_event_p4.c
@@ -60,13 +60,11 @@ struct p4_event_template p4_templates[] = {
[2] = {
.opcode = P4_INSTR_RETIRED,
.config = 0,
- .dep = 0, /* needs front-end tagging */
+ .dep = -1, /* needs front-end tagging */
.emask =
P4_EVENT_ATTR(P4_INSTR_RETIRED, NBOGUSNTAG) |
- P4_EVENT_ATTR(P4_INSTR_RETIRED, NBOGUSTAG) |
- P4_EVENT_ATTR(P4_INSTR_RETIRED, BOGUSNTAG) |
- P4_EVENT_ATTR(P4_INSTR_RETIRED, BOGUSTAG),
- .escr_msr = { MSR_P4_CRU_ESCR2, MSR_P4_CRU_ESCR3 },
+ P4_EVENT_ATTR(P4_INSTR_RETIRED, BOGUSNTAG),
+ .escr_msr = { MSR_P4_CRU_ESCR0, MSR_P4_CRU_ESCR1 },
.cntr = { 12, 14 },
},
[3] = {