Messages in this thread | | | Date | Mon, 13 Mar 2023 16:03:52 -0300 | From | Arnaldo Carvalho de Melo <> | Subject | Re: [PATCH] perf list: Add PMU pai_ext event description for IBM z16 |
| |
Em Mon, Mar 13, 2023 at 08:20:25AM -0700, Ian Rogers escreveu: > On Wed, Mar 8, 2023 at 4:54 AM Thomas Richter <tmricht@linux.ibm.com> wrote: > > > > Add the event description for the IBM z16 pai_ext PMU released with > > commit c432fefe8e62 ("s390/pai: Add support for PAI Extension 1 NNPA counters") > > > > The document SA22-7832-13 "z/Architecture Principles of Operation", > > published May, 2022, contains the description of the > > Processor Activity Instrumentation Facility and the NNPA counter > > set., See Pages 5-113 to 5-116 and chapter 26 for details. > > > > Signed-off-by: Thomas Richter <tmricht@linux.ibm.com> > > Acked-by: Sumanth Korikkar <sumanthk@linux.ibm.com> > > Acked-by: Ian Rogers <irogers@google.com>
Thanks, applied.
- Arnaldo
> Thanks, > Ian > > > --- > > .../pmu-events/arch/s390/cf_z16/pai_ext.json | 178 ++++++++++++++++++ > > tools/perf/pmu-events/jevents.py | 1 + > > 2 files changed, 179 insertions(+) > > create mode 100644 tools/perf/pmu-events/arch/s390/cf_z16/pai_ext.json > > > > diff --git a/tools/perf/pmu-events/arch/s390/cf_z16/pai_ext.json b/tools/perf/pmu-events/arch/s390/cf_z16/pai_ext.json > > new file mode 100644 > > index 000000000000..7ccbded95dc9 > > --- /dev/null > > +++ b/tools/perf/pmu-events/arch/s390/cf_z16/pai_ext.json > > @@ -0,0 +1,178 @@ > > +[ > > + { > > + "Unit": "PAI-EXT", > > + "EventCode": "6144", > > + "EventName": "NNPA_ALL", > > + "BriefDescription": "NNPA ALL Sum of all non zero counters", > > + "PublicDescription": "Sum of all non zero NNPA (Neural Networks Processing Assist) counters" > > + }, > > + { > > + "Unit": "PAI-EXT", > > + "EventCode": "6145", > > + "EventName": "NNPA_ADD", > > + "BriefDescription": "NNPA ADD function ending with CC=0" > > + }, > > + { > > + "Unit": "PAI-EXT", > > + "EventCode": "6146", > > + "EventName": "NNPA_SUB", > > + "BriefDescription": "NNPA SUB function ending with CC=0" > > + }, > > + { > > + "Unit": "PAI-EXT", > > + "EventCode": "6147", > > + "EventName": "NNPA_MUL", > > + "BriefDescription": "NNPA MUL function ending with CC=0" > > + }, > > + { > > + "Unit": "PAI-EXT", > > + "EventCode": "6148", > > + "EventName": "NNPA_DIV", > > + "BriefDescription": "NNPA DIV function ending with CC=0" > > + }, > > + { > > + "Unit": "PAI-EXT", > > + "EventCode": "6149", > > + "EventName": "NNPA_MIN", > > + "BriefDescription": "NNPA MIN function ending with CC=0" > > + }, > > + { > > + "Unit": "PAI-EXT", > > + "EventCode": "6150", > > + "EventName": "NNPA_MAX", > > + "BriefDescription": "NNPA MAX function ending with CC=0" > > + }, > > + { > > + "Unit": "PAI-EXT", > > + "EventCode": "6151", > > + "EventName": "NNPA_LOG", > > + "BriefDescription": "NNPA LOG function ending with CC=0" > > + }, > > + { > > + "Unit": "PAI-EXT", > > + "EventCode": "6152", > > + "EventName": "NNPA_EXP", > > + "BriefDescription": "NNPA EXP function ending with CC=0" > > + }, > > + { > > + "Unit": "PAI-EXT", > > + "EventCode": "6153", > > + "EventName": "NNPA_IBM_RESERVED_9", > > + "BriefDescription": "Reserved for IBM use", > > + "PublicDescription": "Reserved for IBM use" > > + }, > > + { > > + "Unit": "PAI-EXT", > > + "EventCode": "6154", > > + "EventName": "NNPA_RELU", > > + "BriefDescription": "NNPA RELU function ending with CC=0" > > + }, > > + { > > + "Unit": "PAI-EXT", > > + "EventCode": "6155", > > + "EventName": "NNPA_TANH", > > + "BriefDescription": "NNPA TANH function ending with CC=0" > > + }, > > + { > > + "Unit": "PAI-EXT", > > + "EventCode": "6156", > > + "EventName": "NNPA_SIGMOID", > > + "BriefDescription": "NNPA SIGMOID function ending with CC=0" > > + }, > > + { > > + "Unit": "PAI-EXT", > > + "EventCode": "6157", > > + "EventName": "NNPA_SOFTMAX", > > + "BriefDescription": "NNPA SOFTMAX function ending with CC=0" > > + }, > > + { > > + "Unit": "PAI-EXT", > > + "EventCode": "6158", > > + "EventName": "NNPA_BATCHNORM", > > + "BriefDescription": "NNPA BATCHNORM function ending with CC=0" > > + }, > > + { > > + "Unit": "PAI-EXT", > > + "EventCode": "6159", > > + "EventName": "NNPA_MAXPOOL2D", > > + "BriefDescription": "NNPA MAXPOOL2D function ending with CC=0" > > + }, > > + { > > + "Unit": "PAI-EXT", > > + "EventCode": "6160", > > + "EventName": "NNPA_AVGPOOL2D", > > + "BriefDescription": "NNPA AVGPOOL2D function ending with CC=0" > > + }, > > + { > > + "Unit": "PAI-EXT", > > + "EventCode": "6161", > > + "EventName": "NNPA_LSTMACT", > > + "BriefDescription": "NNPA LSTMACT function ending with CC=0" > > + }, > > + { > > + "Unit": "PAI-EXT", > > + "EventCode": "6162", > > + "EventName": "NNPA_GRUACT", > > + "BriefDescription": "NNPA GRUACT function ending with CC=0" > > + }, > > + { > > + "Unit": "PAI-EXT", > > + "EventCode": "6163", > > + "EventName": "NNPA_CONVOLUTION", > > + "BriefDescription": "NNPA CONVOLUTION function ending with CC=0" > > + }, > > + { > > + "Unit": "PAI-EXT", > > + "EventCode": "6164", > > + "EventName": "NNPA_MATMUL_OP", > > + "BriefDescription": "NNPA MATMUL OP function ending with CC=0" > > + }, > > + { > > + "Unit": "PAI-EXT", > > + "EventCode": "6165", > > + "EventName": "NNPA_MATMUL_OP_BCAST23", > > + "BriefDescription": "NNPA NNPA MATMUL OP BCAST23 function ending with CC=0" > > + }, > > + { > > + "Unit": "PAI-EXT", > > + "EventCode": "6166", > > + "EventName": "NNPA_SMALLBATCH", > > + "BriefDescription": "NNPA SMALLBATCH OP function ending with CC=0", > > + "PublicDescription": "NNPA function with conditions as described in Common Operation" > > + }, > > + { > > + "Unit": "PAI-EXT", > > + "EventCode": "6167", > > + "EventName": "NNPA_LARGEDIM", > > + "BriefDescription": "NNPA LARGEDIM OP function ending with CC=0", > > + "PublicDescription": "NNPA function with conditions as described in Common Operation" > > + }, > > + { > > + "Unit": "PAI-EXT", > > + "EventCode": "6168", > > + "EventName": "NNPA_SMALLTENSOR", > > + "BriefDescription": "NNPA SMALLTENSOR OP function ending with CC=0", > > + "PublicDescription": "NNPA function with conditions as described in Common Operation" > > + }, > > + { > > + "Unit": "PAI-EXT", > > + "EventCode": "6169", > > + "EventName": "NNPA_1MFRAME", > > + "BriefDescription": "NNPA 1MFRAME OP function ending with CC=0", > > + "PublicDescription": "NNPA function with conditions as described in Common Operation" > > + }, > > + { > > + "Unit": "PAI-EXT", > > + "EventCode": "6170", > > + "EventName": "NNPA_2GFRAME", > > + "BriefDescription": "NNPA 2GFRAME OP function ending with CC=0", > > + "PublicDescription": "NNPA function with conditions as described in Common Operation" > > + }, > > + { > > + "Unit": "PAI-EXT", > > + "EventCode": "6171", > > + "EventName": "NNPA_ACCESSEXCEPT", > > + "BriefDescription": "NNPA ACCESSEXCEPT OP function ending with CC=0", > > + "PublicDescription": "NNPA function with conditions as described in Common Operation" > > + } > > +] > > diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jevents.py > > index 2bcd07ce609f..b20d06fcc358 100755 > > --- a/tools/perf/pmu-events/jevents.py > > +++ b/tools/perf/pmu-events/jevents.py > > @@ -246,6 +246,7 @@ class JsonEvent: > > 'CPU-M-CF': 'cpum_cf', > > 'CPU-M-SF': 'cpum_sf', > > 'PAI-CRYPTO' : 'pai_crypto', > > + 'PAI-EXT' : 'pai_ext', > > 'UPI LL': 'uncore_upi', > > 'hisi_sicl,cpa': 'hisi_sicl,cpa', > > 'hisi_sccl,ddrc': 'hisi_sccl,ddrc', > > -- > > 2.39.1 > >
--
- Arnaldo
| |