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 51/61] perf c2c report: Allow to report callchains
Date: Mon, 19 Sep 2016 15:10:00 +0200 [thread overview]
Message-ID: <1474290610-23241-52-git-send-email-jolsa@kernel.org> (raw)
In-Reply-To: <1474290610-23241-1-git-send-email-jolsa@kernel.org>
Add --call-graph option to properly setup callchain
code. Adding default settings to display callchains
whenever they are stored in the perf.data.
Link: http://lkml.kernel.org/n/tip-inykbom2f19difvsu1e18avr@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/builtin-c2c.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 67 insertions(+)
diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c
index f4bdef5004c9..913a6b9b4d45 100644
--- a/tools/perf/builtin-c2c.c
+++ b/tools/perf/builtin-c2c.c
@@ -17,6 +17,7 @@
#include "evsel.h"
#include <asm/bug.h>
#include "ui/browsers/hists.h"
+#include "evlist.h"
struct c2c_hists {
struct hists hists;
@@ -181,6 +182,11 @@ static int process_sample_event(struct perf_tool *tool __maybe_unused,
return -1;
}
+ ret = sample__resolve_callchain(sample, &callchain_cursor, NULL,
+ evsel, &al, sysctl_perf_event_max_stack);
+ if (ret)
+ goto out;
+
mi = sample__resolve_mem(sample, &al);
if (mi == NULL)
return -ENOMEM;
@@ -2102,6 +2108,58 @@ static void ui_quirks(bool stdio)
}
}
+#define CALLCHAIN_DEFAULT_OPT "graph,0.5,caller,function,percent"
+
+const char callchain_help[] = "Display call graph (stack chain/backtrace):\n\n"
+ CALLCHAIN_REPORT_HELP
+ "\n\t\t\t\tDefault: " CALLCHAIN_DEFAULT_OPT;
+
+static int
+parse_callchain_opt(const struct option *opt, const char *arg, int unset)
+{
+ struct callchain_param *callchain = opt->value;
+
+ callchain->enabled = !unset;
+ /*
+ * --no-call-graph
+ */
+ if (unset) {
+ symbol_conf.use_callchain = false;
+ callchain->mode = CHAIN_NONE;
+ return 0;
+ }
+
+ return parse_callchain_report_opt(arg);
+}
+
+static int setup_callchain(struct perf_evlist *evlist)
+{
+ u64 sample_type = perf_evlist__combined_sample_type(evlist);
+ enum perf_call_graph_mode mode = CALLCHAIN_NONE;
+
+ if ((sample_type & PERF_SAMPLE_REGS_USER) &&
+ (sample_type & PERF_SAMPLE_STACK_USER))
+ mode = CALLCHAIN_DWARF;
+ else if (sample_type & PERF_SAMPLE_BRANCH_STACK)
+ mode = CALLCHAIN_LBR;
+ else if (sample_type & PERF_SAMPLE_CALLCHAIN)
+ mode = CALLCHAIN_FP;
+
+ if (!callchain_param.enabled &&
+ callchain_param.mode != CHAIN_NONE &&
+ mode != CALLCHAIN_NONE) {
+ symbol_conf.use_callchain = true;
+ if (callchain_register_param(&callchain_param) < 0) {
+ ui__error("Can't register callchain params.\n");
+ return -EINVAL;
+ }
+ }
+
+ callchain_param.record_mode = mode;
+ callchain_param.min_percent = 0;
+ return 0;
+}
+
static int perf_c2c__report(int argc, const char **argv)
{
struct perf_session *session;
@@ -2109,6 +2167,7 @@ static int perf_c2c__report(int argc, const char **argv)
struct perf_data_file file = {
.mode = PERF_DATA_MODE_READ,
};
+ char callchain_default_opt[] = CALLCHAIN_DEFAULT_OPT;
const struct option c2c_options[] = {
OPT_STRING('k', "vmlinux", &symbol_conf.vmlinux_name,
"file", "vmlinux pathname"),
@@ -2122,6 +2181,10 @@ static int perf_c2c__report(int argc, const char **argv)
"Use the stdio interface"),
OPT_BOOLEAN(0, "stats", &c2c.stats_only,
"Use the stdio interface"),
+ OPT_CALLBACK_DEFAULT('g', "call-graph", &callchain_param,
+ "print_type,threshold[,print_limit],order,sort_key[,branch],value",
+ callchain_help, &parse_callchain_opt,
+ callchain_default_opt),
OPT_END()
};
int err = 0;
@@ -2166,6 +2229,10 @@ static int perf_c2c__report(int argc, const char **argv)
goto out;
}
+ err = setup_callchain(session->evlist);
+ if (err)
+ goto out_session;
+
if (symbol__init(&session->header.env) < 0)
goto out_session;
--
2.7.4
next prev parent reply other threads:[~2016-09-19 13:13 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 ` [PATCH 16/61] perf c2c report: Add dimension support Jiri Olsa
2016-09-19 13:09 ` [PATCH 17/61] perf c2c report: Add sort_entry " 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 ` Jiri Olsa [this message]
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-52-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).