* [PATCH] perf/x86/intel/rapl: Add missing Haswell model @ 2016-04-17 15:43 Srinivas Pandruvada 2016-04-20 15:38 ` Peter Zijlstra 2016-04-23 12:53 ` [tip:perf/core] " tip-bot for Srinivas Pandruvada 0 siblings, 2 replies; 4+ messages in thread From: Srinivas Pandruvada @ 2016-04-17 15:43 UTC (permalink / raw) To: tglx, mingo, hpa; +Cc: x86, peterz, bp, linux-kernel, Srinivas Pandruvada 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 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] perf/x86/intel/rapl: Add missing Haswell model 2016-04-17 15:43 [PATCH] perf/x86/intel/rapl: Add missing Haswell model Srinivas Pandruvada @ 2016-04-20 15:38 ` Peter Zijlstra 2016-04-20 17:58 ` Srinivas Pandruvada 2016-04-23 12:53 ` [tip:perf/core] " tip-bot for Srinivas Pandruvada 1 sibling, 1 reply; 4+ messages in thread From: Peter Zijlstra @ 2016-04-20 15:38 UTC (permalink / raw) To: Srinivas Pandruvada; +Cc: tglx, mingo, hpa, x86, bp, linux-kernel 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 */ {}, }; ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] perf/x86/intel/rapl: Add missing Haswell model 2016-04-20 15:38 ` Peter Zijlstra @ 2016-04-20 17:58 ` Srinivas Pandruvada 0 siblings, 0 replies; 4+ messages in thread From: Srinivas Pandruvada @ 2016-04-20 17:58 UTC (permalink / raw) To: Peter Zijlstra; +Cc: tglx, mingo, hpa, x86, bp, linux-kernel 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 */ > {}, > }; ^ permalink raw reply [flat|nested] 4+ messages in thread
* [tip:perf/core] perf/x86/intel/rapl: Add missing Haswell model 2016-04-17 15:43 [PATCH] perf/x86/intel/rapl: Add missing Haswell model Srinivas Pandruvada 2016-04-20 15:38 ` Peter Zijlstra @ 2016-04-23 12:53 ` tip-bot for Srinivas Pandruvada 1 sibling, 0 replies; 4+ messages in thread From: tip-bot for Srinivas Pandruvada @ 2016-04-23 12:53 UTC (permalink / raw) To: linux-tip-commits Cc: hpa, tglx, peterz, torvalds, srinivas.pandruvada, alexander.shishkin, linux-kernel, eranian, jolsa, mingo, vincent.weaver, acme 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; ^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-04-23 12:54 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-04-17 15:43 [PATCH] perf/x86/intel/rapl: Add missing Haswell model Srinivas Pandruvada 2016-04-20 15:38 ` Peter Zijlstra 2016-04-20 17:58 ` Srinivas Pandruvada 2016-04-23 12:53 ` [tip:perf/core] " tip-bot for Srinivas Pandruvada
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).