Commit 66655986 authored by Athira Rajeev's avatar Athira Rajeev Committed by Arnaldo Carvalho de Melo
Browse files

perf tools powerpc: Add support for extended regs in power10 



Added support for supported regs which are new in power10 ( MMCR3,
SIER2, SIER3 ) to sample_reg_mask in the tool side to use with `-I?`
option. Also added PVR check to send extended mask for power10 at kernel
while capturing extended regs in each sample.

Signed-off-by: default avatarAthira Jajeev <atrajeev@linux.vnet.ibm.com>
Reviewed-by: default avatarKajol Jain <kjain@linux.ibm.com>
Reviewed-by: default avatarRavi Bangoria <ravi.bangoria@linux.ibm.com>
Tested-by: default avatarRavi Bangoria <ravi.bangoria@linux.ibm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michael Neuling <mikey@neuling.org>
Cc: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 33583e69

tools/arch/powerpc/include/uapi/asm/perf_regs.h

+6 −0
Original line number Diff line number Diff line
@@ -52,6 +52,9 @@ enum perf_event_powerpc_regs { 
	PERF_REG_POWERPC_MMCR0,

	PERF_REG_POWERPC_MMCR1,

	PERF_REG_POWERPC_MMCR2,

	PERF_REG_POWERPC_MMCR3,

	PERF_REG_POWERPC_SIER2,

	PERF_REG_POWERPC_SIER3,

	/* Max regs without the extended regs */

	PERF_REG_POWERPC_MAX = PERF_REG_POWERPC_MMCRA + 1,

};
@@ -60,6 +63,9 @@ enum perf_event_powerpc_regs { 


/* PERF_REG_EXTENDED_MASK value for CPU_FTR_ARCH_300 */

#define PERF_REG_PMU_MASK_300   (((1ULL << (PERF_REG_POWERPC_MMCR2 + 1)) - 1) - PERF_REG_PMU_MASK)

/* PERF_REG_EXTENDED_MASK value for CPU_FTR_ARCH_31 */

#define PERF_REG_PMU_MASK_31   (((1ULL << (PERF_REG_POWERPC_SIER3 + 1)) - 1) - PERF_REG_PMU_MASK)



#define PERF_REG_MAX_ISA_300   (PERF_REG_POWERPC_MMCR2 + 1)

#define PERF_REG_MAX_ISA_31    (PERF_REG_POWERPC_SIER3 + 1)

#endif /* _UAPI_ASM_POWERPC_PERF_REGS_H */

tools/perf/arch/powerpc/include/perf_regs.h

+3 −0
Original line number Diff line number Diff line
@@ -68,6 +68,9 @@ static const char *reg_names[] = { 
	[PERF_REG_POWERPC_MMCR0] = "mmcr0",

	[PERF_REG_POWERPC_MMCR1] = "mmcr1",

	[PERF_REG_POWERPC_MMCR2] = "mmcr2",

	[PERF_REG_POWERPC_MMCR3] = "mmcr3",

	[PERF_REG_POWERPC_SIER2] = "sier2",

	[PERF_REG_POWERPC_SIER3] = "sier3",

};



static inline const char *perf_reg_name(int id)

tools/perf/arch/powerpc/util/perf_regs.c

+6 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/kernel.h>



#define PVR_POWER9		0x004E

#define PVR_POWER10		0x0080



const struct sample_reg sample_reg_masks[] = {

	SMPL_REG(r0, PERF_REG_POWERPC_R0),
@@ -64,6 +65,9 @@ const struct sample_reg sample_reg_masks[] = { 
	SMPL_REG(mmcr0, PERF_REG_POWERPC_MMCR0),

	SMPL_REG(mmcr1, PERF_REG_POWERPC_MMCR1),

	SMPL_REG(mmcr2, PERF_REG_POWERPC_MMCR2),

	SMPL_REG(mmcr3, PERF_REG_POWERPC_MMCR3),

	SMPL_REG(sier2, PERF_REG_POWERPC_SIER2),

	SMPL_REG(sier3, PERF_REG_POWERPC_SIER3),

	SMPL_REG_END

};
@@ -194,6 +198,8 @@ uint64_t arch__intr_reg_mask(void) 
	version = (((mfspr(SPRN_PVR)) >>  16) & 0xFFFF);

	if (version == PVR_POWER9)

		extended_mask = PERF_REG_PMU_MASK_300;

	else if (version == PVR_POWER10)

		extended_mask = PERF_REG_PMU_MASK_31;

	else

		return mask;

CRA Git | Maintained and supported by SUSTech CRA and CCSE