lkml.org 
[lkml]   [2022]   [Jul]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
Subject[PATCH v1 00/31] Add generated latest Intel events and metrics
From
The goal of this patch series is to align the json events for Intel
platforms with those generated by:
https://github.com/intel/event-converter-for-linux-perf/blob/master/download_and_gen.py
This script takes the latest event json and TMA metrics from:
https://download.01.org/perfmon/ and adds to these metrics, in
particular uncore ones, from: https://github.com/intel/perfmon-metrics
The cpu_operating_frequency metric assumes the presence of the
system_tsc_freq literal posted/reviewed in:
https://lore.kernel.org/lkml/20220718164312.3994191-1-irogers@google.com/

Some fixes were needed to the script for generating the json and are
contained in this pull request:
https://github.com/intel/event-converter-for-linux-perf/pull/15

The json files were first downloaded before being used to generate the
perf json files. This fixes non-ascii characters for (R) and (TM) in
the source json files. This can be reproduced with:
$ download_and_gen.py --hermetic-download --outdir data
$ download_and_gen.py --url=file://`pwd`/data/01 --metrics-url=file://`pwd`/data/github

A minor correction is made in the generated json of:
tools/perf/pmu-events/arch/x86/ivytown/uncore-other.json
changing "\\Inbound\\" to just "Inbound" to avoid compilation errors
caused by \I.

The elkhartlake metrics file is basic and not generated by scripts. It
is retained here although it causes a difference from the generated
files.

The mapfile.csv is the third and final difference from the generated
version due to a bug in 01.org's models for icelake. The existing
models are preferred and retained.

As well as the #system_tsc_freq being necessary, a test change is
added here fixing an issue with fake PMU testing exposed in the
new/updated metrics.

Compared to the previous json, additional changes are the inclusion of
basic meteorlake events and the renaming of tremontx to
snowridgex. The new metrics contribute to the size, but a large
contribution is the inclusion of previously ungenerated and
experimental uncore events.

Ian Rogers (31):
perf test: Avoid sysfs state affecting fake events
perf vendor events: Update Intel broadwellx
perf vendor events: Update Intel broadwell
perf vendor events: Update Intel broadwellde
perf vendor events: Update Intel alderlake
perf vendor events: Update bonnell mapfile.csv
perf vendor events: Update Intel cascadelakex
perf vendor events: Update Intel elkhartlake
perf vendor events: Update goldmont mapfile.csv
perf vendor events: Update goldmontplus mapfile.csv
perf vendor events: Update Intel haswell
perf vendor events: Update Intel haswellx
perf vendor events: Update Intel icelake
perf vendor events: Update Intel icelakex
perf vendor events: Update Intel ivybridge
perf vendor events: Update Intel ivytown
perf vendor events: Update Intel jaketown
perf vendor events: Update Intel knightslanding
perf vendor events: Add Intel meteorlake
perf vendor events: Update Intel nehalemep
perf vendor events: Update Intel nehalemex
perf vendor events: Update Intel sandybridge
perf vendor events: Update Intel sapphirerapids
perf vendor events: Update Intel silvermont
perf vendor events: Update Intel skylake
perf vendor events: Update Intel skylakex
perf vendor events: Update Intel snowridgex
perf vendor events: Update Intel tigerlake
perf vendor events: Update Intel westmereep-dp
perf vendor events: Update Intel westmereep-sp
perf vendor events: Update Intel westmereex

