perf arm-spe: Refactor event type handling

Move the enums of event types to arm-spe-pkt-decoder.h, thus function
arm_spe_pkt_desc_event() can use 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>
Acked-by: Will Deacon <will@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Al Grant <Al.Grant@arm.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Dave Martin <Dave.Martin@arm.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: John Garry <john.garry@huawei.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Wei Li <liwei391@huawei.com>
Link: https://lore.kernel.org/r/20201119152441.6972-11-leo.yan@linaro.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

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 a5111a8d4360024dbaa52a32df2548b74be56200..24727b8ca7ffa2ab7b33a7243c358c51ea1a2302 100644 (file)
--- 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 da6b9f76739c87853e2b73050f97678be464ebf1..3f30b29377152c30feb8c16a0266df4135402d89 100644 (file)
--- a/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c
+++ b/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c
@@ -295,28 +295,28 @@ static int arm_spe_pkt_desc_event(const struct arm_spe_pkt *packet,
 
        arm_spe_pkt_out_string(&err, &buf, &buf_len, "EV");
 
-       if (payload & 0x1)
+       if (payload & BIT(EV_EXCEPTION_GEN))
                arm_spe_pkt_out_string(&err, &buf, &buf_len, " EXCEPTION-GEN");
-       if (payload & 0x2)
+       if (payload & BIT(EV_RETIRED))
                arm_spe_pkt_out_string(&err, &buf, &buf_len, " RETIRED");
-       if (payload & 0x4)
+       if (payload & BIT(EV_L1D_ACCESS))
                arm_spe_pkt_out_string(&err, &buf, &buf_len, " L1D-ACCESS");
-       if (payload & 0x8)
+       if (payload & BIT(EV_L1D_REFILL))
                arm_spe_pkt_out_string(&err, &buf, &buf_len, " L1D-REFILL");
-       if (payload & 0x10)
+       if (payload & BIT(EV_TLB_ACCESS))
                arm_spe_pkt_out_string(&err, &buf, &buf_len, " TLB-ACCESS");
-       if (payload & 0x20)
+       if (payload & BIT(EV_TLB_WALK))
                arm_spe_pkt_out_string(&err, &buf, &buf_len, " TLB-REFILL");
-       if (payload & 0x40)
+       if (payload & BIT(EV_NOT_TAKEN))
                arm_spe_pkt_out_string(&err, &buf, &buf_len, " NOT-TAKEN");
-       if (payload & 0x80)
+       if (payload & BIT(EV_MISPRED))
                arm_spe_pkt_out_string(&err, &buf, &buf_len, " MISPRED");
        if (packet->index > 1) {
-               if (payload & 0x100)
+               if (payload & BIT(EV_LLC_ACCESS))
                        arm_spe_pkt_out_string(&err, &buf, &buf_len, " LLC-ACCESS");
-               if (payload & 0x200)
+               if (payload & BIT(EV_LLC_MISS))
                        arm_spe_pkt_out_string(&err, &buf, &buf_len, " LLC-REFILL");
-               if (payload & 0x400)
+               if (payload & BIT(EV_REMOTE_ACCESS))
                        arm_spe_pkt_out_string(&err, &buf, &buf_len, " 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 7d8e34e35f05f691ab755883a0392b3c967f8f1c..42ed4e61ede25ec6224aa00fc2ea8b284b4b2863 100644 (file)
--- 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,