Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4969e24 authored by Sukadev Bhattiprolu's avatar Sukadev Bhattiprolu Committed by Michael Ellerman
Browse files

powerpc/perf: Remove PME_ prefix for power7 events 



We used the PME_ prefix earlier to avoid some macro/variable name
collisions.  We have since changed the way we define/use the event
macros so we no longer need the prefix.

By dropping the prefix, we keep the the event macros consistent with
their official names.

Reported-by: default avatarMichael Ellerman <ellerman@au1.ibm.com>
Signed-off-by: default avatarSukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 17eb3eef

arch/powerpc/include/asm/perf_event_server.h

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ extern ssize_t power_events_sysfs_show(struct device *dev, 
#define	EVENT_PTR(_id, _suffix)		&EVENT_VAR(_id, _suffix).attr.attr



#define	EVENT_ATTR(_name, _id, _suffix)					\

	PMU_EVENT_ATTR(_name, EVENT_VAR(_id, _suffix), PME_##_id,	\

	PMU_EVENT_ATTR(_name, EVENT_VAR(_id, _suffix), _id,		\

			power_events_sysfs_show)



#define	GENERIC_EVENT_ATTR(_name, _id)	EVENT_ATTR(_name, _id, _g)

arch/powerpc/perf/power7-pmu.c

+9 −9
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
 * Power7 event codes.

 */

#define EVENT(_name, _code) \

	PME_##_name = _code,

	_name = _code,



enum {

#include "power7-events-list.h"
@@ -318,14 +318,14 @@ static void power7_disable_pmc(unsigned int pmc, unsigned long mmcr[]) 
}



static int power7_generic_events[] = {

	[PERF_COUNT_HW_CPU_CYCLES] =			PME_PM_CYC,

	[PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] =	PME_PM_GCT_NOSLOT_CYC,

	[PERF_COUNT_HW_STALLED_CYCLES_BACKEND] =	PME_PM_CMPLU_STALL,

	[PERF_COUNT_HW_INSTRUCTIONS] =			PME_PM_INST_CMPL,

	[PERF_COUNT_HW_CACHE_REFERENCES] =		PME_PM_LD_REF_L1,

	[PERF_COUNT_HW_CACHE_MISSES] =			PME_PM_LD_MISS_L1,

	[PERF_COUNT_HW_BRANCH_INSTRUCTIONS] =		PME_PM_BRU_FIN,

	[PERF_COUNT_HW_BRANCH_MISSES] =			PME_PM_BR_MPRED,

	[PERF_COUNT_HW_CPU_CYCLES] =			PM_CYC,

	[PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] =	PM_GCT_NOSLOT_CYC,

	[PERF_COUNT_HW_STALLED_CYCLES_BACKEND] =	PM_CMPLU_STALL,

	[PERF_COUNT_HW_INSTRUCTIONS] =			PM_INST_CMPL,

	[PERF_COUNT_HW_CACHE_REFERENCES] =		PM_LD_REF_L1,

	[PERF_COUNT_HW_CACHE_MISSES] =			PM_LD_MISS_L1,

	[PERF_COUNT_HW_BRANCH_INSTRUCTIONS] =		PM_BRU_FIN,

	[PERF_COUNT_HW_BRANCH_MISSES] =			PM_BR_MPRED,

};



#define C(x)	PERF_COUNT_HW_CACHE_##x