1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
|
---
events/arm/armv6/events | 9 ++++++---
events/arm/armv6/unit_masks | 2 +-
libop/op_cpu_type.c | 2 +-
libop/op_cpu_type.h | 2 +-
libop/op_events.c | 5 +----
utils/ophelp.c | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
Index: oprofile/events/arm/armv6/events
===================================================================
--- oprofile.orig/events/arm/armv6/events 2007-05-23 15:02:33.000000000 +0100
+++ oprofile/events/arm/armv6/events 2007-05-24 00:33:41.000000000 +0100
@@ -1,4 +1,4 @@
-# ARM11 events
+# ARM V6 events
#
event:0x00 counters:1,2 um:zero minimum:500 name:IFU_IFETCH_MISS : number of instruction fetch misses
event:0x01 counters:1,2 um:zero minimum:500 name:CYCLES_IFU_MEM_STALL : cycles instruction fetch pipe is stalled
@@ -17,5 +17,8 @@ event:0x0f counters:1,2 um:zero minimum:
event:0x10 counters:1,2 um:zero minimum:500 name:EXP_EXTERNAL : Explict external data access
event:0x11 counters:1,2 um:zero minimum:500 name:LSU_STALL : cycles stalled because Load Store request queque is full
event:0x12 counters:1,2 um:zero minimum:500 name:WRITE_DRAIN : Times write buffer was drained
-event:0xff counters:0 um:zero minimum:500 name:CPU_CYCLES : clock cycles counter
-#
+event:0x20 counters:1,2 um:zero minimum:500 name:ETMEXTOUT0 : nuber of cycles ETMEXTOUT[0] signal was asserted
+event:0x21 counters:1,2 um:zero minimum:500 name:ETMEXTOUT1 : nuber of cycles ETMEXTOUT[1] signal was asserted
+event:0x22 counters:1,2 um:zero minimum:500 name:ETMEXTOUT_BOTH : nuber of cycles both ETMEXTOUT [0] and [1] were asserted * 2
+event:0xff counters:1,2 um:zero minimum:500 name:CPU_CYCLES2 : clock cycles counter
+event:0xfe counters:0 um:zero minimum:500 name:CPU_CYCLES : clock cycles counter
Index: oprofile/events/arm/armv6/unit_masks
===================================================================
--- oprofile.orig/events/arm/armv6/unit_masks 2007-05-23 15:02:33.000000000 +0100
+++ oprofile/events/arm/armv6/unit_masks 2007-05-23 15:28:24.000000000 +0100
@@ -1,4 +1,4 @@
-# Arm11 possible unit masks
+# ARM V6 PMU possible unit masks
#
name:zero type:mandatory default:0x00
0x00 No unit mask
Index: oprofile/libop/op_cpu_type.c
===================================================================
--- oprofile.orig/libop/op_cpu_type.c 2007-05-24 00:17:01.000000000 +0100
+++ oprofile/libop/op_cpu_type.c 2007-05-24 00:26:34.000000000 +0100
@@ -70,7 +70,7 @@ static struct cpu_descr const cpu_descrs
{ "AMD64 family10", "x86-64/family10", CPU_FAMILY10, 4 },
{ "ppc64 PA6T", "ppc64/pa6t", CPU_PPC64_PA6T, 6 },
{ "ARM MPCore", "arm/mpcore", CPU_ARM_MPCORE, 2 },
- { "ARM11 PMU", "arm/armv6", CPU_ARM_ARM11, 3 },
+ { "ARM V6 PMU", "arm/armv6", CPU_ARM_V6, 3 },
};
static size_t const nr_cpu_descrs = sizeof(cpu_descrs) / sizeof(struct cpu_descr);
Index: oprofile/libop/op_cpu_type.h
===================================================================
--- oprofile.orig/libop/op_cpu_type.h 2007-05-24 00:17:01.000000000 +0100
+++ oprofile/libop/op_cpu_type.h 2007-05-24 00:26:50.000000000 +0100
@@ -68,7 +68,7 @@ typedef enum {
CPU_FAMILY10, /**< AMD family 10 */
CPU_PPC64_PA6T, /**< ppc64 PA6T */
CPU_ARM_MPCORE, /**< ARM MPCore */
- CPU_ARM_ARM11, /**< ARM11 */
+ CPU_ARM_V6, /**< ARM V6 */
MAX_CPU_TYPE
} op_cpu;
Index: oprofile/libop/op_events.c
===================================================================
--- oprofile.orig/libop/op_events.c 2007-05-24 00:17:01.000000000 +0100
+++ oprofile/libop/op_events.c 2007-05-24 00:27:49.000000000 +0100
@@ -786,6 +786,7 @@ void op_default_event(op_cpu cpu_type, s
case CPU_ARM_XSCALE1:
case CPU_ARM_XSCALE2:
case CPU_ARM_MPCORE:
+ case CPU_ARM_V6:
descr->name = "CPU_CYCLES";
break;
@@ -842,10 +843,6 @@ void op_default_event(op_cpu cpu_type, s
descr->name = "CPU_CLK";
break;
- case CPU_ARM_ARM11:
- descr->name = "CPU_CYCLES";
- break;
-
// don't use default, if someone add a cpu he wants a compiler
// warning if he forgets to handle it here.
case CPU_TIMER_INT:
Index: oprofile/utils/ophelp.c
===================================================================
--- oprofile.orig/utils/ophelp.c 2007-05-24 00:17:12.000000000 +0100
+++ oprofile/utils/ophelp.c 2007-05-24 00:26:08.000000000 +0100
@@ -429,7 +429,7 @@ int main(int argc, char const * argv[])
"Page 3-70, performance counters\n");
break;
- case CPU_ARM_ARM11:
+ case CPU_ARM_V6:
printf("See ARM11 Technical Reference Manual\n");
break;
|
