From: tip-bot for Andi Kleen <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: tglx@linutronix.de, ak@linux.intel.com,
sukadev@linux.vnet.ibm.com, acme@redhat.com,
linux-kernel@vger.kernel.org, jolsa@redhat.com, hpa@zytor.com,
mingo@kernel.org
Subject: [tip:perf/urgent] perf jevents: Fix Intel JSON fixed counter conversions
Date: Thu, 6 Oct 2016 15:41:48 -0700 [thread overview]
Message-ID: <tip-72c6ff2583fba824dc38c0ce87b838631cdb8294@git.kernel.org> (raw)
In-Reply-To: <1475696832-9188-4-git-send-email-andi@firstfloor.org>
Commit-ID: 72c6ff2583fba824dc38c0ce87b838631cdb8294
Gitweb: http://git.kernel.org/tip/72c6ff2583fba824dc38c0ce87b838631cdb8294
Author: Andi Kleen <ak@linux.intel.com>
AuthorDate: Wed, 5 Oct 2016 12:47:12 -0700
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 5 Oct 2016 18:41:06 -0300
perf jevents: Fix Intel JSON fixed counter conversions
Intel fixed counters are special cases in the JSON conversion process
because their decoding differs between perf and the event files. Add
some missing entries in the conversion table.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/r/1475696832-9188-4-git-send-email-andi@firstfloor.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/pmu-events/jevents.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c
index 79c2133..41611d7 100644
--- a/tools/perf/pmu-events/jevents.c
+++ b/tools/perf/pmu-events/jevents.c
@@ -312,6 +312,8 @@ static struct fixed {
const char *event;
} fixed[] = {
{ "inst_retired.any", "event=0xc0" },
+ { "inst_retired.any_p", "event=0xc0" },
+ { "cpu_clk_unhalted.ref", "event=0x0,umask=0x03" },
{ "cpu_clk_unhalted.thread", "event=0x3c" },
{ "cpu_clk_unhalted.thread_any", "event=0x3c,any=1" },
{ NULL, NULL},
prev parent reply other threads:[~2016-10-06 22:42 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-05 19:47 Some minor fixes for the perf tools json event code Andi Kleen
2016-10-05 19:47 ` [PATCH 1/3] perf, tools: Handle events including .c and .o Andi Kleen
2016-10-05 22:47 ` Arnaldo Carvalho de Melo
2016-10-06 16:55 ` Andi Kleen
2016-10-06 20:07 ` Arnaldo Carvalho de Melo
2016-10-06 20:18 ` Arnaldo Carvalho de Melo
2016-10-08 4:02 ` Wangnan (F)
2016-10-08 4:16 ` [PATCH] " Wang Nan
2016-10-17 14:52 ` [tip:perf/urgent] perf jevents: " tip-bot for Wang Nan
2016-10-05 19:47 ` [PATCH 2/3] perf, tools: Handle completion of upper case events Andi Kleen
2016-10-05 21:50 ` Arnaldo Carvalho de Melo
2016-10-05 22:18 ` Andi Kleen
2016-10-05 22:35 ` Arnaldo Carvalho de Melo
2016-10-05 19:47 ` [PATCH 3/3] perf, tools: Fix Intel fixed counter conversions Andi Kleen
2016-10-06 22:41 ` tip-bot for Andi Kleen [this message]
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-72c6ff2583fba824dc38c0ce87b838631cdb8294@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=ak@linux.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=sukadev@linux.vnet.ibm.com \
--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
Powered by JetHome