From: Leo Yan <leo.yan@linaro.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>,
Andre Przywara <andre.przywara@arm.com>,
Dave Martin <Dave.Martin@arm.com>, Wei Li <liwei391@huawei.com>,
James Clark <james.clark@arm.com>, Al Grant <Al.Grant@arm.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Cc: Leo Yan <leo.yan@linaro.org>
Subject: [PATCH v5 15/21] perf arm-spe: Refactor event type handling
Date: Thu, 29 Oct 2020 15:19:21 +0800 [thread overview]
Message-ID: <20201029071927.9308-16-leo.yan@linaro.org> (raw)
In-Reply-To: <20201029071927.9308-1-leo.yan@linaro.org>
Move the enums of event types to arm-spe-pkt-decoder.h, thus function
arm_spe_pkt_desc() can them for bitmasks.
Suggested-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Leo Yan <leo.yan@linaro.org>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
---
.../util/arm-spe-decoder/arm-spe-decoder.h | 17 --------------
.../arm-spe-decoder/arm-spe-pkt-decoder.c | 22 +++++++++----------
.../arm-spe-decoder/arm-spe-pkt-decoder.h | 18 +++++++++++++++
3 files changed, 29 insertions(+), 28 deletions(-)
diff --git a/tools/perf/util/arm-spe-decoder/arm-spe-decoder.h b/tools/perf/util/arm-spe-decoder/arm-spe-decoder.h
index a5111a8d4360..24727b8ca7ff 100644
--- a/tools/perf/util/arm-spe-decoder/arm-spe-decoder.h
+++ b/tools/perf/util/arm-spe-decoder/arm-spe-decoder.h
@@ -13,23 +13,6 @@
#include "arm-spe-pkt-decoder.h"
-enum arm_spe_events {
- EV_EXCEPTION_GEN = 0,
- EV_RETIRED = 1,
- EV_L1D_ACCESS = 2,
- EV_L1D_REFILL = 3,
- EV_TLB_ACCESS = 4,
- EV_TLB_WALK = 5,
- EV_NOT_TAKEN = 6,
- EV_MISPRED = 7,
- EV_LLC_ACCESS = 8,
- EV_LLC_MISS = 9,
- EV_REMOTE_ACCESS = 10,
- EV_ALIGNMENT = 11,
- EV_PARTIAL_PREDICATE = 17,
- EV_EMPTY_PREDICATE = 18,
-};
-
enum arm_spe_sample_type {
ARM_SPE_L1D_ACCESS = 1 << 0,
ARM_SPE_L1D_MISS = 1 << 1,
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 6e4896327e56..e8c334f19316 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
@@ -278,28 +278,28 @@ static int arm_spe_pkt_desc_event(const struct arm_spe_pkt *packet,
arm_spe_pkt_snprintf(&err, &buf, &blen, "EV");
- if (payload & 0x1)
+ if (payload & BIT(EV_EXCEPTION_GEN))
arm_spe_pkt_snprintf(&err, &buf, &blen, " EXCEPTION-GEN");
- if (payload & 0x2)
+ if (payload & BIT(EV_RETIRED))
arm_spe_pkt_snprintf(&err, &buf, &blen, " RETIRED");
- if (payload & 0x4)
+ if (payload & BIT(EV_L1D_ACCESS))
arm_spe_pkt_snprintf(&err, &buf, &blen, " L1D-ACCESS");
- if (payload & 0x8)
+ if (payload & BIT(EV_L1D_REFILL))
arm_spe_pkt_snprintf(&err, &buf, &blen, " L1D-REFILL");
- if (payload & 0x10)
+ if (payload & BIT(EV_TLB_ACCESS))
arm_spe_pkt_snprintf(&err, &buf, &blen, " TLB-ACCESS");
- if (payload & 0x20)
+ if (payload & BIT(EV_TLB_WALK))
arm_spe_pkt_snprintf(&err, &buf, &blen, " TLB-REFILL");
- if (payload & 0x40)
+ if (payload & BIT(EV_NOT_TAKEN))
arm_spe_pkt_snprintf(&err, &buf, &blen, " NOT-TAKEN");
- if (payload & 0x80)
+ if (payload & BIT(EV_MISPRED))
arm_spe_pkt_snprintf(&err, &buf, &blen, " MISPRED");
if (packet->index > 1) {
- if (payload & 0x100)
+ if (payload & BIT(EV_LLC_ACCESS))
arm_spe_pkt_snprintf(&err, &buf, &blen, " LLC-ACCESS");
- if (payload & 0x200)
+ if (payload & BIT(EV_LLC_MISS))
arm_spe_pkt_snprintf(&err, &buf, &blen, " LLC-REFILL");
- if (payload & 0x400)
+ if (payload & BIT(EV_REMOTE_ACCESS))
arm_spe_pkt_snprintf(&err, &buf, &blen, " REMOTE-ACCESS");
}
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 7d8e34e35f05..42ed4e61ede2 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
@@ -87,6 +87,24 @@ struct arm_spe_pkt {
#define SPE_CNT_PKT_HDR_INDEX_ISSUE_LAT 0x1
#define SPE_CNT_PKT_HDR_INDEX_TRANS_LAT 0x2
+/* Event packet payload */
+enum arm_spe_events {
+ EV_EXCEPTION_GEN = 0,
+ EV_RETIRED = 1,
+ EV_L1D_ACCESS = 2,
+ EV_L1D_REFILL = 3,
+ EV_TLB_ACCESS = 4,
+ EV_TLB_WALK = 5,
+ EV_NOT_TAKEN = 6,
+ EV_MISPRED = 7,
+ EV_LLC_ACCESS = 8,
+ EV_LLC_MISS = 9,
+ EV_REMOTE_ACCESS = 10,
+ EV_ALIGNMENT = 11,
+ EV_PARTIAL_PREDICATE = 17,
+ EV_EMPTY_PREDICATE = 18,
+};
+
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
next prev parent reply other threads:[~2020-10-29 7:23 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-29 7:19 [PATCH v5 00/21] perf arm-spe: Refactor decoding & dumping flow Leo Yan
2020-10-29 7:19 ` [PATCH v5 01/21] perf arm-spe: Include bitops.h for BIT() macro Leo Yan
2020-10-29 7:19 ` [PATCH v5 02/21] perf arm-spe: Fix a typo in comment Leo Yan
2020-10-29 7:19 ` [PATCH v5 03/21] perf arm-spe: Refactor payload size calculation Leo Yan
2020-10-29 7:19 ` [PATCH v5 04/21] perf arm-spe: Refactor arm_spe_get_events() Leo Yan
2020-10-29 7:19 ` [PATCH v5 05/21] perf arm-spe: Fix packet length handling Leo Yan
2020-10-29 7:19 ` [PATCH v5 06/21] perf arm-spe: Refactor printing string to buffer Leo Yan
2020-10-29 10:23 ` André Przywara
2020-10-29 10:51 ` Leo Yan
2020-10-29 10:54 ` André Przywara
2020-10-29 11:06 ` Leo Yan
2020-10-29 7:19 ` [PATCH v5 07/21] perf arm-spe: Refactor packet header parsing Leo Yan
2020-10-29 7:19 ` [PATCH v5 08/21] perf arm-spe: Add new function arm_spe_pkt_desc_addr() Leo Yan
2020-10-29 7:19 ` [PATCH v5 09/21] perf arm-spe: Refactor address packet handling Leo Yan
2020-10-29 7:19 ` [PATCH v5 10/21] perf arm_spe: Fixup top byte for data virtual address Leo Yan
2020-10-29 12:01 ` Andre Przywara
2020-10-29 7:19 ` [PATCH v5 11/21] perf arm-spe: Refactor context packet handling Leo Yan
2020-10-29 7:19 ` [PATCH v5 12/21] perf arm-spe: Add new function arm_spe_pkt_desc_counter() Leo Yan
2020-10-29 7:19 ` [PATCH v5 13/21] perf arm-spe: Refactor counter packet handling Leo Yan
2020-10-29 7:19 ` [PATCH v5 14/21] perf arm-spe: Add new function arm_spe_pkt_desc_event() Leo Yan
2020-10-29 7:19 ` Leo Yan [this message]
2020-10-29 7:19 ` [PATCH v5 16/21] perf arm-spe: Remove size condition checking for events Leo Yan
2020-10-29 7:19 ` [PATCH v5 17/21] perf arm-spe: Add new function arm_spe_pkt_desc_op_type() Leo Yan
2020-10-29 7:19 ` [PATCH v5 18/21] perf arm-spe: Refactor operation packet handling Leo Yan
2020-10-29 7:19 ` [PATCH v5 19/21] perf arm-spe: Add more sub classes for operation packet Leo Yan
2020-10-29 7:19 ` [PATCH v5 20/21] perf arm_spe: Decode memory tagging properties Leo Yan
2020-10-29 7:19 ` [PATCH v5 21/21] perf arm-spe: Add support for ARMv8.3-SPE Leo Yan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201029071927.9308-16-leo.yan@linaro.org \
--to=leo.yan@linaro.org \
--cc=Al.Grant@arm.com \
--cc=Dave.Martin@arm.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=andre.przywara@arm.com \
--cc=james.clark@arm.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=liwei391@huawei.com \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).