6 files changed, 101 insertions, 1 deletions

diff --git a/tools/perf/Documentation/perf-report.txt b/tools/perf/Documentation/perf-report.txt
index 496d42cdf02b..9cbddc290aff 100644
--- a/tools/perf/Documentation/perf-report.txt
+++ b/tools/perf/Documentation/perf-report.txt
@@ -103,12 +103,13 @@ OPTIONS
 
         If --branch-stack option is used, following sort keys are also
         available:
-        dso_from, dso_to, symbol_from, symbol_to, mispredict.
 
         - dso_from: name of library or module branched from
         - dso_to: name of library or module branched to
         - symbol_from: name of function branched from
         - symbol_to: name of function branched to
+        - srcline_from: source file and line branched from
+        - srcline_to: source file and line branched to
         - mispredict: "N" for predicted branch, "Y" for mispredicted branch
         - in_tx: branch in TSX transaction
         - abort: TSX transaction abort.
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index cfab531437c7..d1f19e0012d4 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -117,6 +117,13 @@ void hists__calc_col_len(struct hists *hists, struct hist_entry *h)
                         hists__new_col_len(hists, HISTC_SYMBOL_TO, symlen);
                         hists__set_unres_dso_col_len(hists, HISTC_DSO_TO);
                 }
+
+                if (h->branch_info->srcline_from)
+                        hists__new_col_len(hists, HISTC_SRCLINE_FROM,
+                                        strlen(h->branch_info->srcline_from));
+                if (h->branch_info->srcline_to)
+                        hists__new_col_len(hists, HISTC_SRCLINE_TO,
+                                        strlen(h->branch_info->srcline_to));
         }
 
         if (h->mem_info) {
@@ -1042,6 +1049,8 @@ void hist_entry__delete(struct hist_entry *he)
         if (he->branch_info) {
                 map__zput(he->branch_info->from.map);
                 map__zput(he->branch_info->to.map);
+                free_srcline(he->branch_info->srcline_from);
+                free_srcline(he->branch_info->srcline_to);
                 zfree(&he->branch_info);
         }
 
diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
index 0f84bfb42bb1..7b54ccf1b737 100644
--- a/tools/perf/util/hist.h
+++ b/tools/perf/util/hist.h
@@ -52,6 +52,8 @@ enum hist_column {
         HISTC_MEM_IADDR_SYMBOL,
         HISTC_TRANSACTION,
         HISTC_CYCLES,
+        HISTC_SRCLINE_FROM,
+        HISTC_SRCLINE_TO,
         HISTC_TRACE,
         HISTC_NR_COLS, /* Last entry */
 };
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 20e69edd5006..c4e9bd70723c 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -353,6 +353,88 @@ struct sort_entry sort_srcline = {
         .se_width_idx   = HISTC_SRCLINE,
 };
 
+/* --sort srcline_from */
+
+static int64_t
+sort__srcline_from_cmp(struct hist_entry *left, struct hist_entry *right)
+{
+        if (!left->branch_info->srcline_from) {
+                struct map *map = left->branch_info->from.map;
+                if (!map)
+                        left->branch_info->srcline_from = SRCLINE_UNKNOWN;
+                else
+                        left->branch_info->srcline_from = get_srcline(map->dso,
+                                           map__rip_2objdump(map,
+                                                             left->branch_info->from.al_addr),
+                                                         left->branch_info->from.sym, true);
+        }
+        if (!right->branch_info->srcline_from) {
+                struct map *map = right->branch_info->from.map;
+                if (!map)
+                        right->branch_info->srcline_from = SRCLINE_UNKNOWN;
+                else
+                        right->branch_info->srcline_from = get_srcline(map->dso,
+                                             map__rip_2objdump(map,
+                                                               right->branch_info->from.al_addr),
+                                                     right->branch_info->from.sym, true);
+        }
+        return strcmp(right->branch_info->srcline_from, left->branch_info->srcline_from);
+}
+
+static int hist_entry__srcline_from_snprintf(struct hist_entry *he, char *bf,
+                                        size_t size, unsigned int width)
+{
+        return repsep_snprintf(bf, size, "%-*.*s", width, width, he->branch_info->srcline_from);
+}
+
+struct sort_entry sort_srcline_from = {
+        .se_header      = "From Source:Line",
+        .se_cmp         = sort__srcline_from_cmp,
+        .se_snprintf    = hist_entry__srcline_from_snprintf,
+        .se_width_idx   = HISTC_SRCLINE_FROM,
+};
+
+/* --sort srcline_to */
+
+static int64_t
+sort__srcline_to_cmp(struct hist_entry *left, struct hist_entry *right)
+{
+        if (!left->branch_info->srcline_to) {
+                struct map *map = left->branch_info->to.map;
+                if (!map)
+                        left->branch_info->srcline_to = SRCLINE_UNKNOWN;
+                else
+                        left->branch_info->srcline_to = get_srcline(map->dso,
+                                           map__rip_2objdump(map,
+                                                             left->branch_info->to.al_addr),
+                                                         left->branch_info->from.sym, true);
+        }
+        if (!right->branch_info->srcline_to) {
+                struct map *map = right->branch_info->to.map;
+                if (!map)
+                        right->branch_info->srcline_to = SRCLINE_UNKNOWN;
+                else
+                        right->branch_info->srcline_to = get_srcline(map->dso,
+                                             map__rip_2objdump(map,
+                                                               right->branch_info->to.al_addr),
+                                                     right->branch_info->to.sym, true);
+        }
+        return strcmp(right->branch_info->srcline_to, left->branch_info->srcline_to);
+}
+
+static int hist_entry__srcline_to_snprintf(struct hist_entry *he, char *bf,
+                                        size_t size, unsigned int width)
+{
+        return repsep_snprintf(bf, size, "%-*.*s", width, width, he->branch_info->srcline_to);
+}
+
+struct sort_entry sort_srcline_to = {
+        .se_header      = "To Source:Line",
+        .se_cmp         = sort__srcline_to_cmp,
+        .se_snprintf    = hist_entry__srcline_to_snprintf,
+        .se_width_idx   = HISTC_SRCLINE_TO,
+};
+
 /* --sort srcfile */
 
 static char no_srcfile[1];
@@ -1347,6 +1429,8 @@ static struct sort_dimension bstack_sort_dimensions[] = {
         DIM(SORT_IN_TX, "in_tx", sort_in_tx),
         DIM(SORT_ABORT, "abort", sort_abort),
         DIM(SORT_CYCLES, "cycles", sort_cycles),
+        DIM(SORT_SRCLINE_FROM, "srcline_from", sort_srcline_from),
+        DIM(SORT_SRCLINE_TO, "srcline_to", sort_srcline_to),
 };
 
 #undef DIM
diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h
index 42927f448bcb..ebb59cacd092 100644
--- a/tools/perf/util/sort.h
+++ b/tools/perf/util/sort.h
@@ -215,6 +215,8 @@ enum sort_type {
         SORT_ABORT,
         SORT_IN_TX,
         SORT_CYCLES,
+        SORT_SRCLINE_FROM,
+        SORT_SRCLINE_TO,
 
         /* memory mode specific sort keys */
         __SORT_MEMORY_MODE,
diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
index fa415347dbf9..b10d558a8803 100644
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -186,6 +186,8 @@ struct branch_info {
         struct addr_map_symbol from;
         struct addr_map_symbol to;
         struct branch_flags flags;
+        char                    *srcline_from;
+        char                    *srcline_to;
 };
 
 struct mem_info {