10 files changed, 525 insertions, 10 deletions

diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index a97fbbe6b3b3..181389535c0c 100644
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -91,6 +91,7 @@ struct perf_sample {
         u64 weight;
         u32 cpu;
         u32 raw_size;
+        u64 data_src;
         void *raw_data;
         struct ip_callchain *callchain;
         struct branch_stack *branch_stack;
@@ -98,6 +99,13 @@ struct perf_sample {
         struct stack_dump user_stack;
 };
 
+#define PERF_MEM_DATA_SRC_NONE \
+        (PERF_MEM_S(OP, NA) |\
+         PERF_MEM_S(LVL, NA) |\
+         PERF_MEM_S(SNOOP, NA) |\
+         PERF_MEM_S(LOCK, NA) |\
+         PERF_MEM_S(TLB, NA))
+
 struct build_id_event {
         struct perf_event_header header;
         pid_t                    pid;
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 23061a6ccd77..5c4ca51c8f7b 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -1177,6 +1177,12 @@ int perf_evsel__parse_sample(struct perf_evsel *evsel, union perf_event *event,
                 array++;
         }
 
+        data->data_src = PERF_MEM_DATA_SRC_NONE;
+        if (type & PERF_SAMPLE_DATA_SRC) {
+                data->data_src = *array;
+                array++;
+        }
+
         return 0;
 }
 
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 97ddd18acd7c..99cc719ce736 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -67,12 +67,16 @@ static void hists__set_unres_dso_col_len(struct hists *hists, int dso)
 void hists__calc_col_len(struct hists *hists, struct hist_entry *h)
 {
         const unsigned int unresolved_col_width = BITS_PER_LONG / 4;
+        int symlen;
         u16 len;
 
         if (h->ms.sym)
                 hists__new_col_len(hists, HISTC_SYMBOL, h->ms.sym->namelen + 4);
-        else
+        else {
+                symlen = unresolved_col_width + 4 + 2;
+                hists__new_col_len(hists, HISTC_SYMBOL, symlen);
                 hists__set_unres_dso_col_len(hists, HISTC_DSO);
+        }
 
         len = thread__comm_len(h->thread);
         if (hists__new_col_len(hists, HISTC_COMM, len))
@@ -87,7 +91,6 @@ void hists__calc_col_len(struct hists *hists, struct hist_entry *h)
                 hists__new_col_len(hists, HISTC_PARENT, h->parent->namelen);
 
         if (h->branch_info) {
-                int symlen;
                 /*
                  * +4 accounts for '[x] ' priv level info
                  * +2 account of 0x prefix on raw addresses
@@ -116,6 +119,42 @@ void hists__calc_col_len(struct hists *hists, struct hist_entry *h)
                         hists__set_unres_dso_col_len(hists, HISTC_DSO_TO);
                 }
         }
+
+        if (h->mem_info) {
+                /*
+                 * +4 accounts for '[x] ' priv level info
+                 * +2 account of 0x prefix on raw addresses
+                 */
+                if (h->mem_info->daddr.sym) {
+                        symlen = (int)h->mem_info->daddr.sym->namelen + 4
+                               + unresolved_col_width + 2;
+                        hists__new_col_len(hists, HISTC_MEM_DADDR_SYMBOL,
+                                           symlen);
+                } else {
+                        symlen = unresolved_col_width + 4 + 2;
+                        hists__new_col_len(hists, HISTC_MEM_DADDR_SYMBOL,
+                                           symlen);
+                }
+                if (h->mem_info->daddr.map) {
+                        symlen = dso__name_len(h->mem_info->daddr.map->dso);
+                        hists__new_col_len(hists, HISTC_MEM_DADDR_DSO,
+                                           symlen);
+                } else {
+                        symlen = unresolved_col_width + 4 + 2;
+                        hists__set_unres_dso_col_len(hists, HISTC_MEM_DADDR_DSO);
+                }
+        } else {
+                symlen = unresolved_col_width + 4 + 2;
+                hists__new_col_len(hists, HISTC_MEM_DADDR_SYMBOL, symlen);
+                hists__set_unres_dso_col_len(hists, HISTC_MEM_DADDR_DSO);
+        }
+
+        hists__new_col_len(hists, HISTC_MEM_LOCKED, 6);
+        hists__new_col_len(hists, HISTC_MEM_TLB, 22);
+        hists__new_col_len(hists, HISTC_MEM_SNOOP, 12);
+        hists__new_col_len(hists, HISTC_MEM_LVL, 21 + 3);
+        hists__new_col_len(hists, HISTC_LOCAL_WEIGHT, 12);
+        hists__new_col_len(hists, HISTC_GLOBAL_WEIGHT, 12);
 }
 
 void hists__output_recalc_col_len(struct hists *hists, int max_rows)
@@ -158,6 +197,7 @@ static void hist_entry__add_cpumode_period(struct hist_entry *he,
 static void he_stat__add_period(struct he_stat *he_stat, u64 period,
                                 u64 weight)
 {
+
         he_stat->period         += period;
         he_stat->weight         += weight;
         he_stat->nr_events      += 1;
@@ -243,7 +283,7 @@ void hists__decay_entries_threaded(struct hists *hists,
 static struct hist_entry *hist_entry__new(struct hist_entry *template)
 {
         size_t callchain_size = symbol_conf.use_callchain ? sizeof(struct callchain_root) : 0;
-        struct hist_entry *he = malloc(sizeof(*he) + callchain_size);
+        struct hist_entry *he = zalloc(sizeof(*he) + callchain_size);
 
         if (he != NULL) {
                 *he = *template;
@@ -258,6 +298,13 @@ static struct hist_entry *hist_entry__new(struct hist_entry *template)
                                 he->branch_info->to.map->referenced = true;
                 }
 
+                if (he->mem_info) {
+                        if (he->mem_info->iaddr.map)
+                                he->mem_info->iaddr.map->referenced = true;
+                        if (he->mem_info->daddr.map)
+                                he->mem_info->daddr.map->referenced = true;
+                }
+
                 if (symbol_conf.use_callchain)
                         callchain_init(he->callchain);
 
@@ -346,6 +393,36 @@ out_unlock:
         return he;
 }
 
+struct hist_entry *__hists__add_mem_entry(struct hists *self,
+                                          struct addr_location *al,
+                                          struct symbol *sym_parent,
+                                          struct mem_info *mi,
+                                          u64 period,
+                                          u64 weight)
+{
+        struct hist_entry entry = {
+                .thread = al->thread,
+                .ms = {
+                        .map    = al->map,
+                        .sym    = al->sym,
+                },
+                .stat = {
+                        .period = period,
+                        .weight = weight,
+                        .nr_events = 1,