Received: by 2002:a89:413:0:b0:1fd:dba5:e537 with SMTP id m19csp980731lqs; Fri, 14 Jun 2024 11:00:13 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWN9yxd9Fc0xL8J/rhtEv/9MvagaEoPkfiagjONoqxTSNmzWvRT/K5LRHoKgjwnlYIzdYSodbN7CTuaBvkmq46+5KwAQlpMSIG2tOul7g== X-Google-Smtp-Source: AGHT+IGpMstqVXHA6p5rRlziDJrWxel/ZDO+Eg+j6jBGICbERBxAo8h1zp+xbhgFCRHQ5fFbk2cC X-Received: by 2002:a17:902:7612:b0:1f7:243d:821f with SMTP id d9443c01a7336-1f8626d28c5mr27932195ad.35.1718388012913; Fri, 14 Jun 2024 11:00:12 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1718388012; cv=pass; d=google.com; s=arc-20160816; b=VW8Zy3DFCtgUh+0+8e11f8wqybL/ES1GQ5rswSBA2MAi4HwtIZbtyyhnIiTDr8q/QP lcwVQ1dvNapl4rjZmH7UOgX5xC65i8V9yRbHe8t51J54xzxlhkVh4skNopzYeWRl24/i opI4mzbnLC9wx3VAxnYIYjYolAQuSoW8W7dDViC/3prsCF9bHcYCUVJhuYBcUnYTa9xK BSFioD5E5kVtaYPss4w3EBvNdc20CkOWfzk8dny5U2/fsvssR3A/boph2zwQUf/qY/ne jeLAzHuI3XwF3Km8756Kw/9sj7hd9j6GxA8UYdZZzak6PI9c9sjBiqPjQj9JfKi99NSR GXqQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=sp2iV4oZwEYctYWhVj8Lyhs0oK1Mn4x+lyvQsY0nELo=; fh=0PTwb2dctJdgxxdpEHLw2xTRIlYCAL+sOxDjzSKR2y4=; b=jGiyJkkp+B4VscOc7iQFTYP6dwt/dQymjpRrif7FiNOdCSMDIeS2cMFna0A+LG4CRN 1y+2dRBNrWbi5qIhfgKt3PkY2ma8bdp2ZyFgwmiltcnzlXs4FzNdqHaSNg+dVgRufqMO xUFLOVjXix83N8mPrXbH4hm0WPVn44qknFQvE9ViWwh1CI0OOs/M7MxCb0MvHir6Hxhw OoroOZkR0OfPQRjGKmk0XLOU+MoDYWaaZd+BymUnTA6WDCXf6ga8evWL/GaOJNMhflcO PhT9fBx1gBwOZLMM+CaI4BSdxW/WPUal0vDcRALqE9zfYZE0AEJzH7ACkdqpZLZvT76C hCzA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=orMDadqo; arc=pass (i=1 dkim=pass dkdomain=ibm.com dmarc=pass fromdomain=linux.vnet.ibm.com); spf=pass (google.com: domain of linux-kernel+bounces-215343-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-215343-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id d9443c01a7336-1f860a82535si27735805ad.101.2024.06.14.11.00.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jun 2024 11:00:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-215343-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=orMDadqo; arc=pass (i=1 dkim=pass dkdomain=ibm.com dmarc=pass fromdomain=linux.vnet.ibm.com); spf=pass (google.com: domain of linux-kernel+bounces-215343-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-215343-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 061FC2894B3 for ; Fri, 14 Jun 2024 17:28:22 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 61BA01A2FDE; Fri, 14 Jun 2024 17:27:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="orMDadqo" Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 837F11A255D; Fri, 14 Jun 2024 17:27:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718386035; cv=none; b=LB9y2n15z7SmrFehKOcYPxppP80DPPMM1n8UN10SDRHPUhFAUGa+kJdkoogi8hcv+iUKOZIvtYlFNXekFnLasWwvFkTqHp1rsA4ryDWz4FNN2Kgmx2BZGi6ri0zvX0derpF98o0mUStMmku0a3zTbPxhF9+Wj7trloHCAKnnH3Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718386035; c=relaxed/simple; bh=0IGoZqzo9rEGSCy7015k1TcUNKJcD0HZgwQpDPr9KD8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=sD7OtQuKves6Vl4ly/Pj0+9juPuV4NLO8GSgTwXIjGxHLvjYEh/KGSB9kow3FQ+zZbwH5JKICFQ96zmAjhsqEuOKYHHb7cZf0elXITWUde90KcBf5tLxir28vtDMrLkPufLBj/vFwCSQEhuVhFXY1cVL4XN4KIFc/g//PifhOLM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.vnet.ibm.com; spf=none smtp.mailfrom=linux.vnet.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=orMDadqo; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.vnet.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.vnet.ibm.com Received: from pps.filterd (m0353724.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 45EHPZxn023608; Fri, 14 Jun 2024 17:27:04 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from :to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=pp1; bh=sp2iV4oZwEYct YWhVj8Lyhs0oK1Mn4x+lyvQsY0nELo=; b=orMDadqokfuH7h04IxyVpV+ovc1d7 /LQv6pvWD9G3m9QBz1qtLZ34rhSS9J2Vdp+bSDTO/rePETu1tKY8nY1hjveeSAbP ZuoLBtgPbnJ2oQezhVIbQD1Pdv0vV1Um6iIO+TSYz/zwAae6I5TiTu8WFJI1qwnQ i6d/171GjSt+Dw+6XEjpRuMrGyT55EILCsC0bSgaKbXXedjPBeBReRJuqU6UQCVI 1IyFYNG3aC0TcxNbyS/BbfazhsBATOZT/oGHF+eqWv3oDU6rTKfeMR0lWN9Igy3Z Jq+/E/Bk08WPwBiIomcopaEbRthoFjAhymHN4OCjAAWtpu7Bmhd0Q+f/Q== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3yrsja85f8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 14 Jun 2024 17:27:03 +0000 (GMT) Received: from m0353724.ppops.net (m0353724.ppops.net [127.0.0.1]) by pps.reinject (8.18.0.8/8.18.0.8) with ESMTP id 45EHR3S9025410; Fri, 14 Jun 2024 17:27:03 GMT Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3yrsja85f5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 14 Jun 2024 17:27:03 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 45EFNfPL023618; Fri, 14 Jun 2024 17:27:02 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 3yn3unb3u1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 14 Jun 2024 17:27:02 +0000 Received: from smtpav03.fra02v.mail.ibm.com (smtpav03.fra02v.mail.ibm.com [10.20.54.102]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 45EHQurK39977446 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 14 Jun 2024 17:26:59 GMT Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D365720040; Fri, 14 Jun 2024 17:26:56 +0000 (GMT) Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0B04320043; Fri, 14 Jun 2024 17:26:54 +0000 (GMT) Received: from localhost.localdomain (unknown [9.43.82.18]) by smtpav03.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 14 Jun 2024 17:26:53 +0000 (GMT) From: Athira Rajeev To: acme@kernel.org, jolsa@kernel.org, adrian.hunter@intel.com, irogers@google.com, namhyung@kernel.org, segher@kernel.crashing.org, christophe.leroy@csgroup.eu Cc: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, akanksha@linux.ibm.com, maddy@linux.ibm.com, atrajeev@linux.vnet.ibm.com, kjain@linux.ibm.com, disgoel@linux.vnet.ibm.com Subject: [V4 05/16] tools/perf: Add disasm_line__parse to parse raw instruction for powerpc Date: Fri, 14 Jun 2024 22:56:20 +0530 Message-Id: <20240614172631.56803-6-atrajeev@linux.vnet.ibm.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20240614172631.56803-1-atrajeev@linux.vnet.ibm.com> References: <20240614172631.56803-1-atrajeev@linux.vnet.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: rJPNiMWofqM4QU3K2zKtY0_TyJ9DKpDc X-Proofpoint-GUID: zJryH6yyU5xsi5QjiVDOQzs1d2q0XiL8 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-06-14_15,2024-06-14_03,2024-05-17_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 priorityscore=1501 lowpriorityscore=0 mlxscore=0 adultscore=0 clxscore=1015 suspectscore=0 spamscore=0 mlxlogscore=999 impostorscore=0 phishscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2405170001 definitions=main-2406140119 Currently, the perf tool infrastructure disasm_line__parse function to parse disassembled line. Example snippet from objdump: objdump --start-address=
--stop-address=
-d --no-show-raw-insn -C c0000000010224b4: lwz r10,0(r9) This line "lwz r10,0(r9)" is parsed to extract instruction name, registers names and offset. In powerpc, the approach for data type profiling uses raw instruction instead of result from objdump to identify the instruction category and extract the source/target registers. Example: 38 01 81 e8 ld r4,312(r1) Here "38 01 81 e8" is the raw instruction representation. Add function "disasm_line__parse_powerpc" to handle parsing of raw instruction. Also update "struct disasm_line" to save the binary code/ With the change, function captures: line -> "38 01 81 e8 ld r4,312(r1)" raw instruction "38 01 81 e8" Raw instruction is used later to extract the reg/offset fields. Macros are added to extract opcode and register fields. "struct disasm_line" is updated to carry union of "bytes" and "raw_insn" of 32 bit to carry raw code (raw). Function "disasm_line__parse_powerpc fills the raw instruction hex value and can use macros to get opcode. There is no changes in existing code paths, which parses the disassembled code. The architecture using the instruction name and present approach is not altered. Since this approach targets powerpc, the macro implementation is added for powerpc as of now. Since the disasm_line__parse is used in other cases (perf annotate) and not only data tye profiling, the powerpc callback includes changes to work with binary code as well as mneumonic representation. Also in case if the DSO read fails and libcapstone is not supported, the approach fallback to use objdump as option. Hence as option, patch has changes to ensure objdump option also works well. Signed-off-by: Athira Rajeev --- tools/include/linux/string.h | 2 + tools/lib/string.c | 13 ++++ .../perf/arch/powerpc/annotate/instructions.c | 1 + tools/perf/arch/powerpc/util/dwarf-regs.c | 9 +++ tools/perf/util/annotate.h | 5 +- tools/perf/util/disasm.c | 59 ++++++++++++++++++- 6 files changed, 87 insertions(+), 2 deletions(-) diff --git a/tools/include/linux/string.h b/tools/include/linux/string.h index db5c99318c79..0acb1fc14e19 100644 --- a/tools/include/linux/string.h +++ b/tools/include/linux/string.h @@ -46,5 +46,7 @@ extern char * __must_check skip_spaces(const char *); extern char *strim(char *); +extern void remove_spaces(char *s); + extern void *memchr_inv(const void *start, int c, size_t bytes); #endif /* _TOOLS_LINUX_STRING_H_ */ diff --git a/tools/lib/string.c b/tools/lib/string.c index 8b6892f959ab..3126d2cff716 100644 --- a/tools/lib/string.c +++ b/tools/lib/string.c @@ -153,6 +153,19 @@ char *strim(char *s) return skip_spaces(s); } +/* + * remove_spaces - Removes whitespaces from @s + */ +void remove_spaces(char *s) +{ + char *d = s; + + do { + while (*d == ' ') + ++d; + } while ((*s++ = *d++)); +} + /** * strreplace - Replace all occurrences of character in string. * @s: The string to operate on. diff --git a/tools/perf/arch/powerpc/annotate/instructions.c b/tools/perf/arch/powerpc/annotate/instructions.c index a3f423c27cae..d57fd023ef9c 100644 --- a/tools/perf/arch/powerpc/annotate/instructions.c +++ b/tools/perf/arch/powerpc/annotate/instructions.c @@ -55,6 +55,7 @@ static int powerpc__annotate_init(struct arch *arch, char *cpuid __maybe_unused) arch->initialized = true; arch->associate_instruction_ops = powerpc__associate_instruction_ops; arch->objdump.comment_char = '#'; + annotate_opts.show_asm_raw = true; } return 0; diff --git a/tools/perf/arch/powerpc/util/dwarf-regs.c b/tools/perf/arch/powerpc/util/dwarf-regs.c index 0c4f4caf53ac..430623ca5612 100644 --- a/tools/perf/arch/powerpc/util/dwarf-regs.c +++ b/tools/perf/arch/powerpc/util/dwarf-regs.c @@ -98,3 +98,12 @@ int regs_query_register_offset(const char *name) return roff->ptregs_offset; return -EINVAL; } + +#define PPC_OP(op) (((op) >> 26) & 0x3F) +#define PPC_RA(a) (((a) >> 16) & 0x1f) +#define PPC_RT(t) (((t) >> 21) & 0x1f) +#define PPC_RB(b) (((b) >> 11) & 0x1f) +#define PPC_D(D) ((D) & 0xfffe) +#define PPC_DS(DS) ((DS) & 0xfffc) +#define OP_LD 58 +#define OP_STD 62 diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h index d5c821c22f79..9ba772f46270 100644 --- a/tools/perf/util/annotate.h +++ b/tools/perf/util/annotate.h @@ -113,7 +113,10 @@ struct annotation_line { struct disasm_line { struct ins ins; struct ins_operands ops; - + union { + u8 bytes[4]; + u32 raw_insn; + } raw; /* This needs to be at the end. */ struct annotation_line al; }; diff --git a/tools/perf/util/disasm.c b/tools/perf/util/disasm.c index b81cdcf4d6b4..1e8568738b38 100644 --- a/tools/perf/util/disasm.c +++ b/tools/perf/util/disasm.c @@ -45,6 +45,7 @@ static int call__scnprintf(struct ins *ins, char *bf, size_t size, static void ins__sort(struct arch *arch); static int disasm_line__parse(char *line, const char **namep, char **rawp); +static int disasm_line__parse_powerpc(struct disasm_line *dl); static __attribute__((constructor)) void symbol__init_regexpr(void) { @@ -844,6 +845,59 @@ static int disasm_line__parse(char *line, const char **namep, char **rawp) return -1; } +/* + * Parses the result captured from symbol__disassemble_* + * Example, line read from DSO file in powerpc: + * line: 38 01 81 e8 + * opcode: fetched from arch specific get_opcode_insn + * rawp_insn: e8810138 + * + * rawp_insn is used later to extract the reg/offset fields + */ +#define PPC_OP(op) (((op) >> 26) & 0x3F) + +static int disasm_line__parse_powerpc(struct disasm_line *dl) +{ + char *line = dl->al.line; + const char **namep = &dl->ins.name; + char **rawp = &dl->ops.raw; + char tmp, *tmp_raw_insn, *name_raw_insn = skip_spaces(line); + char *name = skip_spaces(name_raw_insn + 11); + int objdump = 0; + + if (strlen(line) > 11) + objdump = 1; + + if (name_raw_insn[0] == '\0') + return -1; + + if (objdump) { + *rawp = name + 1; + while ((*rawp)[0] != '\0' && !isspace((*rawp)[0])) + ++*rawp; + tmp = (*rawp)[0]; + (*rawp)[0] = '\0'; + + *namep = strdup(name); + if (*namep == NULL) + return -1; + + (*rawp)[0] = tmp; + *rawp = strim(*rawp); + } else + *namep = ""; + + tmp_raw_insn = strdup(name_raw_insn); + tmp_raw_insn[11] = '\0'; + remove_spaces(tmp_raw_insn); + + dl->raw.raw_insn = strtol(tmp_raw_insn, NULL, 16); + if (objdump) + dl->raw.raw_insn = be32_to_cpu(strtol(tmp_raw_insn, NULL, 16)); + + return 0; +} + static void annotation_line__init(struct annotation_line *al, struct annotate_args *args, int nr) @@ -897,7 +951,10 @@ struct disasm_line *disasm_line__new(struct annotate_args *args) goto out_delete; if (args->offset != -1) { - if (disasm_line__parse(dl->al.line, &dl->ins.name, &dl->ops.raw) < 0) + if (arch__is(args->arch, "powerpc")) { + if (disasm_line__parse_powerpc(dl) < 0) + goto out_free_line; + } else if (disasm_line__parse(dl->al.line, &dl->ins.name, &dl->ops.raw) < 0) goto out_free_line; disasm_line__init_ins(dl, args->arch, &args->ms); -- 2.43.0