From: Andi Kleen <a...@linux.intel.com>

Add histogram support for the transaction flags. Each flags instance becomes
a separate histogram. Support sorting and displaying the flags in report
and top.

The patch is fairly large, but it's really mostly just plumbing to pass the
flags around.

Signed-off-by: Andi Kleen <a...@linux.intel.com>
---
 tools/perf/builtin-annotate.c |    2 +-
 tools/perf/builtin-diff.c     |    8 ++++--
 tools/perf/builtin-report.c   |    4 +-
 tools/perf/builtin-top.c      |    4 +-
 tools/perf/util/hist.c        |    3 +-
 tools/perf/util/hist.h        |    3 +-
 tools/perf/util/sort.c        |   50 +++++++++++++++++++++++++++++++++++++++++
 tools/perf/util/sort.h        |    2 +
 8 files changed, 66 insertions(+), 10 deletions(-)

diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index c522367..a6f0ffc 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -62,7 +62,7 @@ static int perf_evsel__add_sample(struct perf_evsel *evsel,
                return 0;
        }
 
-       he = __hists__add_entry(&evsel->hists, al, NULL, 1, 1);
+       he = __hists__add_entry(&evsel->hists, al, NULL, 1, 1, 0);
        if (he == NULL)
                return -ENOMEM;
 
diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c
index 04c1d21..cef8f5c 100644
--- a/tools/perf/builtin-diff.c
+++ b/tools/perf/builtin-diff.c
@@ -31,9 +31,10 @@ struct perf_diff {
 
 static int hists__add_entry(struct hists *self,
                            struct addr_location *al, u64 period,
-                           u64 weight)
+                           u64 weight, u64 transaction)
 {
-       if (__hists__add_entry(self, al, NULL, period, weight) != NULL)
+       if (__hists__add_entry(self, al, NULL, period, weight, transaction)
+           != NULL)
                return 0;
        return -ENOMEM;
 }
