Fix topdown event weak grouping
Ian Rogers
reviewerv3 cover Fix topdown event weak grouping
Keep topdown events within a group when a weak group is broken. This is a requirement as topdown events must form a group.
Add perf stat testing including for required topdown event group behaviors.
Note: as with existing topdown evsel/evlist code topdown events are assumed to be on the PMU "cpu". On Alderlake the PMU "cpu_core" should also be tested. Future changes can fix Alderlake.
v3. Fix computation of number of events in leader's group.
Adds reviewed-by: Liang, Kan <[email protected]
v2. Correct behavior wrt pmu prefixed events and avoid the test using
deprecated events: Suggested-by: Liang, Kan <[email protected]>
Ian Rogers (2):
perf evlist: Keep topdown counters in weak group perf test: Add basic stat and topdown group test
tools/perf/arch/x86/util/evsel.c | 12 ++++++ tools/perf/tests/shell/stat.sh | 67 ++++++++++++++++++++++++++++++++ tools/perf/util/evlist.c | 16 +++++++- tools/perf/util/evsel.c | 10 +++++ tools/perf/util/evsel.h | 3 ++ 5 files changed, 106 insertions(+), 2 deletions(-) create mode 100755 tools/perf/tests/shell/stat.sh
Signature · 1 line
2.36.0.550.gb090851708-goog
Ian Rogers
reviewerPATCH v3 1/2 perf evlist: Keep topdown counters in weak group
On Intel Icelake, topdown events must always be grouped with a slots event as leader. When a metric is parsed a weak group is formed and retried if perf_event_open fails. The retried events aren't grouped breaking the slots leader requirement. This change modifies the weak group "reset" behavior so that topdown events aren't broken from the group for the retry.
$ perf stat -e '{slots,topdown-bad-spec,topdown-be-bound,topdown-fe-bound,topdown-retiring,branch-instructions,branch-misses,bus-cycles,cache-misses,cache-references,cpu-cycles,instructions,mem-loads,mem-stores,ref-cycles,baclears.any,ARITH.DIVIDER_ACTIVE}:W' -a sleep 1Performance counter stats for 'system wide':
47,867,188,483 slots (92.27%)
<not supported> topdown-bad-spec
<not supported> topdown-be-bound
<not supported> topdown-fe-bound
<not supported> topdown-retiring
2,173,346,937 branch-instructions (92.27%)
10,540,253 branch-misses # 0.48% of all branches (92.29%)
96,291,140 bus-cycles (92.29%)
6,214,202 cache-misses # 20.120 % of all cache refs (92.29%)
30,886,082 cache-references (76.91%)
11,773,726,641 cpu-cycles (84.62%)
11,807,585,307 instructions # 1.00 insn per cycle (92.31%)
0 mem-loads (92.32%)
2,212,928,573 mem-stores (84.69%)
10,024,403,118 ref-cycles (92.35%)
16,232,978 baclears.any (92.35%)
23,832,633 ARITH.DIVIDER_ACTIVE (84.59%)0.981070734 seconds time elapsed
After:
$ perf stat -e '{slots,topdown-bad-spec,topdown-be-bound,topdown-fe-bound,topdown-retiring,branch-instructions,branch-misses,bus-cycles,cache-misses,cache-references,cpu-cycles,instructions,mem-loads,mem-stores,ref-cycles,baclears.any,ARITH.DIVIDER_ACTIVE}:W' -a sleep 1Performance counter stats for 'system wide':
31040189283 slots (92.27%)
8997514811 topdown-bad-spec # 28.2% bad speculation (92.27%)
10997536028 topdown-be-bound # 34.5% backend bound (92.27%)
4778060526 topdown-fe-bound # 15.0% frontend bound (92.27%)
7086628768 topdown-retiring # 22.2% retiring (92.27%)
1417611942 branch-instructions (92.26%)
5285529 branch-misses # 0.37% of all branches (92.28%)
62922469 bus-cycles (92.29%)
1440708 cache-misses # 8.292 % of all cache refs (92.30%)
17374098 cache-references (76.94%)
8040889520 cpu-cycles (84.63%)
7709992319 instructions # 0.96 insn per cycle (92.32%)
0 mem-loads (92.32%)
1515669558 mem-stores (84.68%)
6542411177 ref-cycles (92.35%)
4154149 baclears.any (92.35%)
20556152 ARITH.DIVIDER_ACTIVE (84.59%)1.010799593 seconds time elapsed
--- tools/perf/arch/x86/util/evsel.c | 12 ++++++++++++ tools/perf/util/evlist.c | 16 ++++++++++++++-- tools/perf/util/evsel.c | 10 ++++++++++ tools/perf/util/evsel.h | 3 +++ 4 files changed, 39 insertions(+), 2 deletions(-)
tools/perf/arch/x86/util/evsel.c +12 -0
@@ -3,6 +3,7 @@#include <stdlib.h> #include "util/evsel.h" #include "util/env.h" +#include "util/pmu.h" #include "linux/string.h" void arch_evsel__set_sample_weight (struct evsel *evsel)
@@ -29,3 +30,14 @@ void arch_evsel__fixup_new_cycles(struct perf_event_attr *attr)free (env.cpuid); } + +bool arch_evsel__must_be_in_group (const struct evsel *evsel) +{ +if ((evsel->pmu_name &&strcmp (evsel->pmu_name,"cpu" )) || + !pmu_have_event ("cpu" ,"slots" )) +return false; + +return evsel->name && + (!strcasecmp (evsel->name,"slots" ) || +strcasestr (evsel->name,"topdown" )); +}
tools/perf/util/evlist.c +14 -2
@@ -1742,8 +1742,17 @@ struct evsel *evlist__reset_weak_group(struct evlist *evsel_list, struct evsel *if (evsel__has_leader (c2, leader)) {if (is_open && close)perf_evsel__close (&c2->core); -evsel__set_leader (c2, c2); - c2->core.nr_members =0 ; +/* +* We want to close all members of the group and reopen +* them. Some events, like Intel topdown, require being +* in a group and so keep these in the group. +*/ +if (!evsel__must_be_in_group (c2) && c2 != leader) { +evsel__set_leader (c2, c2); + c2->core.nr_members =0 ; + leader->core.nr_members--; + } +/* * Set this for all former members of the group * to indicate they get reopened.
@@ -1751,6 +1760,9 @@ struct evsel *evlist__reset_weak_group(struct evlist *evsel_list, struct evsel * c2->reset_group = true; } } +/* Reset the leader count if all entries were removed. */ +if (leader->core.nr_members ==1 ) + leader->core.nr_members =0 ;return leader; }
tools/perf/util/evsel.c +10 -0
@@ -3103,3 +3103,13 @@ int evsel__source_count(const struct evsel *evsel) }return count; } + +bool __weak arch_evsel__must_be_in_group (const struct evsel *evsel__maybe_unused ) +{ +return false; +} + +bool evsel__must_be_in_group (const struct evsel *evsel) +{ +return arch_evsel__must_be_in_group (evsel); +}
tools/perf/util/evsel.h +3 -0
@@ -499,6 +499,9 @@ bool evsel__has_leader(struct evsel *evsel, struct evsel *leader);bool evsel__is_leader (struct evsel *evsel);void evsel__set_leader (struct evsel *evsel,struct evsel *leader);int evsel__source_count (const struct evsel *evsel); +bool evsel__must_be_in_group (const struct evsel *evsel); + +bool arch_evsel__must_be_in_group (const struct evsel *evsel);/* * Macro to swap the bit-field postition and size.
Signature · 1 line
2.36.0.550.gb090851708-goog
Ian Rogers
reviewerPATCH v3 2/2 perf test: Add basic stat and topdown group test
In reply to Ian RogersAdd a basic stat test.
Add two tests of grouping behavior for topdown events. Topdown events are special as they must be grouped with the slots event first.
--- tools/perf/tests/shell/stat.sh | 67 ++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100755 tools/perf/tests/shell/stat.sh
tools/perf/tests/shell/stat.sh new file +67 -0
@@ -0,0 +1,67 @@ +#!/bin/sh +# perf stat tests +# SPDX-License-Identifier: GPL-2.0 + +set -e + +err=0 +test_default_stat() { + echo "Basic stat command test" + if ! perf stat true 2>&1 | egrep -q "Performance counter stats for 'true':" + then + echo "Basic stat command test [Failed]" + err=1 + return + fi + echo "Basic stat command test [Success]" +} + +test_topdown_groups() { + # Topdown events must be grouped with the slots event first. Test that + # parse-events reorders this. + echo "Topdown event group test" + if ! perf stat -e '{slots,topdown-retiring}' true > /dev/null 2>&1 + then + echo "Topdown event group test [Skipped event parsing failed]" + return + fi + if perf stat -e '{slots,topdown-retiring}' true 2>&1 | egrep -q "<not supported>" + then + echo "Topdown event group test [Failed events not supported]" + err=1 + return + fi + if perf stat -e '{topdown-retiring,slots}' true 2>&1 | egrep -q "<not supported>" + then + echo "Topdown event group test [Failed slots not reordered first]" + err=1 + return + fi + echo "Topdown event group test [Success]" +} + +test_topdown_weak_groups() { + # Weak groups break if the perf_event_open of multiple grouped events + # fails. Breaking a topdown group causes the events to fail. Test a very large + # grouping to see that the topdown events aren't broken out. + echo "Topdown weak groups test" + ok_grouping="{slots,topdown-bad-spec,topdown-be-bound,topdown-fe-bound,topdown-retiring},branch-instructions,branch-misses,bus-cycles,cache-misses,cache-references,cpu-cycles,instructions,mem-loads,mem-stores,ref-cycles,cache-misses,cache-references" + if ! perf stat --no-merge -e "$ok_grouping" true > /dev/null 2>&1 + then + echo "Topdown weak groups test [Skipped event parsing failed]" + return + fi + group_needs_break="{slots,topdown-bad-spec,topdown-be-bound,topdown-fe-bound,topdown-retiring,branch-instructions,branch-misses,bus-cycles,cache-misses,cache-references,cpu-cycles,instructions,mem-loads,mem-stores,ref-cycles,cache-misses,cache-references}:W" + if perf stat --no-merge -e "$group_needs_break" true 2>&1 | egrep -q "<not supported>" + then + echo "Topdown weak groups test [Failed events not supported]" + err=1 + return + fi + echo "Topdown weak groups test [Success]" +} + +test_default_stat +test_topdown_groups +test_topdown_weak_groups +exit $err
Signature · 1 line
2.36.0.550.gb090851708-goog
Em Mon, May 16, 2022 at 10:27:22PM -0700, Ian Rogers escreveu:
Quoted 9 lines
Keep topdown events within a group when a weak group is broken. This is a requirement as topdown events must form a group.
Add perf stat testing including for required topdown event group behaviors.
Note: as with existing topdown evsel/evlist code topdown events are assumed to be on the PMU "cpu". On Alderlake the PMU "
cpu_core" should also be tested. Future changes can fix Alderlake.
Thanks, applied.
- Arnaldo
Quoted 19 lines
v3. Fix computation of number of events in leader's group.
Adds reviewed-by: Liang, Kan <[email protected]
v2. Correct behavior wrt pmu prefixed events and avoid the test using
deprecated events: Suggested-by: Liang, Kan <[email protected]>Ian Rogers (2):
perf evlist: Keep topdown counters in weak group perf test: Add basic stat and topdown group testtools/perf/arch/x86/util/evsel.c | 12 ++++++ tools/perf/tests/shell/stat.sh | 67 ++++++++++++++++++++++++++++++++ tools/perf/util/evlist.c | 16 +++++++- tools/perf/util/evsel.c | 10 +++++ tools/perf/util/evsel.h | 3 ++ 5 files changed, 106 insertions(+), 2 deletions(-) create mode 100755 tools/perf/tests/shell/stat.shSignature · 1 line
2.36.0.550.gb090851708-goog
Signature · 1 line
- Arnaldo