Skip to content

PMU refactoring and improvements

Ian Rogers linux-arm-kernel linux-perf-users lkml 5 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v5 Latest34 patches 10 repliesIn review
  2. v435 patches 5 repliesSuperseded
  3. v335 patches 8 repliesSuperseded
Earlier versions · 2
VersionPostedPatchesRepliesStatus
v223 patches2 repliesSuperseded
v123 patches15 repliesSuperseded

Patches in v5 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/34perf cpumap: Add internal nr and cpu accessorstools/lib/perf/cpumap.c+45 -290 replies
2/34perf cpumap: Add equal functiontools/lib/perf/cpumap.c tools/lib/perf/include/perf/cpumap.h tools/perf/tests/cpumap.c+60 -00 replies
3/34libperf cpumap: Add "any CPU"/dummy test functiontools/lib/perf/cpumap.c tools/lib/perf/include/perf/cpumap.h+15 -00 replies
4/34perf pmu: Detect ARM and hybrid PMUs with sysfstools/perf/util/pmu.c tools/perf/util/pmu.h+19 -110 replies
5/34perf pmu: Add is_core to pmutools/perf/util/pmu.c tools/perf/util/pmu.h+11 -30 replies
6/34perf evsel: Add is_pmu_core inorder to interpret own_cpustools/lib/perf/include/internal/evsel.h tools/perf/util/evsel.c tools/perf/util/parse-events.c+11 -00 replies
7/34perf pmu: Add CPU map for "cpu" PMUstools/perf/util/cpumap.c tools/perf/util/cpumap.h tools/perf/util/pmu.c+5 -50 replies
8/34perf evlist: Propagate user CPU maps intersecting core PMU mapstools/lib/perf/evlist.c tools/lib/perf/include/internal/evsel.h+23 -80 replies
9/34perf evlist: Allow has_user_cpus to be set on hybridtools/perf/util/evlist.c+1 -10 replies
10/34perf target: Remove unused hybrid valuetools/perf/builtin-record.c tools/perf/builtin-stat.c tools/perf/util/target.h+0 -40 replies
11/34perf tools: Warn if no user requested CPUs match PMU's CPUstools/perf/builtin-record.c tools/perf/builtin-stat.c tools/perf/util/evlist-hybrid.c +5 more+43 -1210 replies
12/34perf evlist: Remove evlist__warn_hybrid_grouptools/perf/builtin-stat.c tools/perf/util/evlist-hybrid.c tools/perf/util/evlist-hybrid.h+0 -360 replies
13/34perf evlist: Remove __evlist__add_defaulttools/perf/arch/x86/util/evsel.c tools/perf/builtin-record.c tools/perf/builtin-top.c +7 more+25 -1300 replies
14/34perf evlist: Reduce scope of evlist__has_hybridtools/perf/builtin-record.c tools/perf/builtin-stat.c tools/perf/util/Build +4 more+14 -480 replies
15/34perf pmu: Remove perf_pmu__hybrid_mountedtools/perf/util/pmu-hybrid.c tools/perf/util/pmu-hybrid.h tools/perf/util/pmu.c+2 -290 replies
16/34perf pmu: Rewrite perf_pmu__has_hybrid to avoid listtools/perf/util/pmu.c+11 -50 replies
17/34perf x86: Iterate hybrid PMUs as core PMUstools/perf/arch/x86/tests/hybrid.c tools/perf/arch/x86/util/evlist.c tools/perf/arch/x86/util/perf_regs.c+28 -130 replies
18/34perf topology: Avoid hybrid list for hybrid topologytools/perf/util/cputopo.c+14 -50 replies
19/34perf evsel: Compute is_hybrid from PMU being coretools/perf/util/evsel.c tools/perf/util/python.c+15 -20 replies
20/34perf header: Avoid hybrid PMU list in write_pmu_capstools/perf/util/header.c+11 -80 replies
21/34perf metrics: Remove perf_pmu__is_hybrid usetools/perf/util/metricgroup.c+2 -40 replies
22/34perf stat: Avoid hybrid PMU listtools/perf/util/stat-display.c+5 -40 replies
23/34perf mem: Avoid hybrid PMU listtools/perf/builtin-c2c.c tools/perf/builtin-mem.c tools/perf/util/mem-events.c +2 more+36 -160 replies
24/34perf pmu: Remove perf_pmu__hybrid_pmus listtools/perf/builtin-record.c tools/perf/util/Build tools/perf/util/pmu-hybrid.c +5 more+0 -810 replies
25/34perf pmus: Prefer perf_pmu__scan over perf_pmus__for_each_pmutools/perf/bench/pmu-scan.c tools/perf/tests/event_groups.c tools/perf/tests/parse-events.c +1 more+8 -180 replies
26/34perf x86 mem: minor refactor to is_mem_loads_aux_eventtools/perf/arch/x86/util/mem-events.c+7 -70 replies
27/34perf pmu: Separate pmu and pmustools/perf/arch/arm/util/auxtrace.c tools/perf/arch/arm/util/cs-etm.c tools/perf/arch/arm64/util/pmu.c +38 more+533 -5067 replies
28/34perf pmus: Split pmus list into core and othertools/perf/util/pmus.c+38 -149 replies
29/34perf pmus: Allow just core PMU scanningtools/perf/arch/arm64/util/pmu.c tools/perf/arch/x86/util/evlist.c tools/perf/arch/x86/util/perf_regs.c +11 more+75 -961 reply
30/34perf pmus: Avoid repeated sysfs scanningtools/perf/util/pmus.c+31 -20 replies
31/34perf pmus: Ensure all PMUs are read for find_by_typetools/perf/util/pmus.c+14 -10 replies
32/34perf pmus: Add function to return count of core PMUstools/perf/util/pmus.c tools/perf/util/pmus.h+15 -70 replies
33/34perf pmus: Remove perf_pmus__has_hybridtools/perf/arch/x86/tests/hybrid.c tools/perf/arch/x86/util/evlist.c tools/perf/arch/x86/util/perf_regs.c +14 more+31 -800 replies
34/34perf pmu: Remove is_pmu_hybridtools/perf/util/pmu.c tools/perf/util/pmu.h+1 -70 replies

