perf stat: Fix uncore aggregation number
Follow up:
lore.kernel.org/CAP-5=fVDF4-qYL1Lm7efgiHk7X=_nw_nEFMBZFMcsnOOJgX4Kg@mail.gmail.com/
The patch adds unit aggregation during evsel merge the aggregated uncore
counters. Change the name of the column to `ctrs` and `counters` for
json mode.
Tested on a 2-socket machine with SNC3, uncore_imc_[0-11] and
cpumask="0,120"
Before:
perf stat -e clockticks -I 1000 --per-socket
# time socket cpus counts unit events
1.
001085024 S0 1
9615386315 clockticks
1.
001085024 S1 1
9614287448 clockticks
perf stat -e clockticks -I 1000 --per-node
# time node cpus counts unit events
1.
001029867 N0 1
3205726984 clockticks
1.
001029867 N1 1
3205444421 clockticks
1.
001029867 N2 1
3205234018 clockticks
1.
001029867 N3 1
3205224660 clockticks
1.
001029867 N4 1
3205207213 clockticks
1.
001029867 N5 1
3205528246 clockticks
After:
perf stat -e clockticks -I 1000 --per-socket
# time socket ctrs counts unit events
1.
001026071 S0 12
9619677996 clockticks
1.
001026071 S1 12
9618612614 clockticks
perf stat -e clockticks -I 1000 --per-node
# time node ctrs counts unit events
1.
001027449 N0 4
3207251859 clockticks
1.
001027449 N1 4
3207315930 clockticks
1.
001027449 N2 4
3206981828 clockticks
1.
001027449 N3 4
3206566126 clockticks
1.
001027449 N4 4
3206032609 clockticks
1.
001027449 N5 4
3205651355 clockticks
Tested with JSON output linter:
perf test "perf stat JSON output linter"
94: perf stat JSON output linter : Ok
Suggested-by: Ian Rogers <irogers@google.com>
Reviewed-by: Ian Rogers <irogers@google.com>
Signed-off-by: Chun-Tse Shao <ctshao@google.com>
Link: https://lore.kernel.org/r/20250627201818.479421-1-ctshao@google.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>