perf annotate: Remove x86 instructions with suffix

Now the suffix is handled in the general code.  Let's get rid of them.

Reviewed-by: Adrian Hunter <adrian.hunter@intel.com>
Reviewed-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20230524205054.3087004-2-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/arch/x86/annotate/instructions.c b/tools/perf/arch/x86/annotate/instructions.c
index 5c7bec25fee4219075c28c768a8da980c12a983d..5f4ac4fc7fcf788d07ac84b3484396d0424542dc 100644 (file)
--- 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, },
 };