perf block-info: Allow selecting which columns to report and its order

Currently we use a predefined array to set the block info output
formats, it's fixed and inflexible.

This patch adds two parameters "block_hpps" and "nr_hpps" in
block_info__create_report and other static functions, in order to let
user decide which columns to report and with specified report ordering.
It should be more flexible.

Buffers will be allocated to contain the new fmts, of course, we need to
release them before perf exits.

Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jin Yao <yao.jin@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lore.kernel.org/lkml/20200202141655.32053-4-yao.jin@linux.intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 72a12b69f120b959b0d20e6441eb7197e8852f32..d7c905f7520f105c5ff802204c5a380b66ee73bc 100644 (file)
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -104,6 +104,7 @@ struct report {
        bool                    symbol_ipc;
        bool                    total_cycles_mode;
        struct block_report     *block_reports;
+       int                     nr_block_reports;
 };
 
 static int report__config(const char *var, const char *value, void *cb)
@@ -966,8 +967,19 @@ static int __cmd_report(struct report *rep)
        report__output_resort(rep);
 
        if (rep->total_cycles_mode) {
+               int block_hpps[6] = {
+                       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,
+               };
+
                rep->block_reports = block_info__create_report(session->evlist,
-                                                              rep->total_cycles);
+                                                              rep->total_cycles,
+                                                              block_hpps, 6,
+                                                              &rep->nr_block_reports);
                if (!rep->block_reports)
                        return -1;
        }
@@ -1551,8 +1563,11 @@ error:
                zfree(&report.ptime_range);
        }
 
-       if (report.block_reports)
-               zfree(&report.block_reports);
+       if (report.block_reports) {
+               block_info__free_report(report.block_reports,
+                                       report.nr_block_reports);
+               report.block_reports = NULL;
+       }
 
        zstd_fini(&(session->zstd_data));
        perf_session__delete(session);

diff --git a/tools/perf/util/block-info.c b/tools/perf/util/block-info.c
index 25f6422c548b17397fea77c09a5cc06a38dae294..debb8b12cf514415301b333a6ec654fa26687227 100644 (file)
--- a/tools/perf/util/block-info.c
+++ b/tools/perf/util/block-info.c
@@ -373,33 +373,41 @@ static void hpp_register(struct block_fmt *block_fmt, int idx,
 }
 
 static void register_block_columns(struct perf_hpp_list *hpp_list,
-                                  struct block_fmt *block_fmts)
+                                  struct block_fmt *block_fmts,
+                                  int *block_hpps, int nr_hpps)
 {
-       for (int i = 0; i < PERF_HPP_REPORT__BLOCK_MAX_INDEX; i++)
-               hpp_register(&block_fmts[i], i, hpp_list);
+       for (int i = 0; i < nr_hpps; i++)
+               hpp_register(&block_fmts[i], block_hpps[i], hpp_list);
 }
 
-static void init_block_hist(struct block_hist *bh, struct block_fmt *block_fmts)
+static void init_block_hist(struct block_hist *bh, struct block_fmt *block_fmts,
+                           int *block_hpps, int nr_hpps)
 {
        __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);
+       register_block_columns(&bh->block_list, block_fmts,
+                              block_hpps, nr_hpps);
 
-       perf_hpp_list__register_sort_field(&bh->block_list,
-               &block_fmts[PERF_HPP_REPORT__BLOCK_TOTAL_CYCLES_PCT].fmt);
+       /* Sort by the first fmt */
+       perf_hpp_list__register_sort_field(&bh->block_list, &block_fmts[0].fmt);
 }
 
-static void process_block_report(struct hists *hists,
-                                struct block_report *block_report,
-                                u64 total_cycles)
+static int process_block_report(struct hists *hists,
+                               struct block_report *block_report,
+                               u64 total_cycles, int *block_hpps,
+                               int nr_hpps)
 {
        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);
+       if (nr_hpps > PERF_HPP_REPORT__BLOCK_MAX_INDEX)
+               return -1;
+
+       block_report->nr_fmts = nr_hpps;
+       init_block_hist(bh, block_report->fmts, block_hpps, nr_hpps);
 
        while (next) {
                he = rb_entry(next, struct hist_entry, rb_node);
@@ -408,16 +416,19 @@ static void process_block_report(struct hists *hists,
                next = rb_next(&he->rb_node);
        }
 
-       for (int i = 0; i < PERF_HPP_REPORT__BLOCK_MAX_INDEX; i++) {
+       for (int i = 0; i < nr_hpps; 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);
+       return 0;
 }
 
 struct block_report *block_info__create_report(struct evlist *evlist,
-                                              u64 total_cycles)
+                                              u64 total_cycles,
+                                              int *block_hpps, int nr_hpps,
+                                              int *nr_reps)
 {
        struct block_report *block_reports;
        int nr_hists = evlist->core.nr_entries, i = 0;
@@ -430,13 +441,23 @@ struct block_report *block_info__create_report(struct evlist *evlist,
        evlist__for_each_entry(evlist, pos) {
                struct hists *hists = evsel__hists(pos);
 
-               process_block_report(hists, &block_reports[i], total_cycles);
+               process_block_report(hists, &block_reports[i], total_cycles,
+                                    block_hpps, nr_hpps);
                i++;
        }
 
+       *nr_reps = nr_hists;
        return block_reports;
 }
 
+void block_info__free_report(struct block_report *reps, int nr_reps)
+{
+       for (int i = 0; i < nr_reps; i++)
+               hists__delete_entries(&reps[i].hist.block_hists);
+
+       free(reps);
+}
+
 int report__browse_block_hists(struct block_hist *bh, float min_percent,
                               struct evsel *evsel, struct perf_env *env,
                               struct annotation_options *annotation_opts)
@@ -448,13 +469,11 @@ int report__browse_block_hists(struct block_hist *bh, float min_percent,
                symbol_conf.report_individual_block = true;
                hists__fprintf(&bh->block_hists, true, 0, 0, min_percent,
                               stdout, true);
-               hists__delete_entries(&bh->block_hists);
                return 0;
        case 1:
                symbol_conf.report_individual_block = true;
                ret = block_hists_tui_browse(bh, evsel, min_percent,
                                             env, annotation_opts);
-               hists__delete_entries(&bh->block_hists);
                return ret;
        default:
                return -1;

diff --git a/tools/perf/util/block-info.h b/tools/perf/util/block-info.h
index a0fa9fefeaf040439726255aeb577fdabec9ea6e..42e9dcc4cf0ab3584253046d1557036f3f7395e3 100644 (file)
--- a/tools/perf/util/block-info.h
+++ b/tools/perf/util/block-info.h
@@ -45,6 +45,7 @@ struct block_report {
        struct block_hist       hist;
        u64                     cycles;
        struct block_fmt        fmts[PERF_HPP_REPORT__BLOCK_MAX_INDEX];
+       int                     nr_fmts;
 };
 
 struct block_hist;
@@ -70,7 +71,11 @@ 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);
+                                              u64 total_cycles,
+                                              int *block_hpps, int nr_hpps,
+                                              int *nr_reps);
+
+void block_info__free_report(struct block_report *reps, int nr_reps);
 
 int report__browse_block_hists(struct block_hist *bh, float min_percent,
                               struct evsel *evsel, struct perf_env *env,