2019-12-27 09:21:02

by Harry Pan

Subject: [PATCH] perf/x86/intel/rapl: Add Comet Lake support

Comet Lake supports the same RAPL counters like Kaby Lake and Skylake.
After this, on CML machine the energy counters appear in perf list.

Signed-off-by: Harry Pan <[email protected]>

---

arch/x86/events/intel/rapl.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c
index 5053a403e4ae..09913121e726 100644
--- a/arch/x86/events/intel/rapl.c
+++ b/arch/x86/events/intel/rapl.c
@@ -741,6 +741,8 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = {
X86_RAPL_MODEL_MATCH(INTEL_FAM6_ATOM_GOLDMONT_PLUS, model_hsw),
X86_RAPL_MODEL_MATCH(INTEL_FAM6_ICELAKE_L, model_skl),
X86_RAPL_MODEL_MATCH(INTEL_FAM6_ICELAKE, model_skl),
+ X86_RAPL_MODEL_MATCH(INTEL_FAM6_COMETLAKE_L, model_skl),
+ X86_RAPL_MODEL_MATCH(INTEL_FAM6_COMETLAKE, model_skl),
{},
};

--
2.24.1

2020-01-06 15:09:35

by Peter Zijlstra

Subject: Re: [PATCH] perf/x86/intel/rapl: Add Comet Lake support

On Fri, Dec 27, 2019 at 05:19:46PM +0800, Harry Pan wrote:
> Comet Lake supports the same RAPL counters like Kaby Lake and Skylake.
> After this, on CML machine the energy counters appear in perf list.
>
> Signed-off-by: Harry Pan <[email protected]>

Thanks!

2020-01-17 10:12:56

by tip-bot2 for Jacob Pan

Subject: [tip: perf/core] perf/x86/intel/rapl: Add Comet Lake support

The following commit has been merged into the perf/core branch of tip:

Commit-ID: 1e0f17724a74c8e94a5235bee7397987b424893f
Gitweb: https://git.kernel.org/tip/1e0f17724a74c8e94a5235bee7397987b424893f
Author: Harry Pan <[email protected]>
AuthorDate: Fri, 27 Dec 2019 17:19:46 +08:00
Committer: Peter Zijlstra <[email protected]>
CommitterDate: Fri, 17 Jan 2020 10:19:25 +01:00

perf/x86/intel/rapl: Add Comet Lake support

Comet Lake supports the same RAPL counters like Kaby Lake and Skylake.
After this, on CML machine the energy counters appear in perf list.

Signed-off-by: Harry Pan <[email protected]>
Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
Link: https://lkml.kernel.org/r/20191227171944.1.Id6f3ab98474d7d1dba5b95390b24e0a67368d364@changeid
---
arch/x86/events/intel/rapl.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c
index 5053a40..0991312 100644
--- a/arch/x86/events/intel/rapl.c
+++ b/arch/x86/events/intel/rapl.c
@@ -741,6 +741,8 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = {
X86_RAPL_MODEL_MATCH(INTEL_FAM6_ATOM_GOLDMONT_PLUS, model_hsw),
X86_RAPL_MODEL_MATCH(INTEL_FAM6_ICELAKE_L, model_skl),
X86_RAPL_MODEL_MATCH(INTEL_FAM6_ICELAKE, model_skl),
+ X86_RAPL_MODEL_MATCH(INTEL_FAM6_COMETLAKE_L, model_skl),
+ X86_RAPL_MODEL_MATCH(INTEL_FAM6_COMETLAKE, model_skl),
{},
};