@@ -57,7 +58,8 @@ static int diff__process_sample_event(struct perf_tool *tool,
        if (al.filtered || al.sym == NULL)
                return 0;
 
-       if (hists__add_entry(&session->hists, &al, sample->period, 
sample->weight)) {
+       if (hists__add_entry(&session->hists, &al, sample->period, 
sample->weight,
+                            sample->transaction)) {
                pr_warning("problem incrementing symbol period, skipping 
event\n");
                return -1;
        }
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 2c73578..b22a905 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -147,7 +147,7 @@ static int perf_evsel__add_hist_entry(struct perf_evsel 
*evsel,
        }
 
        he = __hists__add_entry(&evsel->hists, al, parent, sample->period,
-                                       sample->weight);
+                               sample->weight, sample->transaction);
        if (he == NULL)
                return -ENOMEM;
 
@@ -596,7 +596,7 @@ int cmd_report(int argc, const char **argv, const char 
*prefix __used)
        OPT_STRING('s', "sort", &sort_order, "key[,key2...]",
                   "sort by key(s): pid, comm, dso, symbol, parent, dso_to,"
                   " dso_from, symbol_to, symbol_from, mispredict, srcline,"
-                  " abort, intx,  weight, global_weight"),
+                  " abort, intx,  weight, global_weight, transaction"),
        OPT_BOOLEAN(0, "showcpuutilization", &symbol_conf.show_cpu_utilization,
                    "Show sample percentage for different cpu modes"),
        OPT_STRING('p', "parent", &parent_pattern, "regex",
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index ee37ddc..5e44f7c 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -270,7 +270,7 @@ static struct hist_entry *perf_evsel__add_hist_entry(struct 
perf_evsel *evsel,
        struct hist_entry *he;
 
        he = __hists__add_entry(&evsel->hists, al, NULL, sample->period,
-                               sample->weight);
+                               sample->weight, sample->transaction);
        if (he == NULL)
                return NULL;
 
@@ -1230,7 +1230,7 @@ int cmd_top(int argc, const char **argv, const char 
*prefix __used)
        OPT_STRING('s', "sort", &sort_order, "key[,key2...]",
                   "sort by key(s): pid, comm, dso, symbol, parent, dso_to,"
                   " dso_from, symbol_to, symbol_from, mispredict, srcline,"
-                  " abort, intx, weight, global_weight"),
+                  " abort, intx, weight, global_weight, transaction"),
        OPT_BOOLEAN('n', "show-nr-samples", &symbol_conf.show_nr_samples,
                    "Show a column with the number of samples"),
        OPT_CALLBACK_DEFAULT('G', "call-graph", &top, "output_type,min_percent, 
call_order",
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 566badc..072b418 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -323,7 +323,7 @@ struct hist_entry *__hists__add_branch_entry(struct hists 
*self,
 struct hist_entry *__hists__add_entry(struct hists *self,
                                      struct addr_location *al,
                                      struct symbol *sym_parent, u64 period,
-                                     u64 weight)
+                                     u64 weight, u64 transaction)
 {
        struct hist_entry entry = {
                .thread = al->thread,
@@ -337,6 +337,7 @@ struct hist_entry *__hists__add_entry(struct hists *self,
                .period = period,
                .parent = sym_parent,
                .filtered = symbol__parent_filter(sym_parent),
+               .transaction = transaction,
        };
 
        return add_hist_entry(self, &entry, al, period, weight);
diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
index a02d068..ab6e262 100644
--- a/tools/perf/util/hist.h
+++ b/tools/perf/util/hist.h
@@ -52,6 +52,7 @@ enum hist_column {
        HISTC_SRCLINE,
        HISTC_WEIGHT,
        HISTC_GLOBAL_WEIGHT,
+       HISTC_TRANSACTION,
        HISTC_NR_COLS, /* Last entry */
 };
 
@@ -77,7 +78,7 @@ struct hists {
 struct hist_entry *__hists__add_entry(struct hists *self,
                                      struct addr_location *al,
                                      struct symbol *parent, u64 period,
-                                     u64 weight);
+                                     u64 weight, u64 transaction);
 int64_t hist_entry__cmp(struct hist_entry *left, struct hist_entry *right);
 int64_t hist_entry__collapse(struct hist_entry *left, struct hist_entry 
*right);
 int hist_entry__snprintf(struct hist_entry *self, char *bf, size_t size,
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 0fcbbcd..258174e 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -559,6 +559,55 @@ struct sort_entry sort_global_weight = {
        .se_width_idx   = HISTC_GLOBAL_WEIGHT,
 };
 
+static int64_t
+sort__transaction_cmp(struct hist_entry *left, struct hist_entry *right)
+{
+       return left->transaction - right->transaction;
+}
+
+static inline char *add_str(char *p, const char *str)
+{
+       strcpy(p, str);
+       return p + strlen(str);
+}
+
+static int hist_entry__transaction_snprintf(struct hist_entry *self, char *bf,
+                                   size_t size, unsigned int width)
+{
+       u64 t = self->transaction;
+       char buf[128];
+       char *p = buf;
+
+       if (t & PERF_SAMPLE_TXN_ELISION)
+               *p++ = 'E';
+       if (t & PERF_SAMPLE_TXN_TRANSACTION)
+               *p++ = 'T';
+       if (t & PERF_SAMPLE_TXN_SYNC)
+               *p++ = 'I';
+       if (t & PERF_SAMPLE_TXN_RETRY)
+               *p++ = 'R';
+       *p = 0;
+       if (t & PERF_SAMPLE_TXN_CONFLICT)
+               p = add_str(p, ":con");
+       if (t & PERF_SAMPLE_TXN_CONFLICT)
+               p = add_str(p, ":cap");
+       if (t & PERF_SAMPLE_TXN_ABORT_MASK) {
+               sprintf(p, ":%" PRIx64,
+                       (t & PERF_SAMPLE_TXN_ABORT_MASK) >>
+                       PERF_SAMPLE_TXN_ABORT_SHIFT);
+               p += strlen(p);
+       }
+
+       return repsep_snprintf(bf, size, "%-*s", width, buf);
+}
+
+struct sort_entry sort_transaction = {
+       .se_header      = "Transaction",
+       .se_cmp         = sort__transaction_cmp,
+       .se_snprintf    = hist_entry__transaction_snprintf,
+       .se_width_idx   = HISTC_TRANSACTION,
+};
+
 struct sort_dimension {
        const char              *name;
        struct sort_entry       *entry;
@@ -584,6 +633,7 @@ static struct sort_dimension sort_dimensions[] = {
        DIM(SORT_INTX, "intx", sort_intx),
        DIM(SORT_WEIGHT, "weight", sort_weight),
        DIM(SORT_GLOBAL_WEIGHT, "global_weight", sort_global_weight),
+       DIM(SORT_TRANSACTION, "transaction", sort_transaction),
 };
 
 int sort_dimension__add(const char *tok)
diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h
index 8b2c5ae..1a74418 100644
--- a/tools/perf/util/sort.h
+++ b/tools/perf/util/sort.h
@@ -61,6 +61,7 @@ struct hist_entry {
        struct thread           *thread;
        u64                     ip;
        u64                     weight;
+       u64                     transaction;
        s32                     cpu;
        u32                     nr_events;
 
@@ -100,6 +101,7 @@ enum sort_type {
        SORT_INTX,
        SORT_WEIGHT,
        SORT_GLOBAL_WEIGHT,
+       SORT_TRANSACTION,
 };
 
 /*
-- 
1.7.7.6

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to