More color in 'perf diff'
v2 cover More color in 'perf diff'
Hi,
This round fixes two problems in the last round:
- In [2/5], the color version includes the 0.01 threshold that was present in the non-color version (thanks to Jiri).
- In [4/5], the trailing '%' is gone (maked as a TODO in the last round).
and introduces one new patch for wdiff: [5/5].
Thanks.
Ramkumar Ramachandra (5):
perf diff: don't compute Delta if he->dummy
perf diff: color the Delta column
perf diff: generalize hpp__color_delta for -c
perf diff: color the Ratio column
perf diff: color the Weighted Diff column
tools/perf/builtin-diff.c | 109 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 108 insertions(+), 1 deletion(-)
Signature · 1 line
1.8.5.rc0.5.g70ebc73.dirty
PATCH v2 1/5 perf diff: don't compute Delta if he->dummy
--- tools/perf/builtin-diff.c | 3 +++ 1 file changed, 3 insertions(+)
tools/perf/builtin-diff.c +3 -0
@@ -792,6 +792,9 @@ hpp__entry_pair(struct hist_entry *he, struct hist_entry *pair,switch (idx) {case PERF_HPP_DIFF__DELTA : +if (he->dummy) +break ; +if (pair->diff.computed) diff = pair->diff.period_ratio_delta;else
Signature · 1 line
1.8.5.rc0.5.g70ebc73.dirty
Re: [PATCH v2 1/5] perf diff: don't compute Delta if he->dummy
Quoted 11 lines · Ramkumar Ramachandra
Cc Arnaldo Carvalho de Melo <[email protected]>Signed-off-by Ramkumar Ramachandra <[email protected]>--- tools/perf/builtin-diff.c | 3 +++ 1 file changed, 3 insertions(+)tools/perf/builtin-diff.c +0
-0
tools/perf/builtin-diff.c hpp__entry_pair(struct hist_entry *he, struct hist_entry *pair, · line 797
Quoted 6 lines
tools/perf/builtin-diff.c +3
-0@@ -792,6 +792,9 @@ hpp__entry_pair(struct hist_entry *he, struct hist_entry *pair,switch (idx) {case PERF_HPP_DIFF__DELTA : +if (he->dummy) +break ; +
the reason I disabled the computation for dummy pairs was that the number (ratio and weighted diff) would not make much sense (to me) without the real pair
but within the dummy delta column we actually see the compared file % overheader which is helpfull, even if there's no real pair in the baseline
jirka
Re: [PATCH v2 1/5] perf diff: don't compute Delta if he->dummy
Quoted 16 lines · Jiri Olsa
tools/perf/builtin-diff.c hpp__entry_pair(struct hist_entry *he, struct hist_entry *pair, · line 797
Quoted 11 lines
tools/perf/builtin-diff.c +3
-0@@ -792,6 +792,9 @@ hpp__entry_pair(struct hist_entry *he, struct hist_entry *pair,switch (idx) {case PERF_HPP_DIFF__DELTA : +if (he->dummy) +break ; +the reason I disabled the computation for dummy pairs was that the number (ratio and weighted diff) would not make much sense (to me) without the real pair
Quoted 3 lines
but within the dummy delta column we actually see the compared file % overheader which is helpfull, even if there's no real pair in the baseline
Wait a minute. Doesn't your comment on [3/5] apply here too? __hpp__entry_global() computes and checks pair' before calling hpp__entry_pair(). If he->dummy is set, it means that he' doesn't have any pairs: which means that hpp_entry_pair() wouldn't have been called by __hpp_entry_global() in the first place. So aren't the he->dummy checks in the RATIO and WEIGHTED_DIFF case redundant?
PATCH v2 2/5 perf diff: color the Delta column
In reply to Ramkumar RamachandraColor the numbers in the Delta column either green or red depending on whether the number is positive or negative.
--- tools/perf/builtin-diff.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-)
tools/perf/builtin-diff.c +36 -1
@@ -769,6 +769,33 @@ static int hpp__entry_baseline(struct hist_entry *he, char *buf, size_t size)return ret; } +static int hpp__color_delta (struct perf_hpp_fmt *fmt, +struct perf_hpp *hpp,struct hist_entry *he) +{ +struct diff_hpp_fmt *dfmt = + container_of(fmt, struct diff_hpp_fmt, fmt); +struct hist_entry *pair =get_pair_fmt (he, dfmt); +double percent; +char pfmt[20 ] =" " ; + +if (!pair) + goto dummy_print; +if (pair->diff.computed) + percent = pair->diff.period_ratio_delta; +else + percent =compute_delta (he, pair); + +if (!he->dummy &&fabs (percent) >=0.01 ) { +scnprintf (pfmt,20 ,"%%%+d.2f%%%%" , dfmt->header_width -1 ); +return color_snprintf (hpp->buf, hpp->size, + percent >0 ?PERF_COLOR_GREEN :PERF_COLOR_RED , + pfmt, percent); + }else +dummy_print: +return scnprintf (hpp->buf, hpp->size,"%*s" , + dfmt->header_width, pfmt); +} +static void hpp__entry_unpair (struct hist_entry *he,int idx,char *buf,size_t size) {
@@ -943,8 +970,16 @@ static void data__hpp_register(struct data__file *d, int idx) fmt->entry = hpp__entry_global;/* TODO more colors */ -if (idx ==PERF_HPP_DIFF__BASELINE ) +switch (idx) { +case PERF_HPP_DIFF__BASELINE : fmt->color = hpp__color_baseline; +break ; +case PERF_HPP_DIFF__DELTA : + fmt->color = hpp__color_delta; +break ; +default : +break ; + }init_header (d, dfmt);perf_hpp__column_register (fmt);
Signature · 1 line
1.8.5.rc0.5.g70ebc73.dirty
Re: [PATCH v2 2/5] perf diff: color the Delta column
Quoted 20 lines · Ramkumar Ramachandra
Color the numbers in the Delta column either green or red depending on whether the number is positive or negative.
Cc Jiri Olsa <[email protected]>Cc Namhyung Kim <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>Signed-off-by Ramkumar Ramachandra <[email protected]>--- tools/perf/builtin-diff.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-)tools/perf/builtin-diff.c +1
-0@@ -769,6 +769,33 @@ static int hpp__entry_baseline(struct hist_entry *he, char *buf, size_t size)return ret; } +static int hpp__color_delta(struct perf_hpp_fmt *fmt,
tools/perf/builtin-diff.c static int hpp__entry_baseline(struct hist_entry *he, char *buf, size_t size) · line 782
Quoted 10 lines
tools/perf/builtin-diff.c +10
-0+ struct perf_hpp *hpp, struct hist_entry *he) +{ + struct diff_hpp_fmt *dfmt = + container_of(fmt, struct diff_hpp_fmt, fmt); +struct hist_entry *pair =get_pair_fmt (he, dfmt); +double percent; +char pfmt[20 ] =" " ; + +if (!pair) + goto dummy_print;
same comment here ^^^ as for previous patch
jirka
Re: [PATCH v2 2/5] perf diff: color the Delta column
Quoted 8 lines · Jiri Olsa
Quoted 8 lines
tools/perf/builtin-diff.c +0
-0@@ -769,6 +769,33 @@ static int hpp__entry_baseline(struct hist_entry *he, char *buf, size_t size)return ret; }
Quoted 13 lines
tools/perf/builtin-diff.c static int hpp__entry_baseline(struct hist_entry *he, char *buf, size_t size) · line 782
Quoted 11 lines
tools/perf/builtin-diff.c +11
-0+static int hpp__color_delta (struct perf_hpp_fmt *fmt, +struct perf_hpp *hpp,struct hist_entry *he) +{ +struct diff_hpp_fmt *dfmt = + container_of(fmt, struct diff_hpp_fmt, fmt); +struct hist_entry *pair =get_pair_fmt (he, dfmt); +double percent; +char pfmt[20 ] =" " ; + +if (!pair) + goto dummy_print;same comment here ^^^ as for previous patch
Hm? The comment on the previous patch pertained to printing the delta if he->dummy was set (ie. if `he' doesn't have any pairs). This statement is analogous to the logic in __hpp__entry_global(): if (!pair), then the next line checking pair->diff.computed will segfault without this check.
PATCH v2 3/5 perf diff: generalize hpp__color_delta for -c
In reply to Ramkumar RamachandraGeneralize the function so that we can accommodate all three comparison
methods: delta, ratio, and wdiff.
--- tools/perf/builtin-diff.c | 47 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 10 deletions(-)
tools/perf/builtin-diff.c +37 -10
@@ -769,33 +769,60 @@ static int hpp__entry_baseline(struct hist_entry *he, char *buf, size_t size)return ret; } -static int hpp__color_delta (struct perf_hpp_fmt *fmt, -struct perf_hpp *hpp,struct hist_entry *he) +static int __hpp__color_compare (struct perf_hpp_fmt *fmt, +struct perf_hpp *hpp,struct hist_entry *he, +int comparison_method) {struct diff_hpp_fmt *dfmt = container_of(fmt, struct diff_hpp_fmt, fmt);struct hist_entry *pair =get_pair_fmt (he, dfmt); -double percent; +double delta;char pfmt[20 ] =" " ;if (!pair) goto dummy_print;if (pair->diff.computed) - percent = pair->diff.period_ratio_delta; +switch (comparison_method) { +case COMPUTE_DELTA : + delta = pair->diff.period_ratio_delta; +break ; +default : +BUG_ON (1 ); + }else - percent =compute_delta (he, pair); +switch (comparison_method) { +case COMPUTE_DELTA : + delta =compute_delta (he, pair); +break ; +default : +BUG_ON (1 ); + } -if (!he->dummy &&fabs (percent) >=0.01 ) { -scnprintf (pfmt,20 ,"%%%+d.2f%%%%" , dfmt->header_width -1 ); -return color_snprintf (hpp->buf, hpp->size, - percent >0 ?PERF_COLOR_GREEN :PERF_COLOR_RED , - pfmt, percent); +if (!he->dummy) { +switch (comparison_method) { +case COMPUTE_DELTA : +if (fabs (delta) <0.01 ) + goto dummy_print; +scnprintf (pfmt,20 ,"%%%+d.2f%%%%" , dfmt->header_width -1 ); +return color_snprintf (hpp->buf, hpp->size, + delta >0 ?PERF_COLOR_GREEN :PERF_COLOR_RED , + pfmt, delta); +break ; +default : +BUG_ON (1 ); + } }else dummy_print:return scnprintf (hpp->buf, hpp->size,"%*s" , dfmt->header_width, pfmt); } +static int hpp__color_delta (struct perf_hpp_fmt *fmt, +struct perf_hpp *hpp,struct hist_entry *he) +{ +return __hpp__color_compare (fmt, hpp, he,COMPUTE_DELTA ); +} +static void hpp__entry_unpair (struct hist_entry *he,int idx,char *buf,size_t size) {
Signature · 1 line
1.8.5.rc0.5.g70ebc73.dirty
Re: [PATCH v2 3/5] perf diff: generalize hpp__color_delta for -c
Quoted 49 lines · Ramkumar Ramachandra
Generalize the function so that we can accommodate all three comparison
methods: delta, ratio, and wdiff.Cc Jiri Olsa <[email protected]>Cc Namhyung Kim <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>Signed-off-by Ramkumar Ramachandra <[email protected]>--- tools/perf/builtin-diff.c | 47 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 10 deletions(-)tools/perf/builtin-diff.c +15
-5@@ -769,33 +769,60 @@ static int hpp__entry_baseline(struct hist_entry *he, char *buf, size_t size)return ret; } -static int hpp__color_delta (struct perf_hpp_fmt *fmt, -struct perf_hpp *hpp,struct hist_entry *he) +static int __hpp__color_compare (struct perf_hpp_fmt *fmt, +struct perf_hpp *hpp,struct hist_entry *he, +int comparison_method) {struct diff_hpp_fmt *dfmt = container_of(fmt, struct diff_hpp_fmt, fmt);struct hist_entry *pair =get_pair_fmt (he, dfmt); -double percent; +double delta;char pfmt[20 ] =" " ;if (!pair) goto dummy_print;if (pair->diff.computed) - percent = pair->diff.period_ratio_delta; +switch (comparison_method) { +case COMPUTE_DELTA : + delta = pair->diff.period_ratio_delta; +break ; +default : +BUG_ON (1 ); + }else - percent =compute_delta (he, pair); +switch (comparison_method) { +case COMPUTE_DELTA : + delta =compute_delta (he, pair); +break ;
tools/perf/builtin-diff.c static int hpp__entry_baseline(struct hist_entry *he, char *buf, size_t size) · line 801
Quoted 10 lines
tools/perf/builtin-diff.c +4
-5+default : +BUG_ON (1 ); + } -if (!he->dummy &&fabs (percent) >=0.01 ) { -scnprintf (pfmt,20 ,"%%%+d.2f%%%%" , dfmt->header_width -1 ); -return color_snprintf (hpp->buf, hpp->size, - percent >0 ?PERF_COLOR_GREEN :PERF_COLOR_RED , - pfmt, percent); +if (!he->dummy) {
isn't this check superfluous because of the above (!pair) check?
jirka
Re: [PATCH v2 3/5] perf diff: generalize hpp__color_delta for -c
Quoted 28 lines · Jiri Olsa
Quoted 17 lines
if (!pair) goto dummy_print; if (pair->diff.computed)tools/perf/builtin-diff.c +11
-2- percent = pair->diff.period_ratio_delta; +switch (comparison_method) { +case COMPUTE_DELTA : + delta = pair->diff.period_ratio_delta; +break ; +default : +BUG_ON (1 ); + } else - percent =compute_delta (he, pair); + switch (comparison_method) { +case COMPUTE_DELTA : + delta =compute_delta (he, pair); +break ;tools/perf/builtin-diff.c static int hpp__entry_baseline(struct hist_entry *he, char *buf, size_t size) · line 801
Quoted 10 lines
tools/perf/builtin-diff.c +4
-5+default : +BUG_ON (1 ); + } -if (!he->dummy &&fabs (percent) >=0.01 ) { -scnprintf (pfmt,20 ,"%%%+d.2f%%%%" , dfmt->header_width -1 ); -return color_snprintf (hpp->buf, hpp->size, - percent >0 ?PERF_COLOR_GREEN :PERF_COLOR_RED , - pfmt, percent); +if (!he->dummy) {
Quoted 3 lines
isn't this check superfluous because of the above (!pair) check?
From builtin-diff.c:get_pair_data(), we see that `pair' is one of the
pairs in he->pairs. he->dummy is set in util/hist.c:hists__add_dummy_entry() which is called only when he doesn't have pairs (util/hist.c:942). Wait, couldn't util/hist.c:hists__add_dummy_entry() also have returned NULL in the case when he is NULL? But __hpp__color_compare wouldn't have been called with a NULL he in the first place. So yeah, the check is redundant although it wasn't immediately obvious to me.
Thanks.
Re: [PATCH v2 3/5] perf diff: generalize hpp__color_delta for -c
Quoted 29 lines · Ramkumar Ramachandra
Quoted 28 lines · Jiri Olsa
Quoted 27 lines
if (!pair) goto dummy_print; if (pair->diff.computed)tools/perf/builtin-diff.c +15
-7- percent = pair->diff.period_ratio_delta; +switch (comparison_method) { +case COMPUTE_DELTA : + delta = pair->diff.period_ratio_delta; +break ; +default : +BUG_ON (1 ); + } else - percent =compute_delta (he, pair); + switch (comparison_method) { +case COMPUTE_DELTA : + delta =compute_delta (he, pair); +break ; +default : +BUG_ON (1 ); + } -if (!he->dummy &&fabs (percent) >=0.01 ) { -scnprintf (pfmt,20 ,"%%%+d.2f%%%%" , dfmt->header_width -1 ); -return color_snprintf (hpp->buf, hpp->size, - percent >0 ?PERF_COLOR_GREEN :PERF_COLOR_RED , - pfmt, percent); +if (!he->dummy) {
Quoted 6 lines
Quoted 1 line
isn't this check superfluous because of the above (!pair) check?
From builtin-diff.c:get_pair_data(), we see that `pair' is one of the pairs in
he->pairs.he->dummyis set in util/hist.c:hists__add_dummy_entry() which is called only when he doesn't have pairs (util/hist.c:942).
Sorry about the major thinko: hists__add_dummy_entry() returns a new he' with he->dummy set; it has nothing to do with pair->pairs of the pair' that it is passed.
I think I understand what's going on: I'll submit a new iteration soon.
Re: [PATCH v2 3/5] perf diff: generalize hpp__color_delta for -c
In reply to Ramkumar RamachandraOn Sun, Nov 24, 2013 at 11:50:23AM +0530, Ramkumar Ramachandra wrote:
SNIP
Quoted 32 lines
tools/perf/builtin-diff.c +15
-8container_of(fmt, struct diff_hpp_fmt, fmt);struct hist_entry *pair =get_pair_fmt (he, dfmt); -double percent; +double delta;char pfmt[20 ] =" " ;if (!pair) goto dummy_print;if (pair->diff.computed) - percent = pair->diff.period_ratio_delta; +switch (comparison_method) { +case COMPUTE_DELTA : + delta = pair->diff.period_ratio_delta; +break ; +default : +BUG_ON (1 ); + }else - percent =compute_delta (he, pair); +switch (comparison_method) { +case COMPUTE_DELTA : + delta =compute_delta (he, pair); +break ; +default : +BUG_ON (1 ); + } -if (!he->dummy &&fabs (percent) >=0.01 ) { -scnprintf (pfmt,20 ,"%%%+d.2f%%%%" , dfmt->header_width -1 ); -return color_snprintf (hpp->buf, hpp->size, - percent >0 ?PERF_COLOR_GREEN :PERF_COLOR_RED , - pfmt, percent);
tools/perf/builtin-diff.c static int hpp__entry_baseline(struct hist_entry *he, char *buf, size_t size) · line 810
Quoted 10 lines
tools/perf/builtin-diff.c +10
-0+if (!he->dummy) { +switch (comparison_method) { +case COMPUTE_DELTA : +if (fabs (delta) <0.01 ) + goto dummy_print; +scnprintf (pfmt,20 ,"%%%+d.2f%%%%" , dfmt->header_width -1 ); +return color_snprintf (hpp->buf, hpp->size, + delta >0 ?PERF_COLOR_GREEN :PERF_COLOR_RED , + pfmt, delta); +break ;
I think it'd be better to have just one switch for comparison_method and do all the processing within
thanks,
jirka
Re: [PATCH v2 3/5] perf diff: generalize hpp__color_delta for -c
Quoted 2 lines · Jiri Olsa
I think it'd be better to have just one switch for
comparison_methodand do all the processing within
Okay, will fix in the next iteration.
PATCH v2 4/5 perf diff: color the Ratio column
In reply to Ramkumar RamachandraIn
$ perf diff -c ratio
color the Ratio column using percent_color_snprintf().
--- tools/perf/builtin-diff.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
tools/perf/builtin-diff.c +20 -0
@@ -786,6 +786,9 @@ static int __hpp__color_compare(struct perf_hpp_fmt *fmt,case COMPUTE_DELTA : delta = pair->diff.period_ratio_delta;break ; +case COMPUTE_RATIO : + delta = pair->diff.period_ratio; +break ;default :BUG_ON (1 ); }
@@ -794,6 +797,9 @@ static int __hpp__color_compare(struct perf_hpp_fmt *fmt,case COMPUTE_DELTA : delta =compute_delta (he, pair);break ; +case COMPUTE_RATIO : + delta =compute_ratio (he, pair); +break ;default :BUG_ON (1 ); }
@@ -808,6 +814,11 @@ static int __hpp__color_compare(struct perf_hpp_fmt *fmt, delta >0 ?PERF_COLOR_GREEN :PERF_COLOR_RED , pfmt, delta);break ; +case COMPUTE_RATIO : +scnprintf (pfmt,20 ,"%%%d.6f" , dfmt->header_width); +return percent_color_snprintf (hpp->buf, hpp->size, + pfmt, delta); +break ;default :BUG_ON (1 ); }
@@ -823,6 +834,12 @@ static int hpp__color_delta(struct perf_hpp_fmt *fmt,return __hpp__color_compare (fmt, hpp, he,COMPUTE_DELTA ); } +static int hpp__color_ratio (struct perf_hpp_fmt *fmt, +struct perf_hpp *hpp,struct hist_entry *he) +{ +return __hpp__color_compare (fmt, hpp, he,COMPUTE_RATIO ); +} +static void hpp__entry_unpair (struct hist_entry *he,int idx,char *buf,size_t size) {
@@ -1004,6 +1021,9 @@ static void data__hpp_register(struct data__file *d, int idx)case PERF_HPP_DIFF__DELTA : fmt->color = hpp__color_delta;break ; +case PERF_HPP_DIFF__RATIO : + fmt->color = hpp__color_ratio; +break ;default :break ; }
Signature · 1 line
1.8.5.rc0.5.g70ebc73.dirty
PATCH v2 5/5 perf diff: color the Weighted Diff column
In reply to Ramkumar RamachandraIn
$ perf diff -c wdiff:M,N
color the numbers in the Weighted Diff column either green or red, depending on whether the number is positive or negative.
--- tools/perf/builtin-diff.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
tools/perf/builtin-diff.c +22 -0
@@ -777,6 +777,7 @@ static int __hpp__color_compare(struct perf_hpp_fmt *fmt, container_of(fmt, struct diff_hpp_fmt, fmt);struct hist_entry *pair =get_pair_fmt (he, dfmt);double delta; +s64 wdiff;char pfmt[20 ] =" " ;if (!pair)
@@ -789,6 +790,9 @@ static int __hpp__color_compare(struct perf_hpp_fmt *fmt,case COMPUTE_RATIO : delta = pair->diff.period_ratio;break ; +case COMPUTE_WEIGHTED_DIFF : + wdiff = pair->diff.wdiff; +break ;default :BUG_ON (1 ); }
@@ -800,6 +804,9 @@ static int __hpp__color_compare(struct perf_hpp_fmt *fmt,case COMPUTE_RATIO : delta =compute_ratio (he, pair);break ; +case COMPUTE_WEIGHTED_DIFF : + wdiff =compute_wdiff (he, pair); +break ;default :BUG_ON (1 ); }
@@ -819,6 +826,12 @@ static int __hpp__color_compare(struct perf_hpp_fmt *fmt,return percent_color_snprintf (hpp->buf, hpp->size, pfmt, delta);break ; +case COMPUTE_WEIGHTED_DIFF : +scnprintf (pfmt,20 ,"%%14ld" , dfmt->header_width); +return color_snprintf (hpp->buf, hpp->size, + wdiff >0 ?PERF_COLOR_GREEN :PERF_COLOR_RED , + pfmt, wdiff); +break ;default :BUG_ON (1 ); }
@@ -840,6 +853,12 @@ static int hpp__color_ratio(struct perf_hpp_fmt *fmt,return __hpp__color_compare (fmt, hpp, he,COMPUTE_RATIO ); } +static int hpp__color_wdiff (struct perf_hpp_fmt *fmt, +struct perf_hpp *hpp,struct hist_entry *he) +{ +return __hpp__color_compare (fmt, hpp, he,COMPUTE_WEIGHTED_DIFF ); +} +static void hpp__entry_unpair (struct hist_entry *he,int idx,char *buf,size_t size) {
@@ -1024,6 +1043,9 @@ static void data__hpp_register(struct data__file *d, int idx)case PERF_HPP_DIFF__RATIO : fmt->color = hpp__color_ratio;break ; +case PERF_HPP_DIFF__WEIGHTED_DIFF : + fmt->color = hpp__color_wdiff; +break ;default :break ; }
Signature · 1 line
1.8.5.rc0.5.g70ebc73.dirty