From patchwork Thu Oct 6 22:22:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Namhyung Kim X-Patchwork-Id: 13000782 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2F3AFC4332F for ; Thu, 6 Oct 2022 22:23:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=FA6vCVGtK/Tsu4fEHZ/C5MaAgyOkjt25W6kaEtkGLUQ=; b=KWd9a4LTI4NRg0 xg6erFGT9bKUKzg4DgYp+nbx3JecQLlWHAlTcIgPqBJWunuW1hBz/V/MqCymJW32ysvB0TI9slp54 nfmJpg7F3f9oA3nYTyh4msgePSKGkY3bVO9q5V9Y2sSFoKE3I9+lzP85F5v1esHECUlYkXzzIbTa/ WuS6jFmtpS/acpXJrnmVWeQNn0weGsXV4co8/hmSxzEMUmzTZo0qAkAmSuNtGEkZ3HHa89njfmGVa MUo3cT/kXt6rB70xeVLGtZjOoyd/HY/0n7IQ9KCONshqzwfyAWU43vBpruB4yXCiSkYLIg0gJr7Nc B6LwQV/FMXj+57dlB1eQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ogZGL-005eYI-Rd; Thu, 06 Oct 2022 22:22:41 +0000 Received: from mail-pg1-x529.google.com ([2607:f8b0:4864:20::529]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ogZGI-005eU8-CN for linux-arm-kernel@lists.infradead.org; Thu, 06 Oct 2022 22:22:39 +0000 Received: by mail-pg1-x529.google.com with SMTP id s206so3065604pgs.3 for ; Thu, 06 Oct 2022 15:22:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=jhNrOzEJoHpU7L6T/hd/++SuohbRXsLLnzlQMkHYgSg=; b=PSjgMXZgkNKvJj3wjg6DvE1cSQ9X9HDA5c6jHPgYlYPZMlNnywOSeC3o3ZC/IaEfxv LjAic3Fbg37rjHZ56XKDwmqojKOTtR/Yxxy3sAyX1dNLad7Bl1PTgOVj81JD2+Dl8KpW SfAzngPxTMj0GdjTdbZjSM32sDwyu0+WDzQixcSRBx2tCozNf/HR/zW/54IpEr0rHs78 q6qHZFKBsCkmzE7I7jdhWQ1iz8vB+BgVTJqyK3nMCdoUGT2wy2lpZSqDrFXk4QU47Hup KXFuLlwIOdbfWyA0KaeokDo1lXfJkBo1QJPIPQ81kW8E1tUanoMati6ujtgtbRK16xoy DQrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=jhNrOzEJoHpU7L6T/hd/++SuohbRXsLLnzlQMkHYgSg=; b=MLs2wGLAgscmcDxR53ImKzBCSANhiBIG+Q94qQR1nzLsTtGBfBfjKst0B3PbY3aUVb 3TtOROmVtEwLRRuT7aFBzIEhEC9m16CaGRCOmXIi998J+2sz6VP19sz/P1tCPBaNydxg zGwK9SfwDR3bVZJ8eNY6xuD8wcKqSRxn3p95B3kDr7nWP9vX8bDGJ5nwK89iipdzw22r GUTKdwzksR4VXxWLWAKKiCVRUzPztOSF30OGQp6j1+214fd4gx0WN1Mk2eQtxHTcSFkq 1d9QHFqY9KRXSzfiMoMlUouuz6XAJrRWOgVRb1m2Zq9R4JWz7MYrVQOO89UlzkwYpEFT WeiQ== X-Gm-Message-State: ACrzQf2v7mYqBbyOQiDSNM1ClIH7mt5NIA4sYejKHJfAMeLnZqXQQxlT Y0XKgSo5kwKLJ4FbnTI62B0= X-Google-Smtp-Source: AMsMyM4FI92O4/hYG1/GICks/lXFq/NcfMStg/5hJCSa2wF26GIFvpc40RLDxUT+oimKtEWHSJNOKQ== X-Received: by 2002:a05:6a02:202:b0:42b:d711:f27c with SMTP id bh2-20020a056a02020200b0042bd711f27cmr1739168pgb.246.1665094955773; Thu, 06 Oct 2022 15:22:35 -0700 (PDT) Received: from youngsil.svl.corp.google.com ([2620:15c:2d4:203:1ec5:e390:bb36:a4ba]) by smtp.gmail.com with ESMTPSA id c82-20020a624e55000000b0056265011136sm116988pfb.112.2022.10.06.15.22.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Oct 2022 15:22:35 -0700 (PDT) From: Namhyung Kim To: Arnaldo Carvalho de Melo , Jiri Olsa Cc: Ingo Molnar , Peter Zijlstra , LKML , Ian Rogers , Adrian Hunter , linux-perf-users@vger.kernel.org, John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , linux-arm-kernel@lists.infradead.org, Kevin Nomura Subject: [PATCH] perf annotate: Add missing condition flags for arm64 Date: Thu, 6 Oct 2022 15:22:32 -0700 Message-Id: <20221006222232.266416-1-namhyung@kernel.org> X-Mailer: git-send-email 2.38.0.rc1.362.ged0d419d3c-goog MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221006_152238_457378_2CF7522A X-CRM114-Status: GOOD ( 13.40 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org According to the document [1], it can also have 'hs', 'lo', 'vc', 'vs' as a condition code. Let's add them too. [1] https://community.arm.com/arm-community-blogs/b/architectures-and-processors-blog/posts/condition-codes-1-condition-flags-and-codes Reported-by: Kevin Nomura Signed-off-by: Namhyung Kim --- tools/perf/arch/arm64/annotate/instructions.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/arch/arm64/annotate/instructions.c b/tools/perf/arch/arm64/annotate/instructions.c index 037e292ecd8e..4af0c3a0f86e 100644 --- a/tools/perf/arch/arm64/annotate/instructions.c +++ b/tools/perf/arch/arm64/annotate/instructions.c @@ -102,7 +102,7 @@ static int arm64__annotate_init(struct arch *arch, char *cpuid __maybe_unused) if (err) goto out_free_arm; /* b, b.cond, br, cbz/cbnz, tbz/tbnz */ - err = regcomp(&arm->jump_insn, "^[ct]?br?\\.?(cc|cs|eq|ge|gt|hi|le|ls|lt|mi|ne|pl)?n?z?$", + err = regcomp(&arm->jump_insn, "^[ct]?br?\\.?(cc|cs|eq|ge|gt|hi|hs|le|lo|ls|lt|mi|ne|pl|vc|vs)?n?z?$", REG_EXTENDED); if (err) goto out_free_call;