Reviews trailers per patch

33 of 34 patches have a Reviewed-by or Acked-by.

PatchKan Liang
1/34
2/34R-b
3/34R-b
4/34R-b
5/34R-b
6/34R-b
7/34R-b
8/34R-b
9/34R-b
10/34R-b
11/34R-b
12/34R-b
13/34R-b
14/34R-b
15/34R-b
16/34R-b
17/34R-b
18/34R-b
19/34R-b
20/34R-b
21/34R-b
22/34R-b
23/34R-b
24/34R-b
25/34R-b
26/34R-b
27/34R-b
28/34R-b
29/34R-b
30/34R-b
31/34R-b
32/34R-b
33/34R-b
34/34R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v5 thread

Cover letter [PATCH v5 00/34] PMU refactoring and improvements

Separate the code in pmu.[ch] into the set/list of PMUs and the code for a particular PMU. Move the set/list of PMUs code into pmus.[ch]. Clean up hybrid code and remove hybrid PMU list, it is sufficient to scan PMUs looking for core ones. Add core PMU list and perf_pmus__scan_core that just reads core PMUs. Switch code that skips non-core PMUs during a perf_pmus__scan, to use the perf_pmus__scan_core variant. Don't scan sysfs for PMUs if all such PMUs have been previously scanned/loaded. Scanning just core PMUs, for the cases it is applicable, can improve the sysfs reading time by more than 4 fold on my laptop, as servers generally have many more uncore PMUs the improvement there should be larger:

```
$ perf bench internals pmu-scan -i 1000
Computing performance of sysfs PMU event scan for 1000 times
  Average core PMU scanning took: 989.231 usec (+- 1.535 usec)
  Average PMU scanning took: 4309.425 usec (+- 74.322 usec)
```

The patch "perf pmu: Separate pmu and pmus" moves and renames a lot of functions, and is consequently large. The changes are trivial, but kept together to keep the overall number of patches more reasonable.

v5. Add helper functions for cpumap as suggested by Arnaldo. Fixes
missing symbols in importing perf into python, found by building with:
https://lore.kernel.org/lkml/[email protected]/
v4. On patch 16 (perf pmu: Remove perf_pmu__hybrid_mounted) remove the
handling of no cpus for a hybrid core PMU following discussion with Kan:
https://lore.kernel.org/lkml/[email protected]/
On patch 9 (perf evlist: Propagate user CPU maps intersecting core PMU maps) fix the comment on struct perf_evsel's system_wide variable from conversation with Namhyung:
https://lore.kernel.org/lkml/[email protected]/
Adds Kan's reviewed-by.
v3. Address fixing hybrid user specified CPU maps by doing it in
propagate maps. Remove nearly all references to cpu_core/cpu_atom in particular by removing is_pmu_hybrid - hybrid is now >1 core PMU. Addresses comments by Kan and Namhyung.
v2. Address Kan's review comments wrt "cycles" -> "cycles:P" and

    "uncore_pmus" -> "other_pmus".

Ian Rogers (34):
perf cpumap: Add internal nr and cpu accessors
perf cpumap: Add equal function
libperf cpumap: Add "any CPU"/dummy test function perf pmu: Detect ARM and hybrid PMUs with sysfs
perf pmu: Add is_core to pmu
perf evsel: Add is_pmu_core inorder to interpret own_cpus perf pmu: Add CPU map for "cpu" PMUs
perf evlist: Propagate user CPU maps intersecting core PMU maps perf evlist: Allow has_user_cpus to be set on hybrid perf target: Remove unused hybrid value
perf tools: Warn if no user requested CPUs match PMU's CPUs perf evlist: Remove evlist__warn_hybrid_group
perf evlist: Remove __evlist__add_default
perf evlist: Reduce scope of evlist__has_hybrid
perf pmu: Remove perf_pmu__hybrid_mounted
perf pmu: Rewrite perf_pmu__has_hybrid to avoid list perf x86: Iterate hybrid PMUs as core PMUs
perf topology: Avoid hybrid list for hybrid topology perf evsel: Compute is_hybrid from PMU being core perf header: Avoid hybrid PMU list in write_pmu_caps perf metrics: Remove perf_pmu__is_hybrid use
perf stat: Avoid hybrid PMU list
perf mem: Avoid hybrid PMU list
perf pmu: Remove perf_pmu__hybrid_pmus list
perf pmus: Prefer perf_pmu__scan over perf_pmus__for_each_pmu perf x86 mem: minor refactor to is_mem_loads_aux_event perf pmu: Separate pmu and pmus
perf pmus: Split pmus list into core and other
perf pmus: Allow just core PMU scanning
perf pmus: Avoid repeated sysfs scanning
perf pmus: Ensure all PMUs are read for find_by_type perf pmus: Add function to return count of core PMUs perf pmus: Remove perf_pmus__has_hybrid
perf pmu: Remove is_pmu_hybrid

 tools/lib/perf/cpumap.c                 | 100 +++--
 tools/lib/perf/evlist.c                 |  25 +-
 tools/lib/perf/include/internal/evsel.h |  15 +-
 tools/lib/perf/include/perf/cpumap.h    |  12 +
 tools/perf/arch/arm/util/auxtrace.c     |   7 +-
 tools/perf/arch/arm/util/cs-etm.c       |   4 +-
 tools/perf/arch/arm64/util/pmu.c        |   6 +-
 tools/perf/arch/x86/tests/hybrid.c      |   7 +-
 tools/perf/arch/x86/util/auxtrace.c     |   5 +-
 tools/perf/arch/x86/util/evlist.c       |  25 +-
 tools/perf/arch/x86/util/evsel.c        |  27 +-
 tools/perf/arch/x86/util/intel-bts.c    |   4 +-
 tools/perf/arch/x86/util/intel-pt.c     |   4 +-
 tools/perf/arch/x86/util/mem-events.c   |  17 +-
 tools/perf/arch/x86/util/perf_regs.c    |  15 +-
 tools/perf/arch/x86/util/topdown.c      |   5 +-
 tools/perf/bench/pmu-scan.c             |  60 +--
 tools/perf/builtin-c2c.c                |   9 +-
 tools/perf/builtin-list.c               |   4 +-
 tools/perf/builtin-mem.c                |   9 +-
 tools/perf/builtin-record.c             |  29 +-
 tools/perf/builtin-stat.c               |  14 +-
 tools/perf/builtin-top.c                |  10 +-
 tools/perf/tests/attr.c                 |  11 +-
 tools/perf/tests/cpumap.c               |  37 ++
 tools/perf/tests/event_groups.c         |   7 +-
 tools/perf/tests/parse-events.c         |  15 +-
 tools/perf/tests/parse-metric.c         |   9 +-
 tools/perf/tests/pmu-events.c           |   6 +-
 tools/perf/tests/switch-tracking.c      |  14 +-
 tools/perf/tests/topology.c             |  16 +-
 tools/perf/util/Build                   |   2 -
 tools/perf/util/cpumap.c                |   4 +-
 tools/perf/util/cpumap.h                |   4 +-
 tools/perf/util/cputopo.c               |  12 +-
 tools/perf/util/env.c                   |   5 +-
 tools/perf/util/evlist-hybrid.c         | 162 --------
 tools/perf/util/evlist-hybrid.h         |  15 -
 tools/perf/util/evlist.c                |  64 +++-
 tools/perf/util/evlist.h                |   9 +-
 tools/perf/util/evsel.c                 |  60 +--
 tools/perf/util/evsel.h                 |   3 -
 tools/perf/util/header.c                |  27 +-
 tools/perf/util/mem-events.c            |  25 +-
 tools/perf/util/metricgroup.c           |   9 +-
 tools/perf/util/parse-events.c          |  25 +-
 tools/perf/util/parse-events.y          |   3 +-
 tools/perf/util/pfm.c                   |   6 +-
 tools/perf/util/pmu-hybrid.c            |  52 ---
 tools/perf/util/pmu-hybrid.h            |  32 --
 tools/perf/util/pmu.c                   | 470 +-----------------------
 tools/perf/util/pmu.h                   |  25 +-
 tools/perf/util/pmus.c                  | 465 ++++++++++++++++++++++-
 tools/perf/util/pmus.h                  |  15 +-
 tools/perf/util/print-events.c          |  15 +-
 tools/perf/util/python-ext-sources      |   1 -
 tools/perf/util/python.c                |  14 +
 tools/perf/util/stat-display.c          |  19 +-
 tools/perf/util/target.h                |   1 -
 59 files changed, 960 insertions(+), 1112 deletions(-)
 delete mode 100644 tools/perf/util/evlist-hybrid.c
 delete mode 100644 tools/perf/util/evlist-hybrid.h
 delete mode 100644 tools/perf/util/pmu-hybrid.c
 delete mode 100644 tools/perf/util/pmu-hybrid.h
Signature · 1 line
2.41.0.rc0.172.g3f132b7071-goog