perf powerpc: Support exposing Performance Monitor Counter SPRs as part of extended...

To enable presenting of Performance Monitor Counter Registers (PMC1 to
PMC6) as part of extended regsiters, this patch adds these to
sample_reg_mask in the tool side (to use with -I? option).

Simplified the PERF_REG_PMU_MASK_300/31 definition. Excluded the
unsupported SPRs (MMCR3, SIER2, SIER3) from extended mask value for
CPU_FTR_ARCH_300.

Signed-off-by: Athira Jajeev <atrajeev@linux.vnet.ibm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/arch/powerpc/include/uapi/asm/perf_regs.h b/tools/arch/powerpc/include/uapi/asm/perf_regs.h
index bdf5f10..578b3ee 100644 (file)
--- a/tools/arch/powerpc/include/uapi/asm/perf_regs.h
+++ b/tools/arch/powerpc/include/uapi/asm/perf_regs.h
@@ -55,17 +55,33 @@ enum perf_event_powerpc_regs {
        PERF_REG_POWERPC_MMCR3,
        PERF_REG_POWERPC_SIER2,
        PERF_REG_POWERPC_SIER3,
+       PERF_REG_POWERPC_PMC1,
+       PERF_REG_POWERPC_PMC2,
+       PERF_REG_POWERPC_PMC3,
+       PERF_REG_POWERPC_PMC4,
+       PERF_REG_POWERPC_PMC5,
+       PERF_REG_POWERPC_PMC6,
        /* Max regs without the extended regs */
        PERF_REG_POWERPC_MAX = PERF_REG_POWERPC_MMCRA + 1,
 };
 
 #define PERF_REG_PMU_MASK      ((1ULL << PERF_REG_POWERPC_MAX) - 1)
 
-/* 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)
+/* Exclude MMCR3, SIER2, SIER3 for CPU_FTR_ARCH_300 */
+#define        PERF_EXCLUDE_REG_EXT_300        (7ULL << PERF_REG_POWERPC_MMCR3)
 
-#define PERF_REG_MAX_ISA_300   (PERF_REG_POWERPC_MMCR2 + 1)
-#define PERF_REG_MAX_ISA_31    (PERF_REG_POWERPC_SIER3 + 1)
+/*
+ * PERF_REG_EXTENDED_MASK value for CPU_FTR_ARCH_300
+ * includes 9 SPRS from MMCR0 to PMC6 excluding the
+ * unsupported SPRS in PERF_EXCLUDE_REG_EXT_300.
+ */
+#define PERF_REG_PMU_MASK_300   ((0xfffULL << PERF_REG_POWERPC_MMCR0) - PERF_EXCLUDE_REG_EXT_300)
+
+/*
+ * PERF_REG_EXTENDED_MASK value for CPU_FTR_ARCH_31
+ * includes 12 SPRs from MMCR0 to PMC6.
+ */
+#define PERF_REG_PMU_MASK_31   (0xfffULL << PERF_REG_POWERPC_MMCR0)
+
+#define PERF_REG_EXTENDED_MAX  (PERF_REG_POWERPC_PMC6 + 1)
 #endif /* _UAPI_ASM_POWERPC_PERF_REGS_H */

diff --git a/tools/perf/arch/powerpc/include/perf_regs.h b/tools/perf/arch/powerpc/include/perf_regs.h
index 63f3ac9..98b6f9e 100644 (file)
--- a/tools/perf/arch/powerpc/include/perf_regs.h
+++ b/tools/perf/arch/powerpc/include/perf_regs.h
@@ -71,6 +71,12 @@ static const char *reg_names[] = {
        [PERF_REG_POWERPC_MMCR3] = "mmcr3",
        [PERF_REG_POWERPC_SIER2] = "sier2",
        [PERF_REG_POWERPC_SIER3] = "sier3",
+       [PERF_REG_POWERPC_PMC1] = "pmc1",
+       [PERF_REG_POWERPC_PMC2] = "pmc2",
+       [PERF_REG_POWERPC_PMC3] = "pmc3",
+       [PERF_REG_POWERPC_PMC4] = "pmc4",
+       [PERF_REG_POWERPC_PMC5] = "pmc5",
+       [PERF_REG_POWERPC_PMC6] = "pmc6",
 };
 
 static inline const char *perf_reg_name(int id)

diff --git a/tools/perf/arch/powerpc/util/perf_regs.c b/tools/perf/arch/powerpc/util/perf_regs.c
index 2b6d470..8116a25 100644 (file)
--- a/tools/perf/arch/powerpc/util/perf_regs.c
+++ b/tools/perf/arch/powerpc/util/perf_regs.c
@@ -68,6 +68,12 @@ const struct sample_reg sample_reg_masks[] = {
        SMPL_REG(mmcr3, PERF_REG_POWERPC_MMCR3),
        SMPL_REG(sier2, PERF_REG_POWERPC_SIER2),
        SMPL_REG(sier3, PERF_REG_POWERPC_SIER3),
+       SMPL_REG(pmc1, PERF_REG_POWERPC_PMC1),
+       SMPL_REG(pmc2, PERF_REG_POWERPC_PMC2),
+       SMPL_REG(pmc3, PERF_REG_POWERPC_PMC3),
+       SMPL_REG(pmc4, PERF_REG_POWERPC_PMC4),
+       SMPL_REG(pmc5, PERF_REG_POWERPC_PMC5),
+       SMPL_REG(pmc6, PERF_REG_POWERPC_PMC6),
        SMPL_REG_END
 };