diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-09-06 12:11:18 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-09-06 12:11:18 -0400 |
commit | 8ad7013b252ba683055df19e657eb03d98f4f312 (patch) | |
tree | c558eac4f3bcf3ecf7e9b64efe52be83249fea41 /tools/perf/util | |
parent | 831394bdd9dd3ac1661336505c7cbdfd786d8cd4 (diff) |
perf test: Add round trip test for sw and hw event names
It basically traverses the hardware and software event name arrays
creating an evlist with all events, then it uses perf_evsel__name to
check that the name is the expected one.
With it I noticed this problem:
[root@sandy ~]# perf test 10
10: roundtrip evsel->name check:invalid or unsupported event: 'CPU-migrations'
Run 'perf list' for a list of valid events
FAILED!
Changed it to "cpu-migrations" in the software event arrays and it
worked.
This is to catch problems like the one reported by Joel Uckelman in
http://permalink.gmane.org/gmane.linux.kernel.perf.user/1016
Hardware cache events will be checked in the following patch.
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-5jskfkuqvf2fi257zmni0ftz@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util')
-rw-r--r-- | tools/perf/util/evsel.c | 6 | ||||
-rw-r--r-- | tools/perf/util/evsel.h | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 7ff3c8fb736c..06f76441547a 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c | |||
@@ -68,7 +68,7 @@ struct perf_evsel *perf_evsel__new(struct perf_event_attr *attr, int idx) | |||
68 | return evsel; | 68 | return evsel; |
69 | } | 69 | } |
70 | 70 | ||
71 | static const char *perf_evsel__hw_names[PERF_COUNT_HW_MAX] = { | 71 | const char *perf_evsel__hw_names[PERF_COUNT_HW_MAX] = { |
72 | "cycles", | 72 | "cycles", |
73 | "instructions", | 73 | "instructions", |
74 | "cache-references", | 74 | "cache-references", |
@@ -131,12 +131,12 @@ static int perf_evsel__hw_name(struct perf_evsel *evsel, char *bf, size_t size) | |||
131 | return r + perf_evsel__add_modifiers(evsel, bf + r, size - r); | 131 | return r + perf_evsel__add_modifiers(evsel, bf + r, size - r); |
132 | } | 132 | } |
133 | 133 | ||
134 | static const char *perf_evsel__sw_names[PERF_COUNT_SW_MAX] = { | 134 | const char *perf_evsel__sw_names[PERF_COUNT_SW_MAX] = { |
135 | "cpu-clock", | 135 | "cpu-clock", |
136 | "task-clock", | 136 | "task-clock", |
137 | "page-faults", | 137 | "page-faults", |
138 | "context-switches", | 138 | "context-switches", |
139 | "CPU-migrations", | 139 | "cpu-migrations", |
140 | "minor-faults", | 140 | "minor-faults", |
141 | "major-faults", | 141 | "major-faults", |
142 | "alignment-faults", | 142 | "alignment-faults", |
diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index 94f6ba16747f..a3f562cec433 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h | |||
@@ -97,8 +97,10 @@ extern const char *perf_evsel__hw_cache[PERF_COUNT_HW_CACHE_MAX] | |||
97 | [PERF_EVSEL__MAX_ALIASES]; | 97 | [PERF_EVSEL__MAX_ALIASES]; |
98 | extern const char *perf_evsel__hw_cache_op[PERF_COUNT_HW_CACHE_OP_MAX] | 98 | extern const char *perf_evsel__hw_cache_op[PERF_COUNT_HW_CACHE_OP_MAX] |
99 | [PERF_EVSEL__MAX_ALIASES]; | 99 | [PERF_EVSEL__MAX_ALIASES]; |
100 | const char *perf_evsel__hw_cache_result[PERF_COUNT_HW_CACHE_RESULT_MAX] | 100 | extern const char *perf_evsel__hw_cache_result[PERF_COUNT_HW_CACHE_RESULT_MAX] |
101 | [PERF_EVSEL__MAX_ALIASES]; | 101 | [PERF_EVSEL__MAX_ALIASES]; |
102 | extern const char *perf_evsel__hw_names[PERF_COUNT_HW_MAX]; | ||
103 | extern const char *perf_evsel__sw_names[PERF_COUNT_SW_MAX]; | ||
102 | int __perf_evsel__hw_cache_type_op_res_name(u8 type, u8 op, u8 result, | 104 | int __perf_evsel__hw_cache_type_op_res_name(u8 type, u8 op, u8 result, |
103 | char *bf, size_t size); | 105 | char *bf, size_t size); |
104 | const char *perf_evsel__name(struct perf_evsel *evsel); | 106 | const char *perf_evsel__name(struct perf_evsel *evsel); |