From patchwork Mon Jun 12 23:00:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Namhyung Kim X-Patchwork-Id: 106946 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp191183vqr; Mon, 12 Jun 2023 16:22:38 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6lLyzQnQNIFXlfU4HV1URfwrBS+iVXwCE28IhLXw8PlA2UiGQmwj0sB+L7X/+GXPzeIpHn X-Received: by 2002:a05:6402:783:b0:506:b8ca:e07e with SMTP id d3-20020a056402078300b00506b8cae07emr6234463edy.11.1686612158399; Mon, 12 Jun 2023 16:22:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686612158; cv=none; d=google.com; s=arc-20160816; b=a0stRJbzkdTBGyJmMsbVp+lKggsGfiqHoqYqhf/xWS8WdAEOjjAejfSW4PyVJS4yVY 2LqRcOtr4l15aupcaF99duJo8zz1UaSImM5J43IYzmlLz8stucqUiQx2EGQ0Vd6IevBy y60XO8DKj3IJ9gSO+kdATbdEhaSzWmL9OzCmfD4UpTOqnL7A5UPOZBDdaPldc1tYm+/i dCeoMC0hQPs9TXTaq4KCTvVlHS/nEIwqz8ywdZTTbPJNH+BtjnrpWt3Ck0IdDPkAYbW0 a54134mxBlVzxqu7Nbo7YRw6ftGlDSz64PXjdn/7ZJH5Ft4SAIjTUHe7ui0w3i6kow/s Ympw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=X6hTdZSx7lI19BPB+NC6SvmJWqew8gyLq/5fpHGrdNU=; b=f+7Gix6BdROx9A50diL7NKFv/8F831C/xyotvsMwl4XjNEa1Kc0M1nevNWqLLD1/Cz IhB+0BLFFR7ToD+iGrQmtRTieMTRlu402GfVV0RzZTrx9PlmMtNST9TrxPZiGrkRSx17 trp1OLINeEPAvidXU/1euKkiWW6r3lzxB5Muyjd8dc+YmFpCZRzAI35VtTnBOw5OMvUt jighMiFm4Kmj6BIT1Ktck0cGJLVO7e5GlBR4EblQiaWCY/3GIuJ25CL9eMt4EvSw0w2s 5/kNAOqhh2v9m4rtyCoItWL4HfWZ6O8s287cKcokQX4w9euJ8MB2PUEZ461nD6w6ajb1 Ud3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=s1STHSzn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u4-20020a05640207c400b00516333867fcsi6604762edy.593.2023.06.12.16.22.13; Mon, 12 Jun 2023 16:22:38 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=s1STHSzn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238098AbjFLXAd (ORCPT + 99 others); Mon, 12 Jun 2023 19:00:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56604 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233202AbjFLXAb (ORCPT ); Mon, 12 Jun 2023 19:00:31 -0400 Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [IPv6:2607:f8b0:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 24475C0; Mon, 12 Jun 2023 16:00:30 -0700 (PDT) Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-1b3b5a5134bso14775735ad.1; Mon, 12 Jun 2023 16:00:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686610829; x=1689202829; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=X6hTdZSx7lI19BPB+NC6SvmJWqew8gyLq/5fpHGrdNU=; b=s1STHSznp+8S8Qi+hRTW0MHhtF44u2FX+cRnVYL4zFZEMvG3FxkmdlQ9h1cn4IKbkF CkEVgF1xmCWSEFHHNytRYJMLQcepjAUJA99UbV3CD1OqZPsoFY7XsD4nDQckdh+xa/Pp cBhxUWjQYt93PwywYvQYinGLZn/eMYSuNTndRV6QLOy1B6qxBIow6IbcibUbKm9HRcwS SuoaW8cuTJgUZ8ZzEdJT4K9TpAjjy+8Jl7+2BP+sssXQxKkDutaiBfNb8YAZKkDLrixO i3d6FbQAMHAikGDY88bBrTfHLMSbnUuz5QXeFvl08nyQ76AVqlVGnw+U4wMLolx6YIQe 5Ftw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686610829; x=1689202829; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=X6hTdZSx7lI19BPB+NC6SvmJWqew8gyLq/5fpHGrdNU=; b=ijGAe4znHdt9+raHsWGzWUaTvB/jdlQa1lzVMvkVcTzHo3ev//jDow72D48zkWjJj+ NIgVk9S+3Rn/yhtXJRsGPE+/alx7uJib8shDoplwCLeOX5uVnFjnh960O9CGntSmuBMM PeySsZ/8jBBDdFHTLPc9oKkNTkauAOlqKqG6u01N4+COLXRn700AA+rrWrZumEDPu1/d 7XOjMS7lc8dOt7fbPVzl9nEHthvlR5UGU663BoE+rCQ0w5RkktZn26OW8qetkDc8t0Te 9yNK4r2vDwPTLkpdXLaE8RXbntIaa/ISnwYEmyeqPfRhgCmNaZCxf5wEAOHZip4fuPM5 RPkQ== X-Gm-Message-State: AC+VfDwJAH/SBvSvK6eI18ro89KiyJdN4gJYRzgmWG4ixR+eiG3UOiol PNU9Uwm+yf6AgPGDgkf4z9A= X-Received: by 2002:a17:902:b949:b0:1af:b97c:2353 with SMTP id h9-20020a170902b94900b001afb97c2353mr6873421pls.15.1686610829423; Mon, 12 Jun 2023 16:00:29 -0700 (PDT) Received: from moohyul.svl.corp.google.com ([2620:15c:2a3:200:1e19:385a:b5d0:f4a2]) by smtp.gmail.com with ESMTPSA id r21-20020a170902ea5500b001b03a1a3151sm8841409plg.70.2023.06.12.16.00.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 16:00:28 -0700 (PDT) Sender: Namhyung Kim From: Namhyung Kim To: Arnaldo Carvalho de Melo , Jiri Olsa Cc: Ian Rogers , Adrian Hunter , Peter Zijlstra , Ingo Molnar , LKML , linux-perf-users@vger.kernel.org, Masami Hiramatsu Subject: [PATCH] perf annotate: Allow whitespace between insn operands Date: Mon, 12 Jun 2023 16:00:26 -0700 Message-ID: <20230612230026.3887586-1-namhyung@kernel.org> X-Mailer: git-send-email 2.41.0.162.gfafddb0af9-goog MIME-Version: 1.0 X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768541030265600360?= X-GMAIL-MSGID: =?utf-8?q?1768541030265600360?= 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),%rsp ffffffff81000007: e8 d4 00 00 00 call ffffffff810000e0 ffffffff8100000c: 48 8d 3d ed ff ff ff lea -0x13(%rip),%rdi In llvm-objdump: Disassembly of section .text: here | ffffffff81000000 : v ffffffff81000000: 48 8d 25 51 1f 40 01 leaq 20979537(%rip), %rsp ffffffff81000007: e8 d4 00 00 00 callq 0xffffffff810000e0 ffffffff8100000c: 48 8d 3d ed ff ff ff leaq -19(%rip), %rdi Signed-off-by: Namhyung Kim Acked-by: Ian Rogers --- 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_operands *ops, struct map_sy if (ops->source.raw == NULL) return -1; - target = ++s; + target = skip_spaces(++s); comment = strchr(s, arch->objdump.comment_char); if (comment != NULL)