From: tip-bot for Adrian Hunter <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: mingo@kernel.org, linux-kernel@vger.kernel.org, jolsa@redhat.com,
acme@redhat.com, tglx@linutronix.de, adrian.hunter@intel.com,
hpa@zytor.com
Subject: [tip:perf/core] perf intel-pt: Add LBR information to synthesized PEBS sample
Date: Fri, 21 Jun 2019 23:41:36 -0700 [thread overview]
Message-ID: <tip-aa62afd7daac4b4cc95cd2454e3f43aa23f519c1@git.kernel.org> (raw)
In-Reply-To: <20190610072803.10456-10-adrian.hunter@intel.com>
Commit-ID: aa62afd7daac4b4cc95cd2454e3f43aa23f519c1
Gitweb: https://git.kernel.org/tip/aa62afd7daac4b4cc95cd2454e3f43aa23f519c1
Author: Adrian Hunter <adrian.hunter@intel.com>
AuthorDate: Mon, 10 Jun 2019 10:28:01 +0300
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 17 Jun 2019 15:57:18 -0300
perf intel-pt: Add LBR information to synthesized PEBS sample
Add LBR information from PEBS data in the Intel PT trace to the
synthesized PEBS sample.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/r/20190610072803.10456-10-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/intel-pt.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 72 insertions(+)
diff --git a/tools/perf/util/intel-pt.c b/tools/perf/util/intel-pt.c
index f83dd10bb7d0..db00c13dc36f 100644
--- a/tools/perf/util/intel-pt.c
+++ b/tools/perf/util/intel-pt.c
@@ -1628,6 +1628,58 @@ static void intel_pt_add_xmm(struct regs_dump *intr_regs, u64 *pos,
}
}
+#define LBR_INFO_MISPRED (1ULL << 63)
+#define LBR_INFO_IN_TX (1ULL << 62)
+#define LBR_INFO_ABORT (1ULL << 61)
+#define LBR_INFO_CYCLES 0xffff
+
+/* Refer kernel's intel_pmu_store_pebs_lbrs() */
+static u64 intel_pt_lbr_flags(u64 info)
+{
+ union {
+ struct branch_flags flags;
+ u64 result;
+ } u = {
+ .flags = {
+ .mispred = !!(info & LBR_INFO_MISPRED),
+ .predicted = !(info & LBR_INFO_MISPRED),
+ .in_tx = !!(info & LBR_INFO_IN_TX),
+ .abort = !!(info & LBR_INFO_ABORT),
+ .cycles = info & LBR_INFO_CYCLES,
+ }
+ };
+
+ return u.result;
+}
+
+static void intel_pt_add_lbrs(struct branch_stack *br_stack,
+ const struct intel_pt_blk_items *items)
+{
+ u64 *to;
+ int i;
+
+ br_stack->nr = 0;
+
+ to = &br_stack->entries[0].from;
+
+ for (i = INTEL_PT_LBR_0_POS; i <= INTEL_PT_LBR_2_POS; i++) {
+ u32 mask = items->mask[i];
+ const u64 *from = items->val[i];
+
+ for (; mask; mask >>= 3, from += 3) {
+ if ((mask & 7) == 7) {
+ *to++ = from[0];
+ *to++ = from[1];
+ *to++ = intel_pt_lbr_flags(from[2]);
+ br_stack->nr += 1;
+ }
+ }
+ }
+}
+
+/* INTEL_PT_LBR_0, INTEL_PT_LBR_1 and INTEL_PT_LBR_2 */
+#define LBRS_MAX (INTEL_PT_BLK_ITEM_ID_CNT * 3)
+
static int intel_pt_synth_pebs_sample(struct intel_pt_queue *ptq)
{
const struct intel_pt_blk_items *items = &ptq->state->items;
@@ -1694,6 +1746,26 @@ static int intel_pt_synth_pebs_sample(struct intel_pt_queue *ptq)
intel_pt_add_xmm(&sample.intr_regs, pos, items, regs_mask);
}
+ if (sample_type & PERF_SAMPLE_BRANCH_STACK) {
+ struct {
+ struct branch_stack br_stack;
+ struct branch_entry entries[LBRS_MAX];
+ } br;
+
+ if (items->mask[INTEL_PT_LBR_0_POS] ||
+ items->mask[INTEL_PT_LBR_1_POS] ||
+ items->mask[INTEL_PT_LBR_2_POS]) {
+ intel_pt_add_lbrs(&br.br_stack, items);
+ sample.branch_stack = &br.br_stack;
+ } else if (pt->synth_opts.last_branch) {
+ intel_pt_copy_last_branch_rb(ptq);
+ sample.branch_stack = ptq->last_branch;
+ } else {
+ br.br_stack.nr = 0;
+ sample.branch_stack = &br.br_stack;
+ }
+ }
+
return intel_pt_deliver_synth_event(pt, ptq, event, &sample, sample_type);
}
next prev parent reply other threads:[~2019-06-22 6:42 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-10 7:27 [PATCH 00/11] perf intel-pt: Prepare for PEBS via PT Adrian Hunter
2019-06-10 7:27 ` [PATCH 01/11] perf intel-pt: Add new packets " Adrian Hunter
2019-06-12 0:09 ` Arnaldo Carvalho de Melo
2019-06-12 5:58 ` Adrian Hunter
2019-06-12 12:41 ` Arnaldo Carvalho de Melo
2019-06-12 12:52 ` Adrian Hunter
2019-06-12 13:28 ` Arnaldo Carvalho de Melo
2019-06-13 8:13 ` Adrian Hunter
2019-07-04 16:10 ` Alexander Shishkin
2019-06-22 6:35 ` [tip:perf/core] " tip-bot for Adrian Hunter
2019-06-10 7:27 ` [PATCH 02/11] perf intel-pt: Add Intel PT packet decoder test Adrian Hunter
2019-06-22 6:36 ` [tip:perf/core] " tip-bot for Adrian Hunter
2019-06-10 7:27 ` [PATCH 03/11] perf intel-pt: Add decoder support for PEBS via PT Adrian Hunter
2019-06-22 6:37 ` [tip:perf/core] " tip-bot for Adrian Hunter
2019-06-10 7:27 ` [PATCH 04/11] perf intel-pt: Prepare to synthesize PEBS samples Adrian Hunter
2019-06-22 6:38 ` [tip:perf/core] " tip-bot for Adrian Hunter
2019-06-10 7:27 ` [PATCH 05/11] perf intel-pt: Factor out common sample preparation for re-use Adrian Hunter
2019-06-22 6:38 ` [tip:perf/core] " tip-bot for Adrian Hunter
2019-06-10 7:27 ` [PATCH 06/11] perf intel-pt: Synthesize PEBS sample basic information Adrian Hunter
2019-06-22 6:39 ` [tip:perf/core] " tip-bot for Adrian Hunter
2019-06-10 7:27 ` [PATCH 07/11] perf intel-pt: Add gp registers to synthesized PEBS sample Adrian Hunter
2019-06-22 6:40 ` [tip:perf/core] " tip-bot for Adrian Hunter
2019-06-10 7:28 ` [PATCH 08/11] perf intel-pt: Add xmm " Adrian Hunter
2019-06-22 6:40 ` [tip:perf/core] perf intel-pt: Add XMM " tip-bot for Adrian Hunter
2019-06-10 7:28 ` [PATCH 09/11] perf intel-pt: Add lbr information " Adrian Hunter
2019-06-22 6:41 ` tip-bot for Adrian Hunter [this message]
2019-06-10 7:28 ` [PATCH 10/11] perf intel-pt: Add memory " Adrian Hunter
2019-06-22 6:42 ` [tip:perf/core] " tip-bot for Adrian Hunter
2019-06-10 7:28 ` [PATCH 11/11] perf intel-pt: Add callchain " Adrian Hunter
2019-06-22 6:43 ` [tip:perf/core] " tip-bot for Adrian Hunter
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=tip-aa62afd7daac4b4cc95cd2454e3f43aa23f519c1@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=hpa@zytor.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/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).