mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>, Thomas Gleixner <tglx@linutronix.de>
Cc: Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
	Clark Williams <williams@redhat.com>,
	linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
	Jin Yao <yao.jin@linux.intel.com>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Andi Kleen <ak@linux.intel.com>, Jin Yao <yao.jin@intel.com>,
	Kan Liang <kan.liang@linux.intel.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 04/18] perf diff: Check if all data files with branch stacks
Date: Wed,  3 Jul 2019 00:27:32 -0300	[thread overview]
Message-ID: <20190703032746.21692-5-acme@kernel.org> (raw)
In-Reply-To: <20190703032746.21692-1-acme@kernel.org>

From: Jin Yao <yao.jin@linux.intel.com>

We will expand perf diff to support diff cycles of individual programs
blocks, so it requires all data files having branch stacks.

This patch checks HEADER_BRANCH_STACK in header, and only set the flag
has_br_stack when HEADER_BRANCH_STACK are set in all data files.

 v2:
 ---
 Move check_file_brstack() from __cmd_diff() to cmd_diff().
 Because later patch will check flag 'has_br_stack' before
 ui_init().

Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
Reviewed-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jin Yao <yao.jin@intel.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1561713784-30533-4-git-send-email-yao.jin@linux.intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/builtin-diff.c | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c
index 6e7920793729..a7e04202955c 100644
--- a/tools/perf/builtin-diff.c
+++ b/tools/perf/builtin-diff.c
@@ -32,6 +32,7 @@ struct perf_diff {
 	struct perf_time_interval	*ptime_range;
 	int				 range_size;
 	int				 range_num;
+	bool				 has_br_stack;
 };
 
 /* Diff command specific HPP columns. */
@@ -873,6 +874,31 @@ static int parse_time_str(struct data__file *d, char *abstime_ostr,
 	return ret;
 }
 
+static int check_file_brstack(void)
+{
+	struct data__file *d;
+	bool has_br_stack;
+	int i;
+
+	data__for_each_file(i, d) {
+		d->session = perf_session__new(&d->data, false, &pdiff.tool);
+		if (!d->session) {
+			pr_err("Failed to open %s\n", d->data.path);
+			return -1;
+		}
+
+		has_br_stack = perf_header__has_feat(&d->session->header,
+						     HEADER_BRANCH_STACK);
+		perf_session__delete(d->session);
+		if (!has_br_stack)
+			return 0;
+	}
+
+	/* Set only all files having branch stacks */
+	pdiff.has_br_stack = true;
+	return 0;
+}
+
 static int __cmd_diff(void)
 {
 	struct data__file *d;
@@ -1487,6 +1513,9 @@ int cmd_diff(int argc, const char **argv)
 	if (data_init(argc, argv) < 0)
 		return -1;
 
+	if (check_file_brstack() < 0)
+		return -1;
+
 	if (ui_init() < 0)
 		return -1;
 
-- 
2.20.1


  parent reply	other threads:[~2019-07-03  3:28 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-03  3:27 [GIT PULL] perf/core improvements and fixes Arnaldo Carvalho de Melo
2019-07-03  3:27 ` [PATCH 01/18] objtool: Fix build by linking against tools/lib/ctype.o sources Arnaldo Carvalho de Melo
2019-07-03  3:27 ` [PATCH 02/18] perf symbol: Create block_info structure Arnaldo Carvalho de Melo
2019-07-03  3:27 ` [PATCH 03/18] perf hists: Add block_info in hist_entry Arnaldo Carvalho de Melo
2019-07-03  3:27 ` Arnaldo Carvalho de Melo [this message]
2019-07-03  3:27 ` [PATCH 05/18] perf diff: Use hists to manage basic blocks per symbol Arnaldo Carvalho de Melo
2019-07-03  3:27 ` [PATCH 06/18] perf diff: Link same basic blocks among different data Arnaldo Carvalho de Melo
2019-07-03  3:27 ` [PATCH 07/18] perf diff: Print the basic block cycles diff Arnaldo Carvalho de Melo
2019-07-03  3:27 ` [PATCH 08/18] perf diff: Documentation -c cycles option Arnaldo Carvalho de Melo
2019-07-03  3:27 ` [PATCH 09/18] perf pmu: Support more complex PMU event aliasing Arnaldo Carvalho de Melo
2019-07-03  3:27 ` [PATCH 10/18] perf jevents: Add support for Hisi hip08 DDRC PMU aliasing Arnaldo Carvalho de Melo
2019-07-03  3:27 ` [PATCH 11/18] perf jevents: Add support for Hisi hip08 HHA " Arnaldo Carvalho de Melo
2019-07-03  3:27 ` [PATCH 12/18] perf jevents: Add support for Hisi hip08 L3C " Arnaldo Carvalho de Melo
2019-07-03  3:27 ` [PATCH 13/18] perf tools: Fix typos / broken sentences Arnaldo Carvalho de Melo
2019-07-03  3:27 ` [PATCH 14/18] perf vendor events intel: Metric fixes for SKX/CLX Arnaldo Carvalho de Melo
2019-07-03  3:27 ` [PATCH 15/18] perf list: Avoid extra : for --raw metrics Arnaldo Carvalho de Melo
2019-07-03  3:27 ` [PATCH 16/18] perf tools metric: Don't include duration_time in group Arnaldo Carvalho de Melo
2019-07-03  3:27 ` [PATCH 17/18] perf tests: Fix record+probe_libc_inet_pton.sh for powerpc64 Arnaldo Carvalho de Melo
2019-07-03  3:27 ` [PATCH 18/18] perf script: Allow specifying the files to process guest samples Arnaldo Carvalho de Melo
2019-07-03 13:56 ` [GIT PULL] perf/core improvements and fixes Ingo Molnar

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=20190703032746.21692-5-acme@kernel.org \
    --to=acme@kernel.org \
    --cc=acme@redhat.com \
    --cc=ak@linux.intel.com \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=jolsa@kernel.org \
    --cc=kan.liang@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-perf-users@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    --cc=williams@redhat.com \
    --cc=yao.jin@intel.com \
    --cc=yao.jin@linux.intel.com \
    /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

Powered by JetHome