perf report: Add "Fractal" mode output - support callchains with relative overhead...

The current callchain displays the overhead rates as absolute:
relative to the total overhead.

This patch provides relative overhead percentage, in which each
branch of the callchain tree is a independant instrumentated object.

This provides a 'fractal' view of the call-chain profile: each
sub-graph looks like a profile in itself - relative to its parent.

You can produce such output by using the "fractal" mode
that you can abbreviate via f, fr, fra, frac, etc...

./perf report -s sym -c fractal

Example:

     8.46%  [k] copy_user_generic_string
                |
                |--52.01%-- generic_file_aio_read
                |          do_sync_read
                |          vfs_read
                |          |
                |          |--97.20%-- sys_pread64
                |          |          system_call_fastpath
                |          |          pread64
                |          |
                |           --2.81%-- sys_read
                |                     system_call_fastpath
                |                     __read
                |
                |--39.85%-- generic_file_buffered_write
                |          __generic_file_aio_write_nolock
                |          generic_file_aio_write
                |          do_sync_write
                |          reiserfs_file_write
                |          vfs_write
                |          |
                |          |--97.05%-- sys_pwrite64
                |          |          system_call_fastpath
                |          |          __pwrite64
                |          |
                |           --2.95%-- sys_write
                |                     system_call_fastpath
                |                     __write_nocancel
[...]

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Anton Blanchard <anton@samba.org>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <1246772361-9960-5-git-send-email-fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 8bd5865..4e5cc26 100644 (file)
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -59,10 +59,15 @@ static regex_t              parent_regex;
 
 static int             exclude_other = 1;
 
-static char            callchain_default_opt[] = "graph,0.5";
+static char            callchain_default_opt[] = "fractal,0.5";
+
 static int             callchain;
-static enum chain_mode callchain_mode;
-static double          callchain_min_percent = 0.5;
+
+static
+struct callchain_param callchain_param = {
+       .mode   = CHAIN_GRAPH_ABS,
+       .min_percent = 0.5
+};
 
 static u64             sample_type;
 
