Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1380771 > unrolled thread
| Started by | Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> |
|---|---|
| First post | 2016-04-17 17:50 +0200 |
| Last post | 2016-04-23 15:00 +0200 |
| Articles | 4 — 3 participants |
Back to article view | Back to linux.kernel
[PATCH] perf/x86/intel/rapl: Add missing Haswell model Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> - 2016-04-17 17:50 +0200
Re: [PATCH] perf/x86/intel/rapl: Add missing Haswell model Peter Zijlstra <peterz@infradead.org> - 2016-04-20 17:40 +0200
Re: [PATCH] perf/x86/intel/rapl: Add missing Haswell model Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> - 2016-04-20 20:00 +0200
[tip:perf/core] perf/x86/intel/rapl: Add missing Haswell model tip-bot for Srinivas Pandruvada <tipbot@zytor.com> - 2016-04-23 15:00 +0200
| From | Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> |
|---|---|
| Date | 2016-04-17 17:50 +0200 |
| Subject | [PATCH] perf/x86/intel/rapl: Add missing Haswell model |
| Message-ID | <roX7t-6DU-15@gated-at.bofh.it> |
Added one missing Haswell model. Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> --- arch/x86/events/intel/rapl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c index 70c93f9..c83c141 100644 --- a/arch/x86/events/intel/rapl.c +++ b/arch/x86/events/intel/rapl.c @@ -718,6 +718,7 @@ static int __init rapl_pmu_init(void) break; case 60: /* Haswell */ case 69: /* Haswell-Celeron */ + case 70: /* Haswell */ case 61: /* Broadwell */ case 71: /* Broadwell-H */ rapl_cntr_mask = RAPL_IDX_HSW; -- 1.9.1
[toc] | [next] | [standalone]
| From | Peter Zijlstra <peterz@infradead.org> |
|---|---|
| Date | 2016-04-20 17:40 +0200 |
| Message-ID | <rq2oq-1Bz-21@gated-at.bofh.it> |
| In reply to | #1380771 |
On Sun, Apr 17, 2016 at 08:43:29AM -0700, Srinivas Pandruvada wrote:
> Added one missing Haswell model.
Indeed, but when I compare with the table in events/intel/core.c I find
we also miss one Broadwell (86) model.
Would the below be correct for that?
---
arch/x86/events/intel/rapl.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c
index 7c56b985c9f6..f9129a85928a 100644
--- a/arch/x86/events/intel/rapl.c
+++ b/arch/x86/events/intel/rapl.c
@@ -739,16 +739,21 @@ static const struct intel_rapl_init_fun knl_rapl_init __initconst = {
static const struct x86_cpu_id rapl_cpu_match[] __initconst = {
X86_RAPL_MODEL_MATCH(42, snb_rapl_init), /* Sandy Bridge */
+ X86_RAPL_MODEL_MATCH(45, snbep_rapl_init), /* Sandy Bridge-EP */
+
X86_RAPL_MODEL_MATCH(58, snb_rapl_init), /* Ivy Bridge */
- X86_RAPL_MODEL_MATCH(63, hsx_rapl_init), /* Haswell-Server */
- X86_RAPL_MODEL_MATCH(79, hsx_rapl_init), /* Broadwell-Server */
+ X86_RAPL_MODEL_MATCH(62, snbep_rapl_init), /* IvyTown */
+
X86_RAPL_MODEL_MATCH(60, hsw_rapl_init), /* Haswell */
+ X86_RAPL_MODEL_MATCH(63, hsx_rapl_init), /* Haswell-Server */
X86_RAPL_MODEL_MATCH(69, hsw_rapl_init), /* Haswell-Celeron */
X86_RAPL_MODEL_MATCH(70, hsw_rapl_init), /* Haswell GTe3 */
+
X86_RAPL_MODEL_MATCH(61, hsw_rapl_init), /* Broadwell */
X86_RAPL_MODEL_MATCH(71, hsw_rapl_init), /* Broadwell-H */
- X86_RAPL_MODEL_MATCH(45, snbep_rapl_init), /* Sandy Bridge-EP */
- X86_RAPL_MODEL_MATCH(62, snbep_rapl_init), /* IvyTown */
+ X86_RAPL_MODEL_MATCH(79, hsx_rapl_init), /* Broadwell-Server */
+ X86_RAPL_MODEL_MATCH(86, hsx_rapl_init), /* Broadwell Xeon D */
+
X86_RAPL_MODEL_MATCH(87, knl_rapl_init), /* Knights Landing */
{},
};
[toc] | [prev] | [next] | [standalone]
| From | Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> |
|---|---|
| Date | 2016-04-20 20:00 +0200 |
| Message-ID | <rq4zV-3eo-33@gated-at.bofh.it> |
| In reply to | #1383509 |
On Wed, 2016-04-20 at 17:38 +0200, Peter Zijlstra wrote:
> On Sun, Apr 17, 2016 at 08:43:29AM -0700, Srinivas Pandruvada wrote:
> >
> > Added one missing Haswell model.
> Indeed, but when I compare with the table in events/intel/core.c I
> find
> we also miss one Broadwell (86) model.
>
> Would the below be correct for that?
Yes.
Thanks,
Srinivas
>
> ---
> arch/x86/events/intel/rapl.c | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/arch/x86/events/intel/rapl.c
> b/arch/x86/events/intel/rapl.c
> index 7c56b985c9f6..f9129a85928a 100644
> --- a/arch/x86/events/intel/rapl.c
> +++ b/arch/x86/events/intel/rapl.c
> @@ -739,16 +739,21 @@ static const struct intel_rapl_init_fun
> knl_rapl_init __initconst = {
>
> static const struct x86_cpu_id rapl_cpu_match[] __initconst = {
> X86_RAPL_MODEL_MATCH(42, snb_rapl_init), /* Sandy
> Bridge */
> + X86_RAPL_MODEL_MATCH(45, snbep_rapl_init), /* Sandy
> Bridge-EP */
> +
> X86_RAPL_MODEL_MATCH(58, snb_rapl_init), /* Ivy
> Bridge */
> - X86_RAPL_MODEL_MATCH(63, hsx_rapl_init), /* Haswell-
> Server */
> - X86_RAPL_MODEL_MATCH(79, hsx_rapl_init), /*
> Broadwell-Server */
> + X86_RAPL_MODEL_MATCH(62, snbep_rapl_init), /* IvyTown
> */
> +
> X86_RAPL_MODEL_MATCH(60, hsw_rapl_init), /* Haswell
> */
> + X86_RAPL_MODEL_MATCH(63, hsx_rapl_init), /* Haswell-
> Server */
> X86_RAPL_MODEL_MATCH(69, hsw_rapl_init), /* Haswell-
> Celeron */
> X86_RAPL_MODEL_MATCH(70, hsw_rapl_init), /* Haswell
> GTe3 */
> +
> X86_RAPL_MODEL_MATCH(61, hsw_rapl_init), /* Broadwell
> */
> X86_RAPL_MODEL_MATCH(71, hsw_rapl_init), /*
> Broadwell-H */
> - X86_RAPL_MODEL_MATCH(45, snbep_rapl_init), /* Sandy
> Bridge-EP */
> - X86_RAPL_MODEL_MATCH(62, snbep_rapl_init), /* IvyTown
> */
> + X86_RAPL_MODEL_MATCH(79, hsx_rapl_init), /*
> Broadwell-Server */
> + X86_RAPL_MODEL_MATCH(86, hsx_rapl_init), /* Broadwell
> Xeon D */
> +
> X86_RAPL_MODEL_MATCH(87, knl_rapl_init), /* Knights
> Landing */
> {},
> };
[toc] | [prev] | [next] | [standalone]
| From | tip-bot for Srinivas Pandruvada <tipbot@zytor.com> |
|---|---|
| Date | 2016-04-23 15:00 +0200 |
| Subject | [tip:perf/core] perf/x86/intel/rapl: Add missing Haswell model |
| Message-ID | <rr5ke-3bE-1@gated-at.bofh.it> |
| In reply to | #1380771 |
Commit-ID: e1089602a3bf3efd13d0ffc575f3e22213f009da Gitweb: http://git.kernel.org/tip/e1089602a3bf3efd13d0ffc575f3e22213f009da Author: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> AuthorDate: Sun, 17 Apr 2016 08:43:29 -0700 Committer: Ingo Molnar <mingo@kernel.org> CommitDate: Sat, 23 Apr 2016 13:46:45 +0200 perf/x86/intel/rapl: Add missing Haswell model Added one missing Haswell model. Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Vince Weaver <vincent.weaver@maine.edu> Cc: bp@alien8.de Cc: hpa@zytor.com Link: http://lkml.kernel.org/r/1460907809-11897-1-git-send-email-srinivas.pandruvada@linux.intel.com Signed-off-by: Ingo Molnar <mingo@kernel.org> --- arch/x86/events/intel/rapl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c index 70c93f9..1705c9d 100644 --- a/arch/x86/events/intel/rapl.c +++ b/arch/x86/events/intel/rapl.c @@ -718,6 +718,7 @@ static int __init rapl_pmu_init(void) break; case 60: /* Haswell */ case 69: /* Haswell-Celeron */ + case 70: /* Haswell GT3e */ case 61: /* Broadwell */ case 71: /* Broadwell-H */ rapl_cntr_mask = RAPL_IDX_HSW;
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web