mirror of
https://github.com/kemko/nomad.git
synced 2026-01-06 18:35:44 +03:00
591394fb62
* drivers: plumb hardware topology via grpc into drivers This PR swaps out the temporary use of detecting system hardware manually in each driver for using the Client's detected topology by plumbing the data over gRPC. This ensures that Client configuration is taken to account consistently in all references to system topology. * cr: use enum instead of bool for core grade * cr: fix test slit tables to be possible
76 lines
1.8 KiB
Go
76 lines
1.8 KiB
Go
// Copyright (c) HashiCorp, Inc.
|
|
// SPDX-License-Identifier: BUSL-1.1
|
|
|
|
//go:build darwin
|
|
|
|
package numalib
|
|
|
|
import (
|
|
"github.com/hashicorp/nomad/client/lib/idset"
|
|
"github.com/hashicorp/nomad/client/lib/numalib/hw"
|
|
"github.com/shoenig/go-m1cpu"
|
|
"golang.org/x/sys/unix"
|
|
)
|
|
|
|
// PlatformScanners returns the set of SystemScanner for macOS.
|
|
func PlatformScanners() []SystemScanner {
|
|
return []SystemScanner{
|
|
new(MacOS),
|
|
}
|
|
}
|
|
|
|
const (
|
|
nodeID = hw.NodeID(0)
|
|
socketID = hw.SocketID(0)
|
|
maxSpeed = hw.KHz(0)
|
|
)
|
|
|
|
// MacOS implements SystemScanner for macOS systems (both arm64 and x86).
|
|
type MacOS struct{}
|
|
|
|
func (m *MacOS) ScanSystem(top *Topology) {
|
|
// all apple hardware is non-numa; just assume as much
|
|
top.NodeIDs = idset.Empty[hw.NodeID]()
|
|
top.NodeIDs.Insert(nodeID)
|
|
|
|
// arch specific detection
|
|
switch m1cpu.IsAppleSilicon() {
|
|
case true:
|
|
m.scanAppleSilicon(top)
|
|
case false:
|
|
m.scanLegacyX86(top)
|
|
}
|
|
}
|
|
|
|
func (m *MacOS) scanAppleSilicon(top *Topology) {
|
|
pCoreCount := m1cpu.PCoreCount()
|
|
pCoreSpeed := hw.KHz(m1cpu.PCoreHz() / 1000)
|
|
|
|
eCoreCount := m1cpu.ECoreCount()
|
|
eCoreSpeed := hw.KHz(m1cpu.ECoreHz() / 1000)
|
|
|
|
top.Cores = make([]Core, pCoreCount+eCoreCount)
|
|
nthCore := hw.CoreID(0)
|
|
|
|
for i := 0; i < pCoreCount; i++ {
|
|
top.insert(nodeID, socketID, nthCore, Performance, maxSpeed, pCoreSpeed)
|
|
nthCore++
|
|
}
|
|
|
|
for i := 0; i < eCoreCount; i++ {
|
|
top.insert(nodeID, socketID, nthCore, Efficiency, maxSpeed, eCoreSpeed)
|
|
nthCore++
|
|
}
|
|
}
|
|
|
|
func (m *MacOS) scanLegacyX86(top *Topology) {
|
|
coreCount, _ := unix.SysctlUint32("machdep.cpu.core_count")
|
|
hz, _ := unix.SysctlUint64("hw.cpufrequency")
|
|
coreSpeed := hw.KHz(hz / 1_000_000)
|
|
|
|
top.Cores = make([]Core, coreCount)
|
|
for i := 0; i < int(coreCount); i++ {
|
|
top.insert(nodeID, socketID, hw.CoreID(i), Performance, maxSpeed, coreSpeed)
|
|
}
|
|
}
|