Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99571ab3 authored by Andi Kleen's avatar Andi Kleen Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Support callchain sorting based on addresses 



With programs with very large functions it can be useful to distinguish
the callgraph nodes on more than just function names. So for example if
you have multiple calls to the same function, it ends up being separate
nodes in the chain.

This patch adds a new key field to the callgraph options, that allows
comparing nodes on functions (as today, default) and addresses.

Longer term it would be nice to also handle src lines, but that would
need more changes and address is a reasonable proxy for it today.

I right now reference the global params, as there was no simple way to
register a params pointer.

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Link: http://lkml.kernel.org/n/tip-0uskktybf0e7wrnoi5e9b9it@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent a198996c

tools/perf/Documentation/perf-report.txt

+6 −2
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ OPTIONS 
--dump-raw-trace::

        Dump raw trace in ASCII.



-g [type,min[,limit],order]::

-g [type,min[,limit],order[,key]]::

--call-graph::

        Display call chains using type, min percent threshold, optional print

	limit and order.
@@ -129,7 +129,11 @@ OPTIONS 
	- callee: callee based call graph.

	- caller: inverted caller based call graph.



	Default: fractal,0.5,callee.

	key can be:

	- function: compare on functions

	- address: compare on individual code addresses



	Default: fractal,0.5,callee,function.



-G::

--inverted::

tools/perf/builtin-report.c

+15 −4
Original line number Diff line number Diff line
@@ -667,12 +667,23 @@ parse_callchain_opt(const struct option *opt, const char *arg, int unset) 
	}



	/* get the call chain order */

	if (!strcmp(tok2, "caller"))

	if (!strncmp(tok2, "caller", strlen("caller")))

		callchain_param.order = ORDER_CALLER;

	else if (!strcmp(tok2, "callee"))

	else if (!strncmp(tok2, "callee", strlen("callee")))

		callchain_param.order = ORDER_CALLEE;

	else

		return -1;



	/* Get the sort key */

	tok2 = strtok(NULL, ",");

	if (!tok2)

		goto setup;

	if (!strncmp(tok2, "function", strlen("function")))

		callchain_param.key = CCKEY_FUNCTION;

	else if (!strncmp(tok2, "address", strlen("address")))

		callchain_param.key = CCKEY_ADDRESS;

	else

		return -1;

setup:

	if (callchain_register_param(&callchain_param) < 0) {

		fprintf(stderr, "Can't register callchain params\n");
@@ -784,8 +795,8 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) 
	OPT_BOOLEAN('x', "exclude-other", &symbol_conf.exclude_other,

		    "Only display entries with parent-match"),

	OPT_CALLBACK_DEFAULT('g', "call-graph", &report, "output_type,min_percent[,print_limit],call_order",

		     "Display callchains using output_type (graph, flat, fractal, or none) , min percent threshold, optional print limit and callchain order. "

		     "Default: fractal,0.5,callee", &parse_callchain_opt, callchain_default_opt),

		     "Display callchains using output_type (graph, flat, fractal, or none) , min percent threshold, optional print limit, callchain order, key (function or address). "

		     "Default: fractal,0.5,callee,function", &parse_callchain_opt, callchain_default_opt),

	OPT_BOOLEAN('G', "inverted", &report.inverted_callchain,

		    "alias for inverted call graph"),

	OPT_CALLBACK(0, "ignore-callees", NULL, "regex",

tools/perf/util/callchain.c

+5 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <errno.h>

#include <math.h>



#include "hist.h"

#include "util.h"

#include "callchain.h"
@@ -327,7 +328,8 @@ append_chain(struct callchain_node *root, 
	/*

	 * Lookup in the current node

	 * If we have a symbol, then compare the start to match

	 * anywhere inside a function.

	 * anywhere inside a function, unless function

	 * mode is disabled.

	 */

	list_for_each_entry(cnode, &root->val, list) {

		struct callchain_cursor_node *node;
@@ -339,7 +341,8 @@ append_chain(struct callchain_node *root, 


		sym = node->sym;



		if (cnode->ms.sym && sym) {

		if (cnode->ms.sym && sym &&

		    callchain_param.key == CCKEY_FUNCTION) {

			if (cnode->ms.sym->start != sym->start)

				break;

		} else if (cnode->ip != node->ip)

tools/perf/util/callchain.h

+6 −0
Original line number Diff line number Diff line
@@ -41,12 +41,18 @@ struct callchain_param; 
typedef void (*sort_chain_func_t)(struct rb_root *, struct callchain_root *,

				 u64, struct callchain_param *);



enum chain_key {

	CCKEY_FUNCTION,

	CCKEY_ADDRESS

};



struct callchain_param {

	enum chain_mode 	mode;

	u32			print_limit;

	double			min_percent;

	sort_chain_func_t	sort;

	enum chain_order	order;

	enum chain_key		key;

};



struct callchain_list {

tools/perf/util/hist.c

+2 −1
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ enum hist_filter { 
struct callchain_param	callchain_param = {

	.mode	= CHAIN_GRAPH_REL,

	.min_percent = 0.5,

	.order  = ORDER_CALLEE

	.order  = ORDER_CALLEE,

	.key	= CCKEY_FUNCTION

};



u16 hists__col_len(struct hists *hists, enum hist_column col)