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

Commit bbdc7aa4 authored by Sukadev Bhattiprolu's avatar Sukadev Bhattiprolu Committed by Arnaldo Carvalho de Melo
Browse files

perf/Power7: Use macros to identify perf events 



Define and use macros to identify perf events codes This would make it
easier and more readable when these event codes need to be used in more
than one place.

Signed-off-by: default avatarSukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Acked-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Anton Blanchard <anton@au1.ibm.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Robert Richter <robert.richter@amd.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: linuxppc-dev@ozlabs.org
Link: http://lkml.kernel.org/r/20130123062353.GB13720@us.ibm.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent e6ab07d0

arch/powerpc/perf/power7-pmu.c

+20 −8
Original line number Original line Diff line number Diff line
@@ -50,6 +50,18 @@ 
#define MMCR1_PMCSEL_SH(n)	(MMCR1_PMC1SEL_SH - (n) * 8)

#define MMCR1_PMCSEL_SH(n)	(MMCR1_PMC1SEL_SH - (n) * 8)

#define MMCR1_PMCSEL_MSK	0xff

#define MMCR1_PMCSEL_MSK	0xff





/*

 * Power7 event codes.

 */

#define	PME_PM_CYC			0x1e

#define	PME_PM_GCT_NOSLOT_CYC		0x100f8

#define	PME_PM_CMPLU_STALL		0x4000a

#define	PME_PM_INST_CMPL		0x2

#define	PME_PM_LD_REF_L1		0xc880

#define	PME_PM_LD_MISS_L1		0x400f0

#define	PME_PM_BRU_FIN			0x10068

#define	PME_PM_BRU_MPRED		0x400f6



/*

/*

 * Layout of constraint bits:

 * Layout of constraint bits:

 * 6666555555555544444444443333333333222222222211111111110000000000

 * 6666555555555544444444443333333333222222222211111111110000000000
@@ -307,14 +319,14 @@ static void power7_disable_pmc(unsigned int pmc, unsigned long mmcr[]) 
}

}





static int power7_generic_events[] = {

static int power7_generic_events[] = {

	[PERF_COUNT_HW_CPU_CYCLES] = 0x1e,

	[PERF_COUNT_HW_CPU_CYCLES] =			PME_PM_CYC,

	[PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] = 0x100f8, /* GCT_NOSLOT_CYC */

	[PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] =	PME_PM_GCT_NOSLOT_CYC,

	[PERF_COUNT_HW_STALLED_CYCLES_BACKEND] = 0x4000a,  /* CMPLU_STALL */

	[PERF_COUNT_HW_STALLED_CYCLES_BACKEND] =	PME_PM_CMPLU_STALL,

	[PERF_COUNT_HW_INSTRUCTIONS] = 2,

	[PERF_COUNT_HW_INSTRUCTIONS] =			PME_PM_INST_CMPL,

	[PERF_COUNT_HW_CACHE_REFERENCES] = 0xc880,	/* LD_REF_L1_LSU*/

	[PERF_COUNT_HW_CACHE_REFERENCES] =		PME_PM_LD_REF_L1,

	[PERF_COUNT_HW_CACHE_MISSES] = 0x400f0,		/* LD_MISS_L1	*/

	[PERF_COUNT_HW_CACHE_MISSES] =			PME_PM_LD_MISS_L1,

	[PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = 0x10068,	/* BRU_FIN	*/

	[PERF_COUNT_HW_BRANCH_INSTRUCTIONS] =		PME_PM_BRU_FIN,

	[PERF_COUNT_HW_BRANCH_MISSES] = 0x400f6,	/* BR_MPRED	*/

	[PERF_COUNT_HW_BRANCH_MISSES] =			PME_PM_BRU_MPRED,

};

};





#define C(x)	PERF_COUNT_HW_CACHE_##x

#define C(x)	PERF_COUNT_HW_CACHE_##x