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: <20230612230026.3887586-1-namhyung@kernel.org>
In-Reply-To: <20230612230026.3887586-1-namhyung@kernel.org>
From:   Ian Rogers <irogers@google.com>
Date:   Mon, 12 Jun 2023 16:55:03 -0700
Message-ID: <CAP-5=fUpXtoaiLkJW_f5Z1q+iW6ibvRKZb3xWR945g+30x-NNw@mail.gmail.com>
Subject: Re: [PATCH] perf annotate: Allow whitespace between insn operands
To:     Namhyung Kim <namhyung@kernel.org>
Cc:     Arnaldo Carvalho de Melo <acme@kernel.org>,
        Jiri Olsa <jolsa@kernel.org>,
        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,
        Masami Hiramatsu <mhiramat@kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Mon, Jun 12, 2023 at 4:00=E2=80=AFPM Namhyung Kim <namhyung@kernel.org> =
wrote:
>
> The llvm-objdump adds a space between the operands while GNU objdump
> does not.  Allow a space to handle the both.
>
> In GNU objdump:
>
>   Disassembly of section .text:                                      here
>                                                                       |
>   ffffffff81000000 <_stext>:                                          v
>   ffffffff81000000:     48 8d 25 51 1f 40 01    lea    0x1401f51(%rip),%r=
sp
>   ffffffff81000007:     e8 d4 00 00 00          call   ffffffff810000e0 <=
verify_cpu>
>   ffffffff8100000c:     48 8d 3d ed ff ff ff    lea    -0x13(%rip),%rdi
>
> In llvm-objdump:
>
>   Disassembly of section .text:                                      here
>                                                                        |
>   ffffffff81000000 <startup_64>:                                       v
>   ffffffff81000000: 48 8d 25 51 1f 40 01        leaq    20979537(%rip), %=
rsp
>   ffffffff81000007: e8 d4 00 00 00              callq   0xffffffff810000e=
0 <verify_cpu>
>   ffffffff8100000c: 48 8d 3d ed ff ff ff        leaq    -19(%rip), %rdi
>
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>

Acked-by: Ian Rogers <irogers@google.com>

Thanks,
Ian

> ---
>  tools/perf/util/annotate.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
> index 9171102dd3ad..3eab6c29eaa5 100644
> --- a/tools/perf/util/annotate.c
> +++ b/tools/perf/util/annotate.c
> @@ -585,7 +585,7 @@ static int mov__parse(struct arch *arch, struct ins_o=
perands *ops, struct map_sy
>         if (ops->source.raw =3D=3D NULL)
>                 return -1;
>
> -       target =3D ++s;
> +       target =3D skip_spaces(++s);
>         comment =3D strchr(s, arch->objdump.comment_char);
>
>         if (comment !=3D NULL)
> --
> 2.41.0.162.gfafddb0af9-goog
>