Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757050Ab2JRX0o (ORCPT ); Thu, 18 Oct 2012 19:26:44 -0400 Received: from mga02.intel.com ([134.134.136.20]:16537 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756611Ab2JRXTy (ORCPT ); Thu, 18 Oct 2012 19:19:54 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,609,1344236400"; d="scan'208";a="229462622" From: Andi Kleen To: a.p.zijlstra@chello.nl Cc: x86@kernel.org, linux-kernel@vger.kernel.org, acme@redhat.com, eranian@google.com, Andi Kleen Subject: [PATCH 12/34] perf, tools: Support sorting by intx, abort branch flags Date: Thu, 18 Oct 2012 16:19:20 -0700 Message-Id: <1350602382-12771-13-git-send-email-andi@firstfloor.org> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1350602382-12771-1-git-send-email-andi@firstfloor.org> References: <1350602382-12771-1-git-send-email-andi@firstfloor.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5602 Lines: 173 From: Andi Kleen Extend the perf branch sorting code to support sorting by intx or abort qualifiers. Also print out those qualifiers. Signed-off-by: Andi Kleen --- 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 a61725d..d46f887 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 ff6db80..3861118 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -1221,7 +1221,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 2762877..15c4f43 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 66cb31f..d918a1a 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 5786f32..10cf155 100644 --- a/tools/perf/util/sort.h +++ b/tools/perf/util/sort.h @@ -100,6 +100,8 @@ enum sort_type { SORT_SYM_TO, SORT_MISPREDICT, SORT_SRCLINE, + SORT_ABORT, + SORT_INTX, }; /* -- 1.7.7.6 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/