From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1162032AbdEYGBY (ORCPT ); Thu, 25 May 2017 02:01:24 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:54043 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755589AbdEYGBS (ORCPT ); Thu, 25 May 2017 02:01:18 -0400 From: Ravi Bangoria To: acme@kernel.org Cc: anton@samba.org, peterz@infradead.org, mingo@redhat.com, alexander.shishkin@linux.intel.com, treeze.taeung@gmail.com, borntraeger@de.ibm.com, linux-kernel@vger.kernel.org, kim.phillips@arm.com, Ravi Bangoria Subject: [PATCH] perf/annotate/powerpc: Fix branch instruction with multiple operands Date: Thu, 25 May 2017 11:29:57 +0530 X-Mailer: git-send-email 2.9.3 X-TM-AS-MML: disable x-cbid: 17052506-1617-0000-0000-000001D6A105 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17052506-1618-0000-0000-0000481B3ABB Message-Id: <20170525055957.7779-1-ravi.bangoria@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-05-25_02:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1703280000 definitions=main-1705250117 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Perf annotate is dropping the cr* fields from branch instructions. Fix it by adding support to display branch instructions having multiple operands. Objdump of int_sqrt: 20.36 | c0000000004d2694: subf r10,r10,r3 | c0000000004d2698: v bgt cr6,c0000000004d26a0 1.82 | c0000000004d269c: mr r3,r10 29.18 | c0000000004d26a0: mr r10,r8 | c0000000004d26a4: v bgt cr7,c0000000004d26ac | c0000000004d26a8: mr r10,r7 Before Patch: 20.36 | subf r10,r10,r3 | v bgt 40 1.82 | mr r3,r10 29.18 | 40: mr r10,r8 | v bgt 4c | mr r10,r7 After patch: 20.36 | subf r10,r10,r3 | v bgt cr6,40 1.82 | mr r3,r10 29.18 | 40: mr r10,r8 | v bgt cr7,4c | mr r10,r7 Reported-by: Anton Blanchard Signed-off-by: Ravi Bangoria --- tools/perf/util/annotate.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 683f834..a031c4d 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -257,10 +257,18 @@ static int jump__parse(struct arch *arch __maybe_unused, struct ins_operands *op static int jump__scnprintf(struct ins *ins, char *bf, size_t size, struct ins_operands *ops) { + const char *c = strchr(ops->raw, ','); + if (!ops->target.addr || ops->target.offset < 0) return ins__raw_scnprintf(ins, bf, size, ops); - return scnprintf(bf, size, "%-6.6s %" PRIx64, ins->name, ops->target.offset); + if (c++ != NULL) + return scnprintf(bf, size, "%-6.6s %.*s%" PRIx64, + ins->name, c - ops->raw, ops->raw, + ops->target.offset); + else + return scnprintf(bf, size, "%-6.6s %" PRIx64, + ins->name, ops->target.offset); } static struct ins_ops jump_ops = { -- 1.8.3.1