Skip to content

Commit 5a8f79f

Browse files
authored
add apple A17 and M3 family macro (#5405)
1 parent 2a07aa2 commit 5a8f79f

File tree

1 file changed

+41
-13
lines changed

1 file changed

+41
-13
lines changed

src/cpu.cpp

+41-13
Original file line numberDiff line numberDiff line change
@@ -93,25 +93,33 @@
9393
#ifndef CPUFAMILY_ARM_LIGHTNING_THUNDER
9494
#define CPUFAMILY_ARM_LIGHTNING_THUNDER 0x462504d2
9595
#endif
96-
// A14
96+
// A14 / M1
9797
#ifndef CPUFAMILY_ARM_FIRESTORM_ICESTORM
9898
#define CPUFAMILY_ARM_FIRESTORM_ICESTORM 0x1b588bb3
9999
#endif
100-
// A15
100+
// A15 / M2
101101
#ifndef CPUFAMILY_ARM_AVALANCHE_BLIZZARD
102102
#define CPUFAMILY_ARM_AVALANCHE_BLIZZARD 0xda33d83d
103103
#endif
104104
// A16
105105
#ifndef CPUFAMILY_ARM_EVEREST_SAWTOOTH
106106
#define CPUFAMILY_ARM_EVEREST_SAWTOOTH 0x8765edea
107107
#endif
108-
// M1
109-
#ifndef CPUFAMILY_AARCH64_FIRESTORM_ICESTORM
110-
#define CPUFAMILY_AARCH64_FIRESTORM_ICESTORM 0x1b588bb3
108+
// A17
109+
#ifndef CPUFAMILY_ARM_COLL
110+
#define CPUFAMILY_ARM_COLL 0x2876f5b5
111111
#endif
112-
// M2
113-
#ifndef CPUFAMILY_AARCH64_AVALANCHE_BLIZZARD
114-
#define CPUFAMILY_AARCH64_AVALANCHE_BLIZZARD 0xda33d83d
112+
// M3
113+
#ifndef CPUFAMILY_ARM_IBIZA
114+
#define CPUFAMILY_ARM_IBIZA 0xfa33415e
115+
#endif
116+
// M3 Pro
117+
#ifndef CPUFAMILY_ARM_LOBOS
118+
#define CPUFAMILY_ARM_LOBOS 0x5f4dea93
119+
#endif
120+
// M3 Max
121+
#ifndef CPUFAMILY_ARM_PALMA
122+
#define CPUFAMILY_ARM_PALMA 0x72015832
115123
#endif
116124
#endif // __APPLE__
117125

@@ -2146,7 +2154,11 @@ int cpu_support_arm_asimdhp()
21462154
|| g_hw_cpufamily == CPUFAMILY_ARM_LIGHTNING_THUNDER
21472155
|| g_hw_cpufamily == CPUFAMILY_ARM_FIRESTORM_ICESTORM
21482156
|| g_hw_cpufamily == CPUFAMILY_ARM_AVALANCHE_BLIZZARD
2149-
|| g_hw_cpufamily == CPUFAMILY_ARM_EVEREST_SAWTOOTH;
2157+
|| g_hw_cpufamily == CPUFAMILY_ARM_EVEREST_SAWTOOTH
2158+
|| g_hw_cpufamily == CPUFAMILY_ARM_COLL
2159+
|| g_hw_cpufamily == CPUFAMILY_ARM_IBIZA
2160+
|| g_hw_cpufamily == CPUFAMILY_ARM_LOBOS
2161+
|| g_hw_cpufamily == CPUFAMILY_ARM_PALMA;
21502162
#else
21512163
return 0;
21522164
#endif
@@ -2186,7 +2198,11 @@ int cpu_support_arm_asimddp()
21862198
|| g_hw_cpufamily == CPUFAMILY_ARM_LIGHTNING_THUNDER
21872199
|| g_hw_cpufamily == CPUFAMILY_ARM_FIRESTORM_ICESTORM
21882200
|| g_hw_cpufamily == CPUFAMILY_ARM_AVALANCHE_BLIZZARD
2189-
|| g_hw_cpufamily == CPUFAMILY_ARM_EVEREST_SAWTOOTH;
2201+
|| g_hw_cpufamily == CPUFAMILY_ARM_EVEREST_SAWTOOTH
2202+
|| g_hw_cpufamily == CPUFAMILY_ARM_COLL
2203+
|| g_hw_cpufamily == CPUFAMILY_ARM_IBIZA
2204+
|| g_hw_cpufamily == CPUFAMILY_ARM_LOBOS
2205+
|| g_hw_cpufamily == CPUFAMILY_ARM_PALMA;
21902206
#else
21912207
return 0;
21922208
#endif
@@ -2208,7 +2224,11 @@ int cpu_support_arm_asimdfhm()
22082224
|| g_hw_cpufamily == CPUFAMILY_ARM_LIGHTNING_THUNDER
22092225
|| g_hw_cpufamily == CPUFAMILY_ARM_FIRESTORM_ICESTORM
22102226
|| g_hw_cpufamily == CPUFAMILY_ARM_AVALANCHE_BLIZZARD
2211-
|| g_hw_cpufamily == CPUFAMILY_ARM_EVEREST_SAWTOOTH;
2227+
|| g_hw_cpufamily == CPUFAMILY_ARM_EVEREST_SAWTOOTH
2228+
|| g_hw_cpufamily == CPUFAMILY_ARM_COLL
2229+
|| g_hw_cpufamily == CPUFAMILY_ARM_IBIZA
2230+
|| g_hw_cpufamily == CPUFAMILY_ARM_LOBOS
2231+
|| g_hw_cpufamily == CPUFAMILY_ARM_PALMA;
22122232
#else
22132233
return 0;
22142234
#endif
@@ -2228,7 +2248,11 @@ int cpu_support_arm_bf16()
22282248
#elif __APPLE__
22292249
return g_hw_optional_arm_FEAT_BF16
22302250
|| g_hw_cpufamily == CPUFAMILY_ARM_AVALANCHE_BLIZZARD
2231-
|| g_hw_cpufamily == CPUFAMILY_ARM_EVEREST_SAWTOOTH;
2251+
|| g_hw_cpufamily == CPUFAMILY_ARM_EVEREST_SAWTOOTH
2252+
|| g_hw_cpufamily == CPUFAMILY_ARM_COLL
2253+
|| g_hw_cpufamily == CPUFAMILY_ARM_IBIZA
2254+
|| g_hw_cpufamily == CPUFAMILY_ARM_LOBOS
2255+
|| g_hw_cpufamily == CPUFAMILY_ARM_PALMA;
22322256
#else
22332257
return 0;
22342258
#endif
@@ -2248,7 +2272,11 @@ int cpu_support_arm_i8mm()
22482272
#elif __APPLE__
22492273
return g_hw_optional_arm_FEAT_I8MM
22502274
|| g_hw_cpufamily == CPUFAMILY_ARM_AVALANCHE_BLIZZARD
2251-
|| g_hw_cpufamily == CPUFAMILY_ARM_EVEREST_SAWTOOTH;
2275+
|| g_hw_cpufamily == CPUFAMILY_ARM_EVEREST_SAWTOOTH
2276+
|| g_hw_cpufamily == CPUFAMILY_ARM_COLL
2277+
|| g_hw_cpufamily == CPUFAMILY_ARM_IBIZA
2278+
|| g_hw_cpufamily == CPUFAMILY_ARM_LOBOS
2279+
|| g_hw_cpufamily == CPUFAMILY_ARM_PALMA;
22522280
#else
22532281
return 0;
22542282
#endif

0 commit comments

Comments
 (0)