perf list: Skip unsupported events
Namhyung Kim
maintainerFrom: Namhyung Kim <[email protected]>
Some hardware events might not be supported on a system. Listing those events seems meaningless and confusing to users. Let's skip them.
Before:
$ perf list cache | wc -l 33
After:
$ perf list cache | wc -l 27
Signed-off-by Namhyung Kim <[email protected]>
--- tools/perf/util/parse-events.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-)
tools/perf/util/parse-events.c +39 -2
@@ -15,6 +15,7 @@#define YY_EXTRA_TYPE int#include "parse-events-flex.h" #include "pmu.h" +#include "thread_map.h" #define MAX_NAME_LEN 100
@@ -1072,6 +1073,33 @@ int is_valid_tracepoint(const char *event_string)return 0 ; } +bool is_event_supported (u8 type,unsigned config) +{ +bool ret = true; +struct perf_evsel *evsel; +struct perf_event_attr attr = { + .type = type, + .config = config, + .disabled =1 , + .exclude_kernel =1 , + }; +struct { +struct thread_map map; +int threads[1 ]; + } tmap = { + .map.nr =1 , + .threads = {0 }, + }; + + evsel =perf_evsel__new (&attr,0 ); +if (evsel) { + ret =perf_evsel__open (evsel,NULL , &tmap.map) >=0 ; +perf_evsel__delete (evsel); + } + +return ret; +} +static void __print_events_type (u8 type,struct event_symbol *syms,unsigned max) {
@@ -1079,14 +1107,16 @@ static void __print_events_type(u8 type, struct event_symbol *syms,unsigned i;for (i =0 ; i < max ; i++, syms++) { +if (!is_event_supported (type, i)) +continue ; +if (strlen (syms->alias))snprintf (name,sizeof (name),"%s OR %s" , syms->symbol, syms->alias);else snprintf (name,sizeof (name),"%s" , syms->symbol); -printf (" %-50s [%s]\n" , name, - event_type_descriptors[type]); +printf (" %-50s [%s]\n" , name, event_type_descriptors[type]); } }
@@ -1115,6 +1145,10 @@ int print_hwcache_events(const char *event_glob, bool name_only)if (event_glob !=NULL && !strglobmatch (name, event_glob))continue ; +if (!is_event_supported (PERF_TYPE_HW_CACHE , + type | (op <<8 ) | (i <<16 ))) +continue ; +if (name_only)printf ("%s " , name);else
@@ -1144,6 +1178,9 @@ static void print_symbol_events(const char *event_glob, unsigned type, (syms->alias && strglobmatch(syms->alias, event_glob)))) continue; +if (!is_event_supported (type, i)) +continue ; +if (name_only) {printf ("%s " , syms->symbol);continue ;
Signature · 1 line
1.7.11.7
Namhyung Kim
maintainerPATCH v2 1/1 perf list: Skip unsupported events
From: Namhyung Kim <[email protected]>
Some hardware events might not be supported on a system. Listing those events seems meaningless and confusing to users. Let's skip them.
Before:
$ perf list cache | wc -l 33
After:
$ perf list cache | wc -l 27
Signed-off-by Namhyung Kim <[email protected]>
---
* fixed a build error
tools/perf/util/parse-events.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-)
tools/perf/util/parse-events.c +39 -2
@@ -15,6 +15,7 @@#define YY_EXTRA_TYPE int#include "parse-events-flex.h" #include "pmu.h" +#include "thread_map.h" #define MAX_NAME_LEN 100
@@ -1072,6 +1073,33 @@ int is_valid_tracepoint(const char *event_string)return 0 ; } +static bool is_event_supported (u8 type,unsigned config) +{ +bool ret = true; +struct perf_evsel *evsel; +struct perf_event_attr attr = { + .type = type, + .config = config, + .disabled =1 , + .exclude_kernel =1 , + }; +struct { +struct thread_map map; +int threads[1 ]; + } tmap = { + .map.nr =1 , + .threads = {0 }, + }; + + evsel =perf_evsel__new (&attr,0 ); +if (evsel) { + ret =perf_evsel__open (evsel,NULL , &tmap.map) >=0 ; +perf_evsel__delete (evsel); + } + +return ret; +} +static void __print_events_type (u8 type,struct event_symbol *syms,unsigned max) {
@@ -1079,14 +1107,16 @@ static void __print_events_type(u8 type, struct event_symbol *syms,unsigned i;for (i =0 ; i < max ; i++, syms++) { +if (!is_event_supported (type, i)) +continue ; +if (strlen (syms->alias))snprintf (name,sizeof (name),"%s OR %s" , syms->symbol, syms->alias);else snprintf (name,sizeof (name),"%s" , syms->symbol); -printf (" %-50s [%s]\n" , name, - event_type_descriptors[type]); +printf (" %-50s [%s]\n" , name, event_type_descriptors[type]); } }
@@ -1115,6 +1145,10 @@ int print_hwcache_events(const char *event_glob, bool name_only)if (event_glob !=NULL && !strglobmatch (name, event_glob))continue ; +if (!is_event_supported (PERF_TYPE_HW_CACHE , + type | (op <<8 ) | (i <<16 ))) +continue ; +if (name_only)printf ("%s " , name);else
@@ -1144,6 +1178,9 @@ static void print_symbol_events(const char *event_glob, unsigned type, (syms->alias && strglobmatch(syms->alias, event_glob)))) continue; +if (!is_event_supported (type, i)) +continue ; +if (name_only) {printf ("%s " , syms->symbol);continue ;
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge botperf list: Skip unsupported events
Commit-ID: b41f1cec91c37eeea6fdb15effbfa24ea0a5536b Gitweb: http://git.kernel.org/tip/b41f1cec91c37eeea6fdb15effbfa24ea0a5536b Author: Namhyung Kim <[email protected]> AuthorDate: Tue, 27 Aug 2013 11:41:53 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 2 Sep 2013 14:58:21 -0300
perf list: Skip unsupported events
Some hardware events might not be supported on a system. Listing those events seems meaningless and confusing to users. Let's skip them.
Before:
$ perf list cache | wc -l 33
After:
$ perf list cache | wc -l 27
Signed-off-by Namhyung Kim <[email protected]>
Cc David Ahern <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/util/parse-events.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-)
tools/perf/util/parse-events.c +39 -2
@@ -15,6 +15,7 @@#define YY_EXTRA_TYPE int#include "parse-events-flex.h" #include "pmu.h" +#include "thread_map.h" #define MAX_NAME_LEN 100
@@ -1076,6 +1077,33 @@ int is_valid_tracepoint(const char *event_string)return 0 ; } +static bool is_event_supported (u8 type,unsigned config) +{ +bool ret = true; +struct perf_evsel *evsel; +struct perf_event_attr attr = { + .type = type, + .config = config, + .disabled =1 , + .exclude_kernel =1 , + }; +struct { +struct thread_map map; +int threads[1 ]; + } tmap = { + .map.nr =1 , + .threads = {0 }, + }; + + evsel =perf_evsel__new (&attr,0 ); +if (evsel) { + ret =perf_evsel__open (evsel,NULL , &tmap.map) >=0 ; +perf_evsel__delete (evsel); + } + +return ret; +} +static void __print_events_type (u8 type,struct event_symbol *syms,unsigned max) {
@@ -1083,14 +1111,16 @@ static void __print_events_type(u8 type, struct event_symbol *syms,unsigned i;for (i =0 ; i < max ; i++, syms++) { +if (!is_event_supported (type, i)) +continue ; +if (strlen (syms->alias))snprintf (name,sizeof (name),"%s OR %s" , syms->symbol, syms->alias);else snprintf (name,sizeof (name),"%s" , syms->symbol); -printf (" %-50s [%s]\n" , name, - event_type_descriptors[type]); +printf (" %-50s [%s]\n" , name, event_type_descriptors[type]); } }
@@ -1119,6 +1149,10 @@ int print_hwcache_events(const char *event_glob, bool name_only)if (event_glob !=NULL && !strglobmatch (name, event_glob))continue ; +if (!is_event_supported (PERF_TYPE_HW_CACHE , + type | (op <<8 ) | (i <<16 ))) +continue ; +if (name_only)printf ("%s " , name);else
@@ -1148,6 +1182,9 @@ static void print_symbol_events(const char *event_glob, unsigned type, (syms->alias && strglobmatch(syms->alias, event_glob)))) continue; +if (!is_event_supported (type, i)) +continue ; +if (name_only) {printf ("%s " , syms->symbol);continue ;