From: Andi Kleen <andi@firstfloor.org>
To: linux-kernel@vger.kernel.org
Cc: acme@redhat.com, x86@vger.kernel.org, eranian@google.com,
jolsa@redhat.com, a.p.zijlstra@chello.nl,
Andi Kleen <ak@linux.intel.com>
Subject: [PATCH 12/31] perf, tools: Support sorting by intx, abort branch flags
Date: Tue, 2 Oct 2012 16:48:32 -0700 [thread overview]
Message-ID: <1349221731-15665-13-git-send-email-andi@firstfloor.org> (raw)
In-Reply-To: <1349221731-15665-1-git-send-email-andi@firstfloor.org>
From: Andi Kleen <ak@linux.intel.com>
Extend the perf branch sorting code to support sorting by intx
or abort qualifiers. Also print out those qualifiers.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
tools/perf/builtin-report.c | 3 +-
tools/perf/builtin-top.c | 4 ++-
tools/perf/perf.h | 4 ++-
tools/perf/util/hist.h | 2 +
tools/perf/util/sort.c | 55 +++++++++++++++++++++++++++++++++++++++++++
tools/perf/util/sort.h | 2 +
6 files changed, 67 insertions(+), 3 deletions(-)
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 1da243d..d93094f 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -595,7 +595,8 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused)
"Use the stdio interface"),
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"),
+ " dso_from, symbol_to, symbol_from, mispredict, srcline,"
+ " abort, intx"),
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 e434a16..8853a24 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -1226,7 +1226,9 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)
OPT_INCR('v', "verbose", &verbose,
"be more verbose (show counter open errors, etc)"),
OPT_STRING('s', "sort", &sort_order, "key[,key2...]",
- "sort by key(s): pid, comm, dso, symbol, parent"),
+ "sort by key(s): pid, comm, dso, symbol, parent, dso_to,"
+ " dso_from, symbol_to, symbol_from, mispredict, srcline,"
+ " abort, intx"),
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/perf.h b/tools/perf/perf.h
index a89cbbb..28ccb6b 100644
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -194,7 +194,9 @@ struct ip_callchain {
struct branch_flags {
u64 mispred:1;
u64 predicted:1;
- u64 reserved:62;
+ u64 intx:1;
+ u64 abort:1;
+ u64 reserved:60;
};
struct branch_entry {
diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
index f011ad4..12ff7b9 100644
--- a/tools/perf/util/hist.h
+++ b/tools/perf/util/hist.h
@@ -43,6 +43,8 @@ enum hist_column {
HISTC_PARENT,
HISTC_CPU,
HISTC_MISPREDICT,
+ HISTC_INTX,
+ HISTC_ABORT,
HISTC_SYMBOL_FROM,
HISTC_SYMBOL_TO,
HISTC_DSO_FROM,
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index b5b1b92..47fc0f2 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -470,6 +470,55 @@ struct sort_entry sort_mispredict = {
.se_width_idx = HISTC_MISPREDICT,
};
+static int64_t
+sort__abort_cmp(struct hist_entry *left, struct hist_entry *right)
+{
+ return left->branch_info->flags.abort !=
+ right->branch_info->flags.abort;
+}
+
+static int hist_entry__abort_snprintf(struct hist_entry *self, char *bf,
+ size_t size, unsigned int width)
+{
+ static const char *out = ".";
+
+ if (self->branch_info->flags.abort)
+ out = "A";
+ return repsep_snprintf(bf, size, "%-*s", width, out);
+}
+
+struct sort_entry sort_abort = {
+ .se_header = "Transaction abort",
+ .se_cmp = sort__abort_cmp,
+ .se_snprintf = hist_entry__abort_snprintf,
+ .se_width_idx = HISTC_ABORT,
+};
+
+static int64_t
+sort__intx_cmp(struct hist_entry *left, struct hist_entry *right)
+{
+ return left->branch_info->flags.intx !=
+ right->branch_info->flags.intx;
+}
+
+static int hist_entry__intx_snprintf(struct hist_entry *self, char *bf,
+ size_t size, unsigned int width)
+{
+ static const char *out = ".";
+
+ if (self->branch_info->flags.intx)
+ out = "T";
+
+ return repsep_snprintf(bf, size, "%-*s", width, out);
+}
+
+struct sort_entry sort_intx = {
+ .se_header = "Branch in transaction",
+ .se_cmp = sort__intx_cmp,
+ .se_snprintf = hist_entry__intx_snprintf,
+ .se_width_idx = HISTC_INTX,
+};
+
struct sort_dimension {
const char *name;
struct sort_entry *entry;
@@ -491,6 +540,8 @@ static struct sort_dimension sort_dimensions[] = {
DIM(SORT_CPU, "cpu", sort_cpu),
DIM(SORT_MISPREDICT, "mispredict", sort_mispredict),
DIM(SORT_SRCLINE, "srcline", sort_srcline),
+ DIM(SORT_ABORT, "abort", sort_abort),
+ DIM(SORT_INTX, "intx", sort_intx)
};
int sort_dimension__add(const char *tok)
@@ -547,6 +598,10 @@ int sort_dimension__add(const char *tok)
sort__first_dimension = SORT_DSO_TO;
else if (!strcmp(sd->name, "mispredict"))
sort__first_dimension = SORT_MISPREDICT;
+ else if (!strcmp(sd->name, "intx"))
+ sort__first_dimension = SORT_INTX;
+ else if (!strcmp(sd->name, "abort"))
+ sort__first_dimension = SORT_ABORT;
}
list_add_tail(&sd->entry->list, &hist_entry__sort_list);
diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h
index 12d6347..76774df 100644
--- a/tools/perf/util/sort.h
+++ b/tools/perf/util/sort.h
@@ -95,6 +95,8 @@ enum sort_type {
SORT_SYM_TO,
SORT_MISPREDICT,
SORT_SRCLINE,
+ SORT_ABORT,
+ SORT_INTX,
};
/*
--
1.7.7.6
next prev parent reply other threads:[~2012-10-02 23:51 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-02 23:48 perf PMU support for Haswell v2 Andi Kleen
2012-10-02 23:48 ` [PATCH 01/31] perf, x86: Add PEBSv2 record support Andi Kleen
2012-10-02 23:48 ` [PATCH 02/31] perf, x86: Basic Haswell PMU support v2 Andi Kleen
2012-10-02 23:48 ` [PATCH 03/31] perf, x86: Basic Haswell PEBS support Andi Kleen
2012-10-02 23:48 ` [PATCH 04/31] perf, x86: Support the TSX intx/intx_cp qualifiers Andi Kleen
2012-10-02 23:48 ` [PATCH 05/31] perf, x86: Report PEBS event in a raw format Andi Kleen
2012-10-02 23:48 ` [PATCH 06/31] perf, kvm: Support the intx/intx_cp modifiers in KVM arch perfmon emulation Andi Kleen
2012-10-03 10:27 ` Avi Kivity
2012-10-03 12:11 ` Andi Kleen
2012-10-03 12:54 ` Avi Kivity
2012-10-04 9:10 ` [06/31] " Gleb Natapov
2012-10-02 23:48 ` [PATCH 07/31] perf, x86: Support PERF_SAMPLE_ADDR on Haswell Andi Kleen
2012-10-02 23:48 ` [PATCH 08/31] perf, x86: Support Haswell v4 LBR format Andi Kleen
2012-10-02 23:48 ` [PATCH 09/31] perf, x86: Disable LBR recording for unknown LBR_FMT Andi Kleen
2012-10-02 23:48 ` [PATCH 10/31] perf, x86: Support LBR filtering by INTX/NOTX/ABORT Andi Kleen
2012-10-02 23:48 ` [PATCH 11/31] perf, tools: Add abort,notx,intx branch filter options to perf report -j Andi Kleen
2012-10-02 23:48 ` Andi Kleen [this message]
2012-10-02 23:48 ` [PATCH 13/31] perf, x86: Support full width counting on Haswell Andi Kleen
2012-10-02 23:48 ` [PATCH 14/31] perf, x86: Avoid checkpointed counters causing excessive TSX aborts Andi Kleen
2012-10-02 23:48 ` [PATCH 15/31] perf, core: Add a concept of a weightened sample Andi Kleen
2012-10-02 23:48 ` [PATCH 16/31] perf, x86: Support weight samples for PEBS Andi Kleen
2012-10-02 23:48 ` [PATCH 17/31] perf, tools: Add support for weight Andi Kleen
2012-10-02 23:48 ` [PATCH 18/31] perf, tools: Handle XBEGIN like a jump Andi Kleen
2012-10-02 23:48 ` [PATCH 19/31] perf, x86: Support for printing PMU state on spurious PMIs v2 Andi Kleen
2012-10-02 23:48 ` [PATCH 20/31] perf, core: Add generic transaction flags Andi Kleen
2012-10-02 23:48 ` [PATCH 21/31] perf, x86: Add Haswell specific transaction flag reporting Andi Kleen
2012-10-02 23:48 ` [PATCH 22/31] perf, tools: Add support for record transaction flags Andi Kleen
2012-10-02 23:48 ` [PATCH 23/31] perf, tools: Point --sort documentation to --help Andi Kleen
2012-10-02 23:48 ` [PATCH 24/31] perf, tools: Add browser support for transaction flags Andi Kleen
2012-10-02 23:48 ` [PATCH 25/31] perf, tools: Move parse_events error printing to parse_events_options Andi Kleen
2012-10-02 23:48 ` [PATCH 26/31] perf, tools: Support events with - in the name Andi Kleen
2012-10-02 23:48 ` [PATCH 27/31] perf, x86: Report the arch perfmon events in sysfs Andi Kleen
2012-10-02 23:48 ` [PATCH 28/31] tools, perf: Add a precise event qualifier Andi Kleen
2012-10-02 23:48 ` [PATCH 29/31] perf, x86: Add Haswell TSX event aliases Andi Kleen
2012-10-02 23:48 ` [PATCH 30/31] perf, tools: Add perf stat --transaction Andi Kleen
2012-10-02 23:48 ` [PATCH 31/31] perf, x86: Add a Haswell precise instructions event Andi Kleen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1349221731-15665-13-git-send-email-andi@firstfloor.org \
--to=andi@firstfloor.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=ak@linux.intel.com \
--cc=eranian@google.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=x86@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®