Commit 00df9093 authored by Robin Murphy's avatar Robin Murphy Committed by Will Deacon
Browse files

perf/arm-cmn: Remove spurious event aliases 



As the name suggests, the "partial DAT flit" event is only counted for
the DAT channel, and furthermore is only applicable to device ports, not
mesh links (strictly it's only device ports with CHI-A requesters
connected, but detecting that degree of detail is more bother than it's
worth). Stop generating spurious event aliases for other combinations
which aren't meaningful.

Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/b01a58e3ff05c322547fbfd015f6dbfedf555ed3.1688746690.git.robin.murphy@arm.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 918dc87b

drivers/perf/arm-cmn.c

+13 −3
Original line number Diff line number Diff line
@@ -791,16 +791,22 @@ static umode_t arm_cmn_event_attr_is_visible(struct kobject *kobj, 
	_CMN_EVENT_HNF(_model, _name##_read, _event, 5, SEL_CBUSY_SNTHROTTLE_SEL), \

	_CMN_EVENT_HNF(_model, _name##_write, _event, 6, SEL_CBUSY_SNTHROTTLE_SEL)



#define _CMN_EVENT_XP(_name, _event)				\

#define _CMN_EVENT_XP_MESH(_name, _event)			\

	__CMN_EVENT_XP(e_##_name, (_event) | (0 << 2)),		\

	__CMN_EVENT_XP(w_##_name, (_event) | (1 << 2)),		\

	__CMN_EVENT_XP(n_##_name, (_event) | (2 << 2)),		\

	__CMN_EVENT_XP(s_##_name, (_event) | (3 << 2)),		\

	__CMN_EVENT_XP(s_##_name, (_event) | (3 << 2))



#define _CMN_EVENT_XP_PORT(_name, _event)			\

	__CMN_EVENT_XP(p0_##_name, (_event) | (4 << 2)),	\

	__CMN_EVENT_XP(p1_##_name, (_event) | (5 << 2)),	\

	__CMN_EVENT_XP(p2_##_name, (_event) | (6 << 2)),	\

	__CMN_EVENT_XP(p3_##_name, (_event) | (7 << 2))



#define _CMN_EVENT_XP(_name, _event)				\

	_CMN_EVENT_XP_MESH(_name, _event),			\

	_CMN_EVENT_XP_PORT(_name, _event)



/* Good thing there are only 3 fundamental XP events... */

#define CMN_EVENT_XP(_name, _event)				\

	_CMN_EVENT_XP(req_##_name, (_event) | (0 << 5)),	\
@@ -813,6 +819,10 @@ static umode_t arm_cmn_event_attr_is_visible(struct kobject *kobj, 
	_CMN_EVENT_XP(snp2_##_name, (_event) | (7 << 5)),	\

	_CMN_EVENT_XP(req2_##_name, (_event) | (8 << 5))



#define CMN_EVENT_XP_DAT(_name, _event)				\

	_CMN_EVENT_XP_PORT(dat_##_name, (_event) | (3 << 5)),	\

	_CMN_EVENT_XP_PORT(dat2_##_name, (_event) | (6 << 5))





static struct attribute *arm_cmn_event_attrs[] = {

	CMN_EVENT_DTC(cycles),
@@ -943,7 +953,7 @@ static struct attribute *arm_cmn_event_attrs[] = { 


	CMN_EVENT_XP(txflit_valid,			0x01),

	CMN_EVENT_XP(txflit_stall,			0x02),

	CMN_EVENT_XP(partial_dat_flit,			0x03),

	CMN_EVENT_XP_DAT(partial_dat_flit,		0x03),

	/* We treat watchpoints as a special made-up class of XP events */

	CMN_EVENT_ATTR(CMN_ANY, watchpoint_up, CMN_TYPE_WP, CMN_WP_UP),

	CMN_EVENT_ATTR(CMN_ANY, watchpoint_down, CMN_TYPE_WP, CMN_WP_DOWN),