.../arch/x86/alderlake/adl-metrics.json | 4 +-
.../pmu-events/arch/x86/alderlake/cache.json | 178 +-
.../arch/x86/alderlake/floating-point.json | 19 +-
.../arch/x86/alderlake/frontend.json | 38 +-
.../pmu-events/arch/x86/alderlake/memory.json | 40 +-
.../pmu-events/arch/x86/alderlake/other.json | 97 +-
.../arch/x86/alderlake/pipeline.json | 507 +-
.../arch/x86/alderlake/uncore-other.json | 2 +-
.../arch/x86/alderlake/virtual-memory.json | 63 +-
.../pmu-events/arch/x86/bonnell/cache.json | 2 +-
.../arch/x86/bonnell/floating-point.json | 2 +-
.../pmu-events/arch/x86/bonnell/frontend.json | 2 +-
.../pmu-events/arch/x86/bonnell/memory.json | 2 +-
.../pmu-events/arch/x86/bonnell/other.json | 2 +-
.../pmu-events/arch/x86/bonnell/pipeline.json | 2 +-
.../arch/x86/bonnell/virtual-memory.json | 2 +-
.../arch/x86/broadwell/bdw-metrics.json | 130 +-
.../pmu-events/arch/x86/broadwell/cache.json | 2 +-
.../arch/x86/broadwell/floating-point.json | 2 +-
.../arch/x86/broadwell/frontend.json | 2 +-
.../pmu-events/arch/x86/broadwell/memory.json | 2 +-
.../pmu-events/arch/x86/broadwell/other.json | 2 +-
.../arch/x86/broadwell/pipeline.json | 2 +-
.../arch/x86/broadwell/uncore-cache.json | 152 +
.../arch/x86/broadwell/uncore-other.json | 82 +
.../pmu-events/arch/x86/broadwell/uncore.json | 278 -
.../arch/x86/broadwell/virtual-memory.json | 2 +-
.../arch/x86/broadwellde/bdwde-metrics.json | 136 +-
.../arch/x86/broadwellde/cache.json | 2 +-
.../arch/x86/broadwellde/floating-point.json | 2 +-
.../arch/x86/broadwellde/frontend.json | 2 +-
.../arch/x86/broadwellde/memory.json | 2 +-
.../arch/x86/broadwellde/other.json | 2 +-
.../arch/x86/broadwellde/pipeline.json | 2 +-
.../arch/x86/broadwellde/uncore-cache.json | 3818 ++-
.../arch/x86/broadwellde/uncore-memory.json | 2867 +-
.../arch/x86/broadwellde/uncore-other.json | 1246 +
.../arch/x86/broadwellde/uncore-power.json | 492 +-
.../arch/x86/broadwellde/virtual-memory.json | 2 +-
.../arch/x86/broadwellx/bdx-metrics.json | 570 +-
.../pmu-events/arch/x86/broadwellx/cache.json | 22 +-
.../arch/x86/broadwellx/floating-point.json | 9 +-
.../arch/x86/broadwellx/frontend.json | 2 +-
.../arch/x86/broadwellx/memory.json | 39 +-
.../pmu-events/arch/x86/broadwellx/other.json | 2 +-
.../arch/x86/broadwellx/pipeline.json | 4 +-
.../arch/x86/broadwellx/uncore-cache.json | 3788 ++-
.../x86/broadwellx/uncore-interconnect.json | 1438 +-
.../arch/x86/broadwellx/uncore-memory.json | 2849 +-
.../arch/x86/broadwellx/uncore-other.json | 3252 ++
.../arch/x86/broadwellx/uncore-power.json | 437 +-
.../arch/x86/broadwellx/virtual-memory.json | 2 +-
.../arch/x86/cascadelakex/cache.json | 8 +-
.../arch/x86/cascadelakex/clx-metrics.json | 724 +-
.../arch/x86/cascadelakex/floating-point.json | 2 +-
.../arch/x86/cascadelakex/frontend.json | 2 +-
.../arch/x86/cascadelakex/other.json | 63 +
.../arch/x86/cascadelakex/pipeline.json | 11 +
.../arch/x86/cascadelakex/uncore-memory.json | 9 +
.../arch/x86/cascadelakex/uncore-other.json | 697 +-
.../arch/x86/cascadelakex/virtual-memory.json | 2 +-
.../arch/x86/elkhartlake/cache.json | 956 +-
.../arch/x86/elkhartlake/floating-point.json | 19 +-
.../arch/x86/elkhartlake/frontend.json | 34 +-
.../arch/x86/elkhartlake/memory.json | 388 +-
.../arch/x86/elkhartlake/other.json | 527 +-
.../arch/x86/elkhartlake/pipeline.json | 203 +-
.../arch/x86/elkhartlake/virtual-memory.json | 151 +-
.../pmu-events/arch/x86/goldmont/cache.json | 2 +-
.../arch/x86/goldmont/floating-point.json | 2 +-
.../arch/x86/goldmont/frontend.json | 2 +-
.../pmu-events/arch/x86/goldmont/memory.json | 2 +-
.../arch/x86/goldmont/pipeline.json | 2 +-
.../arch/x86/goldmont/virtual-memory.json | 2 +-
.../arch/x86/goldmontplus/cache.json | 2 +-
.../arch/x86/goldmontplus/floating-point.json | 2 +-
.../arch/x86/goldmontplus/frontend.json | 2 +-
.../arch/x86/goldmontplus/memory.json | 2 +-
.../arch/x86/goldmontplus/pipeline.json | 2 +-
.../arch/x86/goldmontplus/virtual-memory.json | 2 +-
.../pmu-events/arch/x86/haswell/cache.json | 78 +-
.../arch/x86/haswell/floating-point.json | 2 +-
.../pmu-events/arch/x86/haswell/frontend.json | 2 +-
.../arch/x86/haswell/hsw-metrics.json | 85 +-
.../pmu-events/arch/x86/haswell/memory.json | 75 +-
.../pmu-events/arch/x86/haswell/other.json | 2 +-
.../pmu-events/arch/x86/haswell/pipeline.json | 9 +-
.../arch/x86/haswell/uncore-other.json | 7 +-
.../arch/x86/haswell/virtual-memory.json | 2 +-
.../pmu-events/arch/x86/haswellx/cache.json | 44 +-
.../arch/x86/haswellx/floating-point.json | 2 +-
.../arch/x86/haswellx/frontend.json | 2 +-
.../arch/x86/haswellx/hsx-metrics.json | 85 +-
.../pmu-events/arch/x86/haswellx/memory.json | 52 +-
.../pmu-events/arch/x86/haswellx/other.json | 2 +-
.../arch/x86/haswellx/pipeline.json | 9 +-
.../arch/x86/haswellx/uncore-cache.json | 3779 ++-
.../x86/haswellx/uncore-interconnect.json | 1430 +-
.../arch/x86/haswellx/uncore-memory.json | 2839 +-
.../arch/x86/haswellx/uncore-other.json | 3170 ++
.../arch/x86/haswellx/uncore-power.json | 477 +-
.../arch/x86/haswellx/virtual-memory.json | 2 +-
.../pmu-events/arch/x86/icelake/cache.json | 8 +-
.../arch/x86/icelake/floating-point.json | 2 +-
.../pmu-events/arch/x86/icelake/frontend.json | 2 +-
.../arch/x86/icelake/icl-metrics.json | 126 +-
.../arch/x86/icelake/uncore-other.json | 31 +
.../arch/x86/icelake/virtual-memory.json | 2 +-
.../pmu-events/arch/x86/icelakex/cache.json | 28 +-
.../arch/x86/icelakex/floating-point.json | 2 +-
.../arch/x86/icelakex/frontend.json | 2 +-
.../arch/x86/icelakex/icx-metrics.json | 691 +-
.../pmu-events/arch/x86/icelakex/memory.json | 6 +-
.../pmu-events/arch/x86/icelakex/other.json | 51 +-
.../arch/x86/icelakex/pipeline.json | 12 +
.../arch/x86/icelakex/virtual-memory.json | 2 +-
.../pmu-events/arch/x86/ivybridge/cache.json | 2 +-
.../arch/x86/ivybridge/floating-point.json | 2 +-
.../arch/x86/ivybridge/frontend.json | 2 +-
.../arch/x86/ivybridge/ivb-metrics.json | 94 +-
.../pmu-events/arch/x86/ivybridge/memory.json | 2 +-
.../pmu-events/arch/x86/ivybridge/other.json | 2 +-
.../arch/x86/ivybridge/pipeline.json | 4 +-
.../arch/x86/ivybridge/uncore-other.json | 2 +-
.../arch/x86/ivybridge/virtual-memory.json | 2 +-
.../pmu-events/arch/x86/ivytown/cache.json | 2 +-
.../arch/x86/ivytown/floating-point.json | 2 +-
.../pmu-events/arch/x86/ivytown/frontend.json | 2 +-
.../arch/x86/ivytown/ivt-metrics.json | 94 +-
.../pmu-events/arch/x86/ivytown/memory.json | 2 +-
.../pmu-events/arch/x86/ivytown/other.json | 2 +-
.../arch/x86/ivytown/uncore-cache.json | 3495 ++-
.../arch/x86/ivytown/uncore-interconnect.json | 1750 +-
.../arch/x86/ivytown/uncore-memory.json | 1775 +-
.../arch/x86/ivytown/uncore-other.json | 2411 ++
.../arch/x86/ivytown/uncore-power.json | 696 +-
.../arch/x86/ivytown/virtual-memory.json | 2 +-
.../pmu-events/arch/x86/jaketown/cache.json | 2 +-
.../arch/x86/jaketown/floating-point.json | 2 +-
.../arch/x86/jaketown/frontend.json | 2 +-
.../arch/x86/jaketown/jkt-metrics.json | 11 +-
.../pmu-events/arch/x86/jaketown/memory.json | 2 +-
.../pmu-events/arch/x86/jaketown/other.json | 2 +-
.../arch/x86/jaketown/pipeline.json | 16 +-
.../arch/x86/jaketown/uncore-cache.json | 1960 +-
.../x86/jaketown/uncore-interconnect.json | 824 +-
.../arch/x86/jaketown/uncore-memory.json | 445 +-
.../arch/x86/jaketown/uncore-other.json | 1551 +
.../arch/x86/jaketown/uncore-power.json | 362 +-
.../arch/x86/jaketown/virtual-memory.json | 2 +-
.../arch/x86/knightslanding/cache.json | 2 +-
.../x86/knightslanding/floating-point.json | 2 +-
.../arch/x86/knightslanding/frontend.json | 2 +-
.../arch/x86/knightslanding/memory.json | 2 +-
.../arch/x86/knightslanding/pipeline.json | 2 +-
.../x86/knightslanding/uncore-memory.json | 42 -
.../arch/x86/knightslanding/uncore-other.json | 3890 +++
.../x86/knightslanding/virtual-memory.json | 2 +-
tools/perf/pmu-events/arch/x86/mapfile.csv | 74 +-
.../pmu-events/arch/x86/meteorlake/cache.json | 262 +
.../arch/x86/meteorlake/frontend.json | 24 +
.../arch/x86/meteorlake/memory.json | 185 +
.../pmu-events/arch/x86/meteorlake/other.json | 46 +
.../arch/x86/meteorlake/pipeline.json | 254 +
.../arch/x86/meteorlake/virtual-memory.json | 46 +
.../pmu-events/arch/x86/nehalemep/cache.json | 14 +-
.../arch/x86/nehalemep/floating-point.json | 2 +-
.../arch/x86/nehalemep/frontend.json | 2 +-
.../pmu-events/arch/x86/nehalemep/memory.json | 6 +-
.../arch/x86/nehalemep/virtual-memory.json | 2 +-
.../pmu-events/arch/x86/nehalemex/cache.json | 2974 +-
.../arch/x86/nehalemex/floating-point.json | 182 +-
.../arch/x86/nehalemex/frontend.json | 20 +-
.../pmu-events/arch/x86/nehalemex/memory.json | 672 +-
.../pmu-events/arch/x86/nehalemex/other.json | 170 +-
.../arch/x86/nehalemex/pipeline.json | 830 +-
.../arch/x86/nehalemex/virtual-memory.json | 92 +-
.../arch/x86/sandybridge/cache.json | 2 +-
.../arch/x86/sandybridge/floating-point.json | 2 +-
.../arch/x86/sandybridge/frontend.json | 4 +-
.../arch/x86/sandybridge/memory.json | 2 +-
.../arch/x86/sandybridge/other.json | 2 +-
.../arch/x86/sandybridge/pipeline.json | 10 +-
.../arch/x86/sandybridge/snb-metrics.json | 11 +-
.../arch/x86/sandybridge/uncore-other.json | 2 +-
.../arch/x86/sandybridge/virtual-memory.json | 2 +-
.../arch/x86/sapphirerapids/cache.json | 135 +-
.../x86/sapphirerapids/floating-point.json | 6 +
.../arch/x86/sapphirerapids/frontend.json | 16 +
.../arch/x86/sapphirerapids/memory.json | 23 +-
.../arch/x86/sapphirerapids/other.json | 68 +-
.../arch/x86/sapphirerapids/pipeline.json | 99 +-
.../arch/x86/sapphirerapids/spr-metrics.json | 566 +-
.../arch/x86/sapphirerapids/uncore-other.json | 9 -
.../x86/sapphirerapids/virtual-memory.json | 20 +
.../pmu-events/arch/x86/silvermont/cache.json | 2 +-
.../arch/x86/silvermont/floating-point.json | 2 +-
.../arch/x86/silvermont/frontend.json | 2 +-
.../arch/x86/silvermont/memory.json | 2 +-
.../pmu-events/arch/x86/silvermont/other.json | 2 +-
.../arch/x86/silvermont/pipeline.json | 2 +-
.../arch/x86/silvermont/virtual-memory.json | 2 +-
.../arch/x86/skylake/floating-point.json | 2 +-
.../pmu-events/arch/x86/skylake/frontend.json | 2 +-
.../pmu-events/arch/x86/skylake/other.json | 2 +-
.../arch/x86/skylake/skl-metrics.json | 178 +-
.../arch/x86/skylake/uncore-cache.json | 142 +
.../arch/x86/skylake/uncore-other.json | 79 +
.../pmu-events/arch/x86/skylake/uncore.json | 254 -
.../arch/x86/skylake/virtual-memory.json | 2 +-
.../arch/x86/skylakex/floating-point.json | 2 +-
.../arch/x86/skylakex/frontend.json | 2 +-
.../pmu-events/arch/x86/skylakex/other.json | 66 +-
.../arch/x86/skylakex/pipeline.json | 11 +
.../arch/x86/skylakex/skx-metrics.json | 667 +-
.../arch/x86/skylakex/uncore-memory.json | 9 +
.../arch/x86/skylakex/uncore-other.json | 730 +-
.../arch/x86/skylakex/virtual-memory.json | 2 +-
.../x86/{tremontx => snowridgex}/cache.json | 60 +-
.../floating-point.json | 9 +-
.../{tremontx => snowridgex}/frontend.json | 20 +-
.../x86/{tremontx => snowridgex}/memory.json | 4 +-
.../x86/{tremontx => snowridgex}/other.json | 18 +-
.../{tremontx => snowridgex}/pipeline.json | 98 +-
.../arch/x86/snowridgex/uncore-memory.json | 619 +
.../arch/x86/snowridgex/uncore-other.json | 25249 ++++++++++++++++
.../arch/x86/snowridgex/uncore-power.json | 235 +
.../virtual-memory.json | 69 +-
.../pmu-events/arch/x86/tigerlake/cache.json | 48 +-
.../arch/x86/tigerlake/floating-point.json | 2 +-
.../arch/x86/tigerlake/frontend.json | 2 +-
.../pmu-events/arch/x86/tigerlake/memory.json | 2 +-
.../pmu-events/arch/x86/tigerlake/other.json | 1 -
.../arch/x86/tigerlake/pipeline.json | 4 +-
.../arch/x86/tigerlake/tgl-metrics.json | 378 +-
.../arch/x86/tigerlake/uncore-other.json | 65 +
.../arch/x86/tigerlake/virtual-memory.json | 2 +-
.../arch/x86/tremontx/uncore-memory.json | 245 -
.../arch/x86/tremontx/uncore-other.json | 2395 --
.../arch/x86/tremontx/uncore-power.json | 11 -
.../arch/x86/westmereep-dp/cache.json | 2 +-
.../x86/westmereep-dp/floating-point.json | 2 +-
.../arch/x86/westmereep-dp/frontend.json | 2 +-
.../arch/x86/westmereep-dp/memory.json | 2 +-
.../x86/westmereep-dp/virtual-memory.json | 2 +-
.../x86/westmereep-sp/floating-point.json | 2 +-
.../arch/x86/westmereep-sp/frontend.json | 2 +-
.../x86/westmereep-sp/virtual-memory.json | 2 +-
.../arch/x86/westmereex/floating-point.json | 2 +-
.../arch/x86/westmereex/frontend.json | 2 +-
.../arch/x86/westmereex/virtual-memory.json | 2 +-
tools/perf/tests/pmu-events.c | 9 +
252 files changed, 89144 insertions(+), 8438 deletions(-)
create mode 100644 tools/perf/pmu-events/arch/x86/broadwell/uncore-cache.json
create mode 100644 tools/perf/pmu-events/arch/x86/broadwell/uncore-other.json
delete mode 100644 tools/perf/pmu-events/arch/x86/broadwell/uncore.json
create mode 100644 tools/perf/pmu-events/arch/x86/broadwellde/uncore-other.json
create mode 100644 tools/perf/pmu-events/arch/x86/broadwellx/uncore-other.json
create mode 100644 tools/perf/pmu-events/arch/x86/haswellx/uncore-other.json
create mode 100644 tools/perf/pmu-events/arch/x86/icelake/uncore-other.json
create mode 100644 tools/perf/pmu-events/arch/x86/ivytown/uncore-other.json
create mode 100644 tools/perf/pmu-events/arch/x86/jaketown/uncore-other.json
delete mode 100644 tools/perf/pmu-events/arch/x86/knightslanding/uncore-memory.json
create mode 100644 tools/perf/pmu-events/arch/x86/knightslanding/uncore-other.json
create mode 100644 tools/perf/pmu-events/arch/x86/meteorlake/cache.json
create mode 100644 tools/perf/pmu-events/arch/x86/meteorlake/frontend.json
create mode 100644 tools/perf/pmu-events/arch/x86/meteorlake/memory.json
create mode 100644 tools/perf/pmu-events/arch/x86/meteorlake/other.json
create mode 100644 tools/perf/pmu-events/arch/x86/meteorlake/pipeline.json
create mode 100644 tools/perf/pmu-events/arch/x86/meteorlake/virtual-memory.json
create mode 100644 tools/perf/pmu-events/arch/x86/skylake/uncore-cache.json
create mode 100644 tools/perf/pmu-events/arch/x86/skylake/uncore-other.json
delete mode 100644 tools/perf/pmu-events/arch/x86/skylake/uncore.json
rename tools/perf/pmu-events/arch/x86/{tremontx => snowridgex}/cache.json (95%)
rename tools/perf/pmu-events/arch/x86/{tremontx => snowridgex}/floating-point.json (84%)
rename tools/perf/pmu-events/arch/x86/{tremontx => snowridgex}/frontend.json (94%)
rename tools/perf/pmu-events/arch/x86/{tremontx => snowridgex}/memory.json (99%)
rename tools/perf/pmu-events/arch/x86/{tremontx => snowridgex}/other.json (98%)
rename tools/perf/pmu-events/arch/x86/{tremontx => snowridgex}/pipeline.json (89%)
create mode 100644 tools/perf/pmu-events/arch/x86/snowridgex/uncore-memory.json
create mode 100644 tools/perf/pmu-events/arch/x86/snowridgex/uncore-other.json
create mode 100644 tools/perf/pmu-events/arch/x86/snowridgex/uncore-power.json
rename tools/perf/pmu-events/arch/x86/{tremontx => snowridgex}/virtual-memory.json (91%)
create mode 100644 tools/perf/pmu-events/arch/x86/tigerlake/uncore-other.json
delete mode 100644 tools/perf/pmu-events/arch/x86/tremontx/uncore-memory.json
delete mode 100644 tools/perf/pmu-events/arch/x86/tremontx/uncore-other.json
delete mode 100644 tools/perf/pmu-events/arch/x86/tremontx/uncore-power.json

--
2.37.1.359.gd136c6c3e2-goog

\
 
 \ /
  Last update: 2022-07-23 00:34    [W:0.302 / U:0.244 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site