summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/perf_event_p4.h
diff options
context:
space:
mode:
authorCyrill Gorcunov <gorcunov@openvz.org>2010-03-15 12:58:22 +0800
committerIngo Molnar <mingo@elte.hu>2010-03-15 08:14:34 +0100
commite4495262826d1eabca3529fa6ac22394eb348132 (patch)
tree61ed42e15b785c20e0a1b3a9518d4699ce240199 /arch/x86/include/asm/perf_event_p4.h
parent8576e1971663ffdb6139041de97cdd2e1d4791cc (diff)
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/include/asm/perf_event_p4.h')
-rw-r--r--arch/x86/include/asm/perf_event_p4.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/include/asm/perf_event_p4.h b/arch/x86/include/asm/perf_event_p4.h
index 829f4711645f..b47b9e9ac13f 100644
--- a/arch/x86/include/asm/perf_event_p4.h
+++ b/arch/x86/include/asm/perf_event_p4.h
@@ -324,8 +324,8 @@ static inline u32 p4_default_escr_conf(int cpu, int exclude_os, int exclude_usr)
#define P4_SSE_INPUT_ASSIST P4_EVENT_PACK(0x34, 0x01)
/*
- * MSR_P4_FIRM_ESCR: 8, 9
- * MSR_P4_FIRM_ESCR: 10, 11
+ * MSR_P4_FIRM_ESCR0: 8, 9
+ * MSR_P4_FIRM_ESCR1: 10, 11
*/
#define P4_PACKED_SP_UOP P4_EVENT_PACK(0x08, 0x01)
@@ -462,8 +462,8 @@ static inline u32 p4_default_escr_conf(int cpu, int exclude_os, int exclude_usr)
#define P4_INSTR_RETIRED P4_EVENT_PACK(0x02, 0x04)
/*
- * MSR_P4_CRU_ESCR2: 12, 13, 16
- * MSR_P4_CRU_ESCR3: 14, 15, 17
+ * MSR_P4_CRU_ESCR0: 12, 13, 16
+ * MSR_P4_CRU_ESCR1: 14, 15, 17
*/
#define P4_UOPS_RETIRED P4_EVENT_PACK(0x01, 0x04)