Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752237AbcLTT1D (ORCPT ); Tue, 20 Dec 2016 14:27:03 -0500 Received: from terminus.zytor.com ([198.137.202.10]:35790 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965055AbcLTT05 (ORCPT ); Tue, 20 Dec 2016 14:26:57 -0500 Date: Tue, 20 Dec 2016 11:25:39 -0800 From: tip-bot for Ravi Bangoria Message-ID: Cc: ravi.bangoria@linux.vnet.ibm.com, hpa@zytor.com, kim.phillips@arm.com, mhiramat@kernel.org, chris.ryder@arm.com, tglx@linutronix.de, naveen.n.rao@linux.vnet.ibm.com, alexander.shishkin@linux.intel.com, linux-kernel@vger.kernel.org, peterz@infradead.org, markus@trippelsdorf.de, mingo@kernel.org, acme@redhat.com, treeze.taeung@gmail.com Reply-To: ravi.bangoria@linux.vnet.ibm.com, kim.phillips@arm.com, hpa@zytor.com, mhiramat@kernel.org, naveen.n.rao@linux.vnet.ibm.com, tglx@linutronix.de, chris.ryder@arm.com, peterz@infradead.org, linux-kernel@vger.kernel.org, alexander.shishkin@linux.intel.com, markus@trippelsdorf.de, mingo@kernel.org, treeze.taeung@gmail.com, acme@redhat.com In-Reply-To: <1480953407-7605-2-git-send-email-ravi.bangoria@linux.vnet.ibm.com> References: <1480953407-7605-2-git-send-email-ravi.bangoria@linux.vnet.ibm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf annotate: Support jump instruction with target as second operand Git-Commit-ID: 3ee2eb6da20db1edad31070da38996e8e0f8adfa 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 Content-Length: 2651 Lines: 73 Commit-ID: 3ee2eb6da20db1edad31070da38996e8e0f8adfa Gitweb: http://git.kernel.org/tip/3ee2eb6da20db1edad31070da38996e8e0f8adfa Author: Ravi Bangoria AuthorDate: Mon, 5 Dec 2016 21:26:46 +0530 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 15 Dec 2016 16:25:46 -0300 perf annotate: Support jump instruction with target as second operand Architectures like PowerPC have jump instructions that includes a target address as a second operand. For example, 'bne cr7,0xc0000000000f6154'. Add support for such instruction in perf annotate. objdump o/p: c0000000000f6140: ld r9,1032(r31) c0000000000f6144: cmpdi cr7,r9,0 c0000000000f6148: bne cr7,0xc0000000000f6154 c0000000000f614c: ld r9,2312(r30) c0000000000f6150: std r9,1032(r31) c0000000000f6154: ld r9,88(r31) Corresponding perf annotate o/p: Before patch: ld r9,1032(r31) cmpdi cr7,r9,0 v bne 3ffffffffff09f2c ld r9,2312(r30) std r9,1032(r31) 74: ld r9,88(r31) After patch: ld r9,1032(r31) cmpdi cr7,r9,0 v bne 74 ld r9,2312(r30) std r9,1032(r31) 74: ld r9,88(r31) Signed-off-by: Ravi Bangoria Cc: Alexander Shishkin Cc: Chris Riyder Cc: Kim Phillips Cc: Markus Trippelsdorf Cc: Masami Hiramatsu Cc: Naveen N. Rao Cc: Peter Zijlstra Cc: Taeung Song Cc: linuxppc-dev@lists.ozlabs.org Link: http://lkml.kernel.org/r/1480953407-7605-2-git-send-email-ravi.bangoria@linux.vnet.ibm.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/annotate.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index ea7e0de..590244e 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -223,8 +223,12 @@ bool ins__is_call(const struct ins *ins) static int jump__parse(struct arch *arch __maybe_unused, struct ins_operands *ops, struct map *map __maybe_unused) { const char *s = strchr(ops->raw, '+'); + const char *c = strchr(ops->raw, ','); - ops->target.addr = strtoull(ops->raw, NULL, 16); + if (c++ != NULL) + ops->target.addr = strtoull(c, NULL, 16); + else + ops->target.addr = strtoull(ops->raw, NULL, 16); if (s++ != NULL) ops->target.offset = strtoull(s, NULL, 16);