Re: [PATCH v2 00/21] Update uncore topics, 3x event updates, 2x new archs.
From: Arnaldo Carvalho de Melo
Date: Thu Apr 13 2023 - 07:49:27 EST
Em Wed, Apr 12, 2023 at 10:09:50PM -0700, Ian Rogers escreveu:
> Update the uncore PMUs and topic classification as created by:
> https://github.com/intel/perfmon/pull/70
>
> Event updates stem from:
> https://github.com/intel/perfmon/pull/68
> impacting alderlake, icelakex and sapphirerapids.
>
> Grand Ridge and Sierra Forest events stem from:
> https://github.com/intel/perfmon/pull/69
>
> Changes generated by with PR70 in place:
> https://github.com/intel/perfmon/blob/main/scripts/create_perf_json.py
>
> v2. Adds improvements to uncore topics, uncore PMU name fixes and
> fixes a trigraph issue from ??? being in the json.
Som problem with your mailer? Missing some patches, I'll try b4 +
manual...
- Arnaldo
⬢[acme@toolbox perf-tools-next]$ b4 am -ctsl --cc-trailers 20230413051011.3440849-1-irogers@xxxxxxxxxx
Grabbing thread from lore.kernel.org/all/20230413051011.3440849-1-irogers%40google.com/t.mbox.gz
Checking for newer revisions
Grabbing search results from lore.kernel.org
Analyzing 14 messages in the thread
Checking attestation on all messages, may take a moment...
---
✓ [PATCH v2 1/21] perf vendor events intel: Update alderlake to v1.20
✓ Signed: DKIM/google.com
+ Link: https://lore.kernel.org/r/20230413051011.3440849-2-irogers@xxxxxxxxxx
+ Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
ERROR: missing [2/21]!
ERROR: missing [3/21]!
✓ [PATCH v2 4/21] perf vendor events intel: Add grandridge
✓ Signed: DKIM/google.com
+ Link: https://lore.kernel.org/r/20230413051011.3440849-2-irogers@xxxxxxxxxx
+ Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
✓ [PATCH v2 5/21] perf vendor events intel: Add sierraforest
✓ Signed: DKIM/google.com
+ Link: https://lore.kernel.org/r/20230413051011.3440849-2-irogers@xxxxxxxxxx
+ Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
✓ [PATCH v2 6/21] perf vendor events intel: Fix uncore topics for broadwell
✓ Signed: DKIM/google.com
+ Link: https://lore.kernel.org/r/20230413051011.3440849-2-irogers@xxxxxxxxxx
+ Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
✓ [PATCH v2 7/21] perf vendor events intel: Fix uncore topics for broadwellde
✓ Signed: DKIM/google.com
+ Link: https://lore.kernel.org/r/20230413051011.3440849-2-irogers@xxxxxxxxxx
+ Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
ERROR: missing [8/21]!
ERROR: missing [9/21]!
✓ [PATCH v2 10/21] perf vendor events intel: Fix uncore topics for haswell
✓ Signed: DKIM/google.com
+ Link: https://lore.kernel.org/r/20230413051011.3440849-2-irogers@xxxxxxxxxx
+ Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
ERROR: missing [11/21]!
✓ [PATCH v2 12/21] perf vendor events intel: Fix uncore topics for icelake
✓ Signed: DKIM/google.com
+ Link: https://lore.kernel.org/r/20230413051011.3440849-2-irogers@xxxxxxxxxx
+ Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
✓ [PATCH v2 13/21] perf vendor events intel: Fix uncore topics for ivybridge
✓ Signed: DKIM/google.com
+ Link: https://lore.kernel.org/r/20230413051011.3440849-2-irogers@xxxxxxxxxx
+ Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
ERROR: missing [14/21]!
✓ [PATCH v2 15/21] perf vendor events intel: Fix uncore topics for jaketown
✓ Signed: DKIM/google.com
+ Link: https://lore.kernel.org/r/20230413051011.3440849-2-irogers@xxxxxxxxxx
+ Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
✓ [PATCH v2 16/21] perf vendor events intel: Fix uncore topics for knightslanding
✓ Signed: DKIM/google.com
+ Link: https://lore.kernel.org/r/20230413051011.3440849-2-irogers@xxxxxxxxxx
+ Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
✓ [PATCH v2 17/21] perf vendor events intel: Fix uncore topics for sandybridge
✓ Signed: DKIM/google.com
+ Link: https://lore.kernel.org/r/20230413051011.3440849-2-irogers@xxxxxxxxxx
+ Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
✓ [PATCH v2 18/21] perf vendor events intel: Fix uncore topics for skylake
✓ Signed: DKIM/google.com
+ Link: https://lore.kernel.org/r/20230413051011.3440849-2-irogers@xxxxxxxxxx
+ Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
ERROR: missing [19/21]!
ERROR: missing [20/21]!
✓ [PATCH v2 21/21] perf vendor events intel: Fix uncore topics for tigerlake
✓ Signed: DKIM/google.com
+ Link: https://lore.kernel.org/r/20230413051011.3440849-2-irogers@xxxxxxxxxx
+ Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
Total patches: 13
---
WARNING: Thread incomplete!
Cover: ./v2_20230412_irogers_update_uncore_topics_3x_event_updates_2x_new_archs.cover
Link: https://lore.kernel.org/r/20230413051011.3440849-1-irogers@xxxxxxxxxx
Base: not specified
git am ./v2_20230412_irogers_update_uncore_topics_3x_event_updates_2x_new_archs.mbx
⬢[acme@toolbox perf-tools-next]$ git am ./v2_20230412_irogers_update_uncore_topics_3x_event_updates_2x_new_archs.mbx
Applying: perf vendor events intel: Update alderlake to v1.20
error: patch failed: tools/perf/pmu-events/arch/x86/alderlake/other.json:162
error: tools/perf/pmu-events/arch/x86/alderlake/other.json: patch does not apply
error: patch failed: tools/perf/pmu-events/arch/x86/alderlake/pipeline.json:31
error: tools/perf/pmu-events/arch/x86/alderlake/pipeline.json: patch does not apply
error: patch failed: tools/perf/pmu-events/arch/x86/mapfile.csv:1
error: tools/perf/pmu-events/arch/x86/mapfile.csv: patch does not apply
Patch failed at 0001 perf vendor events intel: Update alderlake to v1.20
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
⬢[acme@toolbox perf-tools-next]$ git am --abort
⬢[acme@toolbox perf-tools-next]$
> Ian Rogers (21):
> perf vendor events intel: Update alderlake to v1.20
> perf vendor events intel: Update icelakex to v1.20
> perf vendor events intel: Update sapphirerapids to v1.12
> perf vendor events intel: Add grandridge
> perf vendor events intel: Add sierraforest
> perf vendor events intel: Fix uncore topics for broadwell
> perf vendor events intel: Fix uncore topics for broadwellde
> perf vendor events intel: Fix uncore topics for broadwellx
> perf vendor events intel: Fix uncore topics for cascadelakex
> perf vendor events intel: Fix uncore topics for haswell
> perf vendor events intel: Fix uncore topics for haswellx
> perf vendor events intel: Fix uncore topics for icelake
> perf vendor events intel: Fix uncore topics for ivybridge
> perf vendor events intel: Fix uncore topics for ivytown
> perf vendor events intel: Fix uncore topics for jaketown
> perf vendor events intel: Fix uncore topics for knightslanding
> perf vendor events intel: Fix uncore topics for sandybridge
> perf vendor events intel: Fix uncore topics for skylake
> perf vendor events intel: Fix uncore topics for skylakex
> perf vendor events intel: Fix uncore topics for snowridgex
> perf vendor events intel: Fix uncore topics for tigerlake
>
> .../pmu-events/arch/x86/alderlake/other.json | 3 +-
> .../arch/x86/alderlake/pipeline.json | 4 +-
> .../x86/alderlake/uncore-interconnect.json | 90 +
> .../arch/x86/alderlake/uncore-other.json | 88 -
> .../x86/alderlaken/uncore-interconnect.json | 26 +
> .../arch/x86/alderlaken/uncore-other.json | 24 -
> .../arch/x86/broadwell/uncore-cache.json | 30 +-
> .../x86/broadwell/uncore-interconnect.json | 61 +
> .../arch/x86/broadwell/uncore-other.json | 59 -
> .../arch/x86/broadwellde/uncore-cache.json | 324 +-
> .../x86/broadwellde/uncore-interconnect.json | 614 +
> .../{uncore-other.json => uncore-io.json} | 612 -
> .../arch/x86/broadwellx/uncore-cache.json | 358 +-
> .../x86/broadwellx/uncore-interconnect.json | 4297 +-
> .../arch/x86/broadwellx/uncore-io.json | 555 +
> .../arch/x86/broadwellx/uncore-other.json | 3242 --
> .../arch/x86/cascadelakex/uncore-cache.json | 10764 +++++
> .../x86/cascadelakex/uncore-interconnect.json | 11334 ++++++
> .../arch/x86/cascadelakex/uncore-io.json | 4250 ++
> .../arch/x86/cascadelakex/uncore-memory.json | 2 +-
> .../arch/x86/cascadelakex/uncore-other.json | 26344 ------------
> .../pmu-events/arch/x86/grandridge/cache.json | 155 +
> .../arch/x86/grandridge/frontend.json | 16 +
> .../arch/x86/grandridge/memory.json | 20 +
> .../pmu-events/arch/x86/grandridge/other.json | 20 +
> .../arch/x86/grandridge/pipeline.json | 96 +
> .../arch/x86/grandridge/virtual-memory.json | 24 +
> .../arch/x86/haswell/uncore-cache.json | 50 +-
> .../arch/x86/haswell/uncore-interconnect.json | 52 +
> .../arch/x86/haswell/uncore-other.json | 50 -
> .../arch/x86/haswellx/uncore-cache.json | 360 +-
> .../x86/haswellx/uncore-interconnect.json | 4242 +-
> .../arch/x86/haswellx/uncore-io.json | 528 +
> .../arch/x86/haswellx/uncore-other.json | 3160 --
> .../arch/x86/icelake/uncore-interconnect.json | 74 +
> .../arch/x86/icelake/uncore-other.json | 72 -
> .../arch/x86/icelakex/uncore-cache.json | 9860 +++++
> .../x86/icelakex/uncore-interconnect.json | 14571 +++++++
> .../arch/x86/icelakex/uncore-io.json | 9270 +++++
> .../arch/x86/icelakex/uncore-other.json | 33697 ----------------
> .../arch/x86/ivybridge/uncore-cache.json | 50 +-
> ...re-other.json => uncore-interconnect.json} | 0
> .../arch/x86/ivytown/uncore-cache.json | 314 +-
> .../arch/x86/ivytown/uncore-interconnect.json | 2025 +-
> .../arch/x86/ivytown/uncore-io.json | 549 +
> .../arch/x86/ivytown/uncore-other.json | 2174 -
> .../arch/x86/jaketown/uncore-cache.json | 194 +-
> .../x86/jaketown/uncore-interconnect.json | 1237 +-
> .../arch/x86/jaketown/uncore-io.json | 324 +
> .../arch/x86/jaketown/uncore-other.json | 1393 -
> .../{uncore-other.json => uncore-cache.json} | 260 -
> .../arch/x86/knightslanding/uncore-io.json | 194 +
> .../x86/knightslanding/uncore-memory.json | 68 +
> tools/perf/pmu-events/arch/x86/mapfile.csv | 10 +-
> .../arch/x86/sandybridge/uncore-cache.json | 50 +-
> ...re-other.json => uncore-interconnect.json} | 0
> .../arch/x86/sapphirerapids/other.json | 3 +-
> .../arch/x86/sapphirerapids/pipeline.json | 4 +-
> .../arch/x86/sapphirerapids/uncore-cache.json | 5644 +++
> .../arch/x86/sapphirerapids/uncore-cxl.json | 450 +
> .../sapphirerapids/uncore-interconnect.json | 6199 +++
> .../arch/x86/sapphirerapids/uncore-io.json | 3651 ++
> .../x86/sapphirerapids/uncore-memory.json | 3283 +-
> .../arch/x86/sapphirerapids/uncore-other.json | 4525 ---
> .../arch/x86/sapphirerapids/uncore-power.json | 107 +
> .../arch/x86/sierraforest/cache.json | 155 +
> .../arch/x86/sierraforest/frontend.json | 16 +
> .../arch/x86/sierraforest/memory.json | 20 +
> .../arch/x86/sierraforest/other.json | 20 +
> .../arch/x86/sierraforest/pipeline.json | 96 +
> .../arch/x86/sierraforest/virtual-memory.json | 24 +
> .../arch/x86/skylake/uncore-cache.json | 28 +-
> .../arch/x86/skylake/uncore-interconnect.json | 67 +
> .../arch/x86/skylake/uncore-other.json | 65 -
> .../arch/x86/skylakex/uncore-cache.json | 10649 +++++
> .../x86/skylakex/uncore-interconnect.json | 11248 ++++++
> .../arch/x86/skylakex/uncore-io.json | 4250 ++
> .../arch/x86/skylakex/uncore-memory.json | 2 +-
> .../arch/x86/skylakex/uncore-other.json | 26143 ------------
> .../arch/x86/snowridgex/uncore-cache.json | 7100 ++++
> .../x86/snowridgex/uncore-interconnect.json | 6016 +++
> .../arch/x86/snowridgex/uncore-io.json | 8944 ++++
> .../arch/x86/snowridgex/uncore-other.json | 22056 ----------
> .../x86/tigerlake/uncore-interconnect.json | 90 +
> .../arch/x86/tigerlake/uncore-other.json | 88 -
> 85 files changed, 142130 insertions(+), 127053 deletions(-)
> create mode 100644 tools/perf/pmu-events/arch/x86/alderlake/uncore-interconnect.json
> create mode 100644 tools/perf/pmu-events/arch/x86/alderlaken/uncore-interconnect.json
> create mode 100644 tools/perf/pmu-events/arch/x86/broadwell/uncore-interconnect.json
> create mode 100644 tools/perf/pmu-events/arch/x86/broadwellde/uncore-interconnect.json
> rename tools/perf/pmu-events/arch/x86/broadwellde/{uncore-other.json => uncore-io.json} (53%)
> create mode 100644 tools/perf/pmu-events/arch/x86/broadwellx/uncore-io.json
> delete mode 100644 tools/perf/pmu-events/arch/x86/broadwellx/uncore-other.json
> create mode 100644 tools/perf/pmu-events/arch/x86/cascadelakex/uncore-cache.json
> create mode 100644 tools/perf/pmu-events/arch/x86/cascadelakex/uncore-interconnect.json
> create mode 100644 tools/perf/pmu-events/arch/x86/cascadelakex/uncore-io.json
> delete mode 100644 tools/perf/pmu-events/arch/x86/cascadelakex/uncore-other.json
> create mode 100644 tools/perf/pmu-events/arch/x86/grandridge/cache.json
> create mode 100644 tools/perf/pmu-events/arch/x86/grandridge/frontend.json
> create mode 100644 tools/perf/pmu-events/arch/x86/grandridge/memory.json
> create mode 100644 tools/perf/pmu-events/arch/x86/grandridge/other.json
> create mode 100644 tools/perf/pmu-events/arch/x86/grandridge/pipeline.json
> create mode 100644 tools/perf/pmu-events/arch/x86/grandridge/virtual-memory.json
> create mode 100644 tools/perf/pmu-events/arch/x86/haswell/uncore-interconnect.json
> create mode 100644 tools/perf/pmu-events/arch/x86/haswellx/uncore-io.json
> delete mode 100644 tools/perf/pmu-events/arch/x86/haswellx/uncore-other.json
> create mode 100644 tools/perf/pmu-events/arch/x86/icelake/uncore-interconnect.json
> create mode 100644 tools/perf/pmu-events/arch/x86/icelakex/uncore-cache.json
> create mode 100644 tools/perf/pmu-events/arch/x86/icelakex/uncore-interconnect.json
> create mode 100644 tools/perf/pmu-events/arch/x86/icelakex/uncore-io.json
> delete mode 100644 tools/perf/pmu-events/arch/x86/icelakex/uncore-other.json
> rename tools/perf/pmu-events/arch/x86/ivybridge/{uncore-other.json => uncore-interconnect.json} (100%)
> create mode 100644 tools/perf/pmu-events/arch/x86/ivytown/uncore-io.json
> delete mode 100644 tools/perf/pmu-events/arch/x86/ivytown/uncore-other.json
> create mode 100644 tools/perf/pmu-events/arch/x86/jaketown/uncore-io.json
> delete mode 100644 tools/perf/pmu-events/arch/x86/jaketown/uncore-other.json
> rename tools/perf/pmu-events/arch/x86/knightslanding/{uncore-other.json => uncore-cache.json} (91%)
> create mode 100644 tools/perf/pmu-events/arch/x86/knightslanding/uncore-io.json
> rename tools/perf/pmu-events/arch/x86/sandybridge/{uncore-other.json => uncore-interconnect.json} (100%)
> create mode 100644 tools/perf/pmu-events/arch/x86/sapphirerapids/uncore-cache.json
> create mode 100644 tools/perf/pmu-events/arch/x86/sapphirerapids/uncore-cxl.json
> create mode 100644 tools/perf/pmu-events/arch/x86/sapphirerapids/uncore-interconnect.json
> create mode 100644 tools/perf/pmu-events/arch/x86/sapphirerapids/uncore-io.json
> delete mode 100644 tools/perf/pmu-events/arch/x86/sapphirerapids/uncore-other.json
> create mode 100644 tools/perf/pmu-events/arch/x86/sierraforest/cache.json
> create mode 100644 tools/perf/pmu-events/arch/x86/sierraforest/frontend.json
> create mode 100644 tools/perf/pmu-events/arch/x86/sierraforest/memory.json
> create mode 100644 tools/perf/pmu-events/arch/x86/sierraforest/other.json
> create mode 100644 tools/perf/pmu-events/arch/x86/sierraforest/pipeline.json
> create mode 100644 tools/perf/pmu-events/arch/x86/sierraforest/virtual-memory.json
> create mode 100644 tools/perf/pmu-events/arch/x86/skylake/uncore-interconnect.json
> create mode 100644 tools/perf/pmu-events/arch/x86/skylakex/uncore-cache.json
> create mode 100644 tools/perf/pmu-events/arch/x86/skylakex/uncore-interconnect.json
> create mode 100644 tools/perf/pmu-events/arch/x86/skylakex/uncore-io.json
> delete mode 100644 tools/perf/pmu-events/arch/x86/skylakex/uncore-other.json
> create mode 100644 tools/perf/pmu-events/arch/x86/snowridgex/uncore-cache.json
> create mode 100644 tools/perf/pmu-events/arch/x86/snowridgex/uncore-interconnect.json
> create mode 100644 tools/perf/pmu-events/arch/x86/snowridgex/uncore-io.json
> delete mode 100644 tools/perf/pmu-events/arch/x86/snowridgex/uncore-other.json
> create mode 100644 tools/perf/pmu-events/arch/x86/tigerlake/uncore-interconnect.json
>
> --
> 2.40.0.577.gac1e443424-goog
>
--
- Arnaldo