From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756706AbcKXEP0 (ORCPT ); Wed, 23 Nov 2016 23:15:26 -0500 Received: from terminus.zytor.com ([198.137.202.10]:49524 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752706AbcKXEPX (ORCPT ); Wed, 23 Nov 2016 23:15:23 -0500 Date: Wed, 23 Nov 2016 20:13:23 -0800 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: ravi.bangoria@linux.vnet.ibm.com, jolsa@kernel.org, naveen.n.rao@linux.vnet.ibm.com, alexander.shishkin@linux.intel.com, pawel.moll@arm.com, hpa@zytor.com, dsahern@gmail.com, markus@trippelsdorf.de, acme@redhat.com, mhiramat@kernel.org, peterz@infradead.org, kim.phillips@arm.com, rmk+kernel@arm.linux.org.uk, tglx@linutronix.de, chris.ryder@arm.com, mingo@kernel.org, treeze.taeung@gmail.com, wangnan0@huawei.com, namhyung@kernel.org, linux-kernel@vger.kernel.org, adrian.hunter@intel.com Reply-To: jolsa@kernel.org, naveen.n.rao@linux.vnet.ibm.com, alexander.shishkin@linux.intel.com, ravi.bangoria@linux.vnet.ibm.com, markus@trippelsdorf.de, acme@redhat.com, mhiramat@kernel.org, hpa@zytor.com, pawel.moll@arm.com, dsahern@gmail.com, kim.phillips@arm.com, rmk+kernel@arm.linux.org.uk, tglx@linutronix.de, peterz@infradead.org, wangnan0@huawei.com, namhyung@kernel.org, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, mingo@kernel.org, chris.ryder@arm.com, treeze.taeung@gmail.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf annotate: Allow arches to specify functions to skip Git-Commit-ID: 9c2fb451bda0aa60127e63e44993401818326e91 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 9c2fb451bda0aa60127e63e44993401818326e91 Gitweb: http://git.kernel.org/tip/9c2fb451bda0aa60127e63e44993401818326e91 Author: Arnaldo Carvalho de Melo AuthorDate: Wed, 16 Nov 2016 15:50:38 -0300 Committer: Arnaldo Carvalho de Melo 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 Cc: Alexander Shishkin Cc: Chris Riyder Cc: David Ahern Cc: Jiri Olsa Cc: Kim Phillips Cc: Markus Trippelsdorf Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Naveen N. Rao Cc: Pawel Moll Cc: Peter Zijlstra Cc: Ravi Bangoria Cc: Russell King Cc: Taeung Song Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-2fi3sy7q3sssdi7m7cbe07gy@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- 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)