Fix incorrect counts when count the same uncore event multiple times
v3 cover Fix incorrect counts when count the same uncore event multiple times
Let's take a look an example, the machine is SKX with 6 IMC devices.
perf stat -e clockticks,clockticks -I 1000
# time counts unit events
1.001127430 6,901,503,174 uncore_imc_0/clockticks/
1.001127430 3,940,896,301 uncore_imc_0/clockticks/
2.002649722 988,376,876 uncore_imc_0/clockticks/
2.002649722 988,376,141 uncore_imc_0/clockticks/
3.004071319 1,000,292,675 uncore_imc_0/clockticks/
3.004071319 1,000,294,160 uncore_imc_0/clockticks/1) The events name should not be uniquified.
2) The initial count for the first clockticks is doubled.
3) Subsequent count only report for the first IMC device.
The first patch fixes 1) and 3), and the second patch fixes 2).
After these fix:
perf stat -e clockticks,clockticks -I 1000
# time counts unit events
1.001127586 4,126,938,857 clockticks
1.001127586 4,121,564,277 clockticks
2.001686014 3,953,806,350 clockticks
2.001686014 3,953,809,541 clockticks
3.003121403 4,137,750,252 clockticks
3.003121403 4,137,749,048 clockticksI also tested -A, --per-socket, --per-die and --per-core, all looks good.
Ian tested hybrid-merge and hwmon, all looks good as well.
Chun-Tse Shao (1):
perf test: Add stat uniquifying test
Ian Rogers (2):
perf evlist: Make uniquifying counter names consistent perf parse-events: Use wildcard processing to set an event to merge
into
tools/perf/builtin-record.c | 7 +- tools/perf/builtin-top.c | 7 +- .../tests/shell/stat+event_uniquifying.sh | 69 ++++++++ tools/perf/util/evlist.c | 66 +++++--- tools/perf/util/evlist.h | 3 +- tools/perf/util/evsel.c | 119 ++++++++++++- tools/perf/util/evsel.h | 11 +- tools/perf/util/parse-events.c | 90 +++++++--- tools/perf/util/stat-display.c | 160 ++---------------- tools/perf/util/stat.c | 40 +---- 10 files changed, 332 insertions(+), 240 deletions(-) create mode 100755 tools/perf/tests/shell/stat+event_uniquifying.sh
--
v3: Rebase with tmp.perf-tools-next. Since most of the conflicts are from lore.kernel.org/[email protected], tested v3 patches with:
perf stat -A -C 0,4-5,8 -e "instructions/cpu=0/,l1d-misses/cpu=4,cpu=5/,inst_retired.any/cpu=8/,cycles" -a sleep 0.1
Performance counter stats for 'system wide':
CPU0 682,860 instructions/cpu=0/ # 0.27 insn per cycle CPU4 53,774 l1d-misses CPU5 18,725 l1d-misses CPU8 608,698 inst_retired.any/cpu=8/ CPU0 2,574,325 cycles CPU4 4,267,115 cycles CPU5 1,741,536 cycles CPU8 1,969,547 cycles
0.102746958 seconds time elapsed
v2: lore.kernel.org/[email protected]
- Fixes for hwmon and --hybrid-merge.
- Add a test for event uniquifying.
v1: lore.kernel.org/[email protected]
2.49.0.1045.g170613ef41-goog
PATCH v3 1/3 perf evlist: Make uniquifying counter names consistent
From: Ian Rogers <[email protected]>
perf stat has different uniquification logic to perf record and perf top. In the case of perf record and perf top all hybrid event names are uniquified. Perf stat is more disciplined respecting name config terms, libpfm4 events, etc. Perf stat will uniquify hybrid events and the non-core PMU cases shouldn't apply to perf record or perf top. For consistency, remove the uniquification for perf record and perf top and reuse the perf stat uniquification, making the code more globally visible for this.
Fix the detection of cross-PMU for disabling uniquify by correctly setting last_pmu. When setting uniquify on an evsel, make sure the PMUs between the 2 considered events differ otherwise the uniquify isn't adding value.
--- tools/perf/builtin-record.c | 7 +- tools/perf/builtin-top.c | 7 +- tools/perf/util/evlist.c | 66 ++++++++++----- tools/perf/util/evlist.h | 3 +- tools/perf/util/evsel.c | 113 +++++++++++++++++++++++++ tools/perf/util/evsel.h | 4 + tools/perf/util/stat-display.c | 149 +-------------------------------- 7 files changed, 176 insertions(+), 173 deletions(-)
tools/perf/builtin-record.c +6 -1
@@ -26,6 +26,7 @@#include "util/target.h" #include "util/session.h" #include "util/tool.h" +#include "util/stat.h" #include "util/symbol.h" #include "util/record.h" #include "util/cpumap.h"
@@ -2484,7 +2485,11 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)pr_warning ("WARNING: --timestamp-filename option is not available in pipe mode.\n" ); } -evlist__uniquify_name (rec->evlist); +/* +* Use global stat_config that is zero meaning aggr_mode is AGGR_NONE +* and hybrid_merge is false. +*/ +evlist__uniquify_evsel_names (rec->evlist, &stat_config);evlist__config (rec->evlist, opts, &callchain_param);
tools/perf/builtin-top.c +6 -1
@@ -35,6 +35,7 @@#include "util/mmap.h" #include "util/session.h" #include "util/thread.h" +#include "util/stat.h" #include "util/symbol.h" #include "util/synthetic-events.h" #include "util/top.h"
@@ -1309,7 +1310,11 @@ static int __cmd_top(struct perf_top *top) } } -evlist__uniquify_name (top->evlist); +/* +* Use global stat_config that is zero meaning aggr_mode is AGGR_NONE +* and hybrid_merge is false. +*/ +evlist__uniquify_evsel_names (top->evlist, &stat_config); ret =perf_top__start_counters (top);if (ret)return ret;
tools/perf/util/evlist.c +44 -22
78 lines not on this page · raw message
tools/perf/util/evlist.h +2 -1
@@ -19,6 +19,7 @@struct pollfd ;struct thread_map ;struct perf_cpu_map ; +struct perf_stat_config ;struct record_opts ;struct strbuf ;struct target ;
@@ -434,7 +435,7 @@ struct evsel *evlist__find_evsel(struct evlist *evlist, int idx);void evlist__format_evsels (struct evlist *evlist,struct strbuf *sb,size_t max_length);void evlist__check_mem_load_aux (struct evlist *evlist);void evlist__warn_user_requested_cpus (struct evlist *evlist,const char *cpu_list); -void evlist__uniquify_name (struct evlist *evlist); +void evlist__uniquify_evsel_names (struct evlist *evlist,const struct perf_stat_config *config);bool evlist__has_bpf_output (struct evlist *evlist);bool evlist__needs_bpf_sb_event (struct evlist *evlist);
tools/perf/util/evsel.c +113 -0
116 lines not on this page · raw message
tools/perf/util/evsel.h +4 -0
@@ -16,6 +16,7 @@struct bpf_object ;struct cgroup ;struct perf_counts ; +struct perf_stat_config ;struct perf_stat_evsel ;union perf_event ;struct bpf_counter_ops ;
@@ -548,6 +549,9 @@ void evsel__remove_from_group(struct evsel *evsel, struct evsel *leader);bool arch_evsel__must_be_in_group (const struct evsel *evsel); +bool evsel__set_needs_uniquify (struct evsel *counter,const struct perf_stat_config *config); +void evsel__uniquify_counter (struct evsel *counter); +/* * Macro to swap the bit-field postition and size. * Used when,
tools/perf/util/stat-display.c +1 -148
173 lines not on this page · raw message
Signature · 1 line
2.49.0.1045.g170613ef41-goog
PATCH v3 2/3 perf parse-events: Use wildcard processing to set an event to merge into
In reply to Chun-Tse ShaoFrom: Ian Rogers <[email protected]>
The merge stat code fails for uncore events if they are repeated twice, for example perf stat -e clockticks,clockticks -I 1000 as the counts of the second set of uncore events will be merged into the first counter. Reimplement the logic to have a first_wildcard_match so that merged later events correctly merge into the first wildcard event that they will be aggregated into.
--- tools/perf/util/evsel.c | 18 ++++--- tools/perf/util/evsel.h | 7 ++- tools/perf/util/parse-events.c | 86 ++++++++++++++++++++++++---------- tools/perf/util/stat-display.c | 11 ++++- tools/perf/util/stat.c | 40 ++-------------- 5 files changed, 89 insertions(+), 73 deletions(-)
tools/perf/util/evsel.c +11 -7
@@ -552,11 +552,11 @@ struct evsel *evsel__clone(struct evsel *dest, struct evsel *orig) evsel->exclude_GH = orig->exclude_GH; evsel->sample_read = orig->sample_read; - evsel->auto_merge_stats = orig->auto_merge_stats; evsel->collect_stat = orig->collect_stat; evsel->weak_group = orig->weak_group; evsel->use_config_name = orig->use_config_name; evsel->pmu = orig->pmu; + evsel->first_wildcard_match = orig->first_wildcard_match;if (evsel__copy_config_terms (evsel, orig) <0 ) goto out_err;
@@ -3964,11 +3964,6 @@ bool evsel__set_needs_uniquify(struct evsel *counter, const struct perf_stat_conreturn true; } -if (counter->merged_stat) { -/* Counter won't be shown. */ -return false; - } -if (counter->use_config_name || counter->is_libpfm_event) {/* Original name will be used. */ return false;
@@ -3997,12 +3992,21 @@ bool evsel__set_needs_uniquify(struct evsel *counter, const struct perf_stat_conreturn true; } +if (counter->first_wildcard_match !=NULL ) { +/* +* If stats are merged then only the first_wildcard_match is +* displayed, there is no need to uniquify this evsel as the +* name won't be shown. +*/ +return false; + } +/* * Do other non-merged events in the evlist have the same name? If so * uniquify is necessary. */ evlist__for_each_entry (counter->evlist, evsel) { -if (evsel == counter || evsel->merged_stat || evsel->pmu == counter->pmu) +if (evsel == counter || evsel->first_wildcard_match || evsel->pmu == counter->pmu)continue ;if (evsel__name_is (counter,evsel__name (evsel))) {
tools/perf/util/evsel.h +5 -2
@@ -70,6 +70,11 @@ struct evsel {const char *unit;struct cgroup *cgrp;const char *metric_id; +/* +* This point to the first evsel with the same name, intended to store the +* aggregated counts in aggregation mode. +*/ +struct evsel *first_wildcard_match;/* parse modifier helper */ int exclude_GH;int sample_read;
@@ -78,7 +83,6 @@ struct evsel {bool percore;bool precise_max;bool is_libpfm_event; -bool auto_merge_stats;bool collect_stat;bool weak_group;bool bpf_counter;
@@ -115,7 +119,6 @@ struct evsel {bool ignore_missing_thread;bool forced_leader;bool cmdline_group_boundary; -bool merged_stat;bool reset_group;bool errored;bool needs_auxtrace_mmap;
tools/perf/util/parse-events.c +61 -25
262 lines not on this page · raw message
tools/perf/util/stat-display.c +9 -2
@@ -1002,8 +1002,15 @@ static void print_counter_aggrdata(struct perf_stat_config *config, os->evsel = counter;/* Skip already merged uncore/hybrid events */ -if (counter->merged_stat) -return ; +if (config->aggr_mode !=AGGR_NONE ) { +if (evsel__is_hybrid (counter)) { +if (config->hybrid_merge && counter->first_wildcard_match !=NULL ) +return ; + }else { +if (counter->first_wildcard_match !=NULL ) +return ; + } + } val = aggr->counts.val; ena = aggr->counts.ena;
tools/perf/util/stat.c +3 -37
@@ -535,35 +535,6 @@ static int evsel__merge_aggr_counters(struct evsel *evsel, struct evsel *alias)return 0 ; } -/* -* Events should have the same name, scale, unit, cgroup but on different core -* PMUs or on different but matching uncore PMUs. -*/ -static bool evsel__is_alias (struct evsel *evsel_a,struct evsel *evsel_b) -{ -if (strcmp (evsel__name (evsel_a),evsel__name (evsel_b))) -return false; - -if (evsel_a->scale != evsel_b->scale) -return false; - -if (evsel_a->cgrp != evsel_b->cgrp) -return false; - -if (strcmp (evsel_a->unit, evsel_b->unit)) -return false; - -if (evsel__is_clock (evsel_a) !=evsel__is_clock (evsel_b)) -return false; - -if (evsel_a->pmu == evsel_b->pmu || evsel_a->pmu ==NULL || evsel_b->pmu ==NULL ) -return false; - -if (evsel_a->pmu->is_core) -return evsel_b->pmu->is_core; - -return perf_pmu__name_no_suffix_match (evsel_a->pmu, evsel_b->pmu->name); -}static void evsel__merge_aliases (struct evsel *evsel) {
@@ -572,10 +543,9 @@ static void evsel__merge_aliases(struct evsel *evsel) alias =list_prepare_entry (evsel, &(evlist->core.entries), core.node);list_for_each_entry_continue (alias, &evlist->core.entries, core.node) { -/* Merge the same events on different PMUs. */ -if (evsel__is_alias (evsel, alias)) { +if (alias->first_wildcard_match == evsel) { +/* Merge the same events on different PMUs. */ evsel__merge_aggr_counters (evsel, alias); - alias->merged_stat = true; } } }
@@ -588,11 +558,7 @@ static bool evsel__should_merge_hybrid(const struct evsel *evsel,static void evsel__merge_stats (struct evsel *evsel,struct perf_stat_config *config) { -/* this evsel is already merged */ -if (evsel->merged_stat) -return ; - -if (evsel->auto_merge_stats ||evsel__should_merge_hybrid (evsel, config)) +if (!evsel->pmu || !evsel->pmu->is_core ||evsel__should_merge_hybrid (evsel, config))evsel__merge_aliases (evsel); }
Signature · 1 line
2.49.0.1045.g170613ef41-goog
PATCH v3 3/3 perf test: Add stat uniquifying test
In reply to Chun-Tse ShaoThe stat+uniquify.sh test retrieves all uniquified clockticks events from perf list -v clockticks and check if perf stat -e clockticks -A contains all of them.
--- .../tests/shell/stat+event_uniquifying.sh | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100755 tools/perf/tests/shell/stat+event_uniquifying.sh
tools/perf/tests/shell/stat+event_uniquifying.sh new file +69 -0
@@ -0,0 +1,69 @@ +#!/bin/bash +# perf stat events uniquifying +# SPDX-License-Identifier: GPL-2.0 + +set -e + +stat_output=$(mktemp /tmp/__perf_test.stat_output.XXXXX) +perf_tool=perf +err=0 + +test_event_uniquifying() { + # We use `clockticks` to verify the uniquify behavior. + event="clockticks" + + # If the `-A` option is added, the event should be uniquified. + # + # $perf list -v clockticks + # + # List of pre-defined events (to be used in -e or -M): + # + # uncore_imc_0/clockticks/ [Kernel PMU event] + # uncore_imc_1/clockticks/ [Kernel PMU event] + # uncore_imc_2/clockticks/ [Kernel PMU event] + # uncore_imc_3/clockticks/ [Kernel PMU event] + # uncore_imc_4/clockticks/ [Kernel PMU event] + # uncore_imc_5/clockticks/ [Kernel PMU event] + # + # ... + # + # $perf stat -e clockticks -A -- true + # + # Performance counter stats for 'system wide': + # + # CPU0 3,773,018 uncore_imc_0/clockticks/ + # CPU0 3,609,025 uncore_imc_1/clockticks/ + # CPU0 0 uncore_imc_2/clockticks/ + # CPU0 3,230,009 uncore_imc_3/clockticks/ + # CPU0 3,049,897 uncore_imc_4/clockticks/ + # CPU0 0 uncore_imc_5/clockticks/ + # + # 0.002029828 seconds time elapsed + + echo "stat event uniquifying test" + uniquified_event_array=() + + # Check how many uniquified events. + while IFS= read -r line; do + uniquified_event=$(echo "$line" | awk '{print $1}') + uniquified_event_array+=("${uniquified_event}") + done < <(${perf_tool} list -v ${event} | grep "\[Kernel PMU event\]") + + perf_command="${perf_tool} stat -e $event -A -o ${stat_output} -- true" + $perf_command + + # Check the output contains all uniquified events. + for uniquified_event in "${uniquified_event_array[@]}"; do + if ! cat "${stat_output}" | grep -q "${uniquified_event}"; then + echo "Event is not uniquified [Failed]" + echo "${perf_command}" + cat "${stat_output}" + err=1 + break + fi + done +} + +test_event_uniquifying +rm -f "${stat_output}" +exit $err
Signature · 1 line
2.49.0.1045.g170613ef41-goog
Arnaldo Carvalho de Melo
maintainerQuoted 11 lines · Chun-Tse Shao
Let's take a look an example, the machine is SKX with 6 IMC devices.
perf stat -e clockticks,clockticks -I 1000
# time counts unit events1.001127430 6,901,503,174 uncore_imc_0/clockticks/ 1.001127430 3,940,896,301 uncore_imc_0/clockticks/ 2.002649722 988,376,876 uncore_imc_0/clockticks/ 2.002649722 988,376,141 uncore_imc_0/clockticks/ 3.004071319 1,000,292,675 uncore_imc_0/clockticks/ 3.004071319 1,000,294,160 uncore_imc_0/clockticks/
Quoted 5 lines
1) The events name should not be uniquified.
2) The initial count for the firstclockticksis doubled.
3) Subsequent count only report for the first IMC device.The first patch fixes 1) and 3), and the second patch fixes 2).
So, after having just the first patch applied I'm getting:
CC /tmp/build/perf-tools-next/util/bpf-filter-flex.outil/parse-events.c: In function ‘__parse_events’:util/parse-events.c:2270:25: error: implicit declaration of function ‘evlist__uniquify_name’; did you mean ‘evlist__uniquify_evsel_names’? [-Wimplicit-function-declaration]
2270 | evlist__uniquify_name(evlist);
| ^~~~~~~~~~~~~~~~~~~~~
| evlist__uniquify_evsel_namesmake[4]: *** [/home/acme/git/perf-tools-next/tools/build/Makefile.build:85: /tmp/build/perf-tools-next/util/parse-events.o] Error 1 make[4]: *** Waiting for unfinished jobs....
make[3]: *** [/home/acme/git/perf-tools-next/tools/build/Makefile.build:142: util] Error 2
make[2]: *** [Makefile.perf:798: /tmp/build/perf-tools-next/perf-util-in.o] Error 2
make[2]: *** Waiting for unfinished jobs....
CC /tmp/build/perf-tools-next/pmu-events/pmu-events.o
LD /tmp/build/perf-tools-next/pmu-events/pmu-events-in.o
make[1]: *** [Makefile.perf:290: sub-make] Error 2
make: *** [Makefile:119: install-bin] Error 2
make: Leaving directory '/home/acme/git/perf-tools-next/tools/perf'
⬢ [acme@toolbx perf-tools-next]$
⬢ [acme@toolbx perf-tools-next]$
⬢ [acme@toolbx perf-tools-next]$
⬢ [acme@toolbx perf-tools-next]$
⬢ [acme@toolbx perf-tools-next]$
⬢ [acme@toolbx perf-tools-next]$
⬢ [acme@toolbx perf-tools-next]$
⬢ [acme@toolbx perf-tools-next]$ git log --oneline -36ffcaec3ac0d055a (HEAD) perf evlist: Make uniquifying counter names consistent 4102ff8b1fdaa588 perf metricgroup: Binary search when resolving referred to metrics 754baf426e099fbf perf pmu: Change aliases from list to hashmap
⬢ [acme@toolbx perf-tools-next]$
When test building the second patch, it builds, so I'm now looking if you used things from the future or if the second patch removes the problem.
- Arnaldo
Quoted 64 lines
After these fix:
perf stat -e clockticks,clockticks -I 1000
# time counts unit events1.001127586 4,126,938,857 clockticks 1.001127586 4,121,564,277 clockticks 2.001686014 3,953,806,350 clockticks 2.001686014 3,953,809,541 clockticks 3.003121403 4,137,750,252 clockticks 3.003121403 4,137,749,048 clockticksI also tested
-A,--per-socket,--per-dieand--per-core, all looks good.Ian tested
hybrid-mergeandhwmon, all looks good as well.Chun-Tse Shao (1):
perf test: Add stat uniquifying testIan Rogers (2):
perf evlist: Make uniquifying counter names consistent perf parse-events: Use wildcard processing to set an event to merge
intotools/perf/builtin-record.c | 7 +- tools/perf/builtin-top.c | 7 +- .../tests/shell/stat+event_uniquifying.sh | 69 ++++++++ tools/perf/util/evlist.c | 66 +++++--- tools/perf/util/evlist.h | 3 +- tools/perf/util/evsel.c | 119 ++++++++++++- tools/perf/util/evsel.h | 11 +- tools/perf/util/parse-events.c | 90 +++++++--- tools/perf/util/stat-display.c | 160 ++---------------- tools/perf/util/stat.c | 40 +---- 10 files changed, 332 insertions(+), 240 deletions(-) create mode 100755 tools/perf/tests/shell/stat+event_uniquifying.sh--
v3: Rebase with tmp.perf-tools-next. Since most of the conflicts are from lore.kernel.org/[email protected], tested v3 patches with:perf stat -A -C 0,4-5,8 -e "instructions/cpu=0/,l1d-misses/cpu=4,cpu=5/,inst_retired.any/cpu=8/,cycles" -a sleep 0.1
Performance counter stats for 'system wide':
CPU0 682,860 instructions/cpu=0/ # 0.27 insn per cycle CPU4 53,774 l1d-misses CPU5 18,725 l1d-misses CPU8 608,698 inst_retired.any/cpu=8/ CPU0 2,574,325 cycles CPU4 4,267,115 cycles CPU5 1,741,536 cycles CPU8 1,969,547 cycles0.102746958 seconds time elapsedv2: lore.kernel.org/[email protected]
- Fixes forhwmonand--hybrid-merge.
- Add a test for event uniquifying.v1: lore.kernel.org/[email protected]
2.49.0.1045.g170613ef41-goog
Arnaldo Carvalho de Melo
maintainerQuoted 51 lines · Arnaldo Carvalho de Melo
Quoted 11 lines · Chun-Tse Shao
Let's take a look an example, the machine is SKX with 6 IMC devices.
perf stat -e clockticks,clockticks -I 1000
# time counts unit events1.001127430 6,901,503,174 uncore_imc_0/clockticks/ 1.001127430 3,940,896,301 uncore_imc_0/clockticks/ 2.002649722 988,376,876 uncore_imc_0/clockticks/ 2.002649722 988,376,141 uncore_imc_0/clockticks/ 3.004071319 1,000,292,675 uncore_imc_0/clockticks/ 3.004071319 1,000,294,160 uncore_imc_0/clockticks/Quoted 5 lines
1) The events name should not be uniquified.
2) The initial count for the firstclockticksis doubled.
3) Subsequent count only report for the first IMC device.The first patch fixes 1) and 3), and the second patch fixes 2).
So, after having just the first patch applied I'm getting:
CC
/tmp/build/perf-tools-next/util/bpf-filter-flex.outil/parse-events.c: In function ‘__parse_events’:util/parse-events.c:2270:25: error: implicit declaration of function ‘evlist__uniquify_name’; did you mean ‘evlist__uniquify_evsel_names’? [-Wimplicit-function-declaration]2270 | evlist__uniquify_name(evlist); | ^~~~~~~~~~~~~~~~~~~~~ | evlist__uniquify_evsel_namesmake[4]: *** [
/home/acme/git/perf-tools-next/tools/build/Makefile.build:85:/tmp/build/perf-tools-next/util/parse-events.o] Error 1 make[4]: *** Waiting for unfinished jobs....
make[3]: *** [/home/acme/git/perf-tools-next/tools/build/Makefile.build:142: util] Error 2
make[2]: *** [Makefile.perf:798:/tmp/build/perf-tools-next/perf-util-in.o] Error 2
make[2]: *** Waiting for unfinished jobs....CC
/tmp/build/perf-tools-next/pmu-events/pmu-events.o
LD/tmp/build/perf-tools-next/pmu-events/pmu-events-in.o
make[1]: *** [Makefile.perf:290: sub-make] Error 2
make: *** [Makefile:119: install-bin] Error 2
make: Leaving directory '/home/acme/git/perf-tools-next/tools/perf'
⬢ [acme@toolbx perf-tools-next]$
⬢ [acme@toolbx perf-tools-next]$
⬢ [acme@toolbx perf-tools-next]$
⬢ [acme@toolbx perf-tools-next]$
⬢ [acme@toolbx perf-tools-next]$
⬢ [acme@toolbx perf-tools-next]$
⬢ [acme@toolbx perf-tools-next]$
⬢ [acme@toolbx perf-tools-next]$ git log --oneline -36ffcaec3ac0d055a(HEAD) perf evlist: Make uniquifying counter names consistent4102ff8b1fdaa588perf metricgroup: Binary search when resolving referred to metrics754baf426e099fbfperf pmu: Change aliases from list to hashmap
⬢ [acme@toolbx perf-tools-next]$
Quoted 3 lines
When test building the second patch, it builds, so I'm now looking if you used things from the future or if the second patch removes the problem.
At that point:
util/parse-events.c: In function ‘__parse_events’:util/parse-events.c:2270:25: error: implicit declaration of function ‘evlist__uniquify_name’; did you mean ‘evlist__uniquify_evsel_names’? [-Wimplicit-function-declaration]
2270 | evlist__uniquify_name(evlist);
| ^~~~~~~~~~~~~~~~~~~~~
| evlist__uniquify_evsel_namesmake[4]: *** [/home/acme/git/perf-tools-next/tools/build/Makefile.build:85: /tmp/build/perf-tools-next/util/parse-events.o] Error 1 make[4]: *** Waiting for unfinished jobs....
LD /tmp/build/perf-tools-next/util/scripting-engines/perf-util-in.o
make[3]: *** [/home/acme/git/perf-tools-next/tools/build/Makefile.build:142: util] Error 2
make[2]: *** [Makefile.perf:798: /tmp/build/perf-tools-next/perf-util-in.o] Error 2
make[1]: *** [Makefile.perf:290: sub-make] Error 2
make: *** [Makefile:119: install-bin] Error 2
make: Leaving directory '/home/acme/git/perf-tools-next/tools/perf'
⬢ [acme@toolbx perf-tools-next]$
⬢ [acme@toolbx perf-tools-next]$ git grep evlist__uniquify_nametools/perf/util/parse-events.c: evlist__uniquify_name(evlist);
⬢ [acme@toolbx perf-tools-next]$
So its the later, the second patch builds because:
⬢ [acme@toolbx perf-tools-next]$ git rebase --continue
Stopped at ed3b26e31f42d1e4... perf parse-events: Use wildcard processing to set an event to merge into You can amend the commit now, with
git commit --amend
Once you are satisfied with your changes, run
git rebase --continue
⬢ [acme@toolbx perf-tools-next]$ git grep evlist__uniquify_name ⬢ [acme@toolbx perf-tools-next]$ git show | grep evlist__uniquify_name
- evlist__uniquify_name(evlist);
⬢ [acme@toolbx perf-tools-next]$
That function isn't there anymore.
Please try to fix this and build it patch by patch so that we don't introduce bisection breakage patches.
Thanks,
- Arnaldo
Thank you Arnaldo, sorry for my mistake. Please check the v4 patchset:
lore.kernel.org/[email protected]
-CT
Quoted 101 lines · Arnaldo Carvalho de Melo
Quoted 51 lines · Arnaldo Carvalho de Melo
Quoted 11 lines · Chun-Tse Shao
Let's take a look an example, the machine is SKX with 6 IMC devices.
perf stat -e clockticks,clockticks -I 1000
# time counts unit events1.001127430 6,901,503,174 uncore_imc_0/clockticks/ 1.001127430 3,940,896,301 uncore_imc_0/clockticks/ 2.002649722 988,376,876 uncore_imc_0/clockticks/ 2.002649722 988,376,141 uncore_imc_0/clockticks/ 3.004071319 1,000,292,675 uncore_imc_0/clockticks/ 3.004071319 1,000,294,160 uncore_imc_0/clockticks/Quoted 5 lines
1) The events name should not be uniquified.
2) The initial count for the firstclockticksis doubled.
3) Subsequent count only report for the first IMC device.The first patch fixes 1) and 3), and the second patch fixes 2).
So, after having just the first patch applied I'm getting:
CC
/tmp/build/perf-tools-next/util/bpf-filter-flex.outil/parse-events.c: In function ‘__parse_events’:util/parse-events.c:2270:25: error: implicit declaration of function ‘evlist__uniquify_name’; did you mean ‘evlist__uniquify_evsel_names’? [-Wimplicit-function-declaration]2270 | evlist__uniquify_name(evlist); | ^~~~~~~~~~~~~~~~~~~~~ | evlist__uniquify_evsel_namesmake[4]: *** [
/home/acme/git/perf-tools-next/tools/build/Makefile.build:85:/tmp/build/perf-tools-next/util/parse-events.o] Error 1 make[4]: *** Waiting for unfinished jobs....
make[3]: *** [/home/acme/git/perf-tools-next/tools/build/Makefile.build:142: util] Error 2
make[2]: *** [Makefile.perf:798:/tmp/build/perf-tools-next/perf-util-in.o] Error 2
make[2]: *** Waiting for unfinished jobs....CC
/tmp/build/perf-tools-next/pmu-events/pmu-events.o
LD/tmp/build/perf-tools-next/pmu-events/pmu-events-in.o
make[1]: *** [Makefile.perf:290: sub-make] Error 2
make: *** [Makefile:119: install-bin] Error 2
make: Leaving directory '/home/acme/git/perf-tools-next/tools/perf'
⬢ [acme@toolbx perf-tools-next]$
⬢ [acme@toolbx perf-tools-next]$
⬢ [acme@toolbx perf-tools-next]$
⬢ [acme@toolbx perf-tools-next]$
⬢ [acme@toolbx perf-tools-next]$
⬢ [acme@toolbx perf-tools-next]$
⬢ [acme@toolbx perf-tools-next]$
⬢ [acme@toolbx perf-tools-next]$ git log --oneline -36ffcaec3ac0d055a(HEAD) perf evlist: Make uniquifying counter names consistent4102ff8b1fdaa588perf metricgroup: Binary search when resolving referred to metrics754baf426e099fbfperf pmu: Change aliases from list to hashmap
⬢ [acme@toolbx perf-tools-next]$Quoted 3 lines
When test building the second patch, it builds, so I'm now looking if you used things from the future or if the second patch removes the problem.
At that point:
util/parse-events.c: In function ‘__parse_events’:util/parse-events.c:2270:25: error: implicit declaration of function ‘evlist__uniquify_name’; did you mean ‘evlist__uniquify_evsel_names’? [-Wimplicit-function-declaration]2270 | evlist__uniquify_name(evlist); | ^~~~~~~~~~~~~~~~~~~~~ | evlist__uniquify_evsel_namesmake[4]: *** [
/home/acme/git/perf-tools-next/tools/build/Makefile.build:85:/tmp/build/perf-tools-next/util/parse-events.o] Error 1 make[4]: *** Waiting for unfinished jobs....
LD/tmp/build/perf-tools-next/util/scripting-engines/perf-util-in.o
make[3]: *** [/home/acme/git/perf-tools-next/tools/build/Makefile.build:142: util] Error 2
make[2]: *** [Makefile.perf:798:/tmp/build/perf-tools-next/perf-util-in.o] Error 2
make[1]: *** [Makefile.perf:290: sub-make] Error 2
make: *** [Makefile:119: install-bin] Error 2
make: Leaving directory '/home/acme/git/perf-tools-next/tools/perf'
⬢ [acme@toolbx perf-tools-next]$
⬢ [acme@toolbx perf-tools-next]$ git grepevlist__uniquify_nametools/perf/util/parse-events.c:evlist__uniquify_name(evlist);
⬢ [acme@toolbx perf-tools-next]$So its the later, the second patch builds because:
⬢ [acme@toolbx perf-tools-next]$ git rebase --continue
Stopped ated3b26e31f42d1e4... perf parse-events: Use wildcard processing to set an event to merge into You can amend the commit now, withgit commit --amendOnce you are satisfied with your changes, run
git rebase --continue
⬢ [acme@toolbx perf-tools-next]$ git grepevlist__uniquify_name⬢ [acme@toolbx perf-tools-next]$ git show | grepevlist__uniquify_name
-evlist__uniquify_name(evlist);
⬢ [acme@toolbx perf-tools-next]$That function isn't there anymore.
Please try to fix this and build it patch by patch so that we don't introduce bisection breakage patches.
Thanks,
- Arnaldo