Author: luporl
Date: Thu Nov  5 16:41:28 2020
New Revision: 367391
URL: https://svnweb.freebsd.org/changeset/base/367391

Log:
  libpmc: add support for POWER8/9 PMCs
  
  This change adds support for POWER8/9 performance counters.
  
  Reviewed by:  jhibbits
  Sponsored by: Eldorado Research Institute (eldorado.org.br)
  Differential Revision:        https://reviews.freebsd.org/D26113

Modified:
  head/lib/libpmc/libpmc.c

Modified: head/lib/libpmc/libpmc.c
==============================================================================
--- head/lib/libpmc/libpmc.c    Thu Nov  5 16:36:39 2020        (r367390)
+++ head/lib/libpmc/libpmc.c    Thu Nov  5 16:41:28 2020        (r367391)
@@ -149,6 +149,7 @@ PMC_CLASSDEP_TABLE(mips74k, MIPS74K);
 PMC_CLASSDEP_TABLE(octeon, OCTEON);
 PMC_CLASSDEP_TABLE(ppc7450, PPC7450);
 PMC_CLASSDEP_TABLE(ppc970, PPC970);
+PMC_CLASSDEP_TABLE(power8, POWER8);
 PMC_CLASSDEP_TABLE(e500, E500);
 
 static struct pmc_event_descr soft_event_table[PMC_EV_DYN_COUNT];
@@ -204,6 +205,7 @@ PMC_MDEP_TABLE(mips74k, MIPS74K, PMC_CLASS_SOFT, PMC_C
 PMC_MDEP_TABLE(octeon, OCTEON, PMC_CLASS_SOFT, PMC_CLASS_OCTEON);
 PMC_MDEP_TABLE(ppc7450, PPC7450, PMC_CLASS_SOFT, PMC_CLASS_PPC7450, 
PMC_CLASS_TSC);
 PMC_MDEP_TABLE(ppc970, PPC970, PMC_CLASS_SOFT, PMC_CLASS_PPC970, 
PMC_CLASS_TSC);
+PMC_MDEP_TABLE(power8, POWER8, PMC_CLASS_SOFT, PMC_CLASS_POWER8, 
PMC_CLASS_TSC);
 PMC_MDEP_TABLE(e500, E500, PMC_CLASS_SOFT, PMC_CLASS_E500, PMC_CLASS_TSC);
 PMC_MDEP_TABLE(generic, SOFT, PMC_CLASS_SOFT);
 
@@ -252,6 +254,7 @@ PMC_CLASS_TABLE_DESC(octeon, OCTEON, octeon, mips);
 #if defined(__powerpc__)
 PMC_CLASS_TABLE_DESC(ppc7450, PPC7450, ppc7450, powerpc);
 PMC_CLASS_TABLE_DESC(ppc970, PPC970, ppc970, powerpc);
+PMC_CLASS_TABLE_DESC(power8, POWER8, power8, powerpc);
 PMC_CLASS_TABLE_DESC(e500, E500, e500, powerpc);
 #endif
 
@@ -913,6 +916,12 @@ static struct pmc_event_alias ppc970_aliases[] = {
        EV_ALIAS(NULL, NULL)
 };
 
+static struct pmc_event_alias power8_aliases[] = {
+       EV_ALIAS("instructions", "INSTR_COMPLETED"),
+       EV_ALIAS("cycles",       "CYCLES"),
+       EV_ALIAS(NULL, NULL)
+};
+
 static struct pmc_event_alias e500_aliases[] = {
        EV_ALIAS("instructions", "INSTR_COMPLETED"),
        EV_ALIAS("cycles",       "CYCLES"),
@@ -1313,6 +1322,10 @@ pmc_event_names_of_class(enum pmc_class cl, const char
                ev = ppc970_event_table;
                count = PMC_EVENT_TABLE_SIZE(ppc970);
                break;
+       case PMC_CLASS_POWER8:
+               ev = power8_event_table;
+               count = PMC_EVENT_TABLE_SIZE(power8);
+               break;
        case PMC_CLASS_E500:
                ev = e500_event_table;
                count = PMC_EVENT_TABLE_SIZE(e500);
@@ -1564,6 +1577,10 @@ pmc_init(void)
                PMC_MDEP_INIT(ppc970);
                pmc_class_table[n] = &ppc970_class_table_descr;
                break;
+       case PMC_CPU_PPC_POWER8:
+               PMC_MDEP_INIT(power8);
+               pmc_class_table[n] = &power8_class_table_descr;
+               break;
        case PMC_CPU_PPC_E500:
                PMC_MDEP_INIT(e500);
                pmc_class_table[n] = &e500_class_table_descr;
@@ -1701,6 +1718,9 @@ _pmc_name_of_event(enum pmc_event pe, enum pmc_cputype
        } else if (pe >= PMC_EV_PPC970_FIRST && pe <= PMC_EV_PPC970_LAST) {
                ev = ppc970_event_table;
                evfence = ppc970_event_table + PMC_EVENT_TABLE_SIZE(ppc970);
+       } else if (pe >= PMC_EV_POWER8_FIRST && pe <= PMC_EV_POWER8_LAST) {
+               ev = power8_event_table;
+               evfence = power8_event_table + PMC_EVENT_TABLE_SIZE(power8);
        } else if (pe >= PMC_EV_E500_FIRST && pe <= PMC_EV_E500_LAST) {
                ev = e500_event_table;
                evfence = e500_event_table + PMC_EVENT_TABLE_SIZE(e500);
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to