From: kan.liang@linux.intel.com
To: peterz@infradead.org, acme@kernel.org, mingo@redhat.com,
linux-kernel@vger.kernel.org
Cc: tglx@linutronix.de, jolsa@kernel.org, eranian@google.com,
alexander.shishkin@linux.intel.com, ak@linux.intel.com,
Kan Liang <kan.liang@linux.intel.com>
Subject: [PATCH 5/9] perf/x86/intel: Set correct weight for TopDown metrics events
Date: Tue, 21 May 2019 14:40:51 -0700 [thread overview]
Message-ID: <20190521214055.31060-6-kan.liang@linux.intel.com> (raw)
In-Reply-To: <20190521214055.31060-1-kan.liang@linux.intel.com>
From: Andi Kleen <ak@linux.intel.com>
The topdown metrics and slots events are mapped to a fixed counter,
but should have the normal weight for the scheduler.
So special case this.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
---
arch/x86/events/intel/core.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c
index 2eec172765f4..6de9249acb28 100644
--- a/arch/x86/events/intel/core.c
+++ b/arch/x86/events/intel/core.c
@@ -5281,6 +5281,15 @@ __init int intel_pmu_init(void)
* counter, so do not extend mask to generic counters
*/
for_each_event_constraint(c, x86_pmu.event_constraints) {
+ /*
+ * Don't limit the event mask for TopDown
+ * metrics and slots events.
+ */
+ if (x86_pmu.num_counters_fixed >= 3 &&
+ c->idxmsk64 & INTEL_PMC_MSK_ANY_SLOTS) {
+ c->weight = hweight64(c->idxmsk64);
+ continue;
+ }
if (c->cmask == FIXED_EVENT_FLAGS
&& c->idxmsk64 != INTEL_PMC_MSK_FIXED_REF_CYCLES) {
c->idxmsk64 |= (1ULL << x86_pmu.num_counters) - 1;
--
2.14.5
next prev parent reply other threads:[~2019-05-21 21:41 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-21 21:40 [PATCH 0/9] TopDown metrics support for Icelake kan.liang
2019-05-21 21:40 ` [PATCH 1/9] perf/core: Support a REMOVE transaction kan.liang
2019-05-21 21:40 ` [PATCH 2/9] perf/x86/intel: Basic support for metrics counters kan.liang
2019-05-28 12:05 ` Peter Zijlstra
2019-05-28 18:20 ` Liang, Kan
2019-05-28 12:15 ` Peter Zijlstra
2019-05-28 18:21 ` Liang, Kan
2019-05-29 7:28 ` Peter Zijlstra
2019-05-29 14:40 ` Liang, Kan
2019-05-29 16:46 ` Peter Zijlstra
2019-05-29 8:14 ` Peter Zijlstra
2019-05-21 21:40 ` [PATCH 3/9] perf/x86/intel: Support overflows on SLOTS kan.liang
2019-05-28 12:20 ` Peter Zijlstra
2019-05-28 18:22 ` Liang, Kan
2019-05-21 21:40 ` [PATCH 4/9] perf/x86/intel: Support hardware TopDown metrics kan.liang
2019-05-28 12:43 ` Peter Zijlstra
2019-05-28 18:23 ` Liang, Kan
2019-05-29 7:30 ` Peter Zijlstra
2019-05-28 12:53 ` Peter Zijlstra
2019-05-28 12:56 ` Peter Zijlstra
2019-05-28 13:32 ` Peter Zijlstra
2019-05-28 13:30 ` Peter Zijlstra
2019-05-28 18:24 ` Liang, Kan
2019-05-29 7:34 ` Peter Zijlstra
2019-05-29 14:41 ` Liang, Kan
2019-05-28 13:43 ` Peter Zijlstra
2019-05-28 18:24 ` Liang, Kan
2019-05-29 7:54 ` Peter Zijlstra
2019-05-29 14:42 ` Liang, Kan
2019-05-29 16:58 ` Peter Zijlstra
2019-06-04 20:39 ` Liang, Kan
2019-05-28 13:48 ` Peter Zijlstra
2019-05-28 18:24 ` Liang, Kan
2019-05-29 7:57 ` Peter Zijlstra
2019-05-29 14:42 ` Liang, Kan
2019-05-21 21:40 ` kan.liang [this message]
2019-05-28 13:50 ` [PATCH 5/9] perf/x86/intel: Set correct weight for TopDown metrics events Peter Zijlstra
2019-05-21 21:40 ` [PATCH 6/9] perf/x86/intel: Export new TopDown metrics events for Icelake kan.liang
2019-05-21 21:40 ` [PATCH 7/9] perf/x86/intel: Disable sampling read slots and topdown kan.liang
2019-05-28 13:52 ` Peter Zijlstra
2019-05-28 18:25 ` Liang, Kan
2019-05-29 7:58 ` Peter Zijlstra
2019-05-21 21:40 ` [PATCH 8/9] perf, tools, stat: Support new per thread TopDown metrics kan.liang
2019-05-21 21:40 ` [PATCH 9/9] perf, tools: Add documentation for topdown metrics kan.liang
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=20190521214055.31060-6-kan.liang@linux.intel.com \
--to=kan.liang@linux.intel.com \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=eranian@google.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.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).