perf stat: Merge uncore events by default for hybrid platform
PATCH 1/1 perf stat: Merge uncore events by default for hybrid platform
On hybrid platform, by default stat aggregates and reports the event counts per pmu. For example,
# perf stat -e cycles -a true
Performance counter stats for 'system wide':
1,400,445 cpu_core/cycles/
680,881 cpu_atom/cycles/
0.001770773 seconds time elapsedWhile for uncore events, that's not a suitable method. Uncore has nothing to do with hybrid. So for uncore events, we aggregate event counts from all PMUs and report the counts without PMUs.
Before:
# perf stat -e arb/event=0x81,umask=0x1/,arb/event=0x84,umask=0x1/ -a true
Performance counter stats for 'system wide':
2,058 uncore_arb_0/event=0x81,umask=0x1/
2,028 uncore_arb_1/event=0x81,umask=0x1/
0 uncore_arb_0/event=0x84,umask=0x1/
0 uncore_arb_1/event=0x84,umask=0x1/0.000614498 seconds time elapsed
After:
# perf stat -e arb/event=0x81,umask=0x1/,arb/event=0x84,umask=0x1/ -a true
Performance counter stats for 'system wide':
3,996 arb/event=0x81,umask=0x1/
0 arb/event=0x84,umask=0x1/
0.000630046 seconds time elapsedOf course, we also keep the '--no-merge' still works for uncore events.
# perf stat -e arb/event=0x81,umask=0x1/,arb/event=0x84,umask=0x1/ --no-merge true
Performance counter stats for 'system wide':
1,952 uncore_arb_0/event=0x81,umask=0x1/
1,921 uncore_arb_1/event=0x81,umask=0x1/
0 uncore_arb_0/event=0x84,umask=0x1/
0 uncore_arb_1/event=0x84,umask=0x1/0.000575536 seconds time elapsed
--- tools/perf/builtin-stat.c | 3 --- tools/perf/util/stat-display.c | 29 +++++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 7 deletions(-)
tools/perf/builtin-stat.c +0 -3
@@ -2442,9 +2442,6 @@ int cmd_stat(int argc, const char **argv)evlist__check_cpu_maps (evsel_list); -if (perf_pmu__has_hybrid ()) - stat_config.no_merge = true; -/* * Initialize thread_map with comm names, * so we could print it out on output.
tools/perf/util/stat-display.c +25 -4
@@ -595,6 +595,19 @@ static void collect_all_aliases(struct perf_stat_config *config, struct evsel *c } } +static bool is_uncore (struct evsel *evsel) +{ +struct perf_pmu *pmu; + +if (evsel->pmu_name) { + pmu =perf_pmu__find (evsel->pmu_name); +if (pmu) +return pmu->is_uncore; + } + +return false; +} + static bool collect_data(struct perf_stat_config *config, struct evsel *counter, void (*cb)(struct perf_stat_config *config, struct evsel *counter, void *data, bool first),
@@ -603,10 +616,18 @@ static bool collect_data(struct perf_stat_config *config, struct evsel *counter,if (counter->merged_stat)return false;cb (config, counter, data, true); -if (config->no_merge) -uniquify_event_name (counter); -else if (counter->auto_merge_stats) -collect_all_aliases (config, counter, cb, data); +if (perf_pmu__has_hybrid ()) { +if (config->no_merge || !is_uncore (counter)) +uniquify_event_name (counter); +else if (counter->auto_merge_stats) +collect_all_aliases (config, counter, cb, data); + }else { +if (config->no_merge) +uniquify_event_name (counter); +else if (counter->auto_merge_stats) +collect_all_aliases (config, counter, cb, data); + } +return true; }
Signature · 1 line
2.17.1
Hi,
Quoted 111 lines · Jin Yao
On hybrid platform, by default stat aggregates and reports the event counts per pmu. For example,
# perf stat -e cycles -a truePerformance counter stats for 'system wide': 1,400,445 cpu_core/cycles/ 680,881 cpu_atom/cycles/ 0.001770773 seconds time elapsedWhile for uncore events, that's not a suitable method. Uncore has nothing to do with hybrid. So for uncore events, we aggregate event counts from all PMUs and report the counts without PMUs.
Before:
# perf stat -e arb/event=0x81,umask=0x1/,arb/event=0x84,umask=0x1/ -a truePerformance counter stats for 'system wide': 2,058 uncore_arb_0/event=0x81,umask=0x1/ 2,028 uncore_arb_1/event=0x81,umask=0x1/ 0 uncore_arb_0/event=0x84,umask=0x1/ 0 uncore_arb_1/event=0x84,umask=0x1/ 0.000614498 seconds time elapsedAfter:
# perf stat -e arb/event=0x81,umask=0x1/,arb/event=0x84,umask=0x1/ -a truePerformance counter stats for 'system wide': 3,996 arb/event=0x81,umask=0x1/ 0 arb/event=0x84,umask=0x1/ 0.000630046 seconds time elapsedOf course, we also keep the '--no-merge' still works for uncore events.
# perf stat -e arb/event=0x81,umask=0x1/,arb/event=0x84,umask=0x1/ --no-merge truePerformance counter stats for 'system wide': 1,952 uncore_arb_0/event=0x81,umask=0x1/ 1,921 uncore_arb_1/event=0x81,umask=0x1/ 0 uncore_arb_0/event=0x84,umask=0x1/ 0 uncore_arb_1/event=0x84,umask=0x1/ 0.000575536 seconds time elapsedSigned-off-by Jin Yao <[email protected]>--- tools/perf/builtin-stat.c | 3 --- tools/perf/util/stat-display.c | 29 +++++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 7 deletions(-)tools/perf/builtin-stat.c +0
-3@@ -2442,9 +2442,6 @@ int cmd_stat(int argc, const char **argv)evlist__check_cpu_maps (evsel_list); -if (perf_pmu__has_hybrid ()) - stat_config.no_merge = true; -/* * Initialize thread_map with comm names, * so we could print it out on output. tools/perf/util/stat-display.c +18
-4@@ -595,6 +595,19 @@ static void collect_all_aliases(struct perf_stat_config *config, struct evsel *c } } +static bool is_uncore (struct evsel *evsel) +{ +struct perf_pmu *pmu; + +if (evsel->pmu_name) { + pmu =perf_pmu__find (evsel->pmu_name); +if (pmu) +return pmu->is_uncore; + } + +return false; +} + static bool collect_data(struct perf_stat_config *config, struct evsel *counter, void (*cb)(struct perf_stat_config *config, struct evsel *counter, void *data, bool first),@@ -603,10 +616,18 @@ static bool collect_data(struct perf_stat_config *config, struct evsel *counter,if (counter->merged_stat)return false;cb (config, counter, data, true); -if (config->no_merge) -uniquify_event_name (counter); -else if (counter->auto_merge_stats) -collect_all_aliases (config, counter, cb, data); +if (perf_pmu__has_hybrid ()) { +if (config->no_merge || !is_uncore (counter)) +uniquify_event_name (counter); +else if (counter->auto_merge_stats) +collect_all_aliases (config, counter, cb, data);
tools/perf/util/stat-display.c static bool collect_data(struct perf_stat_config *config, struct evsel *counter, · line 633
Quoted 10 lines
tools/perf/util/stat-display.c +7
-0+ }else { +if (config->no_merge) +uniquify_event_name (counter); +else if (counter->auto_merge_stats) +collect_all_aliases (config, counter, cb, data); + } +return true; }
Any comments for this patch? :)
Thanks
Jin Yao
Quoted 79 lines · Yao
Hi,
Quoted 76 lines · Jin Yao
On hybrid platform, by default stat aggregates and reports the event counts per pmu. For example,
# perf stat -e cycles -a truePerformance counter stats for 'system wide': 1,400,445 cpu_core/cycles/ 680,881 cpu_atom/cycles/ 0.001770773 seconds time elapsedWhile for uncore events, that's not a suitable method. Uncore has nothing to do with hybrid. So for uncore events, we aggregate event counts from all PMUs and report the counts without PMUs.
Before:
# perf stat -e arb/event=0x81,umask=0x1/,arb/event=0x84,umask=0x1/ -a truePerformance counter stats for 'system wide': 2,058 uncore_arb_0/event=0x81,umask=0x1/ 2,028 uncore_arb_1/event=0x81,umask=0x1/ 0 uncore_arb_0/event=0x84,umask=0x1/ 0 uncore_arb_1/event=0x84,umask=0x1/ 0.000614498 seconds time elapsedAfter:
# perf stat -e arb/event=0x81,umask=0x1/,arb/event=0x84,umask=0x1/ -a truePerformance counter stats for 'system wide': 3,996 arb/event=0x81,umask=0x1/ 0 arb/event=0x84,umask=0x1/ 0.000630046 seconds time elapsedOf course, we also keep the '--no-merge' still works for uncore events.
# perf stat -e arb/event=0x81,umask=0x1/,arb/event=0x84,umask=0x1/ --no-merge truePerformance counter stats for 'system wide': 1,952 uncore_arb_0/event=0x81,umask=0x1/ 1,921 uncore_arb_1/event=0x81,umask=0x1/ 0 uncore_arb_0/event=0x84,umask=0x1/ 0 uncore_arb_1/event=0x84,umask=0x1/ 0.000575536 seconds time elapsedSigned-off-by Jin Yao <[email protected]>--- tools/perf/builtin-stat.c | 3 --- tools/perf/util/stat-display.c | 29 +++++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 7 deletions(-)tools/perf/builtin-stat.c +0
-3@@ -2442,9 +2442,6 @@ int cmd_stat(int argc, const char **argv)evlist__check_cpu_maps (evsel_list); -if (perf_pmu__has_hybrid ()) - stat_config.no_merge = true; -/* * Initialize thread_map with comm names, * so we could print it out on output. tools/perf/util/stat-display.c +0
-0@@ -595,6 +595,19 @@ static void collect_all_aliases(struct perf_stat_config *config, struct evsel *c
Quoted 8 lines
tools/perf/util/stat-display.c static void collect_all_aliases(struct perf_stat_config *config, struct evsel *c · line 603
Quoted 8 lines
tools/perf/util/stat-display.c +6
-0} } +static bool is_uncore (struct evsel *evsel) +{ +struct perf_pmu *pmu; + +if (evsel->pmu_name) { + pmu =perf_pmu__find (evsel->pmu_name);
evsel__find_pmu might be one line shorter? ;-)
Quoted 12 lines
Quoted 12 lines
tools/perf/util/stat-display.c +7
-0+if (pmu) +return pmu->is_uncore; + } + +return false; +} + static bool collect_data(struct perf_stat_config *config, struct evsel *counter, void (*cb)(struct perf_stat_config *config, struct evsel *counter, void *data, bool first),@@ -603,10 +616,18 @@ static bool collect_data(struct perf_stat_config *config, struct evsel *counter,if (counter->merged_stat)
Quoted 8 lines
tools/perf/util/stat-display.c static bool collect_data(struct perf_stat_config *config, struct evsel *counter, · line 620
Quoted 8 lines
tools/perf/util/stat-display.c +2
-4return false;cb (config, counter, data, true); -if (config->no_merge) -uniquify_event_name (counter); -else if (counter->auto_merge_stats) -collect_all_aliases (config, counter, cb, data); +if (perf_pmu__has_hybrid ()) { +if (config->no_merge || !is_uncore (counter))
hum, this is all the same except for the !is_uncore condition, right?
could we just add 'config->no_merge || hybrid_uniquify(count)'
that would cover both perf_pmu__has_hybrid and !is_uncore conditions?
jirka
Quoted 19 lines
tools/perf/util/stat-display.c static bool collect_data(struct perf_stat_config *config, struct evsel *counter, · line 633
Quoted 13 lines
tools/perf/util/stat-display.c +10
-0+uniquify_event_name (counter); + else if (counter->auto_merge_stats) + collect_all_aliases(config, counter, cb, data); + }else { +if (config->no_merge) +uniquify_event_name (counter); +else if (counter->auto_merge_stats) +collect_all_aliases (config, counter, cb, data); + } +return true; }Any comments for this patch? :)
Thanks
Jin Yao
Hi Jiri,
Quoted 82 lines · Jiri Olsa
Quoted 81 lines · Yao
Hi,
Quoted 78 lines · Jin Yao
On hybrid platform, by default stat aggregates and reports the event counts per pmu. For example,
# perf stat -e cycles -a truePerformance counter stats for 'system wide': 1,400,445 cpu_core/cycles/ 680,881 cpu_atom/cycles/ 0.001770773 seconds time elapsedWhile for uncore events, that's not a suitable method. Uncore has nothing to do with hybrid. So for uncore events, we aggregate event counts from all PMUs and report the counts without PMUs.
Before:
# perf stat -e arb/event=0x81,umask=0x1/,arb/event=0x84,umask=0x1/ -a truePerformance counter stats for 'system wide': 2,058 uncore_arb_0/event=0x81,umask=0x1/ 2,028 uncore_arb_1/event=0x81,umask=0x1/ 0 uncore_arb_0/event=0x84,umask=0x1/ 0 uncore_arb_1/event=0x84,umask=0x1/ 0.000614498 seconds time elapsedAfter:
# perf stat -e arb/event=0x81,umask=0x1/,arb/event=0x84,umask=0x1/ -a truePerformance counter stats for 'system wide': 3,996 arb/event=0x81,umask=0x1/ 0 arb/event=0x84,umask=0x1/ 0.000630046 seconds time elapsedOf course, we also keep the '--no-merge' still works for uncore events.
# perf stat -e arb/event=0x81,umask=0x1/,arb/event=0x84,umask=0x1/ --no-merge truePerformance counter stats for 'system wide': 1,952 uncore_arb_0/event=0x81,umask=0x1/ 1,921 uncore_arb_1/event=0x81,umask=0x1/ 0 uncore_arb_0/event=0x84,umask=0x1/ 0 uncore_arb_1/event=0x84,umask=0x1/ 0.000575536 seconds time elapsedSigned-off-by Jin Yao <[email protected]>--- tools/perf/builtin-stat.c | 3 --- tools/perf/util/stat-display.c | 29 +++++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 7 deletions(-)tools/perf/builtin-stat.c +0
-3@@ -2442,9 +2442,6 @@ int cmd_stat(int argc, const char **argv)evlist__check_cpu_maps (evsel_list); -if (perf_pmu__has_hybrid ()) - stat_config.no_merge = true; -/* * Initialize thread_map with comm names, * so we could print it out on output. tools/perf/util/stat-display.c +0
-0@@ -595,6 +595,19 @@ static void collect_all_aliases(struct perf_stat_config *config, struct evsel *c } }
Quoted 9 lines
Quoted 6 lines
tools/perf/util/stat-display.c static void collect_all_aliases(struct perf_stat_config *config, struct evsel *c · line 603
Quoted 6 lines
tools/perf/util/stat-display.c +6
-0+static bool is_uncore (struct evsel *evsel) +{ +struct perf_pmu *pmu; + +if (evsel->pmu_name) { + pmu =perf_pmu__find (evsel->pmu_name);
evsel__find_pmumight be one line shorter? ;-)
Yes, this is a better method, thanks!
Quoted 24 lines
Quoted 13 lines
Quoted 13 lines
tools/perf/util/stat-display.c +7
-0+if (pmu) +return pmu->is_uncore; + } + +return false; +} + static bool collect_data(struct perf_stat_config *config, struct evsel *counter, void (*cb)(struct perf_stat_config *config, struct evsel *counter, void *data, bool first),@@ -603,10 +616,18 @@ static bool collect_data(struct perf_stat_config *config, struct evsel *counter,if (counter->merged_stat)Quoted 8 lines
tools/perf/util/stat-display.c static bool collect_data(struct perf_stat_config *config, struct evsel *counter, · line 620
Quoted 8 lines
tools/perf/util/stat-display.c +2
-4return false;cb (config, counter, data, true); -if (config->no_merge) -uniquify_event_name (counter); -else if (counter->auto_merge_stats) -collect_all_aliases (config, counter, cb, data); +if (perf_pmu__has_hybrid ()) { +if (config->no_merge || !is_uncore (counter))hum, this is all the same except for the !is_uncore condition, right?
Quoted 4 lines
could we just add '
config->no_merge||hybrid_uniquify(count)'that would cover both
perf_pmu__has_hybridand !is_uncore conditions?
Yes, I will create a new function 'hybrid_uniquify' to check if uniquify event name for hybrid.
Thanks
Jin Yao
Quoted 22 lines
jirka
Quoted 19 lines
tools/perf/util/stat-display.c static bool collect_data(struct perf_stat_config *config, struct evsel *counter, · line 633
Quoted 13 lines
tools/perf/util/stat-display.c +10
-0+uniquify_event_name (counter); + else if (counter->auto_merge_stats) + collect_all_aliases(config, counter, cb, data); + }else { +if (config->no_merge) +uniquify_event_name (counter); +else if (counter->auto_merge_stats) +collect_all_aliases (config, counter, cb, data); + } +return true; }Any comments for this patch? :)
Thanks
Jin Yao