Commit 9c2fb451 authored Nov 16, 2016 by Arnaldo Carvalho de Melo

perf annotate: Allow arches to specify functions to skip

This is to cope with an ARM specific kludge introduced in the original
patch supporting ARM annotation, cfef25b8 ("perf annotate: ARM
support") that made functions with a '+' in its name to be skipped when
processing call instructions.

With this patchkit it should be possible to collect a perf.data file on
a ARM machine and then annotate it on a x86 workstation and have those
ARM kludges used.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Chris Riyder <chris.ryder@arm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kim Phillips <kim.phillips@arm.com>
Cc: Markus Trippelsdorf <markus@trippelsdorf.de>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Taeung Song <treeze.taeung@gmail.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-2fi3sy7q3sssdi7m7cbe07gy@git.kernel.org


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 786c1b51

tools/perf/util/annotate.c

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -35,6 +35,7 @@ struct arch {
	const char *name;		const char *name;
	struct {		struct {
	char comment_char;		char comment_char;
			char skip_functions_char;
	} objdump;		} objdump;
	};		};

	@@ -43,6 +44,7 @@ static struct arch architectures[] = {
	.name = "arm",		.name = "arm",
	.objdump = {		.objdump = {
	.comment_char = ';',		.comment_char = ';',
			.skip_functions_char = '+',
	},		},
	},		},
	{		{
	@@ -78,7 +80,7 @@ int ins__scnprintf(struct ins ins, char bf, size_t size,
	return ins__raw_scnprintf(ins, bf, size, ops);		return ins__raw_scnprintf(ins, bf, size, ops);
	}		}

	static int call__parse(struct arch arch __maybe_unused, struct ins_operands ops, struct map *map)		static int call__parse(struct arch arch, struct ins_operands ops, struct map *map)
	{		{
	char endptr, tok, *name;		char endptr, tok, *name;

	@@ -90,10 +92,9 @@ static int call__parse(struct arch arch __maybe_unused, struct ins_operands op

	name++;		name++;

	#ifdef __arm__		if (arch->objdump.skip_functions_char &&
	if (strchr(name, '+'))		strchr(name, arch->objdump.skip_functions_char))
	return -1;		return -1;
	#endif

	tok = strchr(name, '>');		tok = strchr(name, '>');
	if (tok == NULL)		if (tok == NULL)