Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions include/cpuinfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -614,6 +614,11 @@ enum cpuinfo_uarch {
/** Apple A18 pro processor (little cores). */
cpuinfo_uarch_tahiti_sawtooth = 0x00700207,

/** Apple M4 processor (big cores). */
cpuinfo_uarch_donan_everest = 0x00700308,
/** Apple M4 processor (little cores). */
cpuinfo_uarch_donan_sawtooth = 0x00700309,

/** Cavium ThunderX. */
cpuinfo_uarch_thunderx = 0x00800100,
/** Cavium ThunderX2 (originally Broadcom Vulkan). */
Expand Down
6 changes: 5 additions & 1 deletion src/arm/mach/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,11 @@ static enum cpuinfo_uarch decode_uarch(uint32_t cpu_family, uint32_t core_index,
/* Hexa-core: 2x Avalanche + 4x Blizzard */
return core_index + 4 < core_count ? cpuinfo_uarch_tahiti_everest
: cpuinfo_uarch_tahiti_sawtooth;

case CPUFAMILY_ARM_DONAN: /* M4 */
/* 10-core: 4x Donan Everest + 6x Donan Sawtooth */
case CPUFAMILY_ARM_BRAVA: /* M4 Pro */
/* 14-core: 10x Donan Everest + 4x Donan Sawtooth */
return core_index + 4 < core_count ? cpuinfo_uarch_donan_everest : cpuinfo_uarch_donan_sawtooth;
default:
/* Use hw.cpusubtype for detection */
break;
Expand Down
4 changes: 4 additions & 0 deletions tools/cpu-info.c
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,10 @@ static const char* uarch_to_string(enum cpuinfo_uarch uarch) {
return "Tahiti_Everest";
case cpuinfo_uarch_tahiti_sawtooth:
return "Tahiti_Sawtooth";
case cpuinfo_uarch_donan_everest:
return "Donan Everest";
case cpuinfo_uarch_donan_sawtooth:
return "Donan Sawtooth";
case cpuinfo_uarch_thunderx:
return "ThunderX";
case cpuinfo_uarch_thunderx2:
Expand Down
Loading