@@ -846,9 +851,15 @@ callchain__fprintf_graph(FILE *fp, struct callchain_node *self,
        struct callchain_node *child;
        struct callchain_list *chain;
        int new_depth_mask = depth_mask;
+       u64 new_total;
        size_t ret = 0;
        int i;
 
+       if (callchain_param.mode == CHAIN_GRAPH_REL)
+               new_total = self->cumul_hit;
+       else
+               new_total = total_samples;
+
        node = rb_first(&self->rb_root);
        while (node) {
                child = rb_entry(node, struct callchain_node, rb_node);
@@ -873,10 +884,10 @@ callchain__fprintf_graph(FILE *fp, struct callchain_node *self,
                                continue;
                        ret += ipchain__fprintf_graph(fp, chain, depth,
                                                      new_depth_mask, i++,
-                                                     total_samples,
+                                                     new_total,
                                                      child->cumul_hit);
                }
-               ret += callchain__fprintf_graph(fp, child, total_samples,
+               ret += callchain__fprintf_graph(fp, child, new_total,
                                                depth + 1,
                                                new_depth_mask | (1 << depth));
                node = next;
@@ -925,13 +936,18 @@ hist_entry_callchain__fprintf(FILE *fp, struct hist_entry *self,
 
                chain = rb_entry(rb_node, struct callchain_node, rb_node);
                percent = chain->hit * 100.0 / total_samples;
-               if (callchain_mode == FLAT) {
+               switch (callchain_param.mode) {
+               case CHAIN_FLAT:
                        ret += percent_color_fprintf(fp, "           %6.2f%%\n",
                                                     percent);
                        ret += callchain__fprintf_flat(fp, chain, total_samples);
-               } else if (callchain_mode == GRAPH) {
+                       break;
+               case CHAIN_GRAPH_ABS: /* Falldown */
+               case CHAIN_GRAPH_REL:
                        ret += callchain__fprintf_graph(fp, chain,
                                                        total_samples, 1, 1);
+               default:
+                       break;
                }
                ret += fprintf(fp, "\n");
                rb_node = rb_next(rb_node);
@@ -1219,14 +1235,9 @@ static void output__insert_entry(struct hist_entry *he, u64 min_callchain_hits)
        struct rb_node *parent = NULL;
        struct hist_entry *iter;
 
-       if (callchain) {
-               if (callchain_mode == FLAT)
-                       sort_chain_flat(&he->sorted_chain, &he->callchain,
-                                       min_callchain_hits);
-               else if (callchain_mode == GRAPH)
-                       sort_chain_graph(&he->sorted_chain, &he->callchain,
-                                        min_callchain_hits);
-       }
+       if (callchain)
+               callchain_param.sort(&he->sorted_chain, &he->callchain,
+                                     min_callchain_hits, &callchain_param);
 
        while (*p != NULL) {
                parent = *p;
@@ -1249,7 +1260,7 @@ static void output__resort(u64 total_samples)
        struct rb_root *tree = &hist;
        u64 min_callchain_hits;
 
-       min_callchain_hits = total_samples * (callchain_min_percent / 100);
+       min_callchain_hits = total_samples * (callchain_param.min_percent / 100);
 
        if (sort__need_collapse)
                tree = &collapse_hists;
@@ -1829,22 +1840,31 @@ parse_callchain_opt(const struct option *opt __used, const char *arg,
 
        /* get the output mode */
        if (!strncmp(tok, "graph", strlen(arg)))
-               callchain_mode = GRAPH;
+               callchain_param.mode = CHAIN_GRAPH_ABS;
 
        else if (!strncmp(tok, "flat", strlen(arg)))
-               callchain_mode = FLAT;
+               callchain_param.mode = CHAIN_FLAT;
+
+       else if (!strncmp(tok, "fractal", strlen(arg)))
+               callchain_param.mode = CHAIN_GRAPH_REL;
+
        else
                return -1;
 
        /* get the min percentage */
        tok = strtok(NULL, ",");
        if (!tok)
-               return 0;
+               goto setup;
 
-       callchain_min_percent = strtod(tok, &endptr);
+       callchain_param.min_percent = strtod(tok, &endptr);
        if (tok == endptr)
                return -1;
 
+setup:
+       if (register_callchain_param(&callchain_param) < 0) {
+               fprintf(stderr, "Can't register callchain params\n");
+               return -1;
+       }
        return 0;
 }
 

diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c
index 5d244af..9d3c814 100644 (file)
--- a/tools/perf/util/callchain.c
+++ b/tools/perf/util/callchain.c
@@ -32,13 +32,14 @@ rb_insert_callchain(struct rb_root *root, struct callchain_node *chain,
                rnode = rb_entry(parent, struct callchain_node, rb_node);
 
                switch (mode) {
-               case FLAT:
+               case CHAIN_FLAT:
                        if (rnode->hit < chain->hit)
                                p = &(*p)->rb_left;
                        else
                                p = &(*p)->rb_right;
                        break;
-               case GRAPH:
+               case CHAIN_GRAPH_ABS: /* Falldown */
+               case CHAIN_GRAPH_REL:
                        if (rnode->cumul_hit < chain->cumul_hit)
                                p = &(*p)->rb_left;
                        else
@@ -53,43 +54,96 @@ rb_insert_callchain(struct rb_root *root, struct callchain_node *chain,
        rb_insert_color(&chain->rb_node, root);
 }
 
+static void
+__sort_chain_flat(struct rb_root *rb_root, struct callchain_node *node,
+                 u64 min_hit)
+{
+       struct callchain_node *child;
+
+       chain_for_each_child(child, node)
+               __sort_chain_flat(rb_root, child, min_hit);
+
+       if (node->hit && node->hit >= min_hit)
+               rb_insert_callchain(rb_root, node, CHAIN_FLAT);
+}
+
 /*
  * Once we get every callchains from the stream, we can now
  * sort them by hit
  */
-void sort_chain_flat(struct rb_root *rb_root, struct callchain_node *node,
-                    u64 min_hit)
+static void
+sort_chain_flat(struct rb_root *rb_root, struct callchain_node *node,
+               u64 min_hit, struct callchain_param *param __used)
+{
+       __sort_chain_flat(rb_root, node, min_hit);
+}
+
+static void __sort_chain_graph_abs(struct callchain_node *node,
+                                  u64 min_hit)
 {
        struct callchain_node *child;
 
-       chain_for_each_child(child, node)
-               sort_chain_flat(rb_root, child, min_hit);
+       node->rb_root = RB_ROOT;
 
-       if (node->hit && node->hit >= min_hit)
-               rb_insert_callchain(rb_root, node, FLAT);
+       chain_for_each_child(child, node) {
+               __sort_chain_graph_abs(child, min_hit);
+               if (child->cumul_hit >= min_hit)
+                       rb_insert_callchain(&node->rb_root, child,
+                                           CHAIN_GRAPH_ABS);
+       }
+}
+
+static void
+sort_chain_graph_abs(struct rb_root *rb_root, struct callchain_node *chain_root,
+                    u64 min_hit, struct callchain_param *param __used)
+{
+       __sort_chain_graph_abs(chain_root, min_hit);
+       rb_root->rb_node = chain_root->rb_root.rb_node;
 }
 
-static void __sort_chain_graph(struct callchain_node *node, u64 min_hit)
+static void __sort_chain_graph_rel(struct callchain_node *node,
+                                  double min_percent)
 {
        struct callchain_node *child;
+       u64 min_hit;
 
        node->rb_root = RB_ROOT;
+       min_hit = node->cumul_hit * min_percent / 100.0;
 
        chain_for_each_child(child, node) {
-               __sort_chain_graph(child, min_hit);
+               __sort_chain_graph_rel(child, min_percent);
                if (child->cumul_hit >= min_hit)
-                       rb_insert_callchain(&node->rb_root, child, GRAPH);
+                       rb_insert_callchain(&node->rb_root, child,
+                                           CHAIN_GRAPH_REL);
        }
 }
 
-void
-sort_chain_graph(struct rb_root *rb_root, struct callchain_node *chain_root,
-                u64 min_hit)
+static void
+sort_chain_graph_rel(struct rb_root *rb_root, struct callchain_node *chain_root,
+                    u64 min_hit __used, struct callchain_param *param)
 {
-       __sort_chain_graph(chain_root, min_hit);
+       __sort_chain_graph_rel(chain_root, param->min_percent);
        rb_root->rb_node = chain_root->rb_root.rb_node;
 }
 
+int register_callchain_param(struct callchain_param *param)
+{
+       switch (param->mode) {
+       case CHAIN_GRAPH_ABS:
+               param->sort = sort_chain_graph_abs;
+               break;
+       case CHAIN_GRAPH_REL:
+               param->sort = sort_chain_graph_rel;
+               break;
+       case CHAIN_FLAT:
+               param->sort = sort_chain_flat;
+               break;
+       default:
+               return -1;
+       }
+       return 0;
+}
+
 /*
  * Create a child for a parent. If inherit_children, then the new child
  * will become the new parent of it's parent children

diff --git a/tools/perf/util/callchain.h b/tools/perf/util/callchain.h
index f3e4776..7812122 100644 (file)
--- a/tools/perf/util/callchain.h
+++ b/tools/perf/util/callchain.h
@@ -7,8 +7,9 @@
 #include "symbol.h"
 
 enum chain_mode {
-       FLAT,
-       GRAPH
+       CHAIN_FLAT,
+       CHAIN_GRAPH_ABS,
+       CHAIN_GRAPH_REL
 };
 
 struct callchain_node {
@@ -23,6 +24,17 @@ struct callchain_node {
        u64                     cumul_hit; /* hit + hits of children */
 };
 
+struct callchain_param;
+
+typedef void (*sort_chain_func_t)(struct rb_root *, struct callchain_node *,
+                                u64, struct callchain_param *);
+
+struct callchain_param {
+       enum chain_mode         mode;
+       double                  min_percent;
+       sort_chain_func_t       sort;
+};
+
 struct callchain_list {
        u64                     ip;
        struct symbol           *sym;
@@ -36,10 +48,7 @@ static inline void callchain_init(struct callchain_node *node)
        INIT_LIST_HEAD(&node->val);
 }
 
+int register_callchain_param(struct callchain_param *param);
 void append_chain(struct callchain_node *root, struct ip_callchain *chain,
                  struct symbol **syms);
-void sort_chain_flat(struct rb_root *rb_root, struct callchain_node *node,
-                    u64 min_hit);
-void sort_chain_graph(struct rb_root *rb_root, struct callchain_node *node,
-                     u64 min_hit);
 #endif