From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
Don Zickus <dzickus@redhat.com>, Joe Mario <jmario@redhat.com>,
Ingo Molnar <mingo@kernel.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Namhyung Kim <namhyung@kernel.org>,
David Ahern <dsahern@gmail.com>, Andi Kleen <andi@firstfloor.org>
Subject: [PATCH 16/61] perf c2c report: Add dimension support
Date: Mon, 19 Sep 2016 15:09:25 +0200 [thread overview]
Message-ID: <1474290610-23241-17-git-send-email-jolsa@kernel.org> (raw)
In-Reply-To: <1474290610-23241-1-git-send-email-jolsa@kernel.org>
Adding bare bones of dimension support for c2c report.
Main interface functions are:
c2c_hists__init
c2c_hists__reinit
which re/initialize 'struct c2c_hists' object with
sort/display entries string, in a similar way that
setup_sorting function does.
We overload the dimension to provide multi line
header support for sort/display entries.
Also we overload base 'struct perf_hpp_fmt' object
with 'struct c2c_fmt' to define c2c specific functions
to deal with multi line headers and spans.
Link: http://lkml.kernel.org/n/tip-yg8p7bc8p7grxg4eifs2als2@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/builtin-c2c.c | 239 ++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 238 insertions(+), 1 deletion(-)
diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c
index 3fac3a294bdd..63c0e2d8d2d8 100644
--- a/tools/perf/builtin-c2c.c
+++ b/tools/perf/builtin-c2c.c
@@ -10,8 +10,14 @@
#include "tool.h"
#include "data.h"
+struct c2c_hists {
+ struct hists hists;
+ struct perf_hpp_list list;
+};
+
struct perf_c2c {
- struct perf_tool tool;
+ struct perf_tool tool;
+ struct c2c_hists hists;
};
static struct perf_c2c c2c;
@@ -28,6 +34,231 @@ static const char * const __usage_report[] = {
static const char * const *report_c2c_usage = __usage_report;
+#define C2C_HEADER_MAX 2
+
+struct c2c_header {
+ struct {
+ const char *text;
+ int span;
+ } line[C2C_HEADER_MAX];
+};
+
+struct c2c_dimension {
+ struct c2c_header header;
+ const char *name;
+ int width;
+
+ int64_t (*cmp)(struct perf_hpp_fmt *fmt,
+ struct hist_entry *, struct hist_entry *);
+ int (*entry)(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,
+ struct hist_entry *he);
+ int (*color)(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,
+ struct hist_entry *he);
+};
+
+struct c2c_fmt {
+ struct perf_hpp_fmt fmt;
+ struct c2c_dimension *dim;
+};
+
+static int c2c_width(struct perf_hpp_fmt *fmt,
+ struct perf_hpp *hpp __maybe_unused,
+ struct hists *hists __maybe_unused)
+{
+ struct c2c_fmt *c2c_fmt;
+
+ c2c_fmt = container_of(fmt, struct c2c_fmt, fmt);
+ return c2c_fmt->dim->width;
+}
+
+static int c2c_header(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,
+ struct hists *hists __maybe_unused, int line, int *span)
+{
+ struct c2c_fmt *c2c_fmt;
+ struct c2c_dimension *dim;
+ int len = c2c_width(fmt, hpp, hists);
+ const char *text;
+
+ c2c_fmt = container_of(fmt, struct c2c_fmt, fmt);
+ dim = c2c_fmt->dim;
+
+ text = dim->header.line[line].text;
+ if (text == NULL)
+ text = "";
+
+ if (*span) {
+ (*span)--;
+ return 0;
+ } else {
+ *span = dim->header.line[line].span;
+ }
+
+ return scnprintf(hpp->buf, hpp->size, "%*s", len, text);
+}
+
+static struct c2c_dimension *dimensions[] = {
+ NULL,
+};
+
+static void fmt_free(struct perf_hpp_fmt *fmt)
+{
+ struct c2c_fmt *c2c_fmt;
+
+ c2c_fmt = container_of(fmt, struct c2c_fmt, fmt);
+ free(c2c_fmt);
+}
+
+static bool fmt_equal(struct perf_hpp_fmt *a, struct perf_hpp_fmt *b)
+{
+ struct c2c_fmt *c2c_a = container_of(a, struct c2c_fmt, fmt);
+ struct c2c_fmt *c2c_b = container_of(b, struct c2c_fmt, fmt);
+
+ return c2c_a->dim == c2c_b->dim;
+}
+
+static struct c2c_dimension *get_dimension(const char *name)
+{
+ unsigned int i;
+
+ for (i = 0; dimensions[i]; i++) {
+ struct c2c_dimension *dim = dimensions[i];
+
+ if (!strcmp(dim->name, name))
+ return dim;
+ };
+
+ return NULL;
+}
+
+static struct c2c_fmt *get_format(const char *name)
+{
+ struct c2c_dimension *dim = get_dimension(name);
+ struct c2c_fmt *c2c_fmt;
+ struct perf_hpp_fmt *fmt;
+
+ if (!dim)
+ return NULL;
+
+ c2c_fmt = zalloc(sizeof(*c2c_fmt));
+ if (!c2c_fmt)
+ return NULL;
+
+ c2c_fmt->dim = dim;
+
+ fmt = &c2c_fmt->fmt;
+ INIT_LIST_HEAD(&fmt->list);
+ INIT_LIST_HEAD(&fmt->sort_list);
+
+ fmt->cmp = dim->cmp;
+ fmt->sort = dim->cmp;
+ fmt->entry = dim->entry;
+ fmt->header = c2c_header;
+ fmt->width = c2c_width;
+ fmt->collapse = dim->cmp;
+ fmt->equal = fmt_equal;
+ fmt->free = fmt_free;
+
+ return c2c_fmt;
+}
+
+static int c2c_hists__init_output(struct perf_hpp_list *hpp_list, char *name)
+{
+ struct c2c_fmt *c2c_fmt = get_format(name);
+
+ if (!c2c_fmt)
+ return -1;
+
+ perf_hpp_list__column_register(hpp_list, &c2c_fmt->fmt);
+ return 0;
+}
+
+static int c2c_hists__init_sort(struct perf_hpp_list *hpp_list, char *name)
+{
+ struct c2c_fmt *c2c_fmt = get_format(name);
+
+ if (!c2c_fmt)
+ return -1;
+
+ perf_hpp_list__register_sort_field(hpp_list, &c2c_fmt->fmt);
+ return 0;
+}
+
+#define PARSE_LIST(_list, _fn) \
+ do { \
+ char *tmp, *tok; \
+ ret = 0; \
+ \
+ if (!_list) \
+ break; \
+ \
+ for (tok = strtok_r((char *)_list, ", ", &tmp); \
+ tok; tok = strtok_r(NULL, ", ", &tmp)) { \
+ ret = _fn(hpp_list, tok); \
+ if (ret == -EINVAL) { \
+ error("Invalid --fields key: `%s'", tok); \
+ break; \
+ } else if (ret == -ESRCH) { \
+ error("Unknown --fields key: `%s'", tok); \
+ break; \
+ } \
+ } \
+ } while (0)
+
+static int hpp_list__parse(struct perf_hpp_list *hpp_list,
+ const char *output_,
+ const char *sort_)
+{
+ char *output = output_ ? strdup(output_) : NULL;
+ char *sort = sort_ ? strdup(sort_) : NULL;
+ int ret;
+
+ PARSE_LIST(output, c2c_hists__init_output);
+ PARSE_LIST(sort, c2c_hists__init_sort);
+
+ /* copy sort keys to output fields */
+ perf_hpp__setup_output_field(hpp_list);
+
+ /*
+ * We dont need other sorting keys other than those
+ * we already specified. It also really slows down
+ * the processing a lot with big number of output
+ * fields, so switching this off for c2c.
+ */
+
+#if 0
+ /* and then copy output fields to sort keys */
+ perf_hpp__append_sort_keys(&hists->list);
+#endif
+
+ free(output);
+ free(sort);
+ return ret;
+}
+
+static int c2c_hists__init(struct c2c_hists *hists,
+ const char *sort)
+{
+ __hists__init(&hists->hists, &hists->list);
+
+ /*
+ * Initialize only with sort fields, we need to resort
+ * later anyway, and that's where we add output fields
+ * as well.
+ */
+ perf_hpp_list__init(&hists->list);
+
+ return hpp_list__parse(&hists->list, NULL, sort);
+}
+
+__maybe_unused
+static int c2c_hists__reinit(struct c2c_hists *c2c_hists,
+ const char *output,
+ const char *sort)
+{
+ perf_hpp__reset_output_field(&c2c_hists->list);
+ return hpp_list__parse(&c2c_hists->list, output, sort);
+}
+
static int perf_c2c__report(int argc, const char **argv)
{
struct perf_session *session;
@@ -52,6 +283,12 @@ static int perf_c2c__report(int argc, const char **argv)
file.path = input_name;
+ err = c2c_hists__init(&c2c.hists, "dcacheline");
+ if (err) {
+ pr_debug("Failed to initialize hists\n");
+ goto out;
+ }
+
session = perf_session__new(&file, 0, &c2c.tool);
if (session == NULL) {
pr_debug("No memory for session\n");
--
2.7.4
next prev parent reply other threads:[~2016-09-19 13:23 UTC|newest]
Thread overview: 85+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-19 13:09 [PATCHv3 00/61] perf c2c: Add new tool to analyze cacheline contention on NUMA systems Jiri Olsa
2016-09-19 13:09 ` [PATCH 01/61] perf symbols: Do not open device files again Jiri Olsa
2016-09-20 15:28 ` Arnaldo Carvalho de Melo
2016-09-20 15:36 ` Jiri Olsa
2016-09-20 16:12 ` [PATCHv2 01/61] perf symbols: Do not open device files Jiri Olsa
2016-09-20 21:45 ` [tip:perf/core] " tip-bot for Jiri Olsa
2016-09-19 13:09 ` [PATCH 02/61] perf tools: Remove superfluous initialization of weight Jiri Olsa
2016-09-21 15:15 ` Arnaldo Carvalho de Melo
2016-09-23 5:24 ` [tip:perf/core] perf evsel: " tip-bot for Jiri Olsa
2016-09-19 13:09 ` [PATCH 03/61] perf tools: Make hist_entry__snprintf work over struct perf_hpp_list Jiri Olsa
2016-09-21 15:14 ` Arnaldo Carvalho de Melo
2016-09-21 15:30 ` Jiri Olsa
2016-09-19 13:09 ` [PATCH 04/61] perf tools: Use bigger buffer for stdio headers Jiri Olsa
2016-09-21 15:15 ` Arnaldo Carvalho de Melo
2016-09-23 5:25 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-09-19 13:09 ` [PATCH 05/61] perf tools: Introduce c2c_decode_stats function Jiri Olsa
2016-09-19 17:15 ` Nilay Vaish
2016-09-19 18:04 ` Joe Mario
[not found] ` <CACDz1GupJi3kcDx6zBK68KtpL=Q9hJvUFvHCdtMirMyuuuyMOQ@mail.gmail.com>
2016-09-21 9:18 ` Jiri Olsa
2016-09-21 15:16 ` Don Zickus
2016-09-21 15:32 ` Jiri Olsa
2016-09-19 13:09 ` [PATCH 06/61] perf tools: Introduce c2c_add_stats function Jiri Olsa
2016-09-19 13:09 ` [PATCH 07/61] perf tools: Make reset_dimensions global Jiri Olsa
2016-09-19 13:09 ` [PATCH 08/61] perf tools: Make output_field_add and sort_dimension__add global Jiri Olsa
2016-09-19 13:09 ` [PATCH 09/61] perf tools: Make several sorting functions global Jiri Olsa
2016-09-19 13:09 ` [PATCH 10/61] perf tools: Make several display " Jiri Olsa
2016-09-19 13:09 ` [PATCH 11/61] perf tools: Make hist_entry__snprintf function global Jiri Olsa
2016-09-19 13:09 ` [PATCH 12/61] perf tools: Make hists__fprintf_headers " Jiri Olsa
2016-09-19 13:09 ` [PATCH 13/61] perf c2c: Add c2c command Jiri Olsa
2016-09-19 13:09 ` [PATCH 14/61] perf c2c: Add record subcommand Jiri Olsa
2016-09-19 13:09 ` [PATCH 15/61] perf c2c: Add report subcommand Jiri Olsa
2016-09-19 13:09 ` Jiri Olsa [this message]
2016-09-19 13:09 ` [PATCH 17/61] perf c2c report: Add sort_entry dimension support Jiri Olsa
2016-09-19 13:09 ` [PATCH 18/61] perf c2c report: Fallback to standard dimensions Jiri Olsa
2016-09-19 13:09 ` [PATCH 19/61] perf c2c report: Add sample processing Jiri Olsa
2016-09-19 13:09 ` [PATCH 20/61] perf c2c report: Add cacheline hists processing Jiri Olsa
2016-09-19 13:09 ` [PATCH 21/61] perf c2c report: Decode c2c_stats for hist entries Jiri Olsa
2016-09-19 13:09 ` [PATCH 22/61] perf c2c report: Add header macros Jiri Olsa
2016-09-19 13:09 ` [PATCH 23/61] perf c2c report: Add dcacheline dimension key Jiri Olsa
2016-09-19 13:09 ` [PATCH 24/61] perf c2c report: Add offset " Jiri Olsa
2016-09-19 13:09 ` [PATCH 25/61] perf c2c report: Add iaddr " Jiri Olsa
2016-09-19 13:09 ` [PATCH 26/61] perf c2c report: Add hitm related dimension keys Jiri Olsa
2016-09-19 13:09 ` [PATCH 27/61] perf c2c report: Add stores " Jiri Olsa
2016-09-19 13:09 ` [PATCH 28/61] perf c2c report: Add loads " Jiri Olsa
2016-09-19 13:09 ` [PATCH 29/61] perf c2c report: Add llc and remote " Jiri Olsa
2016-09-19 13:09 ` [PATCH 30/61] perf c2c report: Add llc load miss dimension key Jiri Olsa
2016-09-19 13:09 ` [PATCH 31/61] perf c2c report: Add total record sort key Jiri Olsa
2016-09-19 13:09 ` [PATCH 32/61] perf c2c report: Add total loads " Jiri Olsa
2016-09-19 13:09 ` [PATCH 33/61] perf c2c report: Add hitm percent " Jiri Olsa
2016-09-19 13:09 ` [PATCH 34/61] perf c2c report: Add hitm/store percent related sort keys Jiri Olsa
2016-09-19 13:09 ` [PATCH 35/61] perf c2c report: Add dram " Jiri Olsa
2016-09-19 13:09 ` [PATCH 36/61] perf c2c report: Add pid sort key Jiri Olsa
2016-09-19 13:09 ` [PATCH 37/61] perf c2c report: Add tid " Jiri Olsa
2016-09-19 13:09 ` [PATCH 38/61] perf c2c report: Add symbol and dso sort keys Jiri Olsa
2016-09-19 13:09 ` [PATCH 39/61] perf c2c report: Add node sort key Jiri Olsa
2016-09-19 13:09 ` [PATCH 40/61] perf c2c report: Add stats related sort keys Jiri Olsa
2016-09-19 13:09 ` [PATCH 41/61] perf c2c report: Add cpu cnt sort key Jiri Olsa
2016-09-19 13:09 ` [PATCH 42/61] perf c2c report: Add src line " Jiri Olsa
2016-09-19 13:09 ` [PATCH 43/61] perf c2c report: Setup number of header lines for hists Jiri Olsa
2016-09-19 13:09 ` [PATCH 44/61] perf c2c report: Set final resort fields Jiri Olsa
2016-09-19 13:09 ` [PATCH 45/61] perf c2c report: Add stdio output support Jiri Olsa
2016-09-19 13:09 ` [PATCH 46/61] perf c2c report: Add main browser Jiri Olsa
2016-09-19 13:09 ` [PATCH 47/61] perf c2c report: Add cacheline browser Jiri Olsa
2016-09-20 20:10 ` Kim Phillips
2016-09-21 8:21 ` Jiri Olsa
2016-09-21 12:55 ` Jiri Olsa
2016-09-21 19:35 ` Kim Phillips
2016-09-19 13:09 ` [PATCH 48/61] perf c2c report: Add global stats stdio output Jiri Olsa
2016-09-19 13:09 ` [PATCH 49/61] perf c2c report: Add shared cachelines " Jiri Olsa
2016-09-19 13:09 ` [PATCH 50/61] perf c2c report: Add c2c related " Jiri Olsa
2016-09-19 13:10 ` [PATCH 51/61] perf c2c report: Allow to report callchains Jiri Olsa
2016-09-19 13:10 ` [PATCH 52/61] perf c2c report: Limit the cachelines table entries Jiri Olsa
2016-09-19 13:10 ` [PATCH 53/61] perf c2c report: Add support to choose local HITMs Jiri Olsa
2016-09-19 13:10 ` [PATCH 54/61] perf c2c report: Allow to set cacheline sort fields Jiri Olsa
2016-09-19 13:10 ` [PATCH 55/61] perf c2c report: Recalc width of global sort entries Jiri Olsa
2016-09-19 13:10 ` [PATCH 56/61] perf c2c report: Add cacheline index entry Jiri Olsa
2016-09-19 13:10 ` [PATCH 57/61] perf c2c report: Add support to manage symbol name length Jiri Olsa
2016-09-19 13:10 ` [PATCH 58/61] perf c2c report: Iterate node display in browser Jiri Olsa
2016-09-19 13:10 ` [PATCH 59/61] perf c2c report: Add help windows Jiri Olsa
2016-09-19 13:10 ` [PATCH 60/61] perf c2c: Add man page and credits Jiri Olsa
2016-09-19 13:10 ` [PATCH 61/61] perf tools: Fix width computation for srcline sort entry Jiri Olsa
2016-09-19 14:33 ` Arnaldo Carvalho de Melo
2016-09-19 14:49 ` Jiri Olsa
2016-09-19 14:57 ` Arnaldo Carvalho de Melo
2016-09-20 21:43 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
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=1474290610-23241-17-git-send-email-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=andi@firstfloor.org \
--cc=dsahern@gmail.com \
--cc=dzickus@redhat.com \
--cc=jmario@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@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;
as well as URLs for NNTP newsgroup(s).