Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 16:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1639785 - Update rapl for new processors. r=erahm

Browse Source 
Also change the processor IDs to hex, because that's what the Linux kernel
source code uses. And reorder the cases a little.

Differential Revision: https://phabricator.services.mozilla.com/D76272
This commit is contained in:
Nicholas Nethercote 2020-05-22 02:29:54 +00:00
parent 525520f10b
commit 60ecbac3b2
1 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
tools/power/rapl.cpp
View File

@ -294,33 +294,60 @@ class RAPL {
// This is similar to arch/x86/kernel/cpu/perf_event_intel_rapl.c in
// linux-4.1.5/.
//
// By linux-5.6.14/, this stuff had moved into
// arch/x86/events/intel/rapl.c, which references processor families in
// arch/x86/include/asm/intel-family.h.
switch (cpuModel) {
case 60: // 0x3c: Haswell
case 69: // 0x45: Haswell-Celeron
case 70: // 0x46: Haswell
case 61: // 0x3d: Broadwell
// Supports package, cores, GPU, RAM.
mIsGpuSupported = true;
mIsRamSupported = true;
break;
case 42: // 0x2a: Sandy Bridge
case 58: // 0x3a: Ivy Bridge
case 0x2a: // Sandy Bridge
case 0x3a: // Ivy Bridge
// Supports package, cores, GPU.
mIsGpuSupported = true;
mIsRamSupported = false;
break;
case 63: // 0x3f: Haswell-Server
case 0x3f: // Haswell X
case 0x4f: // Broadwell X
case 0x55: // Skylake X
case 0x56: // Broadwell D
// Supports package, cores, RAM. Has the units quirk.
mIsGpuSupported = false;
mIsRamSupported = true;
mHasRamUnitsQuirk = true;
[[fallthrough]];
case 45: // 0x2d: Sandy Bridge-EP
case 62: // 0x3e: Ivy Bridge-E
break;
case 0x2d: // Sandy Bridge X
case 0x3e: // Ivy Bridge X
// Supports package, cores, RAM.
mIsGpuSupported = false;
mIsRamSupported = true;
break;
case 0x3c: // Haswell
case 0x3d: // Broadwell
case 0x45: // Haswell L
case 0x46: // Haswell G
case 0x47: // Broadwell G
// Supports package, cores, GPU, RAM.
mIsGpuSupported = true;
mIsRamSupported = true;
break;
case 0x4e: // Skylake L
case 0x5e: // Skylake
case 0x8e: // Kaby Lake L
case 0x9e: // Kaby Lake
case 0x66: // Cannon Lake L
case 0x7d: // Ice Lake
case 0x7e: // Ice Lake L
case 0xa5: // Comet Lake
case 0xa6: // Comet Lake L
// Supports package, cores, GPU, RAM, PSYS.
// XXX: this tool currently doesn't measure PSYS.
mIsGpuSupported = true;
mIsRamSupported = true;
break;
default:
Abort("unknown CPU model: %d", cpuModel);
break;