perf: Refactor the block info implementation
v6 cover perf: Refactor the block info implementation
This patch series refactors the block info functionalities to let them be used by other builtins and allow setting the output fmts flexibly.
It also supports the 'Sampled Cycles%' and 'Avg Cycles%' printed in colors.
v6:
---
Use __block_info__cmp to replace block_pair_cmp according to Arnaldo's suggestions. Fix some issues found in block_info__cmp.
New patches:
------------
perf util: Fix wrong block address comparison in block_info__cmp perf util: Use __block_info__cmp to replace block_pair_cmp
Unchanged patches:
------------------
perf util: Flexible to set block info output formats perf util: Support color ops to print block percents in color
v5:
---
Only change the patch "perf util: Flexible to set block info output formats". Other patches are not changed.
Jin Yao (4):
perf util: Fix wrong block address comparison in block_info__cmp perf util: Use __block_info__cmp to replace block_pair_cmp perf util: Flexible to set block info output formats perf util: Support color ops to print block percents in color
tools/perf/builtin-diff.c | 21 +------ tools/perf/builtin-report.c | 21 ++++++- tools/perf/util/block-info.c | 106 +++++++++++++++++++++-------------- tools/perf/util/block-info.h | 9 ++- 4 files changed, 91 insertions(+), 66 deletions(-)
Signature · 1 line
2.17.1
PATCH v6 1/4 perf util: Fix wrong block address comparison in block_info__cmp
Commit 6041441870ab ("perf block: Cleanup and refactor block info functions") introduces a function block_info__cmp, which compares two blocks.
But the issues are:
1. It should return the strcmp cmp value only if it's not 0.
2. When symbol names are matched, we need to compare the addresses of blocks further. But it wrongly uses the symbol addresses for comparison.
3. If the syms are both NULL, we can't consider these two blocks are matched.
This patch fixes above 3 issues.
functions")
v6:
---
New in this patch set.
--- tools/perf/util/block-info.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-)
tools/perf/util/block-info.c +6 -15
@@ -74,30 +74,21 @@ int64_t block_info__cmp(struct perf_hpp_fmt *fmt __maybe_unused,if (!bi_l->sym || !bi_r->sym) {if (!bi_l->sym && !bi_r->sym) -return 0 ; +return -1 ;else if (!bi_l->sym)return -1 ;else return 1 ; } -if (bi_l->sym == bi_r->sym) { -if (bi_l->start == bi_r->start) { -if (bi_l->end == bi_r->end) -return 0 ; -else -return (int64_t )(bi_r->end - bi_l->end); - }else -return (int64_t )(bi_r->start - bi_l->start); - }else { - cmp =strcmp (bi_l->sym->name, bi_r->sym->name); + cmp =strcmp (bi_l->sym->name, bi_r->sym->name); +if (cmp)return cmp; - } -if (bi_l->sym->start != bi_r->sym->start) -return (int64_t )(bi_r->sym->start - bi_l->sym->start); +if (bi_l->start != bi_r->start) +return (int64_t )(bi_r->start - bi_l->start); -return (int64_t )(bi_r->sym->end - bi_l->sym->end); +return (int64_t )(bi_r->end - bi_l->end); } static void init_block_info(struct block_info *bi, struct symbol *sym,
Signature · 1 line
2.17.1
[tip: perf/core] perf block-info: Fix wrong block address comparison in block_info__cmp()
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 3e152aa984ff4f639f7d2daf1ad10d408c0a3332 Gitweb: https://git.kernel.org/tip/3e152aa984ff4f639f7d2daf1ad10d408c0a3332 Author: Jin Yao <[email protected]> AuthorDate: Sun, 02 Feb 2020 22:16:52 +08:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Mon, 09 Mar 2020 21:43:25 -03:00
perf block-info: Fix wrong block address comparison in block_info__cmp()
Commit 6041441870ab ("perf block: Cleanup and refactor block info functions") introduces block_info__cmp(), which compares two blocks.
But the issues are:
1. It should return the strcmp cmp value only if it's not 0.
2. When symbol names are matched, we need to compare the addresses of blocks further. But it wrongly uses the symbol addresses for comparison.
3. If the syms are both NULL, we can't consider these two blocks are matched.
This patch fixes above 3 issues.
--- tools/perf/util/block-info.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-)
tools/perf/util/block-info.c +6 -15
@@ -74,30 +74,21 @@ int64_t block_info__cmp(struct perf_hpp_fmt *fmt __maybe_unused,if (!bi_l->sym || !bi_r->sym) {if (!bi_l->sym && !bi_r->sym) -return 0 ; +return -1 ;else if (!bi_l->sym)return -1 ;else return 1 ; } -if (bi_l->sym == bi_r->sym) { -if (bi_l->start == bi_r->start) { -if (bi_l->end == bi_r->end) -return 0 ; -else -return (int64_t )(bi_r->end - bi_l->end); - }else -return (int64_t )(bi_r->start - bi_l->start); - }else { - cmp =strcmp (bi_l->sym->name, bi_r->sym->name); + cmp =strcmp (bi_l->sym->name, bi_r->sym->name); +if (cmp)return cmp; - } -if (bi_l->sym->start != bi_r->sym->start) -return (int64_t )(bi_r->sym->start - bi_l->sym->start); +if (bi_l->start != bi_r->start) +return (int64_t )(bi_r->start - bi_l->start); -return (int64_t )(bi_r->sym->end - bi_l->sym->end); +return (int64_t )(bi_r->end - bi_l->end); } static void init_block_info(struct block_info *bi, struct symbol *sym,
PATCH v6 2/4 perf util: Use __block_info__cmp to replace block_pair_cmp
In reply to Jin Yaoperf-diff uses block_pair_cmp to compare two blocks. The block_info__cmp has the similar functionality and it's a bit more complete.
This patch removes the block_pair_cmp and use __block_info__cmp instead. The __block_info__cmp is wrapped by block_info__cmp and it doesn't receive perf_hpp_fmt parameter.
v6:
---
New in this patch set.
--- tools/perf/builtin-diff.c | 21 ++------------------- tools/perf/util/block-info.c | 9 +++++++-- tools/perf/util/block-info.h | 2 ++ 3 files changed, 11 insertions(+), 21 deletions(-)
tools/perf/builtin-diff.c +2 -19
@@ -572,29 +572,12 @@ static void init_block_hist(struct block_hist *bh) bh->valid = true; } -static int block_pair_cmp (struct hist_entry *a,struct hist_entry *b) -{ -struct block_info *bi_a = a->block_info; -struct block_info *bi_b = b->block_info; -int cmp; - -if (!bi_a->sym || !bi_b->sym) -return -1 ; - - cmp =strcmp (bi_a->sym->name, bi_b->sym->name); - -if ((!cmp) && (bi_a->start == bi_b->start) && (bi_a->end == bi_b->end)) -return 0 ; - -return -1 ; -} -static struct hist_entry *get_block_pair (struct hist_entry *he,struct hists *hists_pair) {struct rb_root_cached *root = hists_pair->entries_in;struct rb_node *next =rb_first_cached (root); -int cmp; +int64_t cmp;while (next !=NULL ) { struct hist_entry *he_pair = rb_entry(next, struct hist_entry,
@@ -602,7 +585,7 @@ static struct hist_entry *get_block_pair(struct hist_entry *he, next =rb_next (&he_pair->rb_node_in); - cmp =block_pair_cmp (he_pair, he); + cmp =__block_info__cmp (he_pair, he);if (!cmp)return he_pair; }
tools/perf/util/block-info.c +7 -2
@@ -65,8 +65,7 @@ struct block_info *block_info__new(void)return bi; } -int64_t block_info__cmp (struct perf_hpp_fmt *fmt__maybe_unused , -struct hist_entry *left,struct hist_entry *right) +int64_t __block_info__cmp (struct hist_entry *left,struct hist_entry *right) {struct block_info *bi_l = left->block_info;struct block_info *bi_r = right->block_info;
@@ -91,6 +90,12 @@ int64_t block_info__cmp(struct perf_hpp_fmt *fmt __maybe_unused,return (int64_t )(bi_r->end - bi_l->end); } +int64_t block_info__cmp (struct perf_hpp_fmt *fmt__maybe_unused , +struct hist_entry *left,struct hist_entry *right) +{ +return __block_info__cmp (left, right); +} +static void init_block_info (struct block_info *bi,struct symbol *sym,struct cyc_hist *ch,int offset,u64 total_cycles)
tools/perf/util/block-info.h +2 -0
@@ -61,6 +61,8 @@ static inline void __block_info__zput(struct block_info **bi)#define block_info__zput (bi) __block_info__zput(&bi) +int64_t __block_info__cmp (struct hist_entry *left,struct hist_entry *right); +int64_t block_info__cmp (struct perf_hpp_fmt *fmt__maybe_unused ,struct hist_entry *left,struct hist_entry *right);
Signature · 1 line
2.17.1
[tip: perf/core] perf diff: Use __block_info__cmp() to replace block_pair_cmp()
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: a8a9f6dc0dbfc0f4f225987abec7eb688f4b2d7e Gitweb: https://git.kernel.org/tip/a8a9f6dc0dbfc0f4f225987abec7eb688f4b2d7e Author: Jin Yao <[email protected]> AuthorDate: Sun, 02 Feb 2020 22:16:53 +08:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Mon, 09 Mar 2020 21:43:25 -03:00
perf diff: Use __block_info__cmp() to replace block_pair_cmp()
'perf diff' uses block_pair_cmp() to compare two blocks. But block_info__cmp() has the similar functionality and it's a bit more complete.
This patch removes block_pair_cmp() and uses __block_info__cmp() instead. __block_info__cmp() is wrapped by block_info__cmp() and it doesn't receives a perf_hpp_fmt parameter.
--- tools/perf/builtin-diff.c | 21 ++------------------- tools/perf/util/block-info.c | 9 +++++++-- tools/perf/util/block-info.h | 2 ++ 3 files changed, 11 insertions(+), 21 deletions(-)
tools/perf/builtin-diff.c +2 -19
@@ -572,29 +572,12 @@ static void init_block_hist(struct block_hist *bh) bh->valid = true; } -static int block_pair_cmp (struct hist_entry *a,struct hist_entry *b) -{ -struct block_info *bi_a = a->block_info; -struct block_info *bi_b = b->block_info; -int cmp; - -if (!bi_a->sym || !bi_b->sym) -return -1 ; - - cmp =strcmp (bi_a->sym->name, bi_b->sym->name); - -if ((!cmp) && (bi_a->start == bi_b->start) && (bi_a->end == bi_b->end)) -return 0 ; - -return -1 ; -} -static struct hist_entry *get_block_pair (struct hist_entry *he,struct hists *hists_pair) {struct rb_root_cached *root = hists_pair->entries_in;struct rb_node *next =rb_first_cached (root); -int cmp; +int64_t cmp;while (next !=NULL ) { struct hist_entry *he_pair = rb_entry(next, struct hist_entry,
@@ -602,7 +585,7 @@ static struct hist_entry *get_block_pair(struct hist_entry *he, next =rb_next (&he_pair->rb_node_in); - cmp =block_pair_cmp (he_pair, he); + cmp =__block_info__cmp (he_pair, he);if (!cmp)return he_pair; }
tools/perf/util/block-info.c +7 -2
@@ -65,8 +65,7 @@ struct block_info *block_info__new(void)return bi; } -int64_t block_info__cmp (struct perf_hpp_fmt *fmt__maybe_unused , -struct hist_entry *left,struct hist_entry *right) +int64_t __block_info__cmp (struct hist_entry *left,struct hist_entry *right) {struct block_info *bi_l = left->block_info;struct block_info *bi_r = right->block_info;
@@ -91,6 +90,12 @@ int64_t block_info__cmp(struct perf_hpp_fmt *fmt __maybe_unused,return (int64_t )(bi_r->end - bi_l->end); } +int64_t block_info__cmp (struct perf_hpp_fmt *fmt__maybe_unused , +struct hist_entry *left,struct hist_entry *right) +{ +return __block_info__cmp (left, right); +} +static void init_block_info (struct block_info *bi,struct symbol *sym,struct cyc_hist *ch,int offset,u64 total_cycles)
tools/perf/util/block-info.h +2 -0
@@ -61,6 +61,8 @@ static inline void __block_info__zput(struct block_info **bi)#define block_info__zput (bi) __block_info__zput(&bi) +int64_t __block_info__cmp (struct hist_entry *left,struct hist_entry *right); +int64_t block_info__cmp (struct perf_hpp_fmt *fmt__maybe_unused ,struct hist_entry *left,struct hist_entry *right);
PATCH v6 3/4 perf util: Flexible to set block info output formats
In reply to Jin YaoCurrently we use a predefined array to set the block info output formats, it's fixed and inflexible.
This patch adds two parameters "block_hpps" and "nr_hpps" in block_info__create_report and other static functions, in order to let user decide which columns to report and with specified report ordering. It should be more flexible.
Buffers will be allocated to contain the new fmts, of course, we need to release them before perf exits.
v6:
---
No change.
v5:
---
Don't need to call hists__delete_entries() after printing the block hists, because we will release the block hists in block_info__free_report().
v4:
---
Keep fmts in struct block_report as an array, instead of allocaing it. That's we don't need the release code.
v3:
---
No change.
v2:
---
New patch created in v2.
--- tools/perf/builtin-report.c | 21 ++++++++++++--- tools/perf/util/block-info.c | 51 +++++++++++++++++++++++++----------- tools/perf/util/block-info.h | 7 ++++- 3 files changed, 59 insertions(+), 20 deletions(-)
tools/perf/builtin-report.c +18 -3
@@ -104,6 +104,7 @@ struct report {bool symbol_ipc;bool total_cycles_mode;struct block_report *block_reports; +int nr_block_reports; };static int report__config (const char *var,const char *value,void *cb)
@@ -966,8 +967,19 @@ static int __cmd_report(struct report *rep)report__output_resort (rep);if (rep->total_cycles_mode) { +int block_hpps[6 ] = { +PERF_HPP_REPORT__BLOCK_TOTAL_CYCLES_PCT , +PERF_HPP_REPORT__BLOCK_LBR_CYCLES , +PERF_HPP_REPORT__BLOCK_CYCLES_PCT , +PERF_HPP_REPORT__BLOCK_AVG_CYCLES , +PERF_HPP_REPORT__BLOCK_RANGE , +PERF_HPP_REPORT__BLOCK_DSO , + }; + rep->block_reports =block_info__create_report (session->evlist, - rep->total_cycles); + rep->total_cycles, + block_hpps,6 , + &rep->nr_block_reports);if (!rep->block_reports)return -1 ; }
@@ -1551,8 +1563,11 @@ int cmd_report(int argc, const char **argv)zfree (&report.ptime_range); } -if (report.block_reports) -zfree (&report.block_reports); +if (report.block_reports) { +block_info__free_report (report.block_reports, + report.nr_block_reports); + report.block_reports =NULL ; + }zstd_fini (&(session->zstd_data));perf_session__delete (session);
tools/perf/util/block-info.c +35 -16
110 lines not on this page · raw message
tools/perf/util/block-info.h +6 -1
@@ -45,6 +45,7 @@ struct block_report {struct block_hist hist;u64 cycles;struct block_fmt fmts[PERF_HPP_REPORT__BLOCK_MAX_INDEX ]; +int nr_fmts; };struct block_hist ;
@@ -70,7 +71,11 @@ int block_info__process_sym(struct hist_entry *he, struct block_hist *bh, u64 *block_cycles_aggr, u64 total_cycles);struct block_report *block_info__create_report (struct evlist *evlist, -u64 total_cycles); +u64 total_cycles, +int *block_hpps,int nr_hpps, +int *nr_reps); + +void block_info__free_report (struct block_report *reps,int nr_reps); int report__browse_block_hists(struct block_hist *bh, float min_percent, struct evsel *evsel, struct perf_env *env,
Signature · 1 line
2.17.1
[tip: perf/core] perf block-info: Allow selecting which columns to report and its order
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: cca0cc76f5f56dff2c8461b551a3e1fdabcd3fba Gitweb: https://git.kernel.org/tip/cca0cc76f5f56dff2c8461b551a3e1fdabcd3fba Author: Jin Yao <[email protected]> AuthorDate: Sun, 02 Feb 2020 22:16:54 +08:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Mon, 09 Mar 2020 21:43:25 -03:00
perf block-info: Allow selecting which columns to report and its order
Currently we use a predefined array to set the block info output formats, it's fixed and inflexible.
This patch adds two parameters "block_hpps" and "nr_hpps" in block_info__create_report and other static functions, in order to let user decide which columns to report and with specified report ordering. It should be more flexible.
Buffers will be allocated to contain the new fmts, of course, we need to release them before perf exits.
--- tools/perf/builtin-report.c | 21 ++++++++++++-- tools/perf/util/block-info.c | 51 ++++++++++++++++++++++++----------- tools/perf/util/block-info.h | 7 ++++- 3 files changed, 59 insertions(+), 20 deletions(-)
tools/perf/builtin-report.c +18 -3
@@ -104,6 +104,7 @@ struct report {bool symbol_ipc;bool total_cycles_mode;struct block_report *block_reports; +int nr_block_reports; };static int report__config (const char *var,const char *value,void *cb)
@@ -966,8 +967,19 @@ static int __cmd_report(struct report *rep)report__output_resort (rep);if (rep->total_cycles_mode) { +int block_hpps[6 ] = { +PERF_HPP_REPORT__BLOCK_TOTAL_CYCLES_PCT , +PERF_HPP_REPORT__BLOCK_LBR_CYCLES , +PERF_HPP_REPORT__BLOCK_CYCLES_PCT , +PERF_HPP_REPORT__BLOCK_AVG_CYCLES , +PERF_HPP_REPORT__BLOCK_RANGE , +PERF_HPP_REPORT__BLOCK_DSO , + }; + rep->block_reports =block_info__create_report (session->evlist, - rep->total_cycles); + rep->total_cycles, + block_hpps,6 , + &rep->nr_block_reports);if (!rep->block_reports)return -1 ; }
@@ -1551,8 +1563,11 @@ error:zfree (&report.ptime_range); } -if (report.block_reports) -zfree (&report.block_reports); +if (report.block_reports) { +block_info__free_report (report.block_reports, + report.nr_block_reports); + report.block_reports =NULL ; + }zstd_fini (&(session->zstd_data));perf_session__delete (session);
tools/perf/util/block-info.c +35 -16
110 lines not on this page · raw message
tools/perf/util/block-info.h +6 -1
@@ -45,6 +45,7 @@ struct block_report {struct block_hist hist;u64 cycles;struct block_fmt fmts[PERF_HPP_REPORT__BLOCK_MAX_INDEX ]; +int nr_fmts; };struct block_hist ;
@@ -70,7 +71,11 @@ int block_info__process_sym(struct hist_entry *he, struct block_hist *bh, u64 *block_cycles_aggr, u64 total_cycles);struct block_report *block_info__create_report (struct evlist *evlist, -u64 total_cycles); +u64 total_cycles, +int *block_hpps,int nr_hpps, +int *nr_reps); + +void block_info__free_report (struct block_report *reps,int nr_reps); int report__browse_block_hists(struct block_hist *bh, float min_percent, struct evsel *evsel, struct perf_env *env,
PATCH v6 4/4 perf util: Support color ops to print block percents in color
In reply to Jin YaoIt would be nice to print the block percents with colors.
This patch supports the 'Sampled Cycles%' and 'Avg Cycles%' printed in colors.
For example,
perf record -b ...
perf report --total-cycles or perf report --total-cycles --stdio
percent > 5%, colored in red percent > 0.5%, colored in green percent < 0.5%, default color
v3/v4/v5/v6:
------------
No change
v2:
---
No functional change
--- tools/perf/util/block-info.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-)
tools/perf/util/block-info.c +15 -10
@@ -181,6 +181,17 @@ static int block_column_width(struct perf_hpp_fmt *fmt,return block_fmt->width; } +static int color_pct (struct perf_hpp *hpp,int width,double pct) +{ +#ifdef HAVE_SLANG_SUPPORT +if (use_browser) { +return __hpp__slsmg_color_printf (hpp,"%*.2f%%" , + width -1 , pct); + } +#endif +return hpp_color_scnprintf (hpp,"%*.2f%%" , width -1 , pct); +} +static int block_total_cycles_pct_entry (struct perf_hpp_fmt *fmt,struct perf_hpp *hpp,struct hist_entry *he)
@@ -188,14 +199,11 @@ static int block_total_cycles_pct_entry(struct perf_hpp_fmt *fmt, struct block_fmt *block_fmt = container_of(fmt, struct block_fmt, fmt);struct block_info *bi = he->block_info;double ratio =0.0 ; -char buf[16 ];if (block_fmt->total_cycles) ratio = (double )bi->cycles / (double )block_fmt->total_cycles; -sprintf (buf,"%.2f%%" ,100.0 * ratio); - -return scnprintf (hpp->buf, hpp->size,"%*s" , block_fmt->width, buf); +return color_pct (hpp, block_fmt->width,100.0 * ratio); } static int64_t block_total_cycles_pct_sort(struct perf_hpp_fmt *fmt,
@@ -248,16 +256,13 @@ static int block_cycles_pct_entry(struct perf_hpp_fmt *fmt,struct block_info *bi = he->block_info;double ratio =0.0 ;u64 avg; -char buf[16 ];if (block_fmt->block_cycles && bi->num_aggr) { avg = bi->cycles_aggr / bi->num_aggr; ratio = (double )avg / (double )block_fmt->block_cycles; } -sprintf (buf,"%.2f%%" ,100.0 * ratio); - -return scnprintf (hpp->buf, hpp->size,"%*s" , block_fmt->width, buf); +return color_pct (hpp, block_fmt->width,100.0 * ratio); } static int block_avg_cycles_entry(struct perf_hpp_fmt *fmt,
@@ -344,7 +349,7 @@ static void hpp_register(struct block_fmt *block_fmt, int idx,switch (idx) {case PERF_HPP_REPORT__BLOCK_TOTAL_CYCLES_PCT : - fmt->entry = block_total_cycles_pct_entry; + fmt->color = block_total_cycles_pct_entry; fmt->cmp = block_info__cmp; fmt->sort = block_total_cycles_pct_sort;break ;
@@ -352,7 +357,7 @@ static void hpp_register(struct block_fmt *block_fmt, int idx, fmt->entry = block_cycles_lbr_entry;break ;case PERF_HPP_REPORT__BLOCK_CYCLES_PCT : - fmt->entry = block_cycles_pct_entry; + fmt->color = block_cycles_pct_entry;break ;case PERF_HPP_REPORT__BLOCK_AVG_CYCLES : fmt->entry = block_avg_cycles_entry;
Signature · 1 line
2.17.1
Re: [PATCH v6 4/4] perf util: Support color ops to print block percents in color
Em Sun, Feb 02, 2020 at 10:16:55PM +0800, Jin Yao escreveu:
Quoted 10 lines
It would be nice to print the block percents with colors.
This patch supports the 'Sampled Cycles%' and 'Avg Cycles%' printed in colors.
For example,
perf record -b ...
perf report --total-cycles or perf report --total-cycles --stdio
Quoted 7 lines
percent > 5%, colored in red percent > 0.5%, colored in green percent < 0.5%, default color
v3/v4/v5/v6:
------------
No change
Thanks, tested the coloring, all works as advertised, thanks, applied to perf/core, should be in git.kernel.org soon.
- Arnaldo
Quoted 86 lines
v2:
---
No functional changeSigned-off-by Jin Yao <[email protected]>--- tools/perf/util/block-info.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-)tools/perf/util/block-info.c +15
-10@@ -181,6 +181,17 @@ static int block_column_width(struct perf_hpp_fmt *fmt,return block_fmt->width; } +static int color_pct (struct perf_hpp *hpp,int width,double pct) +{ +#ifdef HAVE_SLANG_SUPPORT +if (use_browser) { +return __hpp__slsmg_color_printf (hpp,"%*.2f%%" , + width -1 , pct); + } +#endif +return hpp_color_scnprintf (hpp,"%*.2f%%" , width -1 , pct); +} +static int block_total_cycles_pct_entry (struct perf_hpp_fmt *fmt,struct perf_hpp *hpp,struct hist_entry *he)@@ -188,14 +199,11 @@ static int block_total_cycles_pct_entry(struct perf_hpp_fmt *fmt, struct block_fmt *block_fmt = container_of(fmt, struct block_fmt, fmt);struct block_info *bi = he->block_info;double ratio =0.0 ; -char buf[16 ];if (block_fmt->total_cycles) ratio = (double )bi->cycles / (double )block_fmt->total_cycles; -sprintf (buf,"%.2f%%" ,100.0 * ratio); - -return scnprintf (hpp->buf, hpp->size,"%*s" , block_fmt->width, buf); +return color_pct (hpp, block_fmt->width,100.0 * ratio); } static int64_t block_total_cycles_pct_sort(struct perf_hpp_fmt *fmt,@@ -248,16 +256,13 @@ static int block_cycles_pct_entry(struct perf_hpp_fmt *fmt,struct block_info *bi = he->block_info;double ratio =0.0 ;u64 avg; -char buf[16 ];if (block_fmt->block_cycles && bi->num_aggr) { avg = bi->cycles_aggr / bi->num_aggr; ratio = (double )avg / (double )block_fmt->block_cycles; } -sprintf (buf,"%.2f%%" ,100.0 * ratio); - -return scnprintf (hpp->buf, hpp->size,"%*s" , block_fmt->width, buf); +return color_pct (hpp, block_fmt->width,100.0 * ratio); } static int block_avg_cycles_entry(struct perf_hpp_fmt *fmt,@@ -344,7 +349,7 @@ static void hpp_register(struct block_fmt *block_fmt, int idx,switch (idx) {case PERF_HPP_REPORT__BLOCK_TOTAL_CYCLES_PCT : - fmt->entry = block_total_cycles_pct_entry; + fmt->color = block_total_cycles_pct_entry; fmt->cmp = block_info__cmp; fmt->sort = block_total_cycles_pct_sort;break ;@@ -352,7 +357,7 @@ static void hpp_register(struct block_fmt *block_fmt, int idx, fmt->entry = block_cycles_lbr_entry;break ;case PERF_HPP_REPORT__BLOCK_CYCLES_PCT : - fmt->entry = block_cycles_pct_entry; + fmt->color = block_cycles_pct_entry;break ;case PERF_HPP_REPORT__BLOCK_AVG_CYCLES : fmt->entry = block_avg_cycles_entry;Signature · 1 line
2.17.1
Signature · 1 line
- Arnaldo
[tip: perf/core] perf block-info: Support color ops to print block percents in color
In reply to Jin YaoThe following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: f787feff69c466dfc6f261c9632627e383b49187 Gitweb: https://git.kernel.org/tip/f787feff69c466dfc6f261c9632627e383b49187 Author: Jin Yao <[email protected]> AuthorDate: Sun, 02 Feb 2020 22:16:55 +08:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Mon, 09 Mar 2020 21:43:25 -03:00
perf block-info: Support color ops to print block percents in color
It would be nice to print the block percents with colors.
This patch supports the 'Sampled Cycles%' and 'Avg Cycles%' printed in colors.
For example,
perf record -b ...
perf report --total-cycles or perf report --total-cycles --stdio
percent > 5%, colored in red
percent > 0.5%, colored in green
percent < 0.5%, default color
--- tools/perf/util/block-info.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-)
tools/perf/util/block-info.c +15 -10
@@ -181,6 +181,17 @@ static int block_column_width(struct perf_hpp_fmt *fmt,return block_fmt->width; } +static int color_pct (struct perf_hpp *hpp,int width,double pct) +{ +#ifdef HAVE_SLANG_SUPPORT +if (use_browser) { +return __hpp__slsmg_color_printf (hpp,"%*.2f%%" , + width -1 , pct); + } +#endif +return hpp_color_scnprintf (hpp,"%*.2f%%" , width -1 , pct); +} +static int block_total_cycles_pct_entry (struct perf_hpp_fmt *fmt,struct perf_hpp *hpp,struct hist_entry *he)
@@ -188,14 +199,11 @@ static int block_total_cycles_pct_entry(struct perf_hpp_fmt *fmt, struct block_fmt *block_fmt = container_of(fmt, struct block_fmt, fmt);struct block_info *bi = he->block_info;double ratio =0.0 ; -char buf[16 ];if (block_fmt->total_cycles) ratio = (double )bi->cycles / (double )block_fmt->total_cycles; -sprintf (buf,"%.2f%%" ,100.0 * ratio); - -return scnprintf (hpp->buf, hpp->size,"%*s" , block_fmt->width, buf); +return color_pct (hpp, block_fmt->width,100.0 * ratio); } static int64_t block_total_cycles_pct_sort(struct perf_hpp_fmt *fmt,
@@ -248,16 +256,13 @@ static int block_cycles_pct_entry(struct perf_hpp_fmt *fmt,struct block_info *bi = he->block_info;double ratio =0.0 ;u64 avg; -char buf[16 ];if (block_fmt->block_cycles && bi->num_aggr) { avg = bi->cycles_aggr / bi->num_aggr; ratio = (double )avg / (double )block_fmt->block_cycles; } -sprintf (buf,"%.2f%%" ,100.0 * ratio); - -return scnprintf (hpp->buf, hpp->size,"%*s" , block_fmt->width, buf); +return color_pct (hpp, block_fmt->width,100.0 * ratio); } static int block_avg_cycles_entry(struct perf_hpp_fmt *fmt,
@@ -345,7 +350,7 @@ static void hpp_register(struct block_fmt *block_fmt, int idx,switch (idx) {case PERF_HPP_REPORT__BLOCK_TOTAL_CYCLES_PCT : - fmt->entry = block_total_cycles_pct_entry; + fmt->color = block_total_cycles_pct_entry; fmt->cmp = block_info__cmp; fmt->sort = block_total_cycles_pct_sort;break ;
@@ -353,7 +358,7 @@ static void hpp_register(struct block_fmt *block_fmt, int idx, fmt->entry = block_cycles_lbr_entry;break ;case PERF_HPP_REPORT__BLOCK_CYCLES_PCT : - fmt->entry = block_cycles_pct_entry; + fmt->color = block_cycles_pct_entry;break ;case PERF_HPP_REPORT__BLOCK_AVG_CYCLES : fmt->entry = block_avg_cycles_entry;