perf diff: Factor diff command
v3 cover perf diff: Factor diff command
hi,
this is v3 of diff command changes proposed in here:
https://lkml.org/lkml/2012/9/6/344
Half of the previous patchset version (hists related) got already in together with changes of Namhyung Kim. This is what remained, plus additional small fixies from review.
- small delta format changes (Namhyung Kim)
- better error messages for -c option (Andi Kleen)
Thanks a lot to Andi Kleen, who tested this and provided great feedback! I plan to address following in future:
- bucketizing per line instead of per function
- allow diff to specify vmlinux files per data
- recognize/compare same functions within 2 different kernels
- define groups of callers that have a combined cost including all callees, use this as the diff unit
(http://marc.info/?l=linux-kernel&m=134919541904105&w=2)
Attached patches:
1/8 perf diff: Add -b option for perf diff to display paired entries only 2/8 perf diff: Add ratio computation way to compare hist entries 3/8 perf diff: Add option to sort entries based on diff computation 4/8 perf diff: Add weighted diff computation way to compare hist entries 5/8 perf diff: Add -p option to display period values for hist entries 6/8 perf diff: Add -F option to display formula for computation 7/8 perf diff: Include samples without symbol in overall stats 8/8 perf diff: Display empty space for non paired samples
Available also at:
git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/linux.git
perf/diff1
wbr,
jirka
--- tools/perf/Documentation/perf-diff.txt | 60 ++++++++++++++ tools/perf/builtin-diff.c | 401 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- tools/perf/ui/hist.c | 134 ++++++++++++++++++++++++++---- tools/perf/ui/stdio/hist.c | 2 +- tools/perf/util/hist.h | 8 ++ tools/perf/util/sort.h | 18 ++++ 6 files changed, 600 insertions(+), 23 deletions(-)
PATCH v3 1/8 perf diff: Add -b option for perf diff to display paired entries only
Adding -b option to perf diff command to display only entries with match in the baseline.
--- tools/perf/Documentation/perf-diff.txt | 4 ++++ tools/perf/builtin-diff.c | 31 +++++++++++++++++++++++++++++-- 2 files changed, 33 insertions(+), 2 deletions(-)
tools/perf/Documentation/perf-diff.txt +4 -0
@@ -72,6 +72,10 @@ OPTIONS --symfs=<directory>:: Look for files with symbols relative to this directory. +-b:: +--baseline-only:: + Show only items with match in baseline. + SEE ALSO -------- linkperf:perf-record[1]
tools/perf/builtin-diff.c +29 -2
@@ -24,6 +24,7 @@ static char const *input_old = "perf.data.old",static char diff__default_sort_order[] ="dso,symbol" ;static bool force;static bool show_displacement; +static bool show_baseline_only;static int hists__add_entry (struct hists *self,struct addr_location *al,u64 period)
@@ -172,6 +173,31 @@ static void perf_evlist__resort_hists(struct perf_evlist *evlist, bool name) } } +static void hists__baseline_only (struct hists *hists) +{ +struct rb_node *next =rb_first (&hists->entries); + +while (next !=NULL ) { + struct hist_entry *he = rb_entry(next, struct hist_entry, rb_node); + + next =rb_next (&he->rb_node); +if (!he->pair) { +rb_erase (&he->rb_node, &hists->entries); +hist_entry__free (he); + } + } +} + +static void hists__process (struct hists *old,struct hists *new) +{ +hists__match (old, new); + +if (show_baseline_only) +hists__baseline_only (new); + +hists__fprintf (new, true,0 ,0 , stdout); +} +static int __cmd_diff (void ) {int ret, i;
@@ -213,8 +239,7 @@ static int __cmd_diff(void) first = false; -hists__match (&evsel_old->hists, &evsel->hists); -hists__fprintf (&evsel->hists, true,0 ,0 , stdout); +hists__process (&evsel_old->hists, &evsel->hists); } out_delete:
@@ -235,6 +260,8 @@ static const struct option options[] = { "be more verbose (show symbol address, etc)"),OPT_BOOLEAN ('M' ,"displacement" , &show_displacement,"Show position displacement relative to baseline" ), +OPT_BOOLEAN ('b' ,"baseline-only" , &show_baseline_only, +"Show only items with match in baseline" ),OPT_BOOLEAN ('D' ,"dump-raw-trace" , &dump_trace,"dump raw trace in ASCII" ), OPT_BOOLEAN('f', "force", &force, "don't complain, do it"),
Signature · 1 line
1.7.11.4
[tip:perf/core] perf diff: Add -b option for perf diff to display paired entries only
Commit-ID: a06d143e7cfaa10626f3ad0127a9b9169f900add Gitweb: http://git.kernel.org/tip/a06d143e7cfaa10626f3ad0127a9b9169f900add Author: Jiri Olsa <[email protected]> AuthorDate: Fri, 5 Oct 2012 16:44:40 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 5 Oct 2012 14:05:14 -0300
perf diff: Add -b option for perf diff to display paired entries only
Adding -b option to perf diff command to display only entries with match in the baseline.
--- tools/perf/Documentation/perf-diff.txt | 4 ++++ tools/perf/builtin-diff.c | 31 +++++++++++++++++++++++++++++-- 2 files changed, 33 insertions(+), 2 deletions(-)
tools/perf/Documentation/perf-diff.txt +4 -0
@@ -72,6 +72,10 @@ OPTIONS --symfs=<directory>:: Look for files with symbols relative to this directory. +-b:: +--baseline-only:: + Show only items with match in baseline. + SEE ALSO -------- linkperf:perf-record[1]
tools/perf/builtin-diff.c +29 -2
@@ -24,6 +24,7 @@ static char const *input_old = "perf.data.old",static char diff__default_sort_order[] ="dso,symbol" ;static bool force;static bool show_displacement; +static bool show_baseline_only;static int hists__add_entry (struct hists *self,struct addr_location *al,u64 period)
@@ -172,6 +173,31 @@ static void perf_evlist__resort_hists(struct perf_evlist *evlist, bool name) } } +static void hists__baseline_only (struct hists *hists) +{ +struct rb_node *next =rb_first (&hists->entries); + +while (next !=NULL ) { + struct hist_entry *he = rb_entry(next, struct hist_entry, rb_node); + + next =rb_next (&he->rb_node); +if (!he->pair) { +rb_erase (&he->rb_node, &hists->entries); +hist_entry__free (he); + } + } +} + +static void hists__process (struct hists *old,struct hists *new) +{ +hists__match (old, new); + +if (show_baseline_only) +hists__baseline_only (new); + +hists__fprintf (new, true,0 ,0 , stdout); +} +static int __cmd_diff (void ) {int ret, i;
@@ -213,8 +239,7 @@ static int __cmd_diff(void) first = false; -hists__match (&evsel_old->hists, &evsel->hists); -hists__fprintf (&evsel->hists, true,0 ,0 , stdout); +hists__process (&evsel_old->hists, &evsel->hists); } out_delete:
@@ -235,6 +260,8 @@ static const struct option options[] = { "be more verbose (show symbol address, etc)"),OPT_BOOLEAN ('M' ,"displacement" , &show_displacement,"Show position displacement relative to baseline" ), +OPT_BOOLEAN ('b' ,"baseline-only" , &show_baseline_only, +"Show only items with match in baseline" ),OPT_BOOLEAN ('D' ,"dump-raw-trace" , &dump_trace,"dump raw trace in ASCII" ), OPT_BOOLEAN('f', "force", &force, "don't complain, do it"),
PATCH v3 2/8 perf diff: Add ratio computation way to compare hist entries
In reply to Jiri OlsaAdding -c option to select computation method with the current 'Delta' computation as default. Current possible values are of this option are: 'delta' and 'ratio'.
Adding 'ratio' as new computation way to compare hist entries. If specified the 'Ratio' column is displayed with value 'r' computed as:
r = A->period / B->period
with:
- A/B being matching hist entry from first/second file specified (or perf.data/perf.data.old) respectively.
- period being the hist entry period value
--- tools/perf/Documentation/perf-diff.txt | 33 +++++++++++++++++++++ tools/perf/builtin-diff.c | 52 ++++++++++++++++++++++++++++++++-- tools/perf/ui/hist.c | 28 ++++++++++++++++++ tools/perf/util/hist.h | 1 + 4 files changed, 112 insertions(+), 2 deletions(-)
tools/perf/Documentation/perf-diff.txt +33 -0
@@ -76,6 +76,39 @@ OPTIONS --baseline-only:: Show only items with match in baseline. +-c:: +--compute:: + Differential computation selection - delta,ratio (default is delta). + See COMPARISON METHODS section for more info. + +COMPARISON METHODS +------------------ +delta +~~~~~ +If specified the 'Delta' column is displayed with value 'd' computed as: + + d = A->period_percent - B->period_percent + +with: + - A/B being matching hist entry from first/second file specified + (or perf.data/perf.data.old) respectively. + + - period_percent being the % of the hist entry period value within + single data file + +ratio +~~~~~ +If specified the 'Ratio' column is displayed with value 'r' computed as: + + r = A->period / B->period + +with: + - A/B being matching hist entry from first/second file specified + (or perf.data/perf.data.old) respectively. + + - period being the hist entry period value + + SEE ALSO -------- linkperf:perf-record[1]
tools/perf/builtin-diff.c +50 -2
71 lines not on this page · raw message
tools/perf/ui/hist.c +28 -0
@@ -266,6 +266,33 @@ static int hpp__entry_delta(struct perf_hpp *hpp, struct hist_entry *he)return scnprintf (hpp->buf, hpp->size, fmt, buf); } +static int hpp__header_ratio (struct perf_hpp *hpp) +{ +const char *fmt = symbol_conf.field_sep ?"%s" :"%14s" ; + +return scnprintf (hpp->buf, hpp->size, fmt,"Ratio" ); +} + +static int hpp__width_ratio (struct perf_hpp *hpp__maybe_unused ) +{ +return 14 ; +} + +static int hpp__entry_ratio (struct perf_hpp *hpp,struct hist_entry *he) +{ +struct hist_entry *pair = he->pair; +double new_period = he->stat.period; +double old_period = pair ? pair->stat.period :0 ; +double ratio = pair ? new_period / old_period :0 ; +const char *fmt = symbol_conf.field_sep ?"%s" :"%14s" ; +char buf[32 ] =" " ; + +if (ratio >0.0 ) +scnprintf (buf,sizeof (buf),"%+14.6F" , ratio); + +return scnprintf (hpp->buf, hpp->size, fmt, buf); +} +static int hpp__header_displ (struct perf_hpp *hpp) {return scnprintf (hpp->buf, hpp->size,"Displ." );
@@ -311,6 +338,7 @@ struct perf_hpp_fmt perf_hpp__format[] = { { .cond = false, HPP__PRINT_FNS(samples) }, { .cond = false, HPP__PRINT_FNS(period) }, { .cond = false, HPP__PRINT_FNS(delta) }, + { .cond = false, HPP__PRINT_FNS(ratio) }, { .cond = false, HPP__PRINT_FNS(displ) } };
tools/perf/util/hist.h +1 -0
@@ -141,6 +141,7 @@ enum {PERF_HPP__SAMPLES ,PERF_HPP__PERIOD ,PERF_HPP__DELTA , +PERF_HPP__RATIO ,PERF_HPP__DISPL ,PERF_HPP__MAX_INDEX
Signature · 1 line
1.7.11.4
[tip:perf/core] perf diff: Add ratio computation way to compare hist entries
Commit-ID: 7aaf6b35512382329c5b2dd46b42f2bf12a5fff0 Gitweb: http://git.kernel.org/tip/7aaf6b35512382329c5b2dd46b42f2bf12a5fff0 Author: Jiri Olsa <[email protected]> AuthorDate: Fri, 5 Oct 2012 16:44:41 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 5 Oct 2012 14:06:54 -0300
perf diff: Add ratio computation way to compare hist entries
Adding -c option to select computation method with the current 'Delta' computation as default. Current possible values are of this option are:
'delta' and 'ratio'.
Adding 'ratio' as new computation way to compare hist entries. If specified the 'Ratio' column is displayed with value 'r' computed as:
r = A->period / B->period
with:
- A/B being matching hist entry from first/second file specified (or perf.data/perf.data.old) respectively.
- period being the hist entry period value
--- tools/perf/Documentation/perf-diff.txt | 33 ++++++++++++++++++++ tools/perf/builtin-diff.c | 52 ++++++++++++++++++++++++++++++- tools/perf/ui/hist.c | 28 +++++++++++++++++ tools/perf/util/hist.h | 1 + 4 files changed, 112 insertions(+), 2 deletions(-)
tools/perf/Documentation/perf-diff.txt +33 -0
@@ -76,6 +76,39 @@ OPTIONS --baseline-only:: Show only items with match in baseline. +-c:: +--compute:: + Differential computation selection - delta,ratio (default is delta). + See COMPARISON METHODS section for more info. + +COMPARISON METHODS +------------------ +delta +~~~~~ +If specified the 'Delta' column is displayed with value 'd' computed as: + + d = A->period_percent - B->period_percent + +with: + - A/B being matching hist entry from first/second file specified + (or perf.data/perf.data.old) respectively. + + - period_percent being the % of the hist entry period value within + single data file + +ratio +~~~~~ +If specified the 'Ratio' column is displayed with value 'r' computed as: + + r = A->period / B->period + +with: + - A/B being matching hist entry from first/second file specified + (or perf.data/perf.data.old) respectively. + + - period being the hist entry period value + + SEE ALSO -------- linkperf:perf-record[1]
tools/perf/builtin-diff.c +50 -2
71 lines not on this page · raw message
tools/perf/ui/hist.c +28 -0
@@ -266,6 +266,33 @@ static int hpp__entry_delta(struct perf_hpp *hpp, struct hist_entry *he)return scnprintf (hpp->buf, hpp->size, fmt, buf); } +static int hpp__header_ratio (struct perf_hpp *hpp) +{ +const char *fmt = symbol_conf.field_sep ?"%s" :"%14s" ; + +return scnprintf (hpp->buf, hpp->size, fmt,"Ratio" ); +} + +static int hpp__width_ratio (struct perf_hpp *hpp__maybe_unused ) +{ +return 14 ; +} + +static int hpp__entry_ratio (struct perf_hpp *hpp,struct hist_entry *he) +{ +struct hist_entry *pair = he->pair; +double new_period = he->stat.period; +double old_period = pair ? pair->stat.period :0 ; +double ratio = pair ? new_period / old_period :0 ; +const char *fmt = symbol_conf.field_sep ?"%s" :"%14s" ; +char buf[32 ] =" " ; + +if (ratio >0.0 ) +scnprintf (buf,sizeof (buf),"%+14.6F" , ratio); + +return scnprintf (hpp->buf, hpp->size, fmt, buf); +} +static int hpp__header_displ (struct perf_hpp *hpp) {return scnprintf (hpp->buf, hpp->size,"Displ." );
@@ -311,6 +338,7 @@ struct perf_hpp_fmt perf_hpp__format[] = { { .cond = false, HPP__PRINT_FNS(samples) }, { .cond = false, HPP__PRINT_FNS(period) }, { .cond = false, HPP__PRINT_FNS(delta) }, + { .cond = false, HPP__PRINT_FNS(ratio) }, { .cond = false, HPP__PRINT_FNS(displ) } };
tools/perf/util/hist.h +1 -0
@@ -141,6 +141,7 @@ enum {PERF_HPP__SAMPLES ,PERF_HPP__PERIOD ,PERF_HPP__DELTA , +PERF_HPP__RATIO ,PERF_HPP__DISPL ,PERF_HPP__MAX_INDEX
PATCH v3 3/8 perf diff: Add option to sort entries based on diff computation
In reply to Jiri OlsaAdding support to sort hist entries based on the outcome of selected computation. It's now possible to specify '+' as a first character of '-c' option value to make such sort.
Example:
$ perf diff -c ratio -b
# Event 'cache-misses'
#
# Baseline Ratio Shared Object Symbol
# ........ .............. ................. ................................
#
19.64% 0.69 [kernel.kallsyms] [k] clear_page
0.30% 0.17 [kernel.kallsyms] [k] mm_alloc
0.04% 0.20 [kernel.kallsyms] [k] kmem_cache_alloc $ perf diff -c +ratio -b
# Event 'cache-misses'
#
# Baseline Ratio Shared Object Symbol
# ........ .............. ................. ................................
#
19.64% 0.69 [kernel.kallsyms] [k] clear_page
0.04% 0.20 [kernel.kallsyms] [k] kmem_cache_alloc
0.30% 0.17 [kernel.kallsyms] [k] mm_alloc--- tools/perf/Documentation/perf-diff.txt | 2 + tools/perf/builtin-diff.c | 137 +++++++++++++++++++++++++++++++++ tools/perf/ui/hist.c | 29 +++---- tools/perf/util/hist.h | 2 + tools/perf/util/sort.h | 15 ++++ 5 files changed, 167 insertions(+), 18 deletions(-)
tools/perf/Documentation/perf-diff.txt +2 -0
@@ -79,6 +79,8 @@ OPTIONS -c:: --compute:: Differential computation selection - delta,ratio (default is delta). + If '+' is specified as a first character, the output is sorted based + on the computation results. See COMPARISON METHODS section for more info. COMPARISON METHODS
tools/perf/builtin-diff.c +137 -0
167 lines not on this page · raw message
tools/perf/ui/hist.c +11 -18
@@ -242,24 +242,15 @@ static int hpp__width_delta(struct perf_hpp *hpp __maybe_unused)static int hpp__entry_delta (struct perf_hpp *hpp,struct hist_entry *he) { -struct hist_entry *pair = he->pair; -struct hists *pair_hists = pair ? pair->hists :NULL ; -struct hists *hists = he->hists; -u64 old_total, new_total; -double old_percent =0 , new_percent =0 ; -double diff;const char *fmt = symbol_conf.field_sep ?"%s" :"%7.7s" ;char buf[32 ] =" " ; +double diff; - old_total = pair_hists ? pair_hists->stats.total_period :0 ; -if (old_total >0 && pair) - old_percent =100.0 * pair->stat.period / old_total; - - new_total = hists->stats.total_period; -if (new_total >0 ) - new_percent =100.0 * he->stat.period / new_total; +if (he->diff.computed) + diff = he->diff.period_ratio_delta; +else + diff =perf_diff__compute_delta (he); - diff = new_percent - old_percent;if (fabs (diff) >=0.01 )scnprintf (buf,sizeof (buf),"%+4.2F%%" , diff);
@@ -280,12 +271,14 @@ static int hpp__width_ratio(struct perf_hpp *hpp __maybe_unused)static int hpp__entry_ratio (struct perf_hpp *hpp,struct hist_entry *he) { -struct hist_entry *pair = he->pair; -double new_period = he->stat.period; -double old_period = pair ? pair->stat.period :0 ; -double ratio = pair ? new_period / old_period :0 ;const char *fmt = symbol_conf.field_sep ?"%s" :"%14s" ;char buf[32 ] =" " ; +double ratio; + +if (he->diff.computed) + ratio = he->diff.period_ratio; +else + ratio =perf_diff__compute_ratio (he);if (ratio >0.0 )scnprintf (buf,sizeof (buf),"%+14.6F" , ratio);
tools/perf/util/hist.h +2 -0
@@ -205,4 +205,6 @@ int perf_evlist__gtk_browse_hists(struct perf_evlist *evlist __maybe_unused,unsigned int hists__sort_list_width (struct hists *self); +double perf_diff__compute_delta (struct hist_entry *he); +double perf_diff__compute_ratio (struct hist_entry *he);#endif /* __PERF_HIST_H */
tools/perf/util/sort.h +15 -0
@@ -52,6 +52,19 @@ struct he_stat {u32 nr_events; }; +struct hist_entry_diff { +bool computed; + +/* PERF_HPP__DISPL */ +int displacement; + +/* PERF_HPP__DELTA */ +double period_ratio_delta; + +/* PERF_HPP__RATIO */ +double period_ratio; +}; +/** * struct hist_entry - histogram entry *
@@ -67,6 +80,8 @@ struct hist_entry {u64 ip;s32 cpu; +struct hist_entry_diff diff; +/* XXX These two should move to some tree widget lib */ u16 row_offset;u16 nr_rows;
Signature · 1 line
1.7.11.4
[tip:perf/core] perf diff: Add option to sort entries based on diff computation
Commit-ID: 96c47f19846742bdfa3c153c8d26ccca5945586b Gitweb: http://git.kernel.org/tip/96c47f19846742bdfa3c153c8d26ccca5945586b Author: Jiri Olsa <[email protected]> AuthorDate: Fri, 5 Oct 2012 16:44:42 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 5 Oct 2012 14:08:54 -0300
perf diff: Add option to sort entries based on diff computation
Adding support to sort hist entries based on the outcome of selected computation. It's now possible to specify '+' as a first character of '-c' option value to make such sort.
Example:
$ perf diff -c ratio -b
# Event 'cache-misses'
#
# Baseline Ratio Shared Object Symbol
# ........ .............. ................. ................................
#
19.64% 0.69 [kernel.kallsyms] [k] clear_page
0.30% 0.17 [kernel.kallsyms] [k] mm_alloc
0.04% 0.20 [kernel.kallsyms] [k] kmem_cache_alloc $ perf diff -c +ratio -b
# Event 'cache-misses'
#
# Baseline Ratio Shared Object Symbol
# ........ .............. ................. ................................
#
19.64% 0.69 [kernel.kallsyms] [k] clear_page
0.04% 0.20 [kernel.kallsyms] [k] kmem_cache_alloc
0.30% 0.17 [kernel.kallsyms] [k] mm_alloc--- tools/perf/Documentation/perf-diff.txt | 2 + tools/perf/builtin-diff.c | 137 ++++++++++++++++++++++++++++++++ tools/perf/ui/hist.c | 29 +++---- tools/perf/util/hist.h | 2 + tools/perf/util/sort.h | 15 ++++ 5 files changed, 167 insertions(+), 18 deletions(-)
tools/perf/Documentation/perf-diff.txt +2 -0
@@ -79,6 +79,8 @@ OPTIONS -c:: --compute:: Differential computation selection - delta,ratio (default is delta). + If '+' is specified as a first character, the output is sorted based + on the computation results. See COMPARISON METHODS section for more info. COMPARISON METHODS
tools/perf/builtin-diff.c +137 -0
167 lines not on this page · raw message
tools/perf/ui/hist.c +11 -18
@@ -242,24 +242,15 @@ static int hpp__width_delta(struct perf_hpp *hpp __maybe_unused)static int hpp__entry_delta (struct perf_hpp *hpp,struct hist_entry *he) { -struct hist_entry *pair = he->pair; -struct hists *pair_hists = pair ? pair->hists :NULL ; -struct hists *hists = he->hists; -u64 old_total, new_total; -double old_percent =0 , new_percent =0 ; -double diff;const char *fmt = symbol_conf.field_sep ?"%s" :"%7.7s" ;char buf[32 ] =" " ; +double diff; - old_total = pair_hists ? pair_hists->stats.total_period :0 ; -if (old_total >0 && pair) - old_percent =100.0 * pair->stat.period / old_total; - - new_total = hists->stats.total_period; -if (new_total >0 ) - new_percent =100.0 * he->stat.period / new_total; +if (he->diff.computed) + diff = he->diff.period_ratio_delta; +else + diff =perf_diff__compute_delta (he); - diff = new_percent - old_percent;if (fabs (diff) >=0.01 )scnprintf (buf,sizeof (buf),"%+4.2F%%" , diff);
@@ -280,12 +271,14 @@ static int hpp__width_ratio(struct perf_hpp *hpp __maybe_unused)static int hpp__entry_ratio (struct perf_hpp *hpp,struct hist_entry *he) { -struct hist_entry *pair = he->pair; -double new_period = he->stat.period; -double old_period = pair ? pair->stat.period :0 ; -double ratio = pair ? new_period / old_period :0 ;const char *fmt = symbol_conf.field_sep ?"%s" :"%14s" ;char buf[32 ] =" " ; +double ratio; + +if (he->diff.computed) + ratio = he->diff.period_ratio; +else + ratio =perf_diff__compute_ratio (he);if (ratio >0.0 )scnprintf (buf,sizeof (buf),"%+14.6F" , ratio);
tools/perf/util/hist.h +2 -0
@@ -205,4 +205,6 @@ int perf_evlist__gtk_browse_hists(struct perf_evlist *evlist __maybe_unused,unsigned int hists__sort_list_width (struct hists *self); +double perf_diff__compute_delta (struct hist_entry *he); +double perf_diff__compute_ratio (struct hist_entry *he);#endif /* __PERF_HIST_H */
tools/perf/util/sort.h +15 -0
@@ -52,6 +52,19 @@ struct he_stat {u32 nr_events; }; +struct hist_entry_diff { +bool computed; + +/* PERF_HPP__DISPL */ +int displacement; + +/* PERF_HPP__DELTA */ +double period_ratio_delta; + +/* PERF_HPP__RATIO */ +double period_ratio; +}; +/** * struct hist_entry - histogram entry *
@@ -67,6 +80,8 @@ struct hist_entry {u64 ip;s32 cpu; +struct hist_entry_diff diff; +/* XXX These two should move to some tree widget lib */ u16 row_offset;u16 nr_rows;
PATCH v3 4/8 perf diff: Add weighted diff computation way to compare hist entries
In reply to Jiri OlsaAdding 'wdiff' as new computation way to compare hist entries.
If specified the 'Weighted diff' column is displayed with value 'd' computed as:
d = B->period * WEIGHT-A - A->period * WEIGHT-B
- A/B being matching hist entry from first/second file specified (or perf.data/perf.data.old) respectively.
- period being the hist entry period value
- WEIGHT-A/WEIGHT-B being user suplied weights in the the '-c' option
behind ':' separator like '-c wdiff:1,2'.
--- tools/perf/Documentation/perf-diff.txt | 15 ++++- tools/perf/builtin-diff.c | 116 +++++++++++++++++++++++++++++++-- tools/perf/ui/hist.c | 30 +++++++++ tools/perf/util/hist.h | 2 + tools/perf/util/sort.h | 3 + 5 files changed, 160 insertions(+), 6 deletions(-)
tools/perf/Documentation/perf-diff.txt +14 -1
@@ -78,7 +78,7 @@ OPTIONS -c:: --compute:: - Differential computation selection - delta,ratio (default is delta). + Differential computation selection - delta,ratio,wdiff (default is delta). If '+' is specified as a first character, the output is sorted based on the computation results. See COMPARISON METHODS section for more info.
@@ -110,6 +110,19 @@ with: - period being the hist entry period value +wdiff +~~~~~ +If specified the 'Weighted diff' column is displayed with value 'd' computed as: + + d = B->period * WEIGHT-A - A->period * WEIGHT-B + + - A/B being matching hist entry from first/second file specified + (or perf.data/perf.data.old) respectively. + + - period being the hist entry period value + + - WEIGHT-A/WEIGHT-B being user suplied weights in the the '-c' option + behind ':' separator like '-c wdiff:1,2'. SEE ALSO --------
tools/perf/builtin-diff.c +111 -5
185 lines not on this page · raw message
tools/perf/ui/hist.c +30 -0
@@ -286,6 +286,35 @@ static int hpp__entry_ratio(struct perf_hpp *hpp, struct hist_entry *he)return scnprintf (hpp->buf, hpp->size, fmt, buf); } +static int hpp__header_wdiff (struct perf_hpp *hpp) +{ +const char *fmt = symbol_conf.field_sep ?"%s" :"%14s" ; + +return scnprintf (hpp->buf, hpp->size, fmt,"Weighted diff" ); +} + +static int hpp__width_wdiff (struct perf_hpp *hpp__maybe_unused ) +{ +return 14 ; +} + +static int hpp__entry_wdiff (struct perf_hpp *hpp,struct hist_entry *he) +{ +const char *fmt = symbol_conf.field_sep ?"%s" :"%14s" ; +char buf[32 ] =" " ; +s64 wdiff; + +if (he->diff.computed) + wdiff = he->diff.wdiff; +else + wdiff =perf_diff__compute_wdiff (he); + +if (wdiff !=0 ) +scnprintf (buf,sizeof (buf),"%14ld" , wdiff); + +return scnprintf (hpp->buf, hpp->size, fmt, buf); +} +static int hpp__header_displ (struct perf_hpp *hpp) {return scnprintf (hpp->buf, hpp->size,"Displ." );
@@ -332,6 +361,7 @@ struct perf_hpp_fmt perf_hpp__format[] = { { .cond = false, HPP__PRINT_FNS(period) }, { .cond = false, HPP__PRINT_FNS(delta) }, { .cond = false, HPP__PRINT_FNS(ratio) }, + { .cond = false, HPP__PRINT_FNS(wdiff) }, { .cond = false, HPP__PRINT_FNS(displ) } };
tools/perf/util/hist.h +2 -0
@@ -142,6 +142,7 @@ enum {PERF_HPP__PERIOD ,PERF_HPP__DELTA ,PERF_HPP__RATIO , +PERF_HPP__WEIGHTED_DIFF ,PERF_HPP__DISPL ,PERF_HPP__MAX_INDEX
@@ -207,4 +208,5 @@ unsigned int hists__sort_list_width(struct hists *self);double perf_diff__compute_delta (struct hist_entry *he);double perf_diff__compute_ratio (struct hist_entry *he); +s64 perf_diff__compute_wdiff (struct hist_entry *he);#endif /* __PERF_HIST_H */
tools/perf/util/sort.h +3 -0
@@ -63,6 +63,9 @@ struct hist_entry_diff {/* PERF_HPP__RATIO */ double period_ratio; + +/* HISTC_WEIGHTED_DIFF */ +s64 wdiff; };/**
Signature · 1 line
1.7.11.4
[tip:perf/core] perf diff: Add weighted diff computation way to compare hist entries
Commit-ID: 81d5f95819953321a2557b0656b24ea10af9629c Gitweb: http://git.kernel.org/tip/81d5f95819953321a2557b0656b24ea10af9629c Author: Jiri Olsa <[email protected]> AuthorDate: Fri, 5 Oct 2012 16:44:43 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 5 Oct 2012 14:10:42 -0300
perf diff: Add weighted diff computation way to compare hist entries
Adding 'wdiff' as new computation way to compare hist entries.
If specified the 'Weighted diff' column is displayed with value 'd' computed as:
d = B->period * WEIGHT-A - A->period * WEIGHT-B
- A/B being matching hist entry from first/second file specified (or perf.data/perf.data.old) respectively.
- period being the hist entry period value
- WEIGHT-A/WEIGHT-B being user suplied weights in the the '-c' option
behind ':' separator like '-c wdiff:1,2'.
--- tools/perf/Documentation/perf-diff.txt | 15 ++++- tools/perf/builtin-diff.c | 116 ++++++++++++++++++++++++++++++-- tools/perf/ui/hist.c | 30 ++++++++ tools/perf/util/hist.h | 2 + tools/perf/util/sort.h | 3 + 5 files changed, 160 insertions(+), 6 deletions(-)
tools/perf/Documentation/perf-diff.txt +14 -1
@@ -78,7 +78,7 @@ OPTIONS -c:: --compute:: - Differential computation selection - delta,ratio (default is delta). + Differential computation selection - delta,ratio,wdiff (default is delta). If '+' is specified as a first character, the output is sorted based on the computation results. See COMPARISON METHODS section for more info.
@@ -110,6 +110,19 @@ with: - period being the hist entry period value +wdiff +~~~~~ +If specified the 'Weighted diff' column is displayed with value 'd' computed as: + + d = B->period * WEIGHT-A - A->period * WEIGHT-B + + - A/B being matching hist entry from first/second file specified + (or perf.data/perf.data.old) respectively. + + - period being the hist entry period value + + - WEIGHT-A/WEIGHT-B being user suplied weights in the the '-c' option + behind ':' separator like '-c wdiff:1,2'. SEE ALSO --------
tools/perf/builtin-diff.c +111 -5
185 lines not on this page · raw message
tools/perf/ui/hist.c +30 -0
@@ -286,6 +286,35 @@ static int hpp__entry_ratio(struct perf_hpp *hpp, struct hist_entry *he)return scnprintf (hpp->buf, hpp->size, fmt, buf); } +static int hpp__header_wdiff (struct perf_hpp *hpp) +{ +const char *fmt = symbol_conf.field_sep ?"%s" :"%14s" ; + +return scnprintf (hpp->buf, hpp->size, fmt,"Weighted diff" ); +} + +static int hpp__width_wdiff (struct perf_hpp *hpp__maybe_unused ) +{ +return 14 ; +} + +static int hpp__entry_wdiff (struct perf_hpp *hpp,struct hist_entry *he) +{ +const char *fmt = symbol_conf.field_sep ?"%s" :"%14s" ; +char buf[32 ] =" " ; +s64 wdiff; + +if (he->diff.computed) + wdiff = he->diff.wdiff; +else + wdiff =perf_diff__compute_wdiff (he); + +if (wdiff !=0 ) +scnprintf (buf,sizeof (buf),"%14ld" , wdiff); + +return scnprintf (hpp->buf, hpp->size, fmt, buf); +} +static int hpp__header_displ (struct perf_hpp *hpp) {return scnprintf (hpp->buf, hpp->size,"Displ." );
@@ -332,6 +361,7 @@ struct perf_hpp_fmt perf_hpp__format[] = { { .cond = false, HPP__PRINT_FNS(period) }, { .cond = false, HPP__PRINT_FNS(delta) }, { .cond = false, HPP__PRINT_FNS(ratio) }, + { .cond = false, HPP__PRINT_FNS(wdiff) }, { .cond = false, HPP__PRINT_FNS(displ) } };
tools/perf/util/hist.h +2 -0
@@ -142,6 +142,7 @@ enum {PERF_HPP__PERIOD ,PERF_HPP__DELTA ,PERF_HPP__RATIO , +PERF_HPP__WEIGHTED_DIFF ,PERF_HPP__DISPL ,PERF_HPP__MAX_INDEX
@@ -207,4 +208,5 @@ unsigned int hists__sort_list_width(struct hists *self);double perf_diff__compute_delta (struct hist_entry *he);double perf_diff__compute_ratio (struct hist_entry *he); +s64 perf_diff__compute_wdiff (struct hist_entry *he);#endif /* __PERF_HIST_H */
tools/perf/util/sort.h +3 -0
@@ -63,6 +63,9 @@ struct hist_entry_diff {/* PERF_HPP__RATIO */ double period_ratio; + +/* HISTC_WEIGHTED_DIFF */ +s64 wdiff; };/**
PATCH v3 5/8 perf diff: Add -p option to display period values for hist entries
In reply to Jiri OlsaAdding -p option to show period values for both compared hist entries. Showing hist column PERF_HPP__PERIOD and newly added hist column PERF_HPP__PERIOD_BASELINE.
--- tools/perf/Documentation/perf-diff.txt | 4 ++++ tools/perf/builtin-diff.c | 10 +++++++++- tools/perf/ui/hist.c | 21 +++++++++++++++++++++ tools/perf/util/hist.h | 1 + 4 files changed, 35 insertions(+), 1 deletion(-)
tools/perf/Documentation/perf-diff.txt +4 -0
@@ -83,6 +83,10 @@ OPTIONS on the computation results. See COMPARISON METHODS section for more info. +-p:: +--period:: + Show period values for both compared hist entries. + COMPARISON METHODS ------------------ delta
tools/perf/builtin-diff.c +9 -1
@@ -24,6 +24,7 @@ static char const *input_old = "perf.data.old",static char diff__default_sort_order[] ="dso,symbol" ;static bool force;static bool show_displacement; +static bool show_period;static bool show_baseline_only;static bool sort_compute;
@@ -540,6 +541,8 @@ static const struct option options[] = { "delta,ratio,wdiff:w1,w2 (default delta)", "Entries differential computation selection", setup_compute), +OPT_BOOLEAN ('p' ,"period" , &show_period, +"Show period values." ),OPT_BOOLEAN ('D' ,"dump-raw-trace" , &dump_trace,"dump raw trace in ASCII" ), OPT_BOOLEAN('f', "force", &force, "don't complain, do it"),
@@ -568,7 +571,7 @@ static void ui_init(void)/* No overhead column. */ perf_hpp__column_enable (PERF_HPP__OVERHEAD , false); -/* Display baseline/delta/ratio/displacement columns. */ +/* Display baseline/delta/ratio/displacement/periods columns. */ perf_hpp__column_enable (PERF_HPP__BASELINE , true);switch (compute) {
@@ -587,6 +590,11 @@ static void ui_init(void)if (show_displacement)perf_hpp__column_enable (PERF_HPP__DISPL , true); + +if (show_period) { +perf_hpp__column_enable (PERF_HPP__PERIOD , true); +perf_hpp__column_enable (PERF_HPP__PERIOD_BASELINE , true); + } }int cmd_diff (int argc,const char **argv,const char *prefix__maybe_unused )
tools/perf/ui/hist.c +21 -0
@@ -228,6 +228,26 @@ static int hpp__entry_period(struct perf_hpp *hpp, struct hist_entry *he)return scnprintf (hpp->buf, hpp->size, fmt, he->stat.period); } +static int hpp__header_period_baseline (struct perf_hpp *hpp) +{ +const char *fmt = symbol_conf.field_sep ?"%s" :"%12s" ; + +return scnprintf (hpp->buf, hpp->size, fmt,"Period Base" ); +} + +static int hpp__width_period_baseline (struct perf_hpp *hpp__maybe_unused ) +{ +return 12 ; +} + +static int hpp__entry_period_baseline (struct perf_hpp *hpp,struct hist_entry *he) +{ +struct hist_entry *pair = he->pair; +u64 period = pair ? pair->stat.period :0 ; +const char *fmt = symbol_conf.field_sep ?"%" PRIu64 :"%12" PRIu64; + +return scnprintf (hpp->buf, hpp->size, fmt, period); +}static int hpp__header_delta (struct perf_hpp *hpp) {const char *fmt = symbol_conf.field_sep ?"%s" :"%7s" ;
@@ -359,6 +379,7 @@ struct perf_hpp_fmt perf_hpp__format[] = { { .cond = false, HPP__COLOR_PRINT_FNS(overhead_guest_us) }, { .cond = false, HPP__PRINT_FNS(samples) }, { .cond = false, HPP__PRINT_FNS(period) }, + { .cond = false, HPP__PRINT_FNS(period_baseline) }, { .cond = false, HPP__PRINT_FNS(delta) }, { .cond = false, HPP__PRINT_FNS(ratio) }, { .cond = false, HPP__PRINT_FNS(wdiff) },
tools/perf/util/hist.h +1 -0
@@ -140,6 +140,7 @@ enum {PERF_HPP__OVERHEAD_GUEST_US ,PERF_HPP__SAMPLES ,PERF_HPP__PERIOD , +PERF_HPP__PERIOD_BASELINE ,PERF_HPP__DELTA ,PERF_HPP__RATIO , PERF_HPP__WEIGHTED_DIFF,
Signature · 1 line
1.7.11.4
[tip:perf/core] perf diff: Add -p option to display period values for hist entries
Commit-ID: 61949b212e7f6f8f31891236ba24033f9b7af8c3 Gitweb: http://git.kernel.org/tip/61949b212e7f6f8f31891236ba24033f9b7af8c3 Author: Jiri Olsa <[email protected]> AuthorDate: Fri, 5 Oct 2012 16:44:44 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 5 Oct 2012 14:11:47 -0300
perf diff: Add -p option to display period values for hist entries
Adding -p option to show period values for both compared hist entries. Showing hist column PERF_HPP__PERIOD and newly added hist column PERF_HPP__PERIOD_BASELINE.
--- tools/perf/Documentation/perf-diff.txt | 4 ++++ tools/perf/builtin-diff.c | 10 +++++++++- tools/perf/ui/hist.c | 21 +++++++++++++++++++++ tools/perf/util/hist.h | 1 + 4 files changed, 35 insertions(+), 1 deletions(-)
tools/perf/Documentation/perf-diff.txt +4 -0
@@ -83,6 +83,10 @@ OPTIONS on the computation results. See COMPARISON METHODS section for more info. +-p:: +--period:: + Show period values for both compared hist entries. + COMPARISON METHODS ------------------ delta
tools/perf/builtin-diff.c +9 -1
@@ -24,6 +24,7 @@ static char const *input_old = "perf.data.old",static char diff__default_sort_order[] ="dso,symbol" ;static bool force;static bool show_displacement; +static bool show_period;static bool show_baseline_only;static bool sort_compute;
@@ -540,6 +541,8 @@ static const struct option options[] = { "delta,ratio,wdiff:w1,w2 (default delta)", "Entries differential computation selection", setup_compute), +OPT_BOOLEAN ('p' ,"period" , &show_period, +"Show period values." ),OPT_BOOLEAN ('D' ,"dump-raw-trace" , &dump_trace,"dump raw trace in ASCII" ), OPT_BOOLEAN('f', "force", &force, "don't complain, do it"),
@@ -568,7 +571,7 @@ static void ui_init(void)/* No overhead column. */ perf_hpp__column_enable (PERF_HPP__OVERHEAD , false); -/* Display baseline/delta/ratio/displacement columns. */ +/* Display baseline/delta/ratio/displacement/periods columns. */ perf_hpp__column_enable (PERF_HPP__BASELINE , true);switch (compute) {
@@ -587,6 +590,11 @@ static void ui_init(void)if (show_displacement)perf_hpp__column_enable (PERF_HPP__DISPL , true); + +if (show_period) { +perf_hpp__column_enable (PERF_HPP__PERIOD , true); +perf_hpp__column_enable (PERF_HPP__PERIOD_BASELINE , true); + } }int cmd_diff (int argc,const char **argv,const char *prefix__maybe_unused )
tools/perf/ui/hist.c +21 -0
@@ -228,6 +228,26 @@ static int hpp__entry_period(struct perf_hpp *hpp, struct hist_entry *he)return scnprintf (hpp->buf, hpp->size, fmt, he->stat.period); } +static int hpp__header_period_baseline (struct perf_hpp *hpp) +{ +const char *fmt = symbol_conf.field_sep ?"%s" :"%12s" ; + +return scnprintf (hpp->buf, hpp->size, fmt,"Period Base" ); +} + +static int hpp__width_period_baseline (struct perf_hpp *hpp__maybe_unused ) +{ +return 12 ; +} + +static int hpp__entry_period_baseline (struct perf_hpp *hpp,struct hist_entry *he) +{ +struct hist_entry *pair = he->pair; +u64 period = pair ? pair->stat.period :0 ; +const char *fmt = symbol_conf.field_sep ?"%" PRIu64 :"%12" PRIu64; + +return scnprintf (hpp->buf, hpp->size, fmt, period); +}static int hpp__header_delta (struct perf_hpp *hpp) {const char *fmt = symbol_conf.field_sep ?"%s" :"%7s" ;
@@ -359,6 +379,7 @@ struct perf_hpp_fmt perf_hpp__format[] = { { .cond = false, HPP__COLOR_PRINT_FNS(overhead_guest_us) }, { .cond = false, HPP__PRINT_FNS(samples) }, { .cond = false, HPP__PRINT_FNS(period) }, + { .cond = false, HPP__PRINT_FNS(period_baseline) }, { .cond = false, HPP__PRINT_FNS(delta) }, { .cond = false, HPP__PRINT_FNS(ratio) }, { .cond = false, HPP__PRINT_FNS(wdiff) },
tools/perf/util/hist.h +1 -0
@@ -140,6 +140,7 @@ enum {PERF_HPP__OVERHEAD_GUEST_US ,PERF_HPP__SAMPLES ,PERF_HPP__PERIOD , +PERF_HPP__PERIOD_BASELINE ,PERF_HPP__DELTA ,PERF_HPP__RATIO , PERF_HPP__WEIGHTED_DIFF,
PATCH v3 6/8 perf diff: Add -F option to display formula for computation
In reply to Jiri OlsaAdding -F option to display the formula for specified computation. This is mainly to facilitate debugging, but can be useful anyway.
--- tools/perf/Documentation/perf-diff.txt | 4 ++ tools/perf/builtin-diff.c | 67 +++++++++++++++++++++++++++++++++- tools/perf/ui/hist.c | 24 +++++++++++- tools/perf/ui/stdio/hist.c | 2 +- tools/perf/util/hist.h | 2 + 5 files changed, 96 insertions(+), 3 deletions(-)
tools/perf/Documentation/perf-diff.txt +4 -0
@@ -87,6 +87,10 @@ OPTIONS --period:: Show period values for both compared hist entries. +-F:: +--formula:: + Show formula for given computation. + COMPARISON METHODS ------------------ delta
tools/perf/builtin-diff.c +66 -1
97 lines not on this page · raw message
tools/perf/ui/hist.c +23 -1
@@ -359,6 +359,27 @@ static int hpp__entry_displ(struct perf_hpp *hpp,return scnprintf (hpp->buf, hpp->size, fmt, buf); } +static int hpp__header_formula (struct perf_hpp *hpp) +{ +const char *fmt = symbol_conf.field_sep ?"%s" :"%70s" ; + +return scnprintf (hpp->buf, hpp->size, fmt,"Formula" ); +} + +static int hpp__width_formula (struct perf_hpp *hpp__maybe_unused ) +{ +return 70 ; +} + +static int hpp__entry_formula (struct perf_hpp *hpp,struct hist_entry *he) +{ +const char *fmt = symbol_conf.field_sep ?"%s" :"%-70s" ; +char buf[96 ] =" " ; + +perf_diff__formula (buf,sizeof (buf), he); +return scnprintf (hpp->buf, hpp->size, fmt, buf); +} +#define HPP__COLOR_PRINT_FNS (_name) \ .header = hpp__header_ ## _name, \ .width = hpp__width_ ## _name, \
@@ -383,7 +404,8 @@ struct perf_hpp_fmt perf_hpp__format[] = { { .cond = false, HPP__PRINT_FNS(delta) }, { .cond = false, HPP__PRINT_FNS(ratio) }, { .cond = false, HPP__PRINT_FNS(wdiff) }, - { .cond = false, HPP__PRINT_FNS(displ) } + { .cond = false, HPP__PRINT_FNS(displ) }, + { .cond = false, HPP__PRINT_FNS(formula) } };#undef HPP__COLOR_PRINT_FNS
tools/perf/ui/stdio/hist.c +1 -1
@@ -342,7 +342,7 @@ size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows,const char *sep = symbol_conf.field_sep;const char *col_width = symbol_conf.col_width_list_str;int idx, nr_rows =0 ; -char bf[64 ]; +char bf[96 ];struct perf_hpp dummy_hpp = { .buf = bf, .size =sizeof (bf),
tools/perf/util/hist.h +2 -0
@@ -145,6 +145,7 @@ enum {PERF_HPP__RATIO ,PERF_HPP__WEIGHTED_DIFF ,PERF_HPP__DISPL , +PERF_HPP__FORMULA , PERF_HPP__MAX_INDEX };
@@ -210,4 +211,5 @@ unsigned int hists__sort_list_width(struct hists *self);double perf_diff__compute_delta (struct hist_entry *he);double perf_diff__compute_ratio (struct hist_entry *he);s64 perf_diff__compute_wdiff (struct hist_entry *he); +int perf_diff__formula (char *buf,size_t size,struct hist_entry *he);#endif /* __PERF_HIST_H */
Signature · 1 line
1.7.11.4
[tip:perf/core] perf diff: Add -F option to display formula for computation
Commit-ID: ed279da2fc9774b4c0dc9fd513fa89a11cae3f56 Gitweb: http://git.kernel.org/tip/ed279da2fc9774b4c0dc9fd513fa89a11cae3f56 Author: Jiri Olsa <[email protected]> AuthorDate: Fri, 5 Oct 2012 16:44:45 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 5 Oct 2012 14:13:36 -0300
perf diff: Add -F option to display formula for computation
Adding -F option to display the formula for specified computation.
This is mainly to facilitate debugging, but can be useful anyway.
--- tools/perf/Documentation/perf-diff.txt | 4 ++ tools/perf/builtin-diff.c | 67 +++++++++++++++++++++++++++++++- tools/perf/ui/hist.c | 24 +++++++++++- tools/perf/ui/stdio/hist.c | 2 +- tools/perf/util/hist.h | 2 + 5 files changed, 96 insertions(+), 3 deletions(-)
tools/perf/Documentation/perf-diff.txt +4 -0
@@ -87,6 +87,10 @@ OPTIONS --period:: Show period values for both compared hist entries. +-F:: +--formula:: + Show formula for given computation. + COMPARISON METHODS ------------------ delta
tools/perf/builtin-diff.c +66 -1
97 lines not on this page · raw message
tools/perf/ui/hist.c +23 -1
@@ -359,6 +359,27 @@ static int hpp__entry_displ(struct perf_hpp *hpp,return scnprintf (hpp->buf, hpp->size, fmt, buf); } +static int hpp__header_formula (struct perf_hpp *hpp) +{ +const char *fmt = symbol_conf.field_sep ?"%s" :"%70s" ; + +return scnprintf (hpp->buf, hpp->size, fmt,"Formula" ); +} + +static int hpp__width_formula (struct perf_hpp *hpp__maybe_unused ) +{ +return 70 ; +} + +static int hpp__entry_formula (struct perf_hpp *hpp,struct hist_entry *he) +{ +const char *fmt = symbol_conf.field_sep ?"%s" :"%-70s" ; +char buf[96 ] =" " ; + +perf_diff__formula (buf,sizeof (buf), he); +return scnprintf (hpp->buf, hpp->size, fmt, buf); +} +#define HPP__COLOR_PRINT_FNS (_name) \ .header = hpp__header_ ## _name, \ .width = hpp__width_ ## _name, \
@@ -383,7 +404,8 @@ struct perf_hpp_fmt perf_hpp__format[] = { { .cond = false, HPP__PRINT_FNS(delta) }, { .cond = false, HPP__PRINT_FNS(ratio) }, { .cond = false, HPP__PRINT_FNS(wdiff) }, - { .cond = false, HPP__PRINT_FNS(displ) } + { .cond = false, HPP__PRINT_FNS(displ) }, + { .cond = false, HPP__PRINT_FNS(formula) } };#undef HPP__COLOR_PRINT_FNS
tools/perf/ui/stdio/hist.c +1 -1
@@ -342,7 +342,7 @@ size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows,const char *sep = symbol_conf.field_sep;const char *col_width = symbol_conf.col_width_list_str;int idx, nr_rows =0 ; -char bf[64 ]; +char bf[96 ];struct perf_hpp dummy_hpp = { .buf = bf, .size =sizeof (bf),
tools/perf/util/hist.h +2 -0
@@ -145,6 +145,7 @@ enum {PERF_HPP__RATIO ,PERF_HPP__WEIGHTED_DIFF ,PERF_HPP__DISPL , +PERF_HPP__FORMULA , PERF_HPP__MAX_INDEX };
@@ -210,4 +211,5 @@ unsigned int hists__sort_list_width(struct hists *self);double perf_diff__compute_delta (struct hist_entry *he);double perf_diff__compute_ratio (struct hist_entry *he);s64 perf_diff__compute_wdiff (struct hist_entry *he); +int perf_diff__formula (char *buf,size_t size,struct hist_entry *he);#endif /* __PERF_HIST_H */
PATCH v3 7/8 perf diff: Include samples without symbol in overall stats
In reply to Jiri OlsaCurrently we omit samples without symbols. This way we get different and confusing numbers for samples than from report command.
--- tools/perf/builtin-diff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/builtin-diff.c +1 -1
@@ -269,7 +269,7 @@ static int diff__process_sample_event(struct perf_tool *tool __maybe_unused,return -1 ; } -if (al.filtered || al.sym ==NULL ) +if (al.filtered)return 0 ;if (hists__add_entry (&evsel->hists, &al, sample->period)) {
Signature · 1 line
1.7.11.4
[tip:perf/core] perf diff: Include samples without symbol in overall stats
Commit-ID: d88c48f9b5bfcbd2e296b2d240e8cb0aec99f042 Gitweb: http://git.kernel.org/tip/d88c48f9b5bfcbd2e296b2d240e8cb0aec99f042 Author: Jiri Olsa <[email protected]> AuthorDate: Fri, 5 Oct 2012 16:44:46 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 5 Oct 2012 14:14:49 -0300
perf diff: Include samples without symbol in overall stats
Currently we omit samples without symbols. This way we get different and confusing numbers for samples than from report command.
--- tools/perf/builtin-diff.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
tools/perf/builtin-diff.c +1 -1
@@ -269,7 +269,7 @@ static int diff__process_sample_event(struct perf_tool *tool __maybe_unused,return -1 ; } -if (al.filtered || al.sym ==NULL ) +if (al.filtered)return 0 ;if (hists__add_entry (&evsel->hists, &al, sample->period)) {
PATCH v3 8/8 perf diff: Display empty space for non paired samples
In reply to Jiri OlsaCurrently in 'Baseline' and 'Period Base' columns zero values are displayed in case no pair is found for the sample. This might be confusing, using empty space instead.
--- tools/perf/ui/hist.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
tools/perf/ui/hist.c +8 -2
@@ -179,7 +179,10 @@ static int hpp__color_baseline(struct perf_hpp *hpp, struct hist_entry *he) {double percent =baseline_percent (he); -return percent_color_snprintf (hpp->buf, hpp->size," %6.2f%%" , percent); +if (he->pair) +return percent_color_snprintf (hpp->buf, hpp->size," %6.2f%%" , percent); +else +return scnprintf (hpp->buf, hpp->size," " ); }static int hpp__entry_baseline (struct perf_hpp *hpp,struct hist_entry *he)
@@ -187,7 +190,10 @@ static int hpp__entry_baseline(struct perf_hpp *hpp, struct hist_entry *he)double percent =baseline_percent (he);const char *fmt = symbol_conf.field_sep ?"%.2f" :" %6.2f%%" ; -return scnprintf (hpp->buf, hpp->size, fmt, percent); +if (he->pair || symbol_conf.field_sep) +return scnprintf (hpp->buf, hpp->size, fmt, percent); +else +return scnprintf (hpp->buf, hpp->size," " ); }static int hpp__header_samples (struct perf_hpp *hpp)
Signature · 1 line
1.7.11.4
[tip:perf/core] perf diff: Display empty space for non paired samples
Commit-ID: 6e92349d5a814a3f633a43d9d6bd3b199ef3ad72 Gitweb: http://git.kernel.org/tip/6e92349d5a814a3f633a43d9d6bd3b199ef3ad72 Author: Jiri Olsa <[email protected]> AuthorDate: Fri, 5 Oct 2012 16:44:47 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 5 Oct 2012 14:15:19 -0300
perf diff: Display empty space for non paired samples
Currently in 'Baseline' and 'Period Base' columns zero values are displayed in case no pair is found for the sample. This might be confusing, using empty space instead.
--- tools/perf/ui/hist.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-)
tools/perf/ui/hist.c +8 -2
@@ -179,7 +179,10 @@ static int hpp__color_baseline(struct perf_hpp *hpp, struct hist_entry *he) {double percent =baseline_percent (he); -return percent_color_snprintf (hpp->buf, hpp->size," %6.2f%%" , percent); +if (he->pair) +return percent_color_snprintf (hpp->buf, hpp->size," %6.2f%%" , percent); +else +return scnprintf (hpp->buf, hpp->size," " ); }static int hpp__entry_baseline (struct perf_hpp *hpp,struct hist_entry *he)
@@ -187,7 +190,10 @@ static int hpp__entry_baseline(struct perf_hpp *hpp, struct hist_entry *he)double percent =baseline_percent (he);const char *fmt = symbol_conf.field_sep ?"%.2f" :" %6.2f%%" ; -return scnprintf (hpp->buf, hpp->size, fmt, percent); +if (he->pair || symbol_conf.field_sep) +return scnprintf (hpp->buf, hpp->size, fmt, percent); +else +return scnprintf (hpp->buf, hpp->size," " ); }static int hpp__header_samples (struct perf_hpp *hpp)