[PATCH/RFC] perf list: Skip unsupported events

2013-08-26 Thread Namhyung Kim
From: Namhyung Kim 

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 
---
 tools/perf/util/parse-events.c | 41 +++--
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 9cba92386a82..b5e5860c5484 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -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(, 0);
+   if (evsel) {
+   ret = perf_evsel__open(evsel, NULL, ) >= 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;
-- 
1.7.11.7

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH/RFC] perf list: Skip unsupported events

2013-08-26 Thread Namhyung Kim
From: Namhyung Kim namhyung@lge.com

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 namhy...@kernel.org
---
 tools/perf/util/parse-events.c | 41 +++--
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 9cba92386a82..b5e5860c5484 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -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;
-- 
1.7.11.7

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/