perf list: Extend raw-dump to certain kind of events

Extend 'perf list --raw-dump' to 'perf list --raw-dump [hw|sw|cache
|tracepoint|pmu|event_glob]' in order to show the raw-dump of a certain
kind of events rather than all of the events.

Example:

Before this patch:

 $ perf list --raw-dump hw
 branch-instructions branch-misses bus-cycles cache-misses
 cache-references cpu-cycles instructions stalled-cycles-backend
 stalled-cycles-frontend
 alignment-faults context-switches cpu-clock cpu-migrations
 emulation-faults major-faults minor-faults page-faults task-clock
 ...
 ...
 writeback:writeback_thread_start writeback:writeback_thread_stop
 writeback:writeback_wait_iff_congested
 writeback:writeback_wake_background writeback:writeback_wake_thread

As shown above, all of the events are printed.

After this patch:

 $ perf list --raw-dump hw
 branch-instructions branch-misses bus-cycles cache-misses
 cache-references cpu-cycles instructions stalled-cycles-backend
 stalled-cycles-frontend

As shown above, only the hw events are printed.

Signed-off-by: Yunlong Song <yunlong.song@huawei.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1425032491-20224-5-git-send-email-yunlong.song@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/Documentation/perf-list.txt b/tools/perf/Documentation/perf-list.txt
index 3e2aec94f806b5425eca4f961a01e1be077b8901..4692d277980b2af93f1201a7e32a60ff4ae397c1 100644 (file)
--- a/tools/perf/Documentation/perf-list.txt
+++ b/tools/perf/Documentation/perf-list.txt
@@ -127,6 +127,12 @@ To limit the list use:
 One or more types can be used at the same time, listing the events for the
 types specified.
 
+Support raw format:
+
+. '--raw-dump', shows the raw-dump of all the events.
+. '--raw-dump [hw|sw|cache|tracepoint|pmu|event_glob]', shows the raw-dump of
+  a certain kind of events.
+
 SEE ALSO
 --------
 linkperf:perf-stat[1], linkperf:perf-top[1],

diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c
index 8b323e015458f4e866e1078a36ef2563540e6a9b..af5bd05141088469d29d2fc7112927be96f2f610 100644 (file)
--- a/tools/perf/builtin-list.c
+++ b/tools/perf/builtin-list.c
@@ -36,41 +36,36 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
 
        setup_pager();
 
-       if (raw_dump) {
-               print_events(NULL, true);
-               return 0;
-       }
-
        if (!raw_dump)
                printf("\nList of pre-defined events (to be used in -e):\n\n");
 
        if (argc == 0) {
-               print_events(NULL, false);
+               print_events(NULL, raw_dump);
                return 0;
        }
 
        for (i = 0; i < argc; ++i) {
                if (strcmp(argv[i], "tracepoint") == 0)
-                       print_tracepoint_events(NULL, NULL, false);
+                       print_tracepoint_events(NULL, NULL, raw_dump);
                else if (strcmp(argv[i], "hw") == 0 ||
                         strcmp(argv[i], "hardware") == 0)
                        print_symbol_events(NULL, PERF_TYPE_HARDWARE,
-                                       event_symbols_hw, PERF_COUNT_HW_MAX, false);
+                                       event_symbols_hw, PERF_COUNT_HW_MAX, raw_dump);
                else if (strcmp(argv[i], "sw") == 0 ||
                         strcmp(argv[i], "software") == 0)
                        print_symbol_events(NULL, PERF_TYPE_SOFTWARE,
-                                       event_symbols_sw, PERF_COUNT_SW_MAX, false);
+                                       event_symbols_sw, PERF_COUNT_SW_MAX, raw_dump);
                else if (strcmp(argv[i], "cache") == 0 ||
                         strcmp(argv[i], "hwcache") == 0)
-                       print_hwcache_events(NULL, false);
+                       print_hwcache_events(NULL, raw_dump);
                else if (strcmp(argv[i], "pmu") == 0)
-                       print_pmu_events(NULL, false);
+                       print_pmu_events(NULL, raw_dump);
                else {
                        char *sep = strchr(argv[i], ':'), *s;
                        int sep_idx;
 
                        if (sep == NULL) {
-                               print_events(argv[i], false);
+                               print_events(argv[i], raw_dump);
                                continue;
                        }
                        sep_idx = sep - argv[i];
@@ -79,7 +74,7 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
                                return -1;
 
                        s[sep_idx] = '\0';
-                       print_tracepoint_events(s, s + sep_idx + 1, false);
+                       print_tracepoint_events(s, s + sep_idx + 1, raw_dump);
                        free(s);
                }
        }