5 files changed, 62 insertions, 0 deletions

diff --git a/tools/perf/Documentation/perf-report.txt b/tools/perf/Documentation/perf-report.txt
index 1a782ef02b68..7b07d19e2d54 100644
--- a/tools/perf/Documentation/perf-report.txt
+++ b/tools/perf/Documentation/perf-report.txt
@@ -81,6 +81,8 @@ OPTIONS
         - cpu: cpu number the task ran at the time of sample
         - srcline: filename and line number executed at the time of sample.  The
         DWARF debugging info must be provided.
+        - srcfile: file name of the source file of the same. Requires dwarf
+        information.
         - weight: Event specific weight, e.g. memory latency or transaction
         abort cost. This is the global weight.
         - local_weight: Local weight version of the weight above.
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 608c0a7fd0f4..6bccfae334b1 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -154,6 +154,9 @@ void hists__calc_col_len(struct hists *hists, struct hist_entry *h)
         if (h->srcline)
                 hists__new_col_len(hists, HISTC_SRCLINE, strlen(h->srcline));
 
+        if (h->srcfile)
+                hists__new_col_len(hists, HISTC_SRCFILE, strlen(h->srcfile));
+
         if (h->transaction)
                 hists__new_col_len(hists, HISTC_TRANSACTION,
                                    hist_entry__transaction_len());
@@ -949,6 +952,8 @@ void hist_entry__delete(struct hist_entry *he)
 
         zfree(&he->stat_acc);
         free_srcline(he->srcline);
+        if (he->srcfile && he->srcfile[0])
+                free(he->srcfile);
         free_callchain(he->callchain);
         free(he);
 }
diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
index e2f712f85d2e..bc528d54e457 100644
--- a/tools/perf/util/hist.h
+++ b/tools/perf/util/hist.h
@@ -30,6 +30,7 @@ enum hist_column {
         HISTC_PARENT,
         HISTC_CPU,
         HISTC_SRCLINE,
+        HISTC_SRCFILE,
         HISTC_MISPREDICT,
         HISTC_IN_TX,
         HISTC_ABORT,
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 5177088a71d3..c0c32b050e45 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -319,6 +319,57 @@ struct sort_entry sort_srcline = {
         .se_width_idx   = HISTC_SRCLINE,
 };
 
+/* --sort srcfile */
+
+static char no_srcfile[1];
+
+static char *get_srcfile(struct hist_entry *e)
+{
+        char *sf, *p;
+        struct map *map = e->ms.map;
+
+        sf = get_srcline(map->dso, map__rip_2objdump(map, e->ip),
+                         e->ms.sym, true);
+        p = strchr(sf, ':');
+        if (p && *sf) {
+                *p = 0;
+                return sf;
+        }
+        free(sf);
+        return no_srcfile;
+}
+
+static int64_t
+sort__srcfile_cmp(struct hist_entry *left, struct hist_entry *right)
+{
+        if (!left->srcfile) {
+                if (!left->ms.map)
+                        left->srcfile = no_srcfile;
+                else
+                        left->srcfile = get_srcfile(left);
+        }
+        if (!right->srcfile) {
+                if (!right->ms.map)
+                        right->srcfile = no_srcfile;
+                else
+                        right->srcfile = get_srcfile(right);
+        }
+        return strcmp(right->srcfile, left->srcfile);
+}
+
+static int hist_entry__srcfile_snprintf(struct hist_entry *he, char *bf,
+                                        size_t size, unsigned int width)
+{
+        return repsep_snprintf(bf, size, "%-*.*s", width, width, he->srcfile);
+}
+
+struct sort_entry sort_srcfile = {
+        .se_header      = "Source File",
+        .se_cmp         = sort__srcfile_cmp,
+        .se_snprintf    = hist_entry__srcfile_snprintf,
+        .se_width_idx   = HISTC_SRCFILE,
+};
+
 /* --sort parent */
 
 static int64_t
@@ -1196,6 +1247,7 @@ static struct sort_dimension common_sort_dimensions[] = {
         DIM(SORT_PARENT, "parent", sort_parent),
         DIM(SORT_CPU, "cpu", sort_cpu),
         DIM(SORT_SRCLINE, "srcline", sort_srcline),
+        DIM(SORT_SRCFILE, "srcfile", sort_srcfile),
         DIM(SORT_LOCAL_WEIGHT, "local_weight", sort_local_weight),
         DIM(SORT_GLOBAL_WEIGHT, "weight", sort_global_weight),
         DIM(SORT_TRANSACTION, "transaction", sort_transaction),
diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h
index bc6c87a76d16..3c2a399f8f5b 100644
--- a/tools/perf/util/sort.h
+++ b/tools/perf/util/sort.h
@@ -114,6 +114,7 @@ struct hist_entry {
                 };
         };
         char                    *srcline;
+        char                    *srcfile;
         struct symbol           *parent;
         struct rb_root          sorted_chain;
         struct branch_info      *branch_info;
@@ -172,6 +173,7 @@ enum sort_type {
         SORT_PARENT,
         SORT_CPU,
         SORT_SRCLINE,
+        SORT_SRCFILE,
         SORT_LOCAL_WEIGHT,
         SORT_GLOBAL_WEIGHT,
         SORT_TRANSACTION,