From: tip-bot for Vince Weaver <vincent.weaver@maine.edu>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
vincent.weaver@maine.edu, a.p.zijlstra@chello.nl,
tglx@linutronix.de
Subject: [tip:perf/urgent] perf/x86: Fix P6 FP_ASSIST event constraint
Date: Wed, 24 Oct 2012 02:59:38 -0700 [thread overview]
Message-ID: <tip-7991c9ca40d3127dd2ffa3a9c1e33f7d4005495a@git.kernel.org> (raw)
In-Reply-To: <alpine.DEB.2.02.1210191728570.14552@vincent-weaver-1.um.maine.edu>
Commit-ID: 7991c9ca40d3127dd2ffa3a9c1e33f7d4005495a
Gitweb: http://git.kernel.org/tip/7991c9ca40d3127dd2ffa3a9c1e33f7d4005495a
Author: Vince Weaver <vincent.weaver@maine.edu>
AuthorDate: Fri, 19 Oct 2012 17:30:01 -0400
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 24 Oct 2012 10:31:57 +0200
perf/x86: Fix P6 FP_ASSIST event constraint
According to Intel SDM Volume 3B, FP_ASSIST is limited to Counter 1 only,
not Counter 0.
Tested on a Pentium II.
Signed-off-by: Vince Weaver <vincent.weaver@maine.edu>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/alpine.DEB.2.02.1210191728570.14552@vincent-weaver-1.um.maine.edu
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/kernel/cpu/perf_event_p6.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/cpu/perf_event_p6.c b/arch/x86/kernel/cpu/perf_event_p6.c
index e4dd0f7..0ff5f7f 100644
--- a/arch/x86/kernel/cpu/perf_event_p6.c
+++ b/arch/x86/kernel/cpu/perf_event_p6.c
@@ -34,7 +34,7 @@ static struct event_constraint p6_event_constraints[] =
{
INTEL_EVENT_CONSTRAINT(0xc1, 0x1), /* FLOPS */
INTEL_EVENT_CONSTRAINT(0x10, 0x1), /* FP_COMP_OPS_EXE */
- INTEL_EVENT_CONSTRAINT(0x11, 0x1), /* FP_ASSIST */
+ INTEL_EVENT_CONSTRAINT(0x11, 0x2), /* FP_ASSIST */
INTEL_EVENT_CONSTRAINT(0x12, 0x2), /* MUL */
INTEL_EVENT_CONSTRAINT(0x13, 0x2), /* DIV */
INTEL_EVENT_CONSTRAINT(0x14, 0x1), /* CYCLES_DIV_BUSY */
next prev parent reply other threads:[~2012-10-24 10:01 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-19 21:28 [PATCH 0/3] perf_event: improvements to p6 PMU driver Vince Weaver
2012-10-19 21:30 ` [PATCH 1/3] perf_event: fix p6 FP_ASSIST event constraint Vince Weaver
2012-10-24 9:59 ` tip-bot for Vince Weaver [this message]
2012-10-19 21:31 ` [PATCH 2/3] perf_event: Update generic events on p6 PMU Vince Weaver
2012-10-24 10:00 ` [tip:perf/urgent] perf/x86: Update/fix generic events on P6 PMU tip-bot for Vince Weaver
2012-10-19 21:33 ` [PATCH 3/3] perf_event: remove cpuc->enabled check Vince Weaver
2012-10-24 10:01 ` [tip:perf/urgent] perf/x86: Remove P6 " tip-bot for Vince Weaver
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-7991c9ca40d3127dd2ffa3a9c1e33f7d4005495a@git.kernel.org \
--to=vincent.weaver@maine.edu \
--cc=a.p.zijlstra@chello.nl \
--cc=hpa@zytor.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
Powered by JetHome