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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9A4D3C7EE24 for ; Tue, 6 Jun 2023 18:00:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237469AbjFFSAM (ORCPT ); Tue, 6 Jun 2023 14:00:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54120 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233537AbjFFSAM (ORCPT ); Tue, 6 Jun 2023 14:00:12 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 457A910CA; Tue, 6 Jun 2023 11:00:10 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id CA5D4632CF; Tue, 6 Jun 2023 18:00:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EF3FFC433EF; Tue, 6 Jun 2023 18:00:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686074409; bh=PLuf57EhVfN+pzuJMTQc3DpS8E0teEzKSJLSsmxE3ms=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=gyUtHkQrJzRJgPO0kIvGWmbM/g65OIvt5y8qiFe2hg843c8Ku3KaLFrXKkbx73A5B O2g2baBlIP5tw3qqHng6MgJowAEZi7UQqVLzZjXI8UQIctIsp6OQUrJJb7p/AorbiU m6Goxhsl5js0B9JYnmTSgMTmmZ0g7z4QMJOmM8L5iF6wKVzLK99sDr8UozX78b4bKG TJK4FY1OfHhSbYbU1+mIqz+vfjxkfLhAs508IdazNXFL3lqn6+kZ0vi04buOg65JyN 0EGoSklj5yG8Amcojv+CICp1Ap8d61+F8E3GoZpHPdmPWMYD/iLMzEaotzHt1fDY/5 CufjpRR+0E+Fg== Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id 2E0ED40692; Tue, 6 Jun 2023 15:00:06 -0300 (-03) Date: Tue, 6 Jun 2023 15:00:06 -0300 From: Arnaldo Carvalho de Melo To: Masami Hiramatsu Cc: Namhyung Kim , Jiri Olsa , Ian Rogers , Adrian Hunter , Peter Zijlstra , Ingo Molnar , LKML , linux-perf-users@vger.kernel.org, Andi Kleen , Kan Liang Subject: Re: [PATCH v2 1/2] perf annotate: Handle x86 instruction suffix generally Message-ID: References: <20230524205054.3087004-1-namhyung@kernel.org> <20230606230658.c1b478f905c82a9f7005034d@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230606230658.c1b478f905c82a9f7005034d@kernel.org> X-Url: http://acmel.wordpress.com Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org Em Tue, Jun 06, 2023 at 11:06:58PM +0900, Masami Hiramatsu escreveu: > On Wed, 24 May 2023 13:50:53 -0700 > Namhyung Kim wrote: > > > In AT&T asm syntax, most of x86 instructions can have size suffix like > > b, w, l or q. Instead of adding all these instructions in the table, > > we can handle them in a general way. > > > > For example, it can try to find an instruction as is. If not found, > > assuming it has a suffix and it'd try again without the suffix if it's > > one of the allowed suffixes. This way, we can reduce the instruction > > table size for duplicated entries of the same instructions with a > > different suffix. > > > > If an instruction xyz and others like xyz are completely > > different ones, then they both need to be listed in the table so that > > they can be found before the second attempt (without the suffix). > > Looks good to me. > > Reviewed-by: Masami Hiramatsu (Google) Thanks, applied both patches. - Arnaldo > > > > Signed-off-by: Namhyung Kim > > --- > > tools/perf/util/annotate.c | 22 ++++++++++++++++++++++ > > 1 file changed, 22 insertions(+) > > > > diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c > > index b708bbc49c9e..7f05f2a2aa83 100644 > > --- a/tools/perf/util/annotate.c > > +++ b/tools/perf/util/annotate.c > > @@ -70,6 +70,7 @@ struct arch { > > struct ins_ops *(*associate_instruction_ops)(struct arch *arch, const char *name); > > bool sorted_instructions; > > bool initialized; > > + const char *insn_suffix; > > void *priv; > > unsigned int model; > > unsigned int family; > > @@ -179,6 +180,7 @@ static struct arch architectures[] = { > > .init = x86__annotate_init, > > .instructions = x86__instructions, > > .nr_instructions = ARRAY_SIZE(x86__instructions), > > + .insn_suffix = "bwlq", > > .objdump = { > > .comment_char = '#', > > }, > > @@ -720,6 +722,26 @@ static struct ins_ops *__ins__find(struct arch *arch, const char *name) > > } > > > > ins = bsearch(name, arch->instructions, nmemb, sizeof(struct ins), ins__key_cmp); > > + if (ins) > > + return ins->ops; > > + > > + if (arch->insn_suffix) { > > + char tmp[32]; > > + char suffix; > > + size_t len = strlen(name); > > + > > + if (len == 0 || len >= sizeof(tmp)) > > + return NULL; > > + > > + suffix = name[len - 1]; > > + if (strchr(arch->insn_suffix, suffix) == NULL) > > + return NULL; > > + > > + strcpy(tmp, name); > > + tmp[len - 1] = '\0'; /* remove the suffix and check again */ > > + > > + ins = bsearch(tmp, arch->instructions, nmemb, sizeof(struct ins), ins__key_cmp); > > + } > > return ins ? ins->ops : NULL; > > } > > > > -- > > 2.41.0.rc0.172.g3f132b7071-goog > > > > > -- > Masami Hiramatsu (Google) -- - Arnaldo