Skip to content

perf stat: Cleanup counter aggregation (v3)

Namhyung Kim linux-perf-users lkml 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest20 patches 7 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/20perf tools: Save evsel->pmu in parse_events()tools/perf/util/evsel.c tools/perf/util/parse-events.c tools/perf/util/pmu.c+15 -100 replies
2/20perf tools: Use pmu info in evsel__is_hybrid()tools/perf/util/evsel.c+3 -00 replies
3/20perf stat: Use evsel__is_hybrid() moretools/perf/util/stat-display.c+4 -160 replies
4/20perf stat: Add aggr id for global modetools/perf/builtin-stat.c tools/perf/util/cpumap.c tools/perf/util/cpumap.h+49 -30 replies
5/20perf stat: Add cpu aggr id for no aggregation modetools/perf/builtin-stat.c+43 -50 replies
6/20perf stat: Add 'needs_sort' argument to cpu_aggr_map__new()tools/perf/builtin-stat.c tools/perf/util/cpumap.c tools/perf/util/cpumap.h+10 -50 replies
7/20perf stat: Add struct perf_stat_aggr to perf_stat_evseltools/perf/util/stat.c tools/perf/util/stat.h+46 -70 replies
8/20perf stat: Allocate evsel->stats->aggr properlytools/perf/builtin-script.c tools/perf/builtin-stat.c tools/perf/tests/parse-metric.c +3 more+16 -100 replies
9/20perf stat: Aggregate events using evsel->stats->aggrtools/perf/builtin-stat.c tools/perf/util/evsel.c tools/perf/util/scripting-engines/trace-event-python.c +1 more+41 -230 replies
10/20perf stat: Factor out evsel__count_has_error()tools/perf/util/stat.c+20 -20 replies
11/20perf stat: Aggregate per-thread stats using evsel->stats->aggrtools/perf/builtin-stat.c tools/perf/util/stat.c+53 -20 replies
12/20perf stat: Allocate aggr counts for recorded datatools/perf/builtin-stat.c tools/perf/util/stat.c tools/perf/util/stat.h+48 -130 replies
13/20perf stat: Reset aggr counts for each intervaltools/perf/builtin-stat.c tools/perf/util/stat.c tools/perf/util/stat.h+21 -30 replies
14/20perf stat: Split process_counters()tools/perf/builtin-stat.c+13 -90 replies
15/20perf stat: Add perf_stat_merge_counters()tools/perf/builtin-stat.c tools/perf/util/stat.c tools/perf/util/stat.h+100 -00 replies
16/20perf stat: Add perf_stat_process_percore()tools/perf/builtin-stat.c tools/perf/util/stat.c tools/perf/util/stat.h+75 -00 replies
17/20perf stat: Add perf_stat_process_shadow_stats()tools/perf/builtin-stat.c tools/perf/util/stat.c tools/perf/util/stat.h+28 -240 replies
18/20perf stat: Display event stats using aggr countstools/perf/util/stat-display.c tools/perf/util/stat.c tools/perf/util/stat.h+49 -3867 replies
19/20perf stat: Display percore events properlytools/perf/builtin-stat.c tools/perf/util/stat-display.c+25 -180 replies
20/20perf stat: Remove unused perf_counts.aggr fieldtools/perf/util/counts.c tools/perf/util/counts.h tools/perf/util/stat.c+6 -350 replies

Reviews trailers per patch

12 of 20 patches have a Reviewed-by or Acked-by.

PatchIan Rogers
1/20A-b
2/20A-b
3/20A-b
4/20
5/20A-b
6/20
7/20
8/20A-b
9/20
10/20
11/20A-b
12/20A-b
13/20
14/20A-b
15/20
16/20
17/20A-b
18/20A-b
19/20A-b
20/20A-b

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

Read the v1 thread

Cover letter [PATCHSET 00/20] perf stat: Cleanup counter aggregation (v3)

Hello,

Current perf stat code is somewhat hard to follow since it handles many combinations of PMUs/events for given display and aggregation options. This is my attempt to clean it up a little. ;-)

changes in v3)
* fix cgroup event display
* fix perf test failures (Arnaldo)
* add comment on the global debug output (Athira)

changes in v2)
* fix a segfault in perf stat report for per-process record (Jiri)
* fix metric only display (Jiri)
* add evsel__reset_aggr_stat (ian)
* add more comments (Ian)
* add Acked-by from Ian

My first concern is that aggregation and display routines are intermixed and processed differently depends on the aggregation mode. I'd like to separate them apart and make the logic clearer.

To do that, I added struct perf_stat_aggr to save the aggregated counter values and other info. It'll be allocated and processed according to the aggr_mode and display logic will use it.

I've tested the following combination.

  $ cat test-matrix.sh
  #!/bin/sh

set -e

yes > /dev/null &
TARGET=$!

./perf stat true
./perf stat -a true
./perf stat -C0 true
./perf stat -p $TARGET true
./perf stat -t $TARGET true

  ./perf stat -a -A true
  ./perf stat -a --per-node true
  ./perf stat -a --per-socket true
  ./perf stat -a --per-die true
  ./perf stat -a --per-core true
  ./perf stat -a --per-thread true

  ./perf stat -a -I 500 sleep 1
  ./perf stat -a -I 500 --summary sleep 1
  ./perf stat -a -I 500 --per-socket sleep 1
  ./perf stat -a -I 500 --summary --per-socket sleep 1

  ./perf stat -a --metric-only true
  ./perf stat -a --metric-only --per-socket true
  ./perf stat -a --metric-only -I 500 sleep 1
  ./perf stat -a --metric-only -I 500 --per-socket sleep 1

  ./perf stat record true && ./perf stat report
  ./perf stat record -p $TARGET true && ./perf stat report
  ./perf stat record -a true && ./perf stat report
  ./perf stat record -a --per-core true && ./perf stat report
  ./perf stat record -a --per-core --metric-only true && ./perf stat report
  ./perf stat record -a -I 500 sleep 1 && ./perf stat report
  ./perf stat record -a -I 500 --per-core sleep 1 && ./perf stat report
  ./perf stat record -a -I 500 --per-core --metric-only sleep 1 && ./perf stat report

  ./perf stat -a -A -e cpu/event=cpu-cycles,percore/ true
  ./perf stat -a -A -e cpu/event=cpu-cycles,percore/ --percore-show-thread true

kill $TARGET

The code is available at 'perf/stat-aggr-v3' branch in

git://git.kernel.org/pub/scm/linux/kernel/git/namhyung/linux-perf.git

Thanks,
Namhyung

Namhyung Kim (20):
perf tools: Save evsel->pmu in parse_events()
perf tools: Use pmu info in evsel__is_hybrid()
perf stat: Use evsel__is_hybrid() more
perf stat: Add aggr id for global mode
perf stat: Add cpu aggr id for no aggregation mode perf stat: Add 'needs_sort' argument to cpu_aggr_map__new() perf stat: Add struct perf_stat_aggr to perf_stat_evsel perf stat: Allocate evsel->stats->aggr properly
perf stat: Aggregate events using evsel->stats->aggr perf stat: Factor out evsel__count_has_error()
perf stat: Aggregate per-thread stats using evsel->stats->aggr perf stat: Allocate aggr counts for recorded data perf stat: Reset aggr counts for each interval
perf stat: Split process_counters()
perf stat: Add perf_stat_merge_counters()
perf stat: Add perf_stat_process_percore()
perf stat: Add perf_stat_process_shadow_stats()
perf stat: Display event stats using aggr counts perf stat: Display percore events properly
perf stat: Remove unused perf_counts.aggr field

 tools/perf/builtin-script.c                   |   4 +-
 tools/perf/builtin-stat.c                     | 186 +++++--
 tools/perf/tests/parse-metric.c               |   2 +-
 tools/perf/tests/pmu-events.c                 |   2 +-
 tools/perf/util/counts.c                      |   1 -
 tools/perf/util/counts.h                      |   1 -
 tools/perf/util/cpumap.c                      |  16 +-
 tools/perf/util/cpumap.h                      |   8 +-
 tools/perf/util/evsel.c                       |  32 +-
 tools/perf/util/parse-events.c                |   1 +
 tools/perf/util/pmu.c                         |   4 +
 .../scripting-engines/trace-event-python.c    |   6 -
 tools/perf/util/stat-display.c                | 462 +++---------------
 tools/perf/util/stat.c                        | 407 ++++++++++++---
 tools/perf/util/stat.h                        |  40 +-
 15 files changed, 633 insertions(+), 539 deletions(-)

base-commit: a3a365655a28f12f07eddf4f3fd596987b175e1d

Signature · 1 line
2.38.0.413.g74048e4d9e-goog