On Mon, Jan 13, 2014 at 05:04:18PM -0800, Andi Kleen wrote:
> From: Andi Kleen <a...@linux.intel.com>
>
> Add a --branch-history option to perf report that changes all
> the settings necessary for using the branches in callstacks.
>
> This is just a short cut to make this nicer to use, it does
> not enable any functionality by itself.
>
> v2: Change sort order. Rename option to --branch-history to
> be less confusing.
> Signed-off-by: Andi Kleen <a...@linux.intel.com>
> ---
SNIP
> @@ -729,7 +739,7 @@ int cmd_report(int argc, const char **argv, const char
> *prefix __maybe_unused)
> struct perf_session *session;
> struct stat st;
> bool has_br_stack = false;
> - int branch_mode = -1;
> + int branch_mode = -1, branch_call_mode = -1;
> int ret = -1;
> char callchain_default_opt[] = "fractal,0.5,callee";
> const char * const report_usage[] = {
> @@ -838,7 +848,10 @@ int cmd_report(int argc, const char **argv, const char
> *prefix __maybe_unused)
> OPT_BOOLEAN(0, "group", &symbol_conf.event_group,
> "Show event group information together"),
> OPT_CALLBACK_NOOPT('b', "branch-stack", &branch_mode, "",
> - "use branch records for histogram filling",
> parse_branch_mode),
> + "use branch records for per branch histogram filling",
> parse_branch_mode),
> + OPT_CALLBACK_NOOPT(0, "branch-history", &branch_call_mode, "",
> + "add last branch records to call history",
> + parse_branch_call_mode),
> OPT_STRING(0, "objdump", &objdump_path, "path",
> "objdump binary to use for disassembly and annotations"),
> OPT_BOOLEAN(0, "demangle", &symbol_conf.demangle,
> @@ -886,8 +899,16 @@ repeat:
> has_br_stack = perf_header__has_feat(&session->header,
> HEADER_BRANCH_STACK);
>
> - if (branch_mode == -1 && has_br_stack)
> + if (branch_mode == -1 && has_br_stack && branch_call_mode == -1)
> sort__mode = SORT_MODE__BRANCH;
> + if (branch_call_mode != -1) {
> + callchain_param.branch_callstack = 1;
> + callchain_param.key = CCKEY_ADDRESS;
> + symbol_conf.use_callchain = true;
> + callchain_register_param(&callchain_param);
> + if (sort_order == default_sort_order)
> + sort_order = "srcline,symbol,dso";
> + }
this sort of settings needs to be in for the previous patch,
to make the following command work:
$ perf report --call-graph=fractal,0.5,callee,function,branch
will just set symbol_conf.use_callchain, but the sorting stays
as SORT_MODE__BRANCH.. and callchains are invisible
as you said in the changelog, this should be 'short cut to make this nicer to
use',
but it's actually currently the only way..
jirka
--
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/
