From: Masami Hiramatsu (Google) <mhiramat@kernel.org>
To: Namhyung Kim <namhyung@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>,
Jiri Olsa <jolsa@kernel.org>, Ian Rogers <irogers@google.com>,
Adrian Hunter <adrian.hunter@intel.com>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
linux-perf-users@vger.kernel.org, Andi Kleen <ak@linux.intel.com>,
Masami Hiramatsu <mhiramat@kernel.org>,
Kan Liang <kan.liang@linux.intel.com>
Subject: Re: [PATCH v2 2/2] perf annotate: Remove x86 instructions with suffix
Date: Tue, 6 Jun 2023 23:07:37 +0900 [thread overview]
Message-ID: <20230606230737.9f42d22a89e0d9e48f655cc1@kernel.org> (raw)
In-Reply-To: <20230524205054.3087004-2-namhyung@kernel.org>
On Wed, 24 May 2023 13:50:54 -0700
Namhyung Kim <namhyung@kernel.org> wrote:
> Now the suffix is handled in the general code. Let's get rid of them.
>
Looks good to me.
Reviewed-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> ---
> tools/perf/arch/x86/annotate/instructions.c | 52 ++++-----------------
> 1 file changed, 10 insertions(+), 42 deletions(-)
>
> diff --git a/tools/perf/arch/x86/annotate/instructions.c b/tools/perf/arch/x86/annotate/instructions.c
> index 5c7bec25fee4..5f4ac4fc7fcf 100644
> --- a/tools/perf/arch/x86/annotate/instructions.c
> +++ b/tools/perf/arch/x86/annotate/instructions.c
> @@ -1,48 +1,37 @@
> // SPDX-License-Identifier: GPL-2.0
> +/*
> + * x86 instruction nmemonic table to parse disasm lines for annotate.
> + * This table is searched twice - one for exact match and another for
> + * match without a size suffix (b, w, l, q) in case of AT&T syntax.
> + *
> + * So this table should not have entries with the suffix unless it's
> + * a complete different instruction than ones without the suffix.
> + */
> static struct ins x86__instructions[] = {
> { .name = "adc", .ops = &mov_ops, },
> - { .name = "adcb", .ops = &mov_ops, },
> - { .name = "adcl", .ops = &mov_ops, },
> { .name = "add", .ops = &mov_ops, },
> - { .name = "addl", .ops = &mov_ops, },
> - { .name = "addq", .ops = &mov_ops, },
> { .name = "addsd", .ops = &mov_ops, },
> - { .name = "addw", .ops = &mov_ops, },
> { .name = "and", .ops = &mov_ops, },
> - { .name = "andb", .ops = &mov_ops, },
> - { .name = "andl", .ops = &mov_ops, },
> { .name = "andpd", .ops = &mov_ops, },
> { .name = "andps", .ops = &mov_ops, },
> - { .name = "andq", .ops = &mov_ops, },
> - { .name = "andw", .ops = &mov_ops, },
> { .name = "bsr", .ops = &mov_ops, },
> { .name = "bt", .ops = &mov_ops, },
> { .name = "btr", .ops = &mov_ops, },
> { .name = "bts", .ops = &mov_ops, },
> - { .name = "btsq", .ops = &mov_ops, },
> { .name = "call", .ops = &call_ops, },
> - { .name = "callq", .ops = &call_ops, },
> { .name = "cmovbe", .ops = &mov_ops, },
> { .name = "cmove", .ops = &mov_ops, },
> { .name = "cmovae", .ops = &mov_ops, },
> { .name = "cmp", .ops = &mov_ops, },
> - { .name = "cmpb", .ops = &mov_ops, },
> - { .name = "cmpl", .ops = &mov_ops, },
> - { .name = "cmpq", .ops = &mov_ops, },
> - { .name = "cmpw", .ops = &mov_ops, },
> { .name = "cmpxch", .ops = &mov_ops, },
> { .name = "cmpxchg", .ops = &mov_ops, },
> { .name = "cs", .ops = &mov_ops, },
> { .name = "dec", .ops = &dec_ops, },
> - { .name = "decl", .ops = &dec_ops, },
> - { .name = "decq", .ops = &dec_ops, },
> { .name = "divsd", .ops = &mov_ops, },
> { .name = "divss", .ops = &mov_ops, },
> { .name = "gs", .ops = &mov_ops, },
> { .name = "imul", .ops = &mov_ops, },
> { .name = "inc", .ops = &dec_ops, },
> - { .name = "incl", .ops = &dec_ops, },
> - { .name = "incq", .ops = &dec_ops, },
> { .name = "ja", .ops = &jump_ops, },
> { .name = "jae", .ops = &jump_ops, },
> { .name = "jb", .ops = &jump_ops, },
> @@ -56,7 +45,6 @@ static struct ins x86__instructions[] = {
> { .name = "jl", .ops = &jump_ops, },
> { .name = "jle", .ops = &jump_ops, },
> { .name = "jmp", .ops = &jump_ops, },
> - { .name = "jmpq", .ops = &jump_ops, },
> { .name = "jna", .ops = &jump_ops, },
> { .name = "jnae", .ops = &jump_ops, },
> { .name = "jnb", .ops = &jump_ops, },
> @@ -83,49 +71,31 @@ static struct ins x86__instructions[] = {
> { .name = "mov", .ops = &mov_ops, },
> { .name = "movapd", .ops = &mov_ops, },
> { .name = "movaps", .ops = &mov_ops, },
> - { .name = "movb", .ops = &mov_ops, },
> { .name = "movdqa", .ops = &mov_ops, },
> { .name = "movdqu", .ops = &mov_ops, },
> - { .name = "movl", .ops = &mov_ops, },
> - { .name = "movq", .ops = &mov_ops, },
> { .name = "movsd", .ops = &mov_ops, },
> { .name = "movslq", .ops = &mov_ops, },
> { .name = "movss", .ops = &mov_ops, },
> { .name = "movupd", .ops = &mov_ops, },
> { .name = "movups", .ops = &mov_ops, },
> - { .name = "movw", .ops = &mov_ops, },
> { .name = "movzbl", .ops = &mov_ops, },
> { .name = "movzwl", .ops = &mov_ops, },
> { .name = "mulsd", .ops = &mov_ops, },
> { .name = "mulss", .ops = &mov_ops, },
> { .name = "nop", .ops = &nop_ops, },
> - { .name = "nopl", .ops = &nop_ops, },
> - { .name = "nopw", .ops = &nop_ops, },
> { .name = "or", .ops = &mov_ops, },
> - { .name = "orb", .ops = &mov_ops, },
> - { .name = "orl", .ops = &mov_ops, },
> { .name = "orps", .ops = &mov_ops, },
> - { .name = "orq", .ops = &mov_ops, },
> { .name = "pand", .ops = &mov_ops, },
> { .name = "paddq", .ops = &mov_ops, },
> { .name = "pcmpeqb", .ops = &mov_ops, },
> { .name = "por", .ops = &mov_ops, },
> - { .name = "rclb", .ops = &mov_ops, },
> - { .name = "rcll", .ops = &mov_ops, },
> + { .name = "rcl", .ops = &mov_ops, },
> { .name = "ret", .ops = &ret_ops, },
> - { .name = "retq", .ops = &ret_ops, },
> { .name = "sbb", .ops = &mov_ops, },
> - { .name = "sbbl", .ops = &mov_ops, },
> { .name = "sete", .ops = &mov_ops, },
> { .name = "sub", .ops = &mov_ops, },
> - { .name = "subl", .ops = &mov_ops, },
> - { .name = "subq", .ops = &mov_ops, },
> { .name = "subsd", .ops = &mov_ops, },
> - { .name = "subw", .ops = &mov_ops, },
> { .name = "test", .ops = &mov_ops, },
> - { .name = "testb", .ops = &mov_ops, },
> - { .name = "testl", .ops = &mov_ops, },
> - { .name = "testq", .ops = &mov_ops, },
> { .name = "tzcnt", .ops = &mov_ops, },
> { .name = "ucomisd", .ops = &mov_ops, },
> { .name = "ucomiss", .ops = &mov_ops, },
> @@ -139,11 +109,9 @@ static struct ins x86__instructions[] = {
> { .name = "vsubsd", .ops = &mov_ops, },
> { .name = "vucomisd", .ops = &mov_ops, },
> { .name = "xadd", .ops = &mov_ops, },
> - { .name = "xbeginl", .ops = &jump_ops, },
> - { .name = "xbeginq", .ops = &jump_ops, },
> + { .name = "xbegin", .ops = &jump_ops, },
> { .name = "xchg", .ops = &mov_ops, },
> { .name = "xor", .ops = &mov_ops, },
> - { .name = "xorb", .ops = &mov_ops, },
> { .name = "xorpd", .ops = &mov_ops, },
> { .name = "xorps", .ops = &mov_ops, },
> };
> --
> 2.41.0.rc0.172.g3f132b7071-goog
>
--
Masami Hiramatsu (Google) <mhiramat@kernel.org>
next prev parent reply other threads:[~2023-06-06 14:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-24 20:50 [PATCH v2 1/2] perf annotate: Handle x86 instruction suffix generally Namhyung Kim
2023-05-24 20:50 ` [PATCH v2 2/2] perf annotate: Remove x86 instructions with suffix Namhyung Kim
2023-05-25 5:21 ` Adrian Hunter
2023-06-06 14:07 ` Masami Hiramatsu [this message]
2023-05-25 5:21 ` [PATCH v2 1/2] perf annotate: Handle x86 instruction suffix generally Adrian Hunter
2023-06-05 23:56 ` Namhyung Kim
2023-06-06 14:06 ` Masami Hiramatsu
2023-06-06 18:00 ` Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230606230737.9f42d22a89e0d9e48f655cc1@kernel.org \
--to=mhiramat@kernel.org \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=ak@linux.intel.com \
--cc=irogers@google.com \
--cc=jolsa@kernel.org \
--cc=kan.liang@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).