[tip:perf/core] perf annotate: Allow arches to specify functions to skip

[tip-bot for Arnaldo Carvalho de Melo]

Commit-ID:  9c2fb451bda0aa60127e63e44993401818326e91
Gitweb:     http://git.kernel.org/tip/9c2fb451bda0aa60127e63e44993401818326e91
Author:     Arnaldo Carvalho de Melo <a...@redhat.com>
AuthorDate: Wed, 16 Nov 2016 15:50:38 -0300
Committer:  Arnaldo Carvalho de Melo <a...@redhat.com>
CommitDate: Thu, 17 Nov 2016 17:12:56 -0300

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, cfef25b8daf7 ("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.hun...@intel.com>
Cc: Alexander Shishkin <alexander.shish...@linux.intel.com>
Cc: Chris Riyder <chris.ry...@arm.com>
Cc: David Ahern <dsah...@gmail.com>
Cc: Jiri Olsa <jo...@kernel.org>
Cc: Kim Phillips <kim.phill...@arm.com>
Cc: Markus Trippelsdorf <mar...@trippelsdorf.de>
Cc: Masami Hiramatsu <mhira...@kernel.org>
Cc: Namhyung Kim <namhy...@kernel.org>
Cc: Naveen N. Rao <naveen.n....@linux.vnet.ibm.com>
Cc: Pawel Moll <pawel.m...@arm.com>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Ravi Bangoria <ravi.bango...@linux.vnet.ibm.com>
Cc: Russell King <rmk+ker...@arm.linux.org.uk>
Cc: Taeung Song <treeze.tae...@gmail.com>
Cc: Wang Nan <wangn...@huawei.com>
Link: http://lkml.kernel.org/n/tip-2fi3sy7q3sssdi7m7cbe0...@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com>
---
 tools/perf/util/annotate.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 1ba41a2..7276976 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -35,6 +35,7 @@ struct arch {
        const char      *name;
        struct          {
                char comment_char;
+               char skip_functions_char;
        } objdump;
 };
 
@@ -43,6 +44,7 @@ static struct arch architectures[] = {
                .name = "arm",
                .objdump =  {
                        .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);
 }
 
-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;
 
@@ -90,10 +92,9 @@ static int call__parse(struct arch *arch __maybe_unused, 
struct ins_operands *op
 
        name++;
 
-#ifdef __arm__
-       if (strchr(name, '+'))
+       if (arch->objdump.skip_functions_char &&
+           strchr(name, arch->objdump.skip_functions_char))
                return -1;
-#endif
 
        tok = strchr(name, '>');
        if (tok == NULL)