Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230524052834.1041418-1-namhyung@kernel.org> <20230524052834.1041418-2-namhyung@kernel.org>
 <a51d79b3-6ba4-e85f-0f47-a9a180ea057c@intel.com>
In-Reply-To: <a51d79b3-6ba4-e85f-0f47-a9a180ea057c@intel.com>
From:   Namhyung Kim <namhyung@kernel.org>
Date:   Wed, 24 May 2023 09:11:51 -0700
Message-ID: <CAM9d7cjpXj235c+6M6k6z41AmEwHuw7RP_oQ54VXwTopp8ui9w@mail.gmail.com>
Subject: Re: [PATCH 2/2] perf annotate: Remove x86 instructions with suffix
To:     Adrian Hunter <adrian.hunter@intel.com>
Cc:     Arnaldo Carvalho de Melo <acme@kernel.org>,
        Jiri Olsa <jolsa@kernel.org>, Ian Rogers <irogers@google.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>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8BIT
Precedence: bulk

On Tue, May 23, 2023 at 11:15 PM Adrian Hunter <adrian.hunter@intel.com> wrote:
>
> On 24/05/23 08:28, Namhyung Kim wrote:
> > Not the suffix is handled in the general code.  Let's get rid of them.
>
> Not -> Now ?

Correct, will fix.

>
> >
> > Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> > ---
> >  tools/perf/arch/x86/annotate/instructions.c | 44 +--------------------
> >  1 file changed, 2 insertions(+), 42 deletions(-)
> >
> > diff --git a/tools/perf/arch/x86/annotate/instructions.c b/tools/perf/arch/x86/annotate/instructions.c
> > index 5c7bec25fee4..714fd8784d99 100644
> > --- a/tools/perf/arch/x86/annotate/instructions.c
> > +++ b/tools/perf/arch/x86/annotate/instructions.c
> > @@ -1,48 +1,29 @@
> >  // SPDX-License-Identifier: GPL-2.0
>
> Could probably use a comment about how the table works
> with suffixes.

Ok, I will add a comment.

Thanks for your review!
Namhyung


>
> >  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 +37,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 +63,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 +101,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, },
> >  };
>