perf stat: Fix no metric header if --per-socket and --metric-only set
PATCH 1/1 perf stat: Fix no metric header if --per-socket and --metric-only set
We received a report that was no metric header displayed if --per-socket and --metric-only were both set.
It's hard for script to parse the perf-stat output. This patch fixes this issue.
Before:
root@kbl-ppc:~# perf stat -a -M CPI --metric-only --per-socket ^C Performance counter stats for 'system wide':
S0 8 2.6
2.215270071 seconds time elapsed
root@kbl-ppc:~# perf stat -a -M CPI --metric-only --per-socket -I1000
# time socket cpus
1.000411692 S0 8 2.2
2.001547952 S0 8 3.4
3.002446511 S0 8 3.4
4.003346157 S0 8 4.0
5.004245736 S0 8 0.3After:
root@kbl-ppc:~# perf stat -a -M CPI --metric-only --per-socket ^C Performance counter stats for 'system wide':
CPI
S0 8 2.1
1.813579830 seconds time elapsed
root@kbl-ppc:~# perf stat -a -M CPI --metric-only --per-socket -I1000
# time socket cpus CPI
1.000415122 S0 8 3.2
2.001630051 S0 8 2.9
3.002612278 S0 8 4.3
4.003523594 S0 8 3.0
5.004504256 S0 8 3.7--- tools/perf/util/stat-shadow.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
tools/perf/util/stat-shadow.c +5 -2
@@ -803,8 +803,11 @@ static void generic_metric(struct perf_stat_config *config, out->force_header ? (metric_name ? metric_name : name) : "", 0); } - }else -print_metric (config, ctxp,NULL ,NULL ,"" ,0 ); + }else { +print_metric (config, ctxp,NULL ,NULL , + out->force_header ? + (metric_name ? metric_name : name) :"" ,0 ); + }for (i =1 ; i < pctx.num_ids; i++)zfree (&pctx.ids[i].name);
Signature · 1 line
2.17.1
Quoted 43 lines · Jin Yao
We received a report that was no metric header displayed if --per-socket and --metric-only were both set.
It's hard for script to parse the perf-stat output. This patch fixes this issue.
Before:
root@kbl-ppc:~# perf stat -a -M CPI --metric-only --per-socket ^C Performance counter stats for 'system wide':S0 8 2.6
2.215270071 seconds time elapsedroot@kbl-ppc:~# perf stat -a -M CPI --metric-only --per-socket -I1000 # time socket cpus 1.000411692 S0 8 2.2 2.001547952 S0 8 3.4 3.002446511 S0 8 3.4 4.003346157 S0 8 4.0 5.004245736 S0 8 0.3After:
root@kbl-ppc:~# perf stat -a -M CPI --metric-only --per-socket ^C Performance counter stats for 'system wide':CPI
S0 8 2.11.813579830 seconds time elapsedroot@kbl-ppc:~# perf stat -a -M CPI --metric-only --per-socket -I1000 # time socket cpus CPI 1.000415122 S0 8 3.2 2.001630051 S0 8 2.9 3.002612278 S0 8 4.3 4.003523594 S0 8 3.0 5.004504256 S0 8 3.7
Quoted 1 line
Signed-off-by Jin Yao <[email protected]>
thanks,
jirka
Quoted 25 lines
--- tools/perf/util/stat-shadow.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)tools/perf/util/stat-shadow.c +5
-2@@ -803,8 +803,11 @@ static void generic_metric(struct perf_stat_config *config, out->force_header ? (metric_name ? metric_name : name) : "", 0); } - }else -print_metric (config, ctxp,NULL ,NULL ,"" ,0 ); + }else { +print_metric (config, ctxp,NULL ,NULL , + out->force_header ? + (metric_name ? metric_name : name) :"" ,0 ); + }for (i =1 ; i < pctx.num_ids; i++)zfree (&pctx.ids[i].name);Signature · 1 line
2.17.1
Arnaldo Carvalho de Melo
AppliedEm Fri, Apr 03, 2020 at 11:45:00AM +0200, Jiri Olsa escreveu:
Quoted 44 lines · Jin Yao
Quoted 43 lines
We received a report that was no metric header displayed if --per-socket and --metric-only were both set.
It's hard for script to parse the perf-stat output. This patch fixes this issue.
Before:
root@kbl-ppc:~# perf stat -a -M CPI --metric-only --per-socket ^C Performance counter stats for 'system wide':S0 8 2.6
2.215270071 seconds time elapsedroot@kbl-ppc:~# perf stat -a -M CPI --metric-only --per-socket -I1000 # time socket cpus 1.000411692 S0 8 2.2 2.001547952 S0 8 3.4 3.002446511 S0 8 3.4 4.003346157 S0 8 4.0 5.004245736 S0 8 0.3After:
root@kbl-ppc:~# perf stat -a -M CPI --metric-only --per-socket ^C Performance counter stats for 'system wide':CPI
S0 8 2.11.813579830 seconds time elapsedroot@kbl-ppc:~# perf stat -a -M CPI --metric-only --per-socket -I1000 # time socket cpus CPI 1.000415122 S0 8 3.2 2.001630051 S0 8 2.9 3.002612278 S0 8 4.3 4.003523594 S0 8 3.0 5.004504256 S0 8 3.7
Quoted 3 lines
Quoted 1 line
Signed-off-by Jin Yao <[email protected]>Acked-by Jiri Olsa <[email protected]>
Thanks, applied.
- Arnaldo
The following commit has been merged into the perf/urgent branch of tip:
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 8358f698ec9d8467ad00c045e4d83c3e4acc7db4 Gitweb: https://git.kernel.org/tip/8358f698ec9d8467ad00c045e4d83c3e4acc7db4 Author: Jin Yao <[email protected]> AuthorDate: Wed, 01 Apr 2020 02:02:26 +08:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Tue, 14 Apr 2020 08:49:26 -03:00
perf stat: Fix no metric header if --per-socket and --metric-only set
We received a report that was no metric header displayed if --per-socket and --metric-only were both set.
It's hard for script to parse the perf-stat output. This patch fixes this issue.
Before:
root@kbl-ppc:~# perf stat -a -M CPI --metric-only --per-socket ^C Performance counter stats for 'system wide':
S0 8 2.6
2.215270071 seconds time elapsed
root@kbl-ppc:~# perf stat -a -M CPI --metric-only --per-socket -I1000
# time socket cpus
1.000411692 S0 8 2.2
2.001547952 S0 8 3.4
3.002446511 S0 8 3.4
4.003346157 S0 8 4.0
5.004245736 S0 8 0.3After:
root@kbl-ppc:~# perf stat -a -M CPI --metric-only --per-socket ^C Performance counter stats for 'system wide':
CPI
S0 8 2.1
1.813579830 seconds time elapsed
root@kbl-ppc:~# perf stat -a -M CPI --metric-only --per-socket -I1000
# time socket cpus CPI
1.000415122 S0 8 3.2
2.001630051 S0 8 2.9
3.002612278 S0 8 4.3
4.003523594 S0 8 3.0
5.004504256 S0 8 3.7--- tools/perf/util/stat-shadow.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
tools/perf/util/stat-shadow.c +5 -2
@@ -803,8 +803,11 @@ static void generic_metric(struct perf_stat_config *config, out->force_header ? (metric_name ? metric_name : name) : "", 0); } - }else -print_metric (config, ctxp,NULL ,NULL ,"" ,0 ); + }else { +print_metric (config, ctxp,NULL ,NULL , + out->force_header ? + (metric_name ? metric_name : name) :"" ,0 ); + }for (i =1 ; i < pctx.num_ids; i++)zfree (&pctx.ids[i].name);