87f4b71df0
* client/fingerprint: correctly fingerprint E/P cores of Apple Silicon chips This PR adds detection of asymetric core types (Power & Efficiency) (P/E) when running on M1/M2 Apple Silicon CPUs. This functionality is provided by shoenig/go-m1cpu which makes use of the Apple IOKit framework to read undocumented registers containing CPU performance data. Currently working on getting that functionality merged upstream into gopsutil, but gopsutil would still not support detecting P vs E cores like this PR does. Also refactors the CPUFingerprinter code to handle the mixed core types, now setting power vs efficiency cpu attributes. For now the scheduler is still unaware of mixed core types - on Apple platforms tasks cannot reserve cores anyway so it doesn't matter, but at least now the total CPU shares available will be correct. Future work should include adding support for detecting P/E cores on the latest and upcoming Intel chips, where computation of total cpu shares is currently incorrect. For that, we should also include updating the scheduler to be core-type aware, so that tasks of resources.cores on Linux platforms can be assigned the correct number of CPU shares for the core type(s) they have been assigned. node attributes before cpu.arch = arm64 cpu.modelname = Apple M2 Pro cpu.numcores = 12 cpu.reservablecores = 0 cpu.totalcompute = 1000 node attributes after cpu.arch = arm64 cpu.frequency.efficiency = 2424 cpu.frequency.power = 3504 cpu.modelname = Apple M2 Pro cpu.numcores.efficiency = 4 cpu.numcores.power = 8 cpu.reservablecores = 0 cpu.totalcompute = 37728 * fingerprint/cpu: follow up cr items
18 lines
544 B
Go
18 lines
544 B
Go
package fingerprint
|
|
|
|
import (
|
|
"github.com/hashicorp/nomad/client/lib/cgutil"
|
|
)
|
|
|
|
func (f *CPUFingerprint) deriveReservableCores(cgroupParent string) []uint16 {
|
|
// The cpuset cgroup manager is initialized (on linux), but not accessible
|
|
// from the finger-printer. So we reach in and grab the information manually.
|
|
// We may assume the hierarchy is already setup.
|
|
cpuset, err := cgutil.GetCPUsFromCgroup(cgroupParent)
|
|
if err != nil {
|
|
f.logger.Warn("failed to detect set of reservable cores", "error", err)
|
|
return nil
|
|
}
|
|
return cpuset
|
|
}
|