From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3D6D5CFB441 for ; Mon, 7 Oct 2024 09:30:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Mime-Version:References:In-Reply-To: Message-Id:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=gAhTroYLfuzfCTc4Km6NftjumjJM6tRCRsccxe2N8uw=; b=r4Aui8taZANdW6 vUPEjVbvBIj8mmF2640QKiUglPISCA5as5Wa6okGORwbjrHZbGZ1XrgjLJGOVJ2mFLJJx0dZyL5Wa yM3RrPkKjfj2gJm0B5au5CBRjixhUU8Z2VHaCzqBGcQSUvRvEPBVo+2ooW7nqi5taqrVJDvFKBUh3 KrGvay3vKCvvJmrJU5dY39w9axDnICGMAPRWfXOWmGOyJ5bcKR1cgjsemKm95zy70oGLBtS//M3K0 Tq9DtcJLPfAPiRBZQ8bw9tAWQyG4RZ6cPhl9w0MRl+MtDVody5JVSm/JrzMFe3VVl65nvkqiqsuGZ +aqVBkPzm0PoW/MsbZ3Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1sxk4Q-00000001uZr-3sqz; Mon, 07 Oct 2024 09:30:26 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1sximm-00000001hYX-0MXa; Mon, 07 Oct 2024 08:08:09 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 7331D5C4572; Mon, 7 Oct 2024 08:08:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2E985C4CEC6; Mon, 7 Oct 2024 08:07:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1728288486; bh=Jj+bA/iDpKmZb0BWsx4i5xD4QtvKKl6H4sm84kO751s=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=SSBUatO0qMA5dwFmh8IuLOyc7n5tIKqA2wt4O/zfGXHKcKYOZerci4Z76ljfggMxc EUeu/tC8AmSPGGTVkYP5FvJuXTQkM6nPbST+BStybCFdaZ1V5egNlRRcp0Uc3rroXz 8g7IInruEhFSW+tjIHXeCmSWuu+cwgWBA0kp0npQoSa9dP6V1Oj7RHXz8kyQ7U9Pty bBbQJuqnhg/Ant9iT/xEm2Tz7vL6xlwmKyvDmTO8eCeF+Cw0N7ocJSvXsYdcllQVz/ I7c+a4NHzoGbyu/dvKORakrrUlo2VihEZXOFexj1yyxExL6jIQWodQVYR4iyeGi6EP lHRmLpAmGWz1g== Date: Mon, 7 Oct 2024 17:07:55 +0900 From: Masami Hiramatsu (Google) To: Ian Rogers Cc: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Adrian Hunter , Kan Liang , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Guo Ren , Paul Walmsley , Palmer Dabbelt , Albert Ou , Nick Terrell , "Steven Rostedt (Google)" , Guilherme Amadio , Changbin Du , Daniel Bristot de Oliveira , Daniel Wagner , Aditya Gupta , Athira Rajeev , Masahiro Yamada , Kajol Jain , Huacai Chen , Bibo Mao , Anup Patel , Atish Patra , Shenlin Liang , Oliver Upton , "Steinar H. Gunderson" , "Dr. David Alan Gilbert" , Chen Pei , Dima Kogan , Yury Norov , Alexander Lobakin , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-riscv@lists.infradead.org Subject: Re: [PATCH v2 16/31] perf dwarf-regs: Pass accurate disassembly machine to get_dwarf_regnum Message-Id: <20241007170755.03697b9178ed3dcac24dfa21@kernel.org> In-Reply-To: <20241005195541.380070-17-irogers@google.com> References: <20241005195541.380070-1-irogers@google.com> <20241005195541.380070-17-irogers@google.com> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Mime-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241007_010808_251522_9D0FCF18 X-CRM114-Status: GOOD ( 24.02 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org On Sat, 5 Oct 2024 12:55:26 -0700 Ian Rogers wrote: > Rather than pass 0/EM_NONE, use the value computed in the disasm > struct arch. Switch the EM_NONE case to EM_HOST, rewriting EM_NONE if > it were passed to get_dwarf_regnum. Pass a flags value as > architectures like csky need the flags to determine the ABI variant. > Does this change the command output when we use it for cross-build environment? E.g. remote arch is different from host arch? If so, please add output examples with/without this change. Thank you, > Signed-off-by: Ian Rogers > --- > tools/perf/util/annotate.c | 6 +++--- > tools/perf/util/dwarf-regs.c | 8 ++++++-- > tools/perf/util/include/dwarf-regs.h | 5 +++-- > 3 files changed, 12 insertions(+), 7 deletions(-) > > diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c > index 37ce43c4eb8f..b1d98da79be8 100644 > --- a/tools/perf/util/annotate.c > +++ b/tools/perf/util/annotate.c > @@ -2292,7 +2292,7 @@ static int extract_reg_offset(struct arch *arch, const char *str, > if (regname == NULL) > return -1; > > - op_loc->reg1 = get_dwarf_regnum(regname, 0); > + op_loc->reg1 = get_dwarf_regnum(regname, arch->e_machine, arch->e_flags); > free(regname); > > /* Get the second register */ > @@ -2305,7 +2305,7 @@ static int extract_reg_offset(struct arch *arch, const char *str, > if (regname == NULL) > return -1; > > - op_loc->reg2 = get_dwarf_regnum(regname, 0); > + op_loc->reg2 = get_dwarf_regnum(regname, arch->e_machine, arch->e_flags); > free(regname); > } > return 0; > @@ -2405,7 +2405,7 @@ int annotate_get_insn_location(struct arch *arch, struct disasm_line *dl, > return -1; > > if (*s == arch->objdump.register_char) > - op_loc->reg1 = get_dwarf_regnum(s, 0); > + op_loc->reg1 = get_dwarf_regnum(s, arch->e_machine, arch->e_flags); > else if (*s == arch->objdump.imm_char) { > op_loc->offset = strtol(s + 1, &p, 0); > if (p && p != s + 1) > diff --git a/tools/perf/util/dwarf-regs.c b/tools/perf/util/dwarf-regs.c > index 7c01bc4d7e5b..1321387f6948 100644 > --- a/tools/perf/util/dwarf-regs.c > +++ b/tools/perf/util/dwarf-regs.c > @@ -70,7 +70,7 @@ __weak int get_arch_regnum(const char *name __maybe_unused) > } > > /* Return DWARF register number from architecture register name */ > -int get_dwarf_regnum(const char *name, unsigned int machine) > +int get_dwarf_regnum(const char *name, unsigned int machine, unsigned int flags __maybe_unused) > { > char *regname = strdup(name); > int reg = -1; > @@ -84,8 +84,12 @@ int get_dwarf_regnum(const char *name, unsigned int machine) > if (p) > *p = '\0'; > > + if (machine == EM_NONE) { > + /* Generic arch - use host arch */ > + machine = EM_HOST; > + } > switch (machine) { > - case EM_NONE: /* Generic arch - use host arch */ > + case EM_HOST: > reg = get_arch_regnum(regname); > break; > default: > diff --git a/tools/perf/util/include/dwarf-regs.h b/tools/perf/util/include/dwarf-regs.h > index f4f87ded5e3d..ee0a734564c7 100644 > --- a/tools/perf/util/include/dwarf-regs.h > +++ b/tools/perf/util/include/dwarf-regs.h > @@ -93,12 +93,13 @@ int get_arch_regnum(const char *name); > * name: architecture register name > * machine: ELF machine signature (EM_*) > */ > -int get_dwarf_regnum(const char *name, unsigned int machine); > +int get_dwarf_regnum(const char *name, unsigned int machine, unsigned int flags); > > #else /* HAVE_LIBDW_SUPPORT */ > > static inline int get_dwarf_regnum(const char *name __maybe_unused, > - unsigned int machine __maybe_unused) > + unsigned int machine __maybe_unused, > + unsigned int flags __maybe_unused) > { > return -1; > } > -- > 2.47.0.rc0.187.ge670bccf7e-goog > -- Masami Hiramatsu (Google) _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv