perf top: Add branch annotation code to top

Now that we can process branch data in annotate it makes sense to
support enabling branch recording from top too. Most of the code needed
for this is already in shared code with report. But we need to add:

- The option parsing code (using shared code from the previous patch)
- Document the options
- Set up the IPC/cycles accounting state in the top session
- Call the accounting code in the hist iter callback

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1437233094-12844-8-git-send-email-andi@firstfloor.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/Documentation/perf-top.txt b/tools/perf/Documentation/perf-top.txt
index 776aec4..f6a23eb 100644 (file)
--- a/tools/perf/Documentation/perf-top.txt
+++ b/tools/perf/Documentation/perf-top.txt
@@ -208,6 +208,27 @@ Default is to monitor all CPUS.
        This option sets the time out limit. The default value is 500 ms.
 
 
+-b::
+--branch-any::
+       Enable taken branch stack sampling. Any type of taken branch may be sampled.
+       This is a shortcut for --branch-filter any. See --branch-filter for more infos.
+
+-j::
+--branch-filter::
+       Enable taken branch stack sampling. Each sample captures a series of consecutive
+       taken branches. The number of branches captured with each sample depends on the
+       underlying hardware, the type of branches of interest, and the executed code.
+       It is possible to select the types of branches captured by enabling filters.
+       For a full list of modifiers please see the perf record manpage.
+
+       The option requires at least one branch type among any, any_call, any_ret, ind_call, cond.
+       The privilege levels may be omitted, in which case, the privilege levels of the associated
+       event are applied to the branch filter. Both kernel (k) and hypervisor (hv) privilege
+       levels are subject to permissions.  When sampling on multiple events, branch stack sampling
+       is enabled for all the sampling events. The sampled branch type is the same for all events.
+       The various filters must be specified as a comma separated list: --branch-filter any_ret,u,k
+       Note that this feature may not be available on all processors.
+
 INTERACTIVE PROMPTING KEYS
 --------------------------
 

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index ecf3197..bfe24f1 100644 (file)
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -40,6 +40,7 @@
 #include "util/xyarray.h"
 #include "util/sort.h"
 #include "util/intlist.h"
+#include "util/parse-branch-options.h"
 #include "arch/common.h"
 
 #include "util/debug.h"
@@ -695,6 +696,8 @@ static int hist_iter__top_callback(struct hist_entry_iter *iter,
                perf_top__record_precise_ip(top, he, evsel->idx, ip);
        }
 
+       hist__account_cycles(iter->sample->branch_stack, al, iter->sample,
+                    !(top->record_opts.branch_stack & PERF_SAMPLE_BRANCH_ANY));
        return 0;
 }
 
@@ -1171,6 +1174,12 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)
                   "don't try to adjust column width, use these fixed values"),
        OPT_UINTEGER(0, "proc-map-timeout", &opts->proc_map_timeout,
                        "per thread proc mmap processing timeout in ms"),
+       OPT_CALLBACK_NOOPT('b', "branch-any", &opts->branch_stack,
+                    "branch any", "sample any taken branches",
+                    parse_branch_stack),
+       OPT_CALLBACK('j', "branch-filter", &opts->branch_stack,
+                    "branch filter mask", "branch stack filter modes",
+                    parse_branch_stack),
        OPT_END()
        };
        const char * const top_usage[] = {