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 X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1F5E4C4363A for ; Fri, 30 Oct 2020 02:59:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AD073206ED for ; Fri, 30 Oct 2020 02:59:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="TyxBmn10" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726573AbgJ3C70 (ORCPT ); Thu, 29 Oct 2020 22:59:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40684 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726500AbgJ3C7V (ORCPT ); Thu, 29 Oct 2020 22:59:21 -0400 Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 06D22C0613CF for ; Thu, 29 Oct 2020 19:59:21 -0700 (PDT) Received: by mail-pf1-x432.google.com with SMTP id w65so4049241pfd.3 for ; Thu, 29 Oct 2020 19:59:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=B4x9BS3+NZKXtli1EisyzG/epNGlBnlcgkUrkNOZT0s=; b=TyxBmn10EgyrgQsB7hZLfmXd8Ex9YrxM8bWgGxGMmN/jR07eV0SientZs1gA8dNtHg ru+VqL8YLrjnpyhUDaCqWoPcajiKMXcaxJg5bmzhsJVceIfmErP0D7qGODTW+P7l9ZcF 8QFxHLjA3Xdl2aAZRQDhDmqC/7prE+TjnCPIKTeCgNJ/WjUebVbU3gPywwzagmUhOmdL 54VIdON3O+TydjVlzq71UYEfXiYM48r0AB+qVpSVr+vDpro6hdGU/Y8vKslwDX+U5FUD wl/oxVNhrDMpWeUhmYwH5zzjcyu0MqcN3alAG1oyK4g/lj4Bb8kzY42A5+geOcUVPbHv 9J8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=B4x9BS3+NZKXtli1EisyzG/epNGlBnlcgkUrkNOZT0s=; b=EXxtlJkQ/nP0aILK2qTosJ8bFSuWwCj/mgN1sEijz2PRJfQz/tB86FHfRehEXJthpf k/ZjfjA/Gm4lyFR5uitRZycHuWcjGKkW1sI8YwGVklAcOsOy9JzhqYO7aBGvjDtjieO+ aV+a1nGF7twjP9gAMWzuS639SHohXM+DBF/t8eohRgyFSlujvULwd5Oq2DitLFVyqgvv B/UKRKDE/YcI54ZzftrRZTMfYxMLH94GfWjBnh9c5dlISwNkAlAxtx/BBhW+t8gGPd3E m3CBVUOI7QzbqBOjHUdv6gFECuXDtAtiC7Oc2jJR/fkVTLFyLOwWDC3avWUQaXQso7Zw 7Tag== X-Gm-Message-State: AOAM532HimKU7lJ0iZ2GmOQg4sqfON7hckH/hbmDWnzyWPDwFuJA9Sfc VPh7Wa7959z2fo8U4hLkSILesQ== X-Google-Smtp-Source: ABdhPJybMMuyVpfH9TkjQYfrOdKtNo/2KkQmL8eL5hcFksx98vZPoK4Mk5YH4Sz+jYHIlic1smECKA== X-Received: by 2002:aa7:868f:0:b029:155:dcd2:7320 with SMTP id d15-20020aa7868f0000b0290155dcd27320mr7252122pfo.53.1604026760577; Thu, 29 Oct 2020 19:59:20 -0700 (PDT) Received: from localhost ([2600:3c01::f03c:91ff:fe8a:bb03]) by smtp.gmail.com with ESMTPSA id z3sm3826152pgl.73.2020.10.29.19.59.19 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Oct 2020 19:59:20 -0700 (PDT) From: Leo Yan To: Arnaldo Carvalho de Melo , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Andre Przywara , James Clark , Dave Martin , Al Grant , Wei Li , linux-kernel@vger.kernel.org Cc: Leo Yan Subject: [PATCH v6 18/21] perf arm-spe: Refactor operation packet handling Date: Fri, 30 Oct 2020 10:57:21 +0800 Message-Id: <20201030025724.19157-19-leo.yan@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201030025724.19157-1-leo.yan@linaro.org> References: <20201030025724.19157-1-leo.yan@linaro.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Defines macros for operation packet header and formats (support sub classes for 'other', 'branch', 'load and store', etc). Uses these macros for operation packet decoding and dumping. Signed-off-by: Leo Yan Reviewed-by: Andre Przywara --- .../arm-spe-decoder/arm-spe-pkt-decoder.c | 26 ++++++++++--------- .../arm-spe-decoder/arm-spe-pkt-decoder.h | 23 ++++++++++++++++ 2 files changed, 37 insertions(+), 12 deletions(-) diff --git a/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c b/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c index 1616a88db9ba..0e39ba48ea07 100644 --- a/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c +++ b/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c @@ -144,7 +144,7 @@ static int arm_spe_get_op_type(const unsigned char *buf, size_t len, struct arm_spe_pkt *packet) { packet->type = ARM_SPE_OP_TYPE; - packet->index = buf[0] & 0x3; + packet->index = SPE_OP_PKT_HDR_CLASS(buf[0]); return arm_spe_get_payload(buf, len, 0, packet); } @@ -316,32 +316,34 @@ static int arm_spe_pkt_desc_op_type(const struct arm_spe_pkt *packet, int err = 0; switch (packet->index) { - case 0: + case SPE_OP_PKT_HDR_CLASS_OTHER: return arm_spe_pkt_snprintf(&err, &buf, &blen, - payload & 0x1 ? "COND-SELECT" : "INSN-OTHER"); - case 1: + payload & SPE_OP_PKT_COND ? "COND-SELECT" : "INSN-OTHER"); + case SPE_OP_PKT_HDR_CLASS_LD_ST_ATOMIC: arm_spe_pkt_snprintf(&err, &buf, &blen, payload & 0x1 ? "ST" : "LD"); - if (payload & 0x2) { - if (payload & 0x4) + if (SPE_OP_PKT_IS_LDST_ATOMIC(payload)) { + if (payload & SPE_OP_PKT_AT) arm_spe_pkt_snprintf(&err, &buf, &blen, " AT"); - if (payload & 0x8) + if (payload & SPE_OP_PKT_EXCL) arm_spe_pkt_snprintf(&err, &buf, &blen, " EXCL"); - if (payload & 0x10) + if (payload & SPE_OP_PKT_AR) arm_spe_pkt_snprintf(&err, &buf, &blen, " AR"); - } else if (payload & 0x4) { + } else if (SPE_OP_PKT_LDST_SUBCLASS_GET(payload) == + SPE_OP_PKT_LDST_SUBCLASS_SIMD_FP) { arm_spe_pkt_snprintf(&err, &buf, &blen, " SIMD-FP"); } return err ?: (int)(buf_len - blen); - case 2: + case SPE_OP_PKT_HDR_CLASS_BR_ERET: arm_spe_pkt_snprintf(&err, &buf, &blen, "B"); - if (payload & 0x1) + if (payload & SPE_OP_PKT_COND) arm_spe_pkt_snprintf(&err, &buf, &blen, " COND"); - if (payload & 0x2) + + if (SPE_OP_PKT_IS_INDIRECT_BRANCH(payload)) arm_spe_pkt_snprintf(&err, &buf, &blen, " IND"); return err ?: (int)(buf_len - blen); diff --git a/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h b/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h index 42ed4e61ede2..7032fc141ad4 100644 --- a/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h +++ b/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h @@ -105,6 +105,29 @@ enum arm_spe_events { EV_EMPTY_PREDICATE = 18, }; +/* Operation packet header */ +#define SPE_OP_PKT_HDR_CLASS(h) ((h) & GENMASK_ULL(1, 0)) +#define SPE_OP_PKT_HDR_CLASS_OTHER 0x0 +#define SPE_OP_PKT_HDR_CLASS_LD_ST_ATOMIC 0x1 +#define SPE_OP_PKT_HDR_CLASS_BR_ERET 0x2 + +#define SPE_OP_PKT_COND BIT(0) + +#define SPE_OP_PKT_LDST_SUBCLASS_GET(v) ((v) & GENMASK_ULL(7, 1)) +#define SPE_OP_PKT_LDST_SUBCLASS_GP_REG 0x0 +#define SPE_OP_PKT_LDST_SUBCLASS_SIMD_FP 0x4 +#define SPE_OP_PKT_LDST_SUBCLASS_UNSPEC_REG 0x10 +#define SPE_OP_PKT_LDST_SUBCLASS_NV_SYSREG 0x30 + +#define SPE_OP_PKT_IS_LDST_ATOMIC(v) (((v) & (GENMASK_ULL(7, 5) | BIT(1))) == 0x2) + +#define SPE_OP_PKT_AR BIT(4) +#define SPE_OP_PKT_EXCL BIT(3) +#define SPE_OP_PKT_AT BIT(2) +#define SPE_OP_PKT_ST BIT(0) + +#define SPE_OP_PKT_IS_INDIRECT_BRANCH(v) (((v) & GENMASK_ULL(7, 1)) == 0x2) + const char *arm_spe_pkt_name(enum arm_spe_pkt_type); int arm_spe_get_packet(const unsigned char *buf, size_t len, -- 2.17.1