From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756151AbbFRQKb (ORCPT ); Thu, 18 Jun 2015 12:10:31 -0400 Received: from cantor2.suse.de ([195.135.220.15]:54973 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754188AbbFRQKX (ORCPT ); Thu, 18 Jun 2015 12:10:23 -0400 Message-ID: <5582ED6D.4010707@suse.cz> Date: Thu, 18 Jun 2015 18:10:21 +0200 From: =?windows-1252?Q?Martin_Li=9Aka?= User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: linux-kernel@vger.kernel.org CC: Arnaldo Carvalho de Melo , Ingo Molnar , Peter Zijlstra , Paul Mackerras , Andi Kleen Subject: [PATCH] perf annotate: With --show-total-period, display total # of samples. Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org To compare two records on an instruction base, with --show-total-period option provided, display total number of samples that belong to a line in assembly language. Signed-off-by: Martin Liska --- tools/perf/builtin-annotate.c | 2 ++ tools/perf/ui/browsers/annotate.c | 44 +++++++++++++++++++++++++-------------- tools/perf/util/annotate.c | 28 +++++++++++++++++++------ tools/perf/util/annotate.h | 3 ++- 4 files changed, 54 insertions(+), 23 deletions(-) diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index 4e08c2d..2c1bec3 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c @@ -329,6 +329,8 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __maybe_unused) "objdump binary to use for disassembly and annotations"), OPT_BOOLEAN(0, "group", &symbol_conf.event_group, "Show event group information together"), + OPT_BOOLEAN(0, "show-total-period", &symbol_conf.show_total_period, + "Show a column with the sum of periods"), OPT_END() }; int ret = hists__init(); diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c index acb0e23..89dd816 100644 --- a/tools/perf/ui/browsers/annotate.c +++ b/tools/perf/ui/browsers/annotate.c @@ -11,16 +11,21 @@ #include "../../util/evsel.h" #include +struct disasm_tuple { + double percent; + double samples; +}; + struct browser_disasm_line { - struct rb_node rb_node; - u32 idx; - int idx_asm; - int jump_sources; + struct rb_node rb_node; + u32 idx; + int idx_asm; + int jump_sources; /* * actual length of this array is saved on the nr_events field * of the struct annotate_browser */ - double percent[1]; + struct disasm_tuple tuples[1]; }; static struct annotate_browser_opt { @@ -105,15 +110,19 @@ static void annotate_browser__write(struct ui_browser *browser, void *entry, int char bf[256]; for (i = 0; i < ab->nr_events; i++) { - if (bdl->percent[i] > percent_max) - percent_max = bdl->percent[i]; + if (bdl->tuples[i].percent > percent_max) + percent_max = bdl->tuples[i].percent; } if (dl->offset != -1 && percent_max != 0.0) { for (i = 0; i < ab->nr_events; i++) { - ui_browser__set_percent_color(browser, bdl->percent[i], + ui_browser__set_percent_color(browser, + bdl->tuples[i].percent, current_entry); - slsmg_printf("%6.2f ", bdl->percent[i]); + if (symbol_conf.show_total_period) + slsmg_printf("%6.0f ", bdl->tuples[i].samples); + else + slsmg_printf("%6.2f ", bdl->tuples[i].percent); } } else { ui_browser__set_percent_color(browser, 0, current_entry); @@ -273,9 +282,9 @@ static int disasm__cmp(struct browser_disasm_line *a, int i; for (i = 0; i < nr_pcnt; i++) { - if (a->percent[i] == b->percent[i]) + if (a->tuples[i].percent == b->tuples[i].percent) continue; - return a->percent[i] < b->percent[i]; + return a->tuples[i].percent < b->tuples[i].percent; } return 0; } @@ -366,14 +375,17 @@ static void annotate_browser__calc_percent(struct annotate_browser *browser, next = disasm__get_next_ip_line(¬es->src->source, pos); for (i = 0; i < browser->nr_events; i++) { - bpos->percent[i] = disasm__calc_percent(notes, + double samples; + + bpos->tuples[i].percent = disasm__calc_percent(notes, evsel->idx + i, pos->offset, next ? next->offset : len, - &path); + &path, &samples); + bpos->tuples[i].samples = samples; - if (max_percent < bpos->percent[i]) - max_percent = bpos->percent[i]; + if (max_percent < bpos->tuples[i].percent) + max_percent = bpos->tuples[i].percent; } if (max_percent < 0.01) { @@ -929,7 +941,7 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, if (perf_evsel__is_group_event(evsel)) { nr_pcnt = evsel->nr_members; - sizeof_bdl += sizeof(double) * (nr_pcnt - 1); + sizeof_bdl += sizeof(struct disasm_tuple) * (nr_pcnt - 1); } if (symbol__annotate(sym, map, sizeof_bdl) < 0) { diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index bf80430..8b94603 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -654,10 +654,11 @@ struct disasm_line *disasm__get_next_ip_line(struct list_head *head, struct disa } double disasm__calc_percent(struct annotation *notes, int evidx, s64 offset, - s64 end, const char **path) + s64 end, const char **path, double *samples) { struct source_line *src_line = notes->src->lines; double percent = 0.0; + *samples = 0.0; if (src_line) { size_t sizeof_src_line = sizeof(*src_line) + @@ -671,6 +672,7 @@ double disasm__calc_percent(struct annotation *notes, int evidx, s64 offset, *path = src_line->path; percent += src_line->p[evidx].percent; + *samples += src_line->p[evidx].samples; offset++; } } else { @@ -680,8 +682,10 @@ double disasm__calc_percent(struct annotation *notes, int evidx, s64 offset, while (offset < end) hits += h->addr[offset++]; - if (h->sum) + if (h->sum) { + *samples = hits; percent = 100.0 * hits / h->sum; + } } return percent; @@ -696,8 +700,9 @@ static int disasm_line__print(struct disasm_line *dl, struct symbol *sym, u64 st if (dl->offset != -1) { const char *path = NULL; - double percent, max_percent = 0.0; + double percent, samples, max_percent = 0.0; double *ppercents = &percent; + double *psamples = &samples; int i, nr_percent = 1; const char *color; struct annotation *notes = symbol__annotation(sym); @@ -710,8 +715,10 @@ static int disasm_line__print(struct disasm_line *dl, struct symbol *sym, u64 st if (perf_evsel__is_group_event(evsel)) { nr_percent = evsel->nr_members; ppercents = calloc(nr_percent, sizeof(double)); - if (ppercents == NULL) + psamples = calloc(nr_percent, sizeof(double)); + if (ppercents == NULL || psamples == NULL) { return -1; + } } for (i = 0; i < nr_percent; i++) { @@ -719,9 +726,10 @@ static int disasm_line__print(struct disasm_line *dl, struct symbol *sym, u64 st notes->src->lines ? i : evsel->idx + i, offset, next ? next->offset : (s64) len, - &path); + &path, &samples); ppercents[i] = percent; + psamples[i] = samples; if (percent > max_percent) max_percent = percent; } @@ -759,8 +767,13 @@ static int disasm_line__print(struct disasm_line *dl, struct symbol *sym, u64 st for (i = 0; i < nr_percent; i++) { percent = ppercents[i]; + samples = psamples[i]; color = get_percent_color(percent); - color_fprintf(stdout, color, " %7.2f", percent); + + if (symbol_conf.show_total_period) + color_fprintf(stdout, color, " %7.0f", samples); + else + color_fprintf(stdout, color, " %7.2f", percent); } printf(" : "); @@ -770,6 +783,9 @@ static int disasm_line__print(struct disasm_line *dl, struct symbol *sym, u64 st if (ppercents != &percent) free(ppercents); + if (psamples != &samples) + free(psamples); + } else if (max_lines && printed >= max_lines) return 1; else { diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h index cadbdc9..752d1bd 100644 --- a/tools/perf/util/annotate.h +++ b/tools/perf/util/annotate.h @@ -72,7 +72,7 @@ struct disasm_line *disasm__get_next_ip_line(struct list_head *head, struct disa int disasm_line__scnprintf(struct disasm_line *dl, char *bf, size_t size, bool raw); size_t disasm__fprintf(struct list_head *head, FILE *fp); double disasm__calc_percent(struct annotation *notes, int evidx, s64 offset, - s64 end, const char **path); + s64 end, const char **path, double *samples); struct sym_hist { u64 sum; @@ -82,6 +82,7 @@ struct sym_hist { struct source_line_percent { double percent; double percent_sum; + double samples; }; struct source_line { -- 2.1.4