powerpc/perf: Add PM_LD_MISS_L1 and PM_BR_2PATH to power9 event list

Add couple of more events (PM_LD_MISS_L1 and PM_BR_2PATH) to
power9 event list and power9_event_alternatives array (these
events can be counted in more than one PMC).

Signed-off-by: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/perf/power9-events-list.h b/arch/powerpc/perf/power9-events-list.h
index 5068918..3910dd8 100644 (file)
--- a/arch/powerpc/perf/power9-events-list.h
+++ b/arch/powerpc/perf/power9-events-list.h
@@ -23,6 +23,9 @@ EVENT(PM_BR_MPRED_CMPL,                               0x400f6)
 EVENT(PM_LD_REF_L1,                            0x100fc)
 /* Load Missed L1 */
 EVENT(PM_LD_MISS_L1_FIN,                       0x2c04e)
+EVENT(PM_LD_MISS_L1,                           0x3e054)
+/* Alternate event code for PM_LD_MISS_L1 */
+EVENT(PM_LD_MISS_L1_ALT,                       0x400f0)
 /* Store Missed L1 */
 EVENT(PM_ST_MISS_L1,                           0x300f0)
 /* L1 cache data prefetches */
@@ -62,3 +65,7 @@ EVENT(PM_INST_DISP,                           0x200f2)
 EVENT(PM_INST_DISP_ALT,                                0x300f2)
 /* Alternate Branch event code */
 EVENT(PM_BR_CMPL_ALT,                          0x10012)
+/* Branch event that are not strongly biased */
+EVENT(PM_BR_2PATH,                             0x20036)
+/* ALternate branch event that are not strongly biased */
+EVENT(PM_BR_2PATH_ALT,                         0x40036)

diff --git a/arch/powerpc/perf/power9-pmu.c b/arch/powerpc/perf/power9-pmu.c
index d83aa24..bbf6759 100644 (file)
--- a/arch/powerpc/perf/power9-pmu.c
+++ b/arch/powerpc/perf/power9-pmu.c
@@ -109,6 +109,8 @@ static const unsigned int power9_event_alternatives[][MAX_ALT] = {
        { PM_INST_DISP,                 PM_INST_DISP_ALT },
        { PM_RUN_CYC_ALT,               PM_RUN_CYC },
        { PM_RUN_INST_CMPL_ALT,         PM_RUN_INST_CMPL },
+       { PM_LD_MISS_L1,                PM_LD_MISS_L1_ALT },
+       { PM_BR_2PATH,                  PM_BR_2PATH_ALT },
 };
 
 static int power9_get_alternatives(u64 event, unsigned int flags, u64 alt[])