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 C893BD3EE95 for ; Thu, 22 Jan 2026 16:55:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:To:From:Subject :Message-ID:References:Mime-Version:In-Reply-To:Date:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Xlxy7gGNB7fnsuI8qX0WFdpap2bNeW5xmXABoxpIzho=; b=b3chze1l3d42tn8kgLEFGRIA9Y WoZtXloPY/877BmTWyz/UpQeVXvIdWDs2KzzpKt7kdRzBUSvPbYSumzaHBIKH6LDp0c55k8ghEGB9 dDO5H0QIfNwH8UP9JcgptvRweA60Pa0cWVwIkArCjud/3UQKHkrWHRMqLDXqWY1Umz5ptvSuajUY4 ehW4zlJw3ByAi7xY2jQuBfuIiH3i5A5c5vB8rDNtNR51qnT2q1tyLXpNTros7QxNALtTeWn2PjKsD W0ledvFLoMhmyNt5AVV9M9xSusYAtol45KTLU6u3fT/kIefsTc7rIYYwIS8BR/0BHYLmQv+Fmyv/q uTGEeUDQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vixxG-00000007U0Q-3Ta3; Thu, 22 Jan 2026 16:54:46 +0000 Received: from mail-dy1-x134a.google.com ([2607:f8b0:4864:20::134a]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vixx2-00000007Tmj-32sb for linux-arm-kernel@lists.infradead.org; Thu, 22 Jan 2026 16:54:33 +0000 Received: by mail-dy1-x134a.google.com with SMTP id 5a478bee46e88-2b7174ab5faso5215297eec.1 for ; Thu, 22 Jan 2026 08:54:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769100871; x=1769705671; darn=lists.infradead.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=Xlxy7gGNB7fnsuI8qX0WFdpap2bNeW5xmXABoxpIzho=; b=zkSPCYfDGFlpHVxnPmAook9iknvv/+7FZ9SL4Jrr67FX8bEKGqeIyhmb4LVC4YIK0A AxeeoGD+nL19U2jL9dHB3TgXpXtxDW2PBmc0PVlb4+Zs8Wp0rpw7lyOxLOceV3bOOZLc VKU3B9KJC9mr7iOTFLxA1lBivB1+xV0XGQSWBwIQzRJeUUaeJ1RVT/c5KBHtLLemFtL6 3/f8SZDcgylxD6mNGnY17a4BHv2iwbr6Z253beDaie68ICfxMOAQxEpA05aKaDOpWFwL MeZWMaKai/duZ+xVZKzV/py6SIDBLIbsOKX/AAR6OY/5GQUVzIKOgP5piie/gYCZcG+u ZU9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769100871; x=1769705671; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Xlxy7gGNB7fnsuI8qX0WFdpap2bNeW5xmXABoxpIzho=; b=URyI2t2h4LcYFFoBnEIq6iI7o/80RCmzYadeNQtKe0cD5t+fN5Es3nIwU/v4yFNd4C 8fFArGv2t6HNLGS8+CkoocYroDrkbn8EIx4aP5iE1FCwbJ/550Lz8HRm8MtTC1ENbFsT /EE/w5AEQ94YVEO7PGrRNOjIlpLVtu8o8V9cpR8FP4eyMu0bYEjReFdEW0cmaYeZ7K4m zmr/p2FQtAxSZZah54aA69BTKl6Go5lVTSSARBiyU54HDqom294n8v/FN3kX/o5VxF8Z sq0EqlH1YzF+fX6J3k41Pl2j0eG3+ACY0P4HOhEpEoIGmrJektixe1sjAxrKbiwfWqZh RXXw== X-Forwarded-Encrypted: i=1; AJvYcCWzVXDPnwp71qBw+vbwC4TqoMCFbpQKE+kEuHJdrCrnjdvrtrYg2SD06GXtb4xFDnaNsYRPygIYvsN8th/Mg7/e@lists.infradead.org X-Gm-Message-State: AOJu0YzvH5LEeInShDX1ub2yl7xOKFyazkl0RUnV3iiBeeWj6dkNw6C7 BhCX+PwzNXkEX25qUcjrC3DsHtDrIXGwnmninzSQMvT19ujKnFOzkppEPAIwr3ICdodhIfMFG6N cFuiwAVLXpQ== X-Received: from dyer16.prod.google.com ([2002:a05:7300:2310:b0:2b0:6a03:e2bb]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7301:1291:b0:2b7:1744:725e with SMTP id 5a478bee46e88-2b7397a364dmr12071eec.0.1769100871210; Thu, 22 Jan 2026 08:54:31 -0800 (PST) Date: Thu, 22 Jan 2026 08:54:04 -0800 In-Reply-To: <20260122165407.561888-1-irogers@google.com> Mime-Version: 1.0 References: <20260122165407.561888-1-irogers@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260122165407.561888-10-irogers@google.com> Subject: [PATCH v2 09/12] perf disasm: Refactor ins__is_call/jump to avoid exposing arch ins_ops From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , James Clark , John Garry , Will Deacon , Leo Yan , Guo Ren , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Zecheng Li , Tianyou Li , Thomas Falcon , Julia Lawall , Suchit Karunakaran , Athira Rajeev , Aditya Bodkhe , Howard Chu , "=?UTF-8?q?Krzysztof=20=C5=81opatowski?=" , "Dr. David Alan Gilbert" , Shimin Guo , Sergei Trofimovich , 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 Content-Type: text/plain; charset="UTF-8" X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260122_085432_781784_DDFD04C0 X-CRM114-Status: GOOD ( 13.52 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add booleans indicating whether and ins_ops are call or jump and return it. This avoids exposing loongarch and s390 ins_ops for the sake of matching. Signed-off-by: Ian Rogers --- tools/perf/util/annotate-arch/annotate-loongarch.c | 6 ++++-- tools/perf/util/annotate-arch/annotate-s390.c | 3 ++- tools/perf/util/disasm.c | 6 ++++-- tools/perf/util/disasm.h | 5 ++--- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/tools/perf/util/annotate-arch/annotate-loongarch.c b/tools/perf/util/annotate-arch/annotate-loongarch.c index 32df10f6fed5..79dc116ade2f 100644 --- a/tools/perf/util/annotate-arch/annotate-loongarch.c +++ b/tools/perf/util/annotate-arch/annotate-loongarch.c @@ -57,9 +57,10 @@ static int loongarch_call__parse(const struct arch *arch, struct ins_operands *o return 0; } -const struct ins_ops loongarch_call_ops = { +static const struct ins_ops loongarch_call_ops = { .parse = loongarch_call__parse, .scnprintf = call__scnprintf, + .is_call = true, }; static int loongarch_jump__parse(const struct arch *arch, struct ins_operands *ops, @@ -106,9 +107,10 @@ static int loongarch_jump__parse(const struct arch *arch, struct ins_operands *o return 0; } -const struct ins_ops loongarch_jump_ops = { +static const struct ins_ops loongarch_jump_ops = { .parse = loongarch_jump__parse, .scnprintf = jump__scnprintf, + .is_jump = true, }; static diff --git a/tools/perf/util/annotate-arch/annotate-s390.c b/tools/perf/util/annotate-arch/annotate-s390.c index 81db102b3e15..7b2d27b62e6b 100644 --- a/tools/perf/util/annotate-arch/annotate-s390.c +++ b/tools/perf/util/annotate-arch/annotate-s390.c @@ -57,9 +57,10 @@ static int s390_call__parse(const struct arch *arch, struct ins_operands *ops, return 0; } -const struct ins_ops s390_call_ops = { +static const struct ins_ops s390_call_ops = { .parse = s390_call__parse, .scnprintf = call__scnprintf, + .is_call = true, }; static int s390_mov__parse(const struct arch *arch __maybe_unused, diff --git a/tools/perf/util/disasm.c b/tools/perf/util/disasm.c index 845c2d0f39b1..8c3e9094600a 100644 --- a/tools/perf/util/disasm.c +++ b/tools/perf/util/disasm.c @@ -315,11 +315,12 @@ int call__scnprintf(const struct ins *ins, char *bf, size_t size, const struct ins_ops call_ops = { .parse = call__parse, .scnprintf = call__scnprintf, + .is_call = true, }; bool ins__is_call(const struct ins *ins) { - return ins->ops == &call_ops || ins->ops == &s390_call_ops || ins->ops == &loongarch_call_ops; + return ins->ops && ins->ops->is_call; } /* @@ -469,11 +470,12 @@ const struct ins_ops jump_ops = { .free = jump__delete, .parse = jump__parse, .scnprintf = jump__scnprintf, + .is_jump = true, }; bool ins__is_jump(const struct ins *ins) { - return ins->ops == &jump_ops || ins->ops == &loongarch_jump_ops; + return ins->ops && ins->ops->is_jump; } static int comment__symbol(char *raw, char *comment, u64 *addrp, char **namep) diff --git a/tools/perf/util/disasm.h b/tools/perf/util/disasm.h index 83503c5075f9..b6a2a30fdf27 100644 --- a/tools/perf/util/disasm.h +++ b/tools/perf/util/disasm.h @@ -93,6 +93,8 @@ struct ins_ops { struct disasm_line *dl); int (*scnprintf)(const struct ins *ins, char *bf, size_t size, struct ins_operands *ops, int max_ins_name); + bool is_jump; + bool is_call; }; struct annotate_args { @@ -139,9 +141,6 @@ bool ins__is_fused(const struct arch *arch, const char *ins1, const char *ins2); bool ins__is_ret(const struct ins *ins); bool ins__is_lock(const struct ins *ins); -extern const struct ins_ops s390_call_ops; -extern const struct ins_ops loongarch_call_ops; -extern const struct ins_ops loongarch_jump_ops; const struct ins_ops *check_ppc_insn(struct disasm_line *dl); struct disasm_line *disasm_line__new(struct annotate_args *args); -- 2.52.0.457.g6b5491de43-goog