Commit e217d1a3 authored by Leo Yan's avatar Leo Yan Committed by Zheng Zengkai
Browse files

perf arm-spe: Refactor event type handling 

mainline inclusion
from mainline-v5.11-rc1
commit 889d1a67
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I4NGPV


CVE: NA

-------------------------------------------------

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: default avatarAndre Przywara <andre.przywara@arm.com>
Signed-off-by: default avatarLeo Yan <leo.yan@linaro.org>
Reviewed-by: default avatarAndre Przywara <andre.przywara@arm.com>
Acked-by: default avatarWill 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarWei Li <liwei391@huawei.com>
Reviewed-by: default avatarYang Jihong <yangjihong1@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 8205cabe

tools/perf/util/arm-spe-decoder/arm-spe-decoder.h

+0 −17
Original line number Diff line number Diff line
@@ -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,

tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c

+11 −11
Original line number Diff line number Diff line
@@ -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");

	}

tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h

+18 −0
Original line number Diff line number Diff line
@@ -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,