perf report: Support sorting all blocks by cycles
v5 cover perf report: Support sorting all blocks by cycles
It would be useful to support sorting for all blocks by the sampled cycles percent per block. This is useful to concentrate on the globally hottest blocks.
This patch series implements a new option "--total-cycles" which sorts all blocks by 'Sampled Cycles%'. The 'Sampled Cycles%' is block sampled cycles aggregation / total sampled cycles
For example,
perf record -b ./div
perf report --total-cycles --stdio
# To display the perf.data header info, please use --header/--header-only options. #
#
# Total Lost Samples: 0
#
# Samples: 2M of event 'cycles'
# Event count (approx.): 2753248
#
# Sampled Cycles% Sampled Cycles Avg Cycles% Avg Cycles [Program Block Range] Shared Object
# ............... .............. ........... .......... ................................................................. ....................
#
26.04% 2.8M 0.40% 18 [div.c:42 -> div.c:39] div
15.17% 1.2M 0.16% 7 [random_r.c:357 -> random_r.c:380] libc-2.27.so
5.11% 402.0K 0.04% 2 [div.c:27 -> div.c:28] div
4.87% 381.6K 0.04% 2 [random.c:288 -> random.c:291] libc-2.27.so
4.53% 381.0K 0.04% 2 [div.c:40 -> div.c:40] div
3.85% 300.9K 0.02% 1 [div.c:22 -> div.c:25] div
3.08% 241.1K 0.02% 1 [rand.c:26 -> rand.c:27] libc-2.27.so
3.06% 240.0K 0.02% 1 [random.c:291 -> random.c:291] libc-2.27.so
2.78% 215.7K 0.02% 1 [random.c:298 -> random.c:298] libc-2.27.so
2.52% 198.3K 0.02% 1 [random.c:293 -> random.c:293] libc-2.27.so
2.36% 184.8K 0.02% 1 [rand.c:28 -> rand.c:28] libc-2.27.so
2.33% 180.5K 0.02% 1 [random.c:295 -> random.c:295] libc-2.27.so
2.28% 176.7K 0.02% 1 [random.c:295 -> random.c:295] libc-2.27.so
2.20% 168.8K 0.02% 1 [rand@plt+0 -> rand@plt+0] div
1.98% 158.2K 0.02% 1 [random_r.c:388 -> random_r.c:388] libc-2.27.so
1.57% 123.3K 0.02% 1 [div.c:42 -> div.c:44] div
1.44% 116.0K 0.42% 19 [random_r.c:357 -> random_r.c:394] libc-2.27.so......
This patch series supports both stdio and tui. And also with the supporting of --percent-limit.
v5:
---
1. Move all block functions to block-info.c
2. Move the code of setting ms(map+sym) in block hist_entry to patch 'perf util: Support block formats with compare/sort/display'. Because this info is needed for reporting the block range (i.e. source line)
3. Fix a crash issue when tui mode is enabled.
Impacted patches:
-----------------
perf util: Support block formats with compare/sort/display perf report: Sort by sampled cycles percent per block for stdio perf report: Support --percent-limit for --total-cycles perf report: Sort by sampled cycles percent per block for tui
v4:
---
1. Move the block collection out of block printing.
2. Use new option '--total-cycles' to replace '-s total_cycles'
3. Move code for skipping column length calculation to patch:
'perf diff: Don't use hack to skip column length calculation'
4. Some minor updates and cleanup.
v3:
---
1. Move common block info functions to block-info.h/block-info.c
2. Remove nasty hack for skipping calculation of column length.
3. Some minor cleanup.
v2:
---
Rebase to perf/core branch
Jin Yao (7):
perf diff: Don't use hack to skip column length calculation perf util: Cleanup and refactor block info functions perf util: Count the total cycles of all samples
perf util: Support block formats with compare/sort/display perf report: Sort by sampled cycles percent per block for stdio perf report: Support --percent-limit for --total-cycles perf report: Sort by sampled cycles percent per block for tui
tools/perf/Documentation/perf-report.txt | 11 + tools/perf/builtin-annotate.c | 2 +- tools/perf/builtin-diff.c | 121 +----- tools/perf/builtin-report.c | 74 +++- tools/perf/builtin-top.c | 3 +- tools/perf/ui/browsers/hists.c | 62 ++- tools/perf/ui/browsers/hists.h | 2 + tools/perf/ui/stdio/hist.c | 29 +- tools/perf/util/Build | 1 + tools/perf/util/block-info.c | 456 +++++++++++++++++++++++ tools/perf/util/block-info.h | 74 ++++ tools/perf/util/hist.c | 13 +- tools/perf/util/hist.h | 15 +- tools/perf/util/symbol.c | 22 -- tools/perf/util/symbol.h | 24 -- tools/perf/util/symbol_conf.h | 1 + 16 files changed, 749 insertions(+), 161 deletions(-) create mode 100644 tools/perf/util/block-info.c create mode 100644 tools/perf/util/block-info.h
Signature · 1 line
2.17.1
PATCH v5 1/7 perf diff: Don't use hack to skip column length calculation
Previously we use a nasty hack to skip the hists__calc_col_len for block since this function is not very suitable for block column length calculation.
This patch removes the hack code and add a check at the entry of hists__calc_col_len to skip for block case.
--- tools/perf/builtin-diff.c | 11 ++--------- tools/perf/util/hist.c | 2 ++ 2 files changed, 4 insertions(+), 9 deletions(-)
tools/perf/builtin-diff.c +2 -9
@@ -765,13 +765,6 @@ static void block_hists_match(struct hists *hists_base, } } -static int filter_cb (struct hist_entry *he,void *arg__maybe_unused ) -{ -/* Skip the calculation of column length in output_resort */ - he->filtered = true; -return 0 ; -} -static void hists__precompute (struct hists *hists) {struct rb_root_cached *root;
@@ -820,8 +813,8 @@ static void hists__precompute(struct hists *hists)if (bh->valid && pair_bh->valid) {block_hists_match (&bh->block_hists, &pair_bh->block_hists); -hists__output_resort_cb (&pair_bh->block_hists, -NULL , filter_cb); +hists__output_resort (&pair_bh->block_hists, +NULL ); }break ;default :
tools/perf/util/hist.c +2 -0
@@ -80,6 +80,8 @@ void hists__calc_col_len(struct hists *hists, struct hist_entry *h)int symlen;u16 len; +if (h->block_info) +return ;/* * +4 accounts for '[x] ' priv level info * +2 accounts for 0x prefix on raw addresses
Signature · 1 line
2.17.1
PATCH v5 2/7 perf util: Cleanup and refactor block info functions
In reply to Jin YaoWe have already implemented some block-info related functions. Now it's time to do some cleanup, refactoring and move the functions and structures to new block-info.h/block-info.c.
v4:
---
Move code for skipping column length calculation to patch:
'perf diff: Don't use hack to skip column length calculation'
v3:
---
1. Rename the patch title
2. Rename from block.h/block.c to block-info.h/block-info.c
3. Move more common part to block-info, such as block_info__process_sym.
4. Remove the nasty hack for skipping calculation of column length
--- tools/perf/builtin-diff.c | 107 +++-------------------------- tools/perf/util/Build | 1 + tools/perf/util/block-info.c | 129 +++++++++++++++++++++++++++++++++++ tools/perf/util/block-info.h | 43 ++++++++++++ tools/perf/util/hist.c | 1 + tools/perf/util/symbol.c | 22 ------ tools/perf/util/symbol.h | 24 ------- 7 files changed, 185 insertions(+), 142 deletions(-) create mode 100644 tools/perf/util/block-info.c create mode 100644 tools/perf/util/block-info.h
tools/perf/builtin-diff.c +11 -96
@@ -24,6 +24,7 @@#include "util/annotate.h" #include "util/map.h" #include "util/spark.h" +#include "util/block-info.h" #include <linux/err.h> #include <linux/zalloc.h> #include <subcmd/pager.h>
@@ -98,8 +99,6 @@ static s64 compute_wdiff_w2;static const char *cpu_list; static DECLARE_BITMAP(cpu_bitmap, MAX_NR_CPUS); -static struct addr_location dummy_al; -enum {COMPUTE_DELTA ,COMPUTE_RATIO ,
@@ -537,41 +536,6 @@ static void hists__baseline_only(struct hists *hists) } } -static int64_t block_cmp (struct perf_hpp_fmt *fmt__maybe_unused , -struct hist_entry *left,struct hist_entry *right) -{ -struct block_info *bi_l = left->block_info; -struct block_info *bi_r = right->block_info; -int cmp; - -if (!bi_l->sym || !bi_r->sym) { -if (!bi_l->sym && !bi_r->sym) -return 0 ; -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); -return cmp; - } - -if (bi_l->sym->start != bi_r->sym->start) -return (int64_t )(bi_r->sym->start - bi_l->sym->start); - -return (int64_t )(bi_r->sym->end - bi_l->sym->end); -} -static int64_t block_cycles_diff_cmp (struct hist_entry *left,struct hist_entry *right) {
@@ -600,67 +564,13 @@ static void init_block_hist(struct block_hist *bh)INIT_LIST_HEAD (&bh->block_fmt.list);INIT_LIST_HEAD (&bh->block_fmt.sort_list); - bh->block_fmt.cmp = block_cmp; + bh->block_fmt.cmp = block_info__cmp; bh->block_fmt.sort = block_sort;perf_hpp_list__register_sort_field (&bh->block_list, &bh->block_fmt); bh->valid = true; } -static void init_block_info (struct block_info *bi,struct symbol *sym, -struct cyc_hist *ch,int offset) -{ - bi->sym = sym; - bi->start = ch->start; - bi->end = offset; - bi->cycles = ch->cycles; - bi->cycles_aggr = ch->cycles_aggr; - bi->num = ch->num; - bi->num_aggr = ch->num_aggr; - -memcpy (bi->cycles_spark, ch->cycles_spark, -NUM_SPARKS *sizeof (u64)); -} - -static int process_block_per_sym (struct hist_entry *he) -{ -struct annotation *notes; -struct cyc_hist *ch; -struct block_hist *bh; - -if (!he->ms.map || !he->ms.sym) -return 0 ; - - notes =symbol__annotation (he->ms.sym); -if (!notes || !notes->src || !notes->src->cycles_hist) -return 0 ; - - bh = container_of(he, struct block_hist, he); -init_block_hist (bh); - - ch = notes->src->cycles_hist; -for (unsigned int i =0 ; i <symbol__size (he->ms.sym); i++) { -if (ch[i].num_aggr) { -struct block_info *bi; -struct hist_entry *he_block; - - bi =block_info__new (); -if (!bi) -return -1 ; - -init_block_info (bi, he->ms.sym, &ch[i], i); - he_block =hists__add_entry_block (&bh->block_hists, - &dummy_al, bi); -if (!he_block) { -block_info__put (bi); -return -1 ; - } - } - } - -return 0 ; -} -static int block_pair_cmp (struct hist_entry *a,struct hist_entry *b) {struct block_info *bi_a = a->block_info;
@@ -785,8 +695,11 @@ static void hists__precompute(struct hists *hists) he = rb_entry(next, struct hist_entry, rb_node_in); next =rb_next (&he->rb_node_in); -if (compute ==COMPUTE_CYCLES ) -process_block_per_sym (he); +if (compute ==COMPUTE_CYCLES ) { + bh = container_of(he, struct block_hist, he); +init_block_hist (bh); +block_info__process_sym (he, bh,NULL ,0 ); + }data__for_each_file_new (i, d) { pair =get_pair_data (he, d);
@@ -805,10 +718,12 @@ static void hists__precompute(struct hists *hists)compute_wdiff (he, pair);break ;case COMPUTE_CYCLES : -process_block_per_sym (pair); - bh = container_of(he, struct block_hist, he); pair_bh = container_of(pair, struct block_hist, he); +init_block_hist (pair_bh); +block_info__process_sym (pair, pair_bh,NULL ,0 ); + + bh = container_of(he, struct block_hist, he);if (bh->valid && pair_bh->valid) { block_hists_match(&bh->block_hists,
tools/perf/util/Build +1 -0
@@ -1,4 +1,5 @@ perf-y += annotate.o +perf-y += block-info.o perf-y += block-range.o perf-y += build-id.o perf-y += cacheline.o
tools/perf/util/block-info.c new file +129 -0
129 lines not on this page · raw message
tools/perf/util/block-info.h new file +43 -0
43 lines not on this page · raw message
tools/perf/util/hist.c +1 -0
@@ -18,6 +18,7 @@#include "srcline.h" #include "symbol.h" #include "thread.h" +#include "block-info.h" #include "ui/progress.h" #include <errno.h> #include <math.h>
tools/perf/util/symbol.c +0 -22
@@ -2371,25 +2371,3 @@ struct mem_info *mem_info__new(void)refcount_set (&mi->refcnt,1 );return mi; } - -struct block_info *block_info__get (struct block_info *bi) -{ -if (bi) -refcount_inc (&bi->refcnt); -return bi; -} - -void block_info__put (struct block_info *bi) -{ -if (bi &&refcount_dec_and_test (&bi->refcnt)) -free (bi); -} - -struct block_info *block_info__new (void ) -{ -struct block_info *bi =zalloc (sizeof (*bi)); - -if (bi) -refcount_set (&bi->refcnt,1 ); -return bi; -}
tools/perf/util/symbol.h +0 -24
@@ -106,18 +106,6 @@ struct ref_reloc_sym {u64 unrelocated_addr; }; -struct block_info { -struct symbol *sym; -u64 start; -u64 end; -u64 cycles; -u64 cycles_aggr; -s64 cycles_spark[NUM_SPARKS ]; -int num; -int num_aggr; -refcount_t refcnt; -}; -struct addr_location {struct machine *machine;struct thread *thread;
@@ -291,16 +279,4 @@ static inline void __mem_info__zput(struct mem_info **mi)#define mem_info__zput (mi) __mem_info__zput(&mi) -struct block_info *block_info__new (void ); -struct block_info *block_info__get (struct block_info *bi); -void block_info__put (struct block_info *bi); - -static inline void __block_info__zput (struct block_info **bi) -{ -block_info__put (*bi); - *bi =NULL ; -} - -#define block_info__zput (bi) __block_info__zput(&bi) -#endif /* __PERF_SYMBOL */
Signature · 1 line
2.17.1
PATCH v5 3/7 perf util: Count the total cycles of all samples
In reply to Jin YaoWe can get the per sample cycles by hist__account_cycles(). It's also useful to know the total cycles of all samples in order to get the cycles coverage for a single program block in further. For example,
coverage = per block sampled cycles / total sampled cycles
This patch creates a new argument 'total_cycles' in hist__account_cycles(), which will be added with the cycles of each sample.
--- tools/perf/builtin-annotate.c | 2 +- tools/perf/builtin-diff.c | 3 ++- tools/perf/builtin-report.c | 2 +- tools/perf/builtin-top.c | 3 ++- tools/perf/util/hist.c | 6 +++++- tools/perf/util/hist.h | 3 ++- 6 files changed, 13 insertions(+), 6 deletions(-)
tools/perf/builtin-annotate.c +1 -1
@@ -201,7 +201,7 @@ static int process_branch_callback(struct evsel *evsel,if (a.map !=NULL ) a.map->dso->hit =1 ; -hist__account_cycles (sample->branch_stack, al, sample, false); +hist__account_cycles (sample->branch_stack, al, sample, false,NULL ); ret =hist_entry_iter__add (&iter, &a,PERF_MAX_STACK_DEPTH , ann);return ret;
tools/perf/builtin-diff.c +2 -1
@@ -426,7 +426,8 @@ static int diff__process_sample_event(struct perf_tool *tool, goto out_put; } -hist__account_cycles (sample->branch_stack, &al, sample, false); +hist__account_cycles (sample->branch_stack, &al, sample, false, +NULL ); }/*
tools/perf/builtin-report.c +1 -1
@@ -292,7 +292,7 @@ static int process_sample_event(struct perf_tool *tool,if (ui__has_annotation () || rep->symbol_ipc) {hist__account_cycles (sample->branch_stack, &al, sample, - rep->nonany_branch_mode); + rep->nonany_branch_mode,NULL ); } ret =hist_entry_iter__add (&iter, &al, rep->max_stack, rep);
tools/perf/builtin-top.c +2 -1
@@ -725,7 +725,8 @@ static int hist_iter__top_callback(struct hist_entry_iter *iter,perf_top__record_precise_ip (top, he, iter->sample, evsel, al->addr);hist__account_cycles (iter->sample->branch_stack, al, iter->sample, - !(top->record_opts.branch_stack &PERF_SAMPLE_BRANCH_ANY )); + !(top->record_opts.branch_stack &PERF_SAMPLE_BRANCH_ANY ), +NULL );return 0 ; }
tools/perf/util/hist.c +5 -1
@@ -2572,7 +2572,8 @@ int hists__unlink(struct hists *hists) }void hist__account_cycles (struct branch_stack *bs,struct addr_location *al, -struct perf_sample *sample,bool nonany_branch_mode) +struct perf_sample *sample,bool nonany_branch_mode, +u64 *total_cycles) {struct branch_info *bi;
@@ -2599,6 +2600,9 @@ void hist__account_cycles(struct branch_stack *bs, struct addr_location *al, nonany_branch_mode ?NULL : prev, bi[i].flags.cycles); prev = &bi[i].to; + +if (total_cycles) + *total_cycles += bi[i].flags.cycles; }free (bi); }
tools/perf/util/hist.h +2 -1
@@ -527,7 +527,8 @@ unsigned int hists__sort_list_width(struct hists *hists);unsigned int hists__overhead_width (struct hists *hists);void hist__account_cycles (struct branch_stack *bs,struct addr_location *al, -struct perf_sample *sample,bool nonany_branch_mode); +struct perf_sample *sample,bool nonany_branch_mode, +u64 *total_cycles);struct option ;int parse_filter_percentage (const struct option *opt,const char *arg,int unset);
Signature · 1 line
2.17.1
PATCH v5 4/7 perf util: Support block formats with compare/sort/display
In reply to Jin YaoThis patch provides helper routines to support new columns for block info output.
The new columns are:
Sampled Cycles%
Sampled Cycles
Avg Cycles%
Avg Cycles
[Program Block Range]
Shared Object
v5:
---
1. Move more block related functions from builtin-report.c to block-info.c
2. Set ms (map+sym) in block hist_entry. Because this info is needed for reporting the block range (i.e. source line)
--- tools/perf/util/block-info.c | 317 +++++++++++++++++++++++++++++++++++ tools/perf/util/block-info.h | 33 +++- tools/perf/util/hist.c | 4 + 3 files changed, 352 insertions(+), 2 deletions(-)
tools/perf/util/block-info.c +317 -0
@@ -6,6 +6,40 @@#include "sort.h" #include "annotate.h" #include "symbol.h" +#include "dso.h" +#include "map.h" +#include "srcline.h" +#include "evlist.h" + +static struct block_header_column { +const char *name; +int width; +} block_columns[PERF_HPP_REPORT__BLOCK_MAX_INDEX ] = { + [PERF_HPP_REPORT__BLOCK_TOTAL_CYCLES_PCT ] = { + .name ="Sampled Cycles%" , + .width =15 , + }, + [PERF_HPP_REPORT__BLOCK_LBR_CYCLES ] = { + .name ="Sampled Cycles" , + .width =14 , + }, + [PERF_HPP_REPORT__BLOCK_CYCLES_PCT ] = { + .name ="Avg Cycles%" , + .width =11 , + }, + [PERF_HPP_REPORT__BLOCK_AVG_CYCLES ] = { + .name ="Avg Cycles" , + .width =10 , + }, + [PERF_HPP_REPORT__BLOCK_RANGE ] = { + .name ="[Program Block Range]" , + .width =70 , + }, + [PERF_HPP_REPORT__BLOCK_DSO ] = { + .name ="Shared Object" , + .width =20 , + } +};struct block_info *block_info__get (struct block_info *bi) {
@@ -127,3 +161,286 @@ int block_info__process_sym(struct hist_entry *he, struct block_hist *bh,return 0 ; } + +static int block_column_header (struct perf_hpp_fmt *fmt, +struct perf_hpp *hpp, +struct hists *hists__maybe_unused , +int line__maybe_unused , +int *span__maybe_unused ) +{ + struct block_fmt *block_fmt = container_of(fmt, struct block_fmt, fmt); + +return scnprintf (hpp->buf, hpp->size,"%*s" , block_fmt->width, + block_fmt->header); +} + +static int block_column_width (struct perf_hpp_fmt *fmt, +struct perf_hpp *hpp__maybe_unused , +struct hists *hists__maybe_unused ) +{ + struct block_fmt *block_fmt = container_of(fmt, struct block_fmt, fmt); + +return block_fmt->width; +} + +static int block_total_cycles_pct_entry (struct perf_hpp_fmt *fmt, +struct perf_hpp *hpp, +struct hist_entry *he) +{ + 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); +} + +static int64_t block_total_cycles_pct_sort (struct perf_hpp_fmt *fmt, +struct hist_entry *left, +struct hist_entry *right) +{ + struct block_fmt *block_fmt = container_of(fmt, struct block_fmt, fmt); +struct block_info *bi_l = left->block_info; +struct block_info *bi_r = right->block_info; +double l, r; + +if (block_fmt->total_cycles) { + l = ((double )bi_l->cycles / + (double )block_fmt->total_cycles) *1000.0 ; + r = ((double )bi_r->cycles / + (double )block_fmt->total_cycles) *1000.0 ; +return (int64_t )l - (int64_t )r; + } + +return 0 ; +} + +static void cycles_string (u64 cycles,char *buf,int size) +{ +if (cycles >=1000000 ) +scnprintf (buf, size,"%.1fM" , (double )cycles /1000000.0 ); +else if (cycles >=1000 ) +scnprintf (buf, size,"%.1fK" , (double )cycles /1000.0 ); +else +scnprintf (buf, size,"%1d" , cycles); +} + +static int block_cycles_lbr_entry (struct perf_hpp_fmt *fmt, +struct perf_hpp *hpp,struct hist_entry *he) +{ + struct block_fmt *block_fmt = container_of(fmt, struct block_fmt, fmt); +struct block_info *bi = he->block_info; +char cycles_buf[16 ]; + +cycles_string (bi->cycles_aggr, cycles_buf,sizeof (cycles_buf)); + +return scnprintf (hpp->buf, hpp->size,"%*s" , block_fmt->width, + cycles_buf); +} + +static int block_cycles_pct_entry (struct perf_hpp_fmt *fmt, +struct perf_hpp *hpp,struct hist_entry *he) +{ + struct block_fmt *block_fmt = container_of(fmt, struct block_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); +} + +static int block_avg_cycles_entry (struct perf_hpp_fmt *fmt, +struct perf_hpp *hpp, +struct hist_entry *he) +{ + struct block_fmt *block_fmt = container_of(fmt, struct block_fmt, fmt); +struct block_info *bi = he->block_info; +char cycles_buf[16 ]; + +cycles_string (bi->cycles_aggr / bi->num_aggr, cycles_buf, +sizeof (cycles_buf)); + +return scnprintf (hpp->buf, hpp->size,"%*s" , block_fmt->width, + cycles_buf); +} + +static int block_range_entry (struct perf_hpp_fmt *fmt,struct perf_hpp *hpp, +struct hist_entry *he) +{ + struct block_fmt *block_fmt = container_of(fmt, struct block_fmt, fmt); +struct block_info *bi = he->block_info; +char buf[128 ]; +char *start_line, *end_line; + + symbol_conf.disable_add2line_warn = true; + + start_line =map__srcline (he->ms.map, bi->sym->start + bi->start, + he->ms.sym); + + end_line =map__srcline (he->ms.map, bi->sym->start + bi->end, + he->ms.sym); + +if ((start_line !=SRCLINE_UNKNOWN ) && (end_line !=SRCLINE_UNKNOWN )) { +scnprintf (buf,sizeof (buf),"[%s -> %s]" , + start_line, end_line); + }else { +scnprintf (buf,sizeof (buf),"[%7lx -> %7lx]" , + bi->start, bi->end); + } + +free_srcline (start_line); +free_srcline (end_line); + +return scnprintf (hpp->buf, hpp->size,"%*s" , block_fmt->width, buf); +} + +static int block_dso_entry (struct perf_hpp_fmt *fmt,struct perf_hpp *hpp, +struct hist_entry *he) +{ + struct block_fmt *block_fmt = container_of(fmt, struct block_fmt, fmt); +struct map *map = he->ms.map; + +if (map && map->dso) { +return scnprintf (hpp->buf, hpp->size,"%*s" , block_fmt->width, + map->dso->short_name); + } + +return scnprintf (hpp->buf, hpp->size,"%*s" , block_fmt->width, +"[unknown]" ); +} + +static void init_block_header (struct block_fmt *block_fmt) +{ +struct perf_hpp_fmt *fmt = &block_fmt->fmt; + +BUG_ON (block_fmt->idx >=PERF_HPP_REPORT__BLOCK_MAX_INDEX ); + + block_fmt->header = block_columns[block_fmt->idx].name; + block_fmt->width = block_columns[block_fmt->idx].width; + + fmt->header = block_column_header; + fmt->width = block_column_width; +} + +static void hpp_register (struct block_fmt *block_fmt,int idx, +struct perf_hpp_list *hpp_list) +{ +struct perf_hpp_fmt *fmt = &block_fmt->fmt; + + block_fmt->idx = idx; +INIT_LIST_HEAD (&fmt->list); +INIT_LIST_HEAD (&fmt->sort_list); + +switch (idx) { +case PERF_HPP_REPORT__BLOCK_TOTAL_CYCLES_PCT : + fmt->entry = block_total_cycles_pct_entry; + fmt->cmp = block_info__cmp; + fmt->sort = block_total_cycles_pct_sort; +break ; +case PERF_HPP_REPORT__BLOCK_LBR_CYCLES : + fmt->entry = block_cycles_lbr_entry; +break ; +case PERF_HPP_REPORT__BLOCK_CYCLES_PCT : + fmt->entry = block_cycles_pct_entry; +break ; +case PERF_HPP_REPORT__BLOCK_AVG_CYCLES : + fmt->entry = block_avg_cycles_entry; +break ; +case PERF_HPP_REPORT__BLOCK_RANGE : + fmt->entry = block_range_entry; +break ; +case PERF_HPP_REPORT__BLOCK_DSO : + fmt->entry = block_dso_entry; +break ; +default : +return ; + } + +init_block_header (block_fmt); +perf_hpp_list__column_register (hpp_list, fmt); +} + +static void register_block_columns (struct perf_hpp_list *hpp_list, +struct block_fmt *block_fmts) +{ +for (int i =0 ; i <PERF_HPP_REPORT__BLOCK_MAX_INDEX ; i++) +hpp_register (&block_fmts[i], i, hpp_list); +} + +static void init_block_hist (struct block_hist *bh,struct block_fmt *block_fmts) +{ +__hists__init (&bh->block_hists, &bh->block_list); +perf_hpp_list__init (&bh->block_list); + bh->block_list.nr_header_lines =1 ; + +register_block_columns (&bh->block_list, block_fmts); + +perf_hpp_list__register_sort_field (&bh->block_list, + &block_fmts[PERF_HPP_REPORT__BLOCK_TOTAL_CYCLES_PCT ].fmt); +} + +static inline void set_fmt (struct block_fmt *block_fmt, +u64 total_cycles,u64 block_cycles) +{ + block_fmt->total_cycles = total_cycles; + block_fmt->block_cycles = block_cycles; +} + +static void process_block_report (struct hists *hists, +struct block_report *block_report, +u64 total_cycles) +{ +struct rb_node *next =rb_first_cached (&hists->entries); +struct block_hist *bh = &block_report->hist; +struct hist_entry *he; + +init_block_hist (bh, block_report->fmts); + +while (next) { + he = rb_entry(next, struct hist_entry, rb_node); +block_info__process_sym (he, bh, &block_report->cycles, + total_cycles); + next =rb_next (&he->rb_node); + } + +for (int i =0 ; i <PERF_HPP_REPORT__BLOCK_MAX_INDEX ; i++) { + block_report->fmts[i].total_cycles = total_cycles; + block_report->fmts[i].block_cycles = block_report->cycles; + } + +hists__output_resort (&bh->block_hists,NULL ); +} + +struct block_report *block_info__create_report (struct evlist *evlist, +u64 total_cycles) +{ +struct block_report *block_reports; +int nr_hists = evlist->core.nr_entries, i =0 ; +struct evsel *pos; + + block_reports =calloc (nr_hists,sizeof (struct block_report )); +if (!block_reports) +return NULL ; + +evlist__for_each_entry (evlist, pos) { +struct hists *hists =evsel__hists (pos); + +process_block_report (hists, &block_reports[i], total_cycles); + i++; + } + +return block_reports; +}
tools/perf/util/block-info.h +31 -2
@@ -4,8 +4,9 @@#include <linux/types.h> #include <linux/refcount.h> -#include "util/hist.h" -#include "util/symbol.h" +#include "hist.h" +#include "symbol.h" +#include "sort.h" struct block_info {struct symbol *sym;
@@ -20,6 +21,31 @@ struct block_info {refcount_t refcnt; }; +struct block_fmt { +struct perf_hpp_fmt fmt; +int idx; +int width; +const char *header; +u64 total_cycles; +u64 block_cycles; +}; + +enum { +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 , +PERF_HPP_REPORT__BLOCK_MAX_INDEX +}; + +struct block_report { +struct block_hist hist; +u64 cycles; +struct block_fmt fmts[PERF_HPP_REPORT__BLOCK_MAX_INDEX ]; +}; +struct block_hist ;struct block_info *block_info__new (void );
@@ -40,4 +66,7 @@ int64_t block_info__cmp(struct perf_hpp_fmt *fmt __maybe_unused,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); +#endif /* __PERF_BLOCK_H */
tools/perf/util/hist.c +4 -0
@@ -758,6 +758,10 @@ struct hist_entry *hists__add_entry_block(struct hists *hists,struct hist_entry entry = { .block_info = block_info, .hists = hists, + .ms = { + .map = al->map, + .sym = al->sym, + }, }, *he =hists__findnew_entry (hists, &entry, al, false);return he;
Signature · 1 line
2.17.1
PATCH v5 5/7 perf report: Sort by sampled cycles percent per block for stdio
In reply to Jin YaoIt would be useful to support sorting for all blocks by the sampled cycles percent per block. This is useful to concentrate on the globally hottest blocks.
This patch implements a new option "--total-cycles" which sorts all blocks by 'Sampled Cycles%'. The 'Sampled Cycles%' is the percent:
percent = block sampled cycles aggregation / total sampled cycles
Note that, this patch only supports "--stdio" mode.
For example,
perf record -b ./div
perf report --total-cycles --stdio
# To display the perf.data header info, please use --header/--header-only options. #
#
# Total Lost Samples: 0
#
# Samples: 2M of event 'cycles'
# Event count (approx.): 2753248
#
# Sampled Cycles% Sampled Cycles Avg Cycles% Avg Cycles [Program Block Range] Shared Object
# ............... .............. ........... .......... ................................................................. ....................
#
26.04% 2.8M 0.40% 18 [div.c:42 -> div.c:39] div
15.17% 1.2M 0.16% 7 [random_r.c:357 -> random_r.c:380] libc-2.27.so
5.11% 402.0K 0.04% 2 [div.c:27 -> div.c:28] div
4.87% 381.6K 0.04% 2 [random.c:288 -> random.c:291] libc-2.27.so
4.53% 381.0K 0.04% 2 [div.c:40 -> div.c:40] div
3.85% 300.9K 0.02% 1 [div.c:22 -> div.c:25] div
3.08% 241.1K 0.02% 1 [rand.c:26 -> rand.c:27] libc-2.27.so
3.06% 240.0K 0.02% 1 [random.c:291 -> random.c:291] libc-2.27.so
2.78% 215.7K 0.02% 1 [random.c:298 -> random.c:298] libc-2.27.so
2.52% 198.3K 0.02% 1 [random.c:293 -> random.c:293] libc-2.27.so
2.36% 184.8K 0.02% 1 [rand.c:28 -> rand.c:28] libc-2.27.so
2.33% 180.5K 0.02% 1 [random.c:295 -> random.c:295] libc-2.27.so
2.28% 176.7K 0.02% 1 [random.c:295 -> random.c:295] libc-2.27.so
2.20% 168.8K 0.02% 1 [rand@plt+0 -> rand@plt+0] div
1.98% 158.2K 0.02% 1 [random_r.c:388 -> random_r.c:388] libc-2.27.so
1.57% 123.3K 0.02% 1 [div.c:42 -> div.c:44] div
1.44% 116.0K 0.42% 19 [random_r.c:357 -> random_r.c:394] libc-2.27.so
0.25% 182.5K 0.02% 1 [random_r.c:388 -> random_r.c:391] libc-2.27.so
0.00% 48 1.07% 48 [x86_pmu_enable+284 -> x86_pmu_enable+298] [kernel.kallsyms]
0.00% 74 1.64% 74 [vm_mmap_pgoff+0 -> vm_mmap_pgoff+92] [kernel.kallsyms]
0.00% 73 1.62% 73 [vm_mmap+0 -> vm_mmap+48] [kernel.kallsyms]
0.00% 63 0.69% 31 [up_write+0 -> up_write+34] [kernel.kallsyms]
0.00% 13 0.29% 13 [setup_arg_pages+396 -> setup_arg_pages+413] [kernel.kallsyms]
0.00% 3 0.07% 3 [setup_arg_pages+418 -> setup_arg_pages+450] [kernel.kallsyms]
0.00% 616 6.84% 308 [security_mmap_file+0 -> security_mmap_file+72] [kernel.kallsyms]
0.00% 23 0.51% 23 [security_mmap_file+77 -> security_mmap_file+87] [kernel.kallsyms]
0.00% 4 0.02% 1 [sched_clock+0 -> sched_clock+4] [kernel.kallsyms]
0.00% 4 0.02% 1 [sched_clock+9 -> sched_clock+12] [kernel.kallsyms]
0.00% 1 0.02% 1 [rcu_nmi_exit+0 -> rcu_nmi_exit+9] [kernel.kallsyms] v5:
---
1. Move all block functions to block-info.c
2. Move the code of setting ms in block hist_entry to other patch.
v4:
---
1. Use new option '--total-cycles' to replace
'-s total_cycles' in v3.
2. Move block info collection out of block info
printing.
v3:
---
1. Use common function block_info__process_sym to process the blocks per symbol.
2. Remove the nasty hack for skipping calculation of column length
3. Some minor cleanup
--- tools/perf/Documentation/perf-report.txt | 11 +++++ tools/perf/builtin-report.c | 54 ++++++++++++++++++++++-- tools/perf/ui/stdio/hist.c | 22 ++++++++++ tools/perf/util/symbol_conf.h | 1 + 4 files changed, 85 insertions(+), 3 deletions(-)
tools/perf/Documentation/perf-report.txt +11 -0
@@ -525,6 +525,17 @@ include::itrace.txt[] Configure time quantum for time sort key. Default 100ms. Accepts s, us, ms, ns units. +--total-cycles:: + When --total-cycles is specified, it supports sorting for all blocks by + 'Sampled Cycles%'. This is useful to concentrate on the globally hottest + blocks. In output, there are some new columns: + + 'Sampled Cycles%' - block sampled cycles aggregation / total sampled cycles + 'Sampled Cycles' - block sampled cycles aggregation + 'Avg Cycles%' - block average sampled cycles / sum of total block average + sampled cycles + 'Avg Cycles' - block average sampled cycles + include::callchain-overhead-calculation.txt[] SEE ALSO
tools/perf/builtin-report.c +51 -3
130 lines not on this page · raw message
tools/perf/ui/stdio/hist.c +22 -0
@@ -558,6 +558,25 @@ static int hist_entry__block_fprintf(struct hist_entry *he,return ret; } +static int hist_entry__individual_block_fprintf (struct hist_entry *he, +char *bf,size_t size, +FILE *fp) +{ +int ret =0 ; + +struct perf_hpp hpp = { + .buf = bf, + .size = size, + .skip = false, + }; + +hist_entry__snprintf (he, &hpp); +if (!hpp.skip) + ret +=fprintf (fp,"%s\n" , bf); + +return ret; +} +static int hist_entry__fprintf (struct hist_entry *he,size_t size,char *bf,size_t bfsz,FILE *fp,bool ignore_callchains)
@@ -580,6 +599,9 @@ static int hist_entry__fprintf(struct hist_entry *he, size_t size,if (symbol_conf.report_block)return hist_entry__block_fprintf (he, bf, size, fp); +if (symbol_conf.report_individual_block) +return hist_entry__individual_block_fprintf (he, bf, size, fp); +hist_entry__snprintf (he, &hpp); ret =fprintf (fp,"%s\n" , bf);
tools/perf/util/symbol_conf.h +1 -0
@@ -40,6 +40,7 @@ struct symbol_conf { raw_trace, report_hierarchy, report_block, + report_individual_block, inline_name, disable_add2line_warn; const char *vmlinux_name,
Signature · 1 line
2.17.1
Re: [PATCH v5 5/7] perf report: Sort by sampled cycles percent per block for stdio
On Wed, Oct 30, 2019 at 02:04:28PM +0800, Jin Yao wrote:
SNIP
Quoted 25 lines
tools/perf/builtin-report.c +11
-0+static int hists__fprintf_all_blocks (struct block_hist *bh) +{ + symbol_conf.report_individual_block = true; +hists__fprintf (&bh->block_hists, true,0 ,0 ,0 , + stdout, true); +hists__delete_entries (&bh->block_hists); +return 0 ; +} +static int perf_evlist__tty_browse_hists (struct evlist *evlist,struct report *rep,const char *help) {struct evsel *pos; +int i =0 ;if (!quiet) { fprintf(stdout, "#\n# Total Lost Samples: %" PRIu64 "\n#\n",@@ -494,12 +509,20 @@ static int perf_evlist__tty_browse_hists(struct evlist *evlist,evlist__for_each_entry (evlist, pos) {struct hists *hists =evsel__hists (pos);const char *evname =perf_evsel__name (pos); +struct block_hist *block_hist; if (symbol_conf.event_group &&
tools/perf/builtin-report.c static int perf_evlist__tty_browse_hists(struct evlist *evlist, · line 524
Quoted 10 lines
tools/perf/builtin-report.c +6
-0!perf_evsel__is_group_leader(pos))continue ;hists__fprintf_nr_sample_events (hists, rep, evname, stdout); + +if (rep->total_cycles_mode) { + block_hist = &rep->block_reports[i++].hist; +hists__fprintf_all_blocks (block_hist); +continue ; + }
hum, you don't need evsel in here, please make separate function like perf_evlist__tty_browse_block_hists, where you will iterate directly block_reports[i++]
IMO the best would be to have report__browse_block_hists in block-info.c and handle all display modes from there
that's probably the last thing that would be moved to block-info.c other than that I think the patchset is ok
thanks,
jirka
Re: [PATCH v5 5/7] perf report: Sort by sampled cycles percent per block for stdio
Quoted 44 lines · Jiri Olsa
On Wed, Oct 30, 2019 at 02:04:28PM +0800, Jin Yao wrote:
SNIP
Quoted 25 lines
tools/perf/builtin-report.c +11
-0+static int hists__fprintf_all_blocks (struct block_hist *bh) +{ + symbol_conf.report_individual_block = true; +hists__fprintf (&bh->block_hists, true,0 ,0 ,0 , + stdout, true); +hists__delete_entries (&bh->block_hists); +return 0 ; +} +static int perf_evlist__tty_browse_hists (struct evlist *evlist,struct report *rep,const char *help) {struct evsel *pos; +int i =0 ;if (!quiet) { fprintf(stdout, "#\n# Total Lost Samples: %" PRIu64 "\n#\n",@@ -494,12 +509,20 @@ static int perf_evlist__tty_browse_hists(struct evlist *evlist,evlist__for_each_entry (evlist, pos) {struct hists *hists =evsel__hists (pos);const char *evname =perf_evsel__name (pos); +struct block_hist *block_hist; if (symbol_conf.event_group &&tools/perf/builtin-report.c static int perf_evlist__tty_browse_hists(struct evlist *evlist, · line 524
Quoted 10 lines
tools/perf/builtin-report.c +6
-0!perf_evsel__is_group_leader(pos))continue ;hists__fprintf_nr_sample_events (hists, rep, evname, stdout); + +if (rep->total_cycles_mode) { + block_hist = &rep->block_reports[i++].hist; +hists__fprintf_all_blocks (block_hist); +continue ; + }hum, you don't need evsel in here, please make separate function like
perf_evlist__tty_browse_block_hists, where you will iterate directly block_reports[i++]
Quoted 9 lines
IMO the best would be to have
report__browse_block_histsinblock-info.cand handle all display modes from therethat's probably the last thing that would be moved to
block-info.cother than that I think the patchset is okthanks,
jirka
Thanks Jiri!
I just posted v6 which moved more block display codes from builtin-report.c to block-info.c. That should let the code be more clear.
Thanks
Jin Yao
PATCH v5 6/7 perf report: Support --percent-limit for --total-cycles
In reply to Jin YaoWe have already supported the '--total-cycles' option in previous patch. It's also useful to show entries only above a threshold percent.
This patch enables '--percent-limit' for not showing entries under that percent.
For example,
perf report --total-cycles --stdio --percent-limit 1
# To display the perf.data header info, please use --header/--header-only options. #
#
# Total Lost Samples: 0
#
# Samples: 2M of event 'cycles'
# Event count (approx.): 2753248
#
# Sampled Cycles% Sampled Cycles Avg Cycles% Avg Cycles [Program Block Range] Shared Object
# ............... .............. ........... .......... ................................................................. ....................
#
26.04% 2.8M 0.40% 18 [div.c:42 -> div.c:39] div
15.17% 1.2M 0.16% 7 [random_r.c:357 -> random_r.c:380] libc-2.27.so
5.11% 402.0K 0.04% 2 [div.c:27 -> div.c:28] div
4.87% 381.6K 0.04% 2 [random.c:288 -> random.c:291] libc-2.27.so
4.53% 381.0K 0.04% 2 [div.c:40 -> div.c:40] div
3.85% 300.9K 0.02% 1 [div.c:22 -> div.c:25] div
3.08% 241.1K 0.02% 1 [rand.c:26 -> rand.c:27] libc-2.27.so
3.06% 240.0K 0.02% 1 [random.c:291 -> random.c:291] libc-2.27.so
2.78% 215.7K 0.02% 1 [random.c:298 -> random.c:298] libc-2.27.so
2.52% 198.3K 0.02% 1 [random.c:293 -> random.c:293] libc-2.27.so
2.36% 184.8K 0.02% 1 [rand.c:28 -> rand.c:28] libc-2.27.so
2.33% 180.5K 0.02% 1 [random.c:295 -> random.c:295] libc-2.27.so
2.28% 176.7K 0.02% 1 [random.c:295 -> random.c:295] libc-2.27.so
2.20% 168.8K 0.02% 1 [rand@plt+0 -> rand@plt+0] div
1.98% 158.2K 0.02% 1 [random_r.c:388 -> random_r.c:388] libc-2.27.so
1.57% 123.3K 0.02% 1 [div.c:42 -> div.c:44] div
1.44% 116.0K 0.42% 19 [random_r.c:357 -> random_r.c:394] libc-2.27.soIt only shows the entries which 'Sampled Cycles%' > 1%.
v5:
---
No functional change. Only fix the conflict issue because previous patches are changed.
v4:
---
No functional change. Only fix the build issue because previous patches are changed.
--- tools/perf/builtin-report.c | 6 +++--- tools/perf/ui/stdio/hist.c | 7 ++++++- tools/perf/util/block-info.c | 10 ++++++++++ tools/perf/util/block-info.h | 2 ++ 4 files changed, 21 insertions(+), 4 deletions(-)
tools/perf/builtin-report.c +3 -3
@@ -485,10 +485,10 @@ static size_t hists__fprintf_nr_sample_events(struct hists *hists, struct reportreturn ret +fprintf (fp,"\n#\n" ); } -static int hists__fprintf_all_blocks (struct block_hist *bh) +static int hists__fprintf_all_blocks (struct block_hist *bh,float min_percent) { symbol_conf.report_individual_block = true; -hists__fprintf (&bh->block_hists, true,0 ,0 ,0 , +hists__fprintf (&bh->block_hists, true,0 ,0 , min_percent, stdout, true);hists__delete_entries (&bh->block_hists);return 0 ;
@@ -519,7 +519,7 @@ static int perf_evlist__tty_browse_hists(struct evlist *evlist,if (rep->total_cycles_mode) { block_hist = &rep->block_reports[i++].hist; -hists__fprintf_all_blocks (block_hist); +hists__fprintf_all_blocks (block_hist, rep->min_percent);continue ; }
tools/perf/ui/stdio/hist.c +6 -1
@@ -15,6 +15,7 @@#include "../../util/srcline.h" #include "../../util/string2.h" #include "../../util/thread.h" +#include "../../util/block-info.h" #include <linux/ctype.h> #include <linux/zalloc.h>
@@ -856,7 +857,11 @@ size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows,if (h->filtered)continue ; - percent =hist_entry__get_percent_limit (h); +if (symbol_conf.report_individual_block) + percent =block_info__total_cycles_percent (h); +else + percent =hist_entry__get_percent_limit (h); +if (percent < min_pcnt)continue ;
tools/perf/util/block-info.c +10 -0
@@ -444,3 +444,13 @@ struct block_report *block_info__create_report(struct evlist *evlist,return block_reports; } + +float block_info__total_cycles_percent (struct hist_entry *he) +{ +struct block_info *bi = he->block_info; + +if (bi->total_cycles) +return bi->cycles *100.0 / bi->total_cycles; + +return 0.0 ; +}
tools/perf/util/block-info.h +2 -0
@@ -69,4 +69,6 @@ int block_info__process_sym(struct hist_entry *he, struct block_hist *bh,struct block_report *block_info__create_report (struct evlist *evlist,u64 total_cycles); +float block_info__total_cycles_percent (struct hist_entry *he); +#endif /* __PERF_BLOCK_H */
Signature · 1 line
2.17.1
PATCH v5 7/7 perf report: Sort by sampled cycles percent per block for tui
In reply to Jin YaoPrevious patch has implemented a new option "--total-cycles". But only stdio mode is supported.
This patch supports the tui mode and support '--percent-limit'.
For example,
perf record -b ./div
perf report --total-cycles --percent-limit 1
# Samples: 2753248 of event 'cycles'
Sampled Cycles% Sampled Cycles Avg Cycles% Avg Cycles [Program Block Range] Shared Object
26.04% 2.8M 0.40% 18 [div.c:42 -> div.c:39] div
15.17% 1.2M 0.16% 7 [random_r.c:357 -> random_r.c:380] libc-2.27.so
5.11% 402.0K 0.04% 2 [div.c:27 -> div.c:28] div
4.87% 381.6K 0.04% 2 [random.c:288 -> random.c:291] libc-2.27.so
4.53% 381.0K 0.04% 2 [div.c:40 -> div.c:40] div
3.85% 300.9K 0.02% 1 [div.c:22 -> div.c:25] div
3.08% 241.1K 0.02% 1 [rand.c:26 -> rand.c:27] libc-2.27.so
3.06% 240.0K 0.02% 1 [random.c:291 -> random.c:291] libc-2.27.so
2.78% 215.7K 0.02% 1 [random.c:298 -> random.c:298] libc-2.27.so
2.52% 198.3K 0.02% 1 [random.c:293 -> random.c:293] libc-2.27.so
2.36% 184.8K 0.02% 1 [rand.c:28 -> rand.c:28] libc-2.27.so
2.33% 180.5K 0.02% 1 [random.c:295 -> random.c:295] libc-2.27.so
2.28% 176.7K 0.02% 1 [random.c:295 -> random.c:295] libc-2.27.so
2.20% 168.8K 0.02% 1 [rand@plt+0 -> rand@plt+0] div
1.98% 158.2K 0.02% 1 [random_r.c:388 -> random_r.c:388] libc-2.27.so
1.57% 123.3K 0.02% 1 [div.c:42 -> div.c:44] div
1.44% 116.0K 0.42% 19 [random_r.c:357 -> random_r.c:394] libc-2.27.so v5:
---
Fix a crash issue when running perf report without '--total-cycles'. The issue is because the internal flag is renamed from 'total_cycles' to 'total_cycles_mode' in previous patch but this patch still uses 'total_cycles' to check if the '--total-cycles' option is enabled, which causes the code to be inconsistent.
v4:
---
Since the block collection is moved out of printing in previous patch, this patch is updated accordingly for tui supporting.
v3:
---
Minor change since the function name is changed:
block_total_cycles_percent -> block_info__total_cycles_percent
--- tools/perf/builtin-report.c | 30 +++++++++++++--- tools/perf/ui/browsers/hists.c | 62 +++++++++++++++++++++++++++++++++- tools/perf/ui/browsers/hists.h | 2 ++ tools/perf/util/hist.h | 12 +++++++ 4 files changed, 100 insertions(+), 6 deletions(-)
tools/perf/builtin-report.c +25 -5
@@ -494,6 +494,25 @@ static int hists__fprintf_all_blocks(struct block_hist *bh, float min_percent)return 0 ; } +static int perf_evlist__tui_block_hists_browse (struct evlist *evlist, +struct report *rep) +{ +struct block_hist *bh; +struct evsel *pos; +int i =0 , ret; + +evlist__for_each_entry (evlist, pos) { + bh = &rep->block_reports[i++].hist; + symbol_conf.report_individual_block = true; + ret =block_hists_tui_browse (bh, pos, rep->min_percent); +hists__delete_entries (&bh->block_hists); +if (ret !=0 ) +return ret; + } + +return ret; +} +static int perf_evlist__tty_browse_hists (struct evlist *evlist,struct report *rep,const char *help)
@@ -605,6 +624,11 @@ static int report__browse_hists(struct report *rep)switch (use_browser) {case 1 : +if (rep->total_cycles_mode) { + ret =perf_evlist__tui_block_hists_browse (evlist, rep); +break ; + } + ret = perf_evlist__tui_browse_hists(evlist, help, NULL, rep->min_percent, &session->header.env,
@@ -1408,12 +1432,8 @@ int cmd_report(int argc, const char **argv)if (report.total_cycles_mode) {if (sort__mode !=SORT_MODE__BRANCH ) report.total_cycles_mode = false; -else if (!report.use_stdio) { -pr_err ("Error: --total-cycles can be only used together with --stdio\n" ); - goto error; - }else { +else sort_order ="sym" ; - } }if (strcmp (input_name,"-" ) !=0 )
tools/perf/ui/browsers/hists.c +61 -1
77 lines not on this page · raw message
tools/perf/ui/browsers/hists.h +2 -0
@@ -5,6 +5,7 @@#include "ui/browser.h" struct annotation_options ; +struct evsel ;struct hist_browser {struct ui_browser b;
@@ -15,6 +16,7 @@ struct hist_browser {struct pstack *pstack;struct perf_env *env;struct annotation_options *annotation_opts; +struct evsel *block_evsel;int print_seq;bool show_dso;bool show_headers;
tools/perf/util/hist.h +12 -0
@@ -449,6 +449,8 @@ enum rstype { A_SOURCE }; +struct block_hist ; +#ifdef HAVE_SLANG_SUPPORT #include "../ui/keysyms.h" void attr_to_script (char *buf,struct perf_event_attr *attr);
@@ -474,6 +476,9 @@ void run_script(char *cmd);int res_sample_browse (struct res_sample *res_samples,int num_res,struct evsel *evsel,enum rstype rstype);void res_sample_init (void ); + +int block_hists_tui_browse (struct block_hist *bh,struct evsel *evsel, +float min_percent);#else static inline int perf_evlist__tui_browse_hists(struct evlist *evlist __maybe_unused,
@@ -516,6 +521,13 @@ static inline int res_sample_browse(struct res_sample *res_samples __maybe_unusereturn 0 ; } +static inline int block_hists_tui_browse (struct block_hist *bh__maybe_unused , +struct evsel *evsel__maybe_unused , +float min_percent__maybe_unused ) +{ +return 0 ; +} +static inline void res_sample_init (void ) {}#define K_LEFT -1000
Signature · 1 line
2.17.1
Re: [PATCH v5 7/7] perf report: Sort by sampled cycles percent per block for tui
On Wed, Oct 30, 2019 at 02:04:30PM +0800, Jin Yao wrote:
SNIP
tools/perf/builtin-report.c static int report__browse_hists(struct report *rep) · line 630
Quoted 12 lines
tools/perf/builtin-report.c +5
-0+static int perf_evlist__tty_browse_hists (struct evlist *evlist,struct report *rep,const char *help)@@ -605,6 +624,11 @@ static int report__browse_hists(struct report *rep)switch (use_browser) {case 1 : +if (rep->total_cycles_mode) { + ret =perf_evlist__tui_block_hists_browse (evlist, rep); +break ; + }
does this have sense only for cycles event? what if I do:
# perf record -b -e cycles,cache-misses
jirka
Quoted 18 lines
tools/perf/builtin-report.c +2
-5+ ret = perf_evlist__tui_browse_hists(evlist, help, NULL, rep->min_percent, &session->header.env,@@ -1408,12 +1432,8 @@ int cmd_report(int argc, const char **argv)if (report.total_cycles_mode) {if (sort__mode !=SORT_MODE__BRANCH ) report.total_cycles_mode = false; -else if (!report.use_stdio) { -pr_err ("Error: --total-cycles can be only used together with --stdio\n" ); - goto error; - }else { +else sort_order ="sym" ; - } }if (strcmp (input_name,"-" ) !=0 )
SNIP
Re: [PATCH v5 7/7] perf report: Sort by sampled cycles percent per block for tui
Quoted 18 lines · Jiri Olsa
On Wed, Oct 30, 2019 at 02:04:30PM +0800, Jin Yao wrote:
SNIP
tools/perf/builtin-report.c static int report__browse_hists(struct report *rep) · line 630
Quoted 12 lines
tools/perf/builtin-report.c +5
-0+static int perf_evlist__tty_browse_hists (struct evlist *evlist,struct report *rep,const char *help)@@ -605,6 +624,11 @@ static int report__browse_hists(struct report *rep)switch (use_browser) {case 1 : +if (rep->total_cycles_mode) { + ret =perf_evlist__tui_block_hists_browse (evlist, rep); +break ; + }does this have sense only for cycles event? what if I do:
Quoted 4 lines
# perf record -b -e cycles,cache-missesjirka
It can report both cycles and cache-misses. But I use a simple way.
When I run 'perf report --total-cycles', it displays the window for the first event ('cycles') by default. For example,
# Samples: 8384 of event 'cycles'
Sampled Cycles% Sampled Cycles Avg Cycles% Avg Cycles
...
Once I press 'q' to quit current window, it then switches to another window for the second event ('cache-misses'). For example,
# Samples: 7072 of event 'cache-misses'
Sampled Cycles% Sampled Cycles Avg Cycles% Avg Cycles
...
Thanks
Jin Yao
Quoted 21 lines
Quoted 18 lines
tools/perf/builtin-report.c +2
-5+ ret = perf_evlist__tui_browse_hists(evlist, help, NULL, rep->min_percent, &session->header.env,@@ -1408,12 +1432,8 @@ int cmd_report(int argc, const char **argv)if (report.total_cycles_mode) {if (sort__mode !=SORT_MODE__BRANCH ) report.total_cycles_mode = false; -else if (!report.use_stdio) { -pr_err ("Error: --total-cycles can be only used together with --stdio\n" ); - goto error; - }else { +else sort_order ="sym" ; - } }if (strcmp (input_name,"-" ) !=0 )SNIP
Re: [PATCH v5 7/7] perf report: Sort by sampled cycles percent per block for tui
In reply to Jin YaoOn Wed, Oct 30, 2019 at 02:04:30PM +0800, Jin Yao wrote:
SNIP
Quoted 13 lines
tools/perf/ui/browsers/hists.h +1
-0@@ -5,6 +5,7 @@#include "ui/browser.h" struct annotation_options ; +struct evsel ;struct hist_browser {struct ui_browser b;
tools/perf/ui/browsers/hists.h struct hist_browser { · line 19
Quoted 4 lines
tools/perf/ui/browsers/hists.h +1
-0@@ -15,6 +16,7 @@ struct hist_browser {struct pstack *pstack;struct perf_env *env;struct annotation_options *annotation_opts; +struct evsel *block_evsel;
you should be able to get the evsel from hists_to_evsel function
jirka
Re: [PATCH v5 7/7] perf report: Sort by sampled cycles percent per block for tui
Quoted 24 lines · Jiri Olsa
On Wed, Oct 30, 2019 at 02:04:30PM +0800, Jin Yao wrote:
SNIP
Quoted 13 lines
tools/perf/ui/browsers/hists.h +1
-0@@ -5,6 +5,7 @@#include "ui/browser.h" struct annotation_options ; +struct evsel ;struct hist_browser {struct ui_browser b;tools/perf/ui/browsers/hists.h struct hist_browser { · line 19
Quoted 4 lines
tools/perf/ui/browsers/hists.h +1
-0@@ -15,6 +16,7 @@ struct hist_browser {struct pstack *pstack;struct perf_env *env;struct annotation_options *annotation_opts; +struct evsel *block_evsel;you should be able to get the evsel from
hists_to_evselfunction
Quoted 2 lines
jirka
Maybe we can't. The hists in hist_browser is set to block_hists (not the hists for evsel).
See block_hists_tui_browse,
int block_hists_tui_browse(struct block_hist *bh, struct evsel *evsel,
float min_percent)
{
struct hists *hists = &bh->block_hists;
struct hist_browser *browser;
......
browser = hist_browser__new(hists);
......
}So I have to pass the evsel in.
Thanks
Jin Yao
Re: [PATCH v5 7/7] perf report: Sort by sampled cycles percent per block for tui
Quoted 43 lines · Yao
Quoted 22 lines · Jiri Olsa
On Wed, Oct 30, 2019 at 02:04:30PM +0800, Jin Yao wrote:
SNIP
Quoted 11 lines
tools/perf/ui/browsers/hists.h +1
-0@@ -5,6 +5,7 @@#include "ui/browser.h" struct annotation_options ; +struct evsel ;struct hist_browser {struct ui_browser b;tools/perf/ui/browsers/hists.h struct hist_browser { · line 19
Quoted 4 lines
tools/perf/ui/browsers/hists.h +1
-0@@ -15,6 +16,7 @@ struct hist_browser {struct pstack *pstack;struct perf_env *env;struct annotation_options *annotation_opts; +struct evsel *block_evsel;you should be able to get the evsel from
hists_to_evselfunctionQuoted 2 lines
jirka
Maybe we can't. The hists in
hist_browseris set toblock_hists(not the hists for evsel).See
block_hists_tui_browse,int block_hists_tui_browse(struct
block_hist*bh, struct evsel *evsel,
floatmin_percent){ struct hists *hists = &bh->block_hists; struct hist_browser *browser; ...... browser = hist_browser__new(hists); ...... }
Quoted 1 line
So I have to pass the evsel in.
I see, ok
jirka