better apple silicon support

Author: chriselrod

Project.toml

@@ -1,7 +1,7 @@
 name = "CPUSummary"
 uuid = "2a0fbf3d-bb9c-48f3-b0a9-814d99fd7ab9"
 authors = ["chriselrod <elrodc@gmail.com> and contributors"]
-version = "0.1.14"
+version = "0.1.15"
 
 [deps]
 Hwloc = "0e44f5e4-bd66-52a0-8798-143a42290a1d"

src/CPUSummary.jl

@@ -6,7 +6,7 @@ using IfElse: ifelse
 export cache_size, cache_linesize, cache_associativity, cache_type,
   cache_inclusive, num_cache, num_cores, num_threads
 
-const USE_HWLOC = @load_preference("hwloc", true)
+const USE_HWLOC = @load_preference("hwloc", Sys.ARCH !== :aarch64 || !Sys.isapple())
 use_hwloc(b) = @set_preferences!("hwloc" => b)
 
 @static if USE_HWLOC

src/generic_topology.jl

@@ -2,21 +2,31 @@
 num_machines() = static(1)
 num_sockets() = static(1)
 
-let nc = static((Sys.CPU_THREADS)::Int>>1)
+function _get_num_threads()
+  static((Sys.CPU_THREADS)::Int >> (Sys.ARCH !== :aarch64))
+end
+
+let nc = _get_num_threads()
   global num_l1cache() = nc
   global num_cores() = nc
 end
 let syst = static((Sys.CPU_THREADS)::Int)
   global sys_threads() = syst
   global num_threads() = syst
 end
-
+@static if Sys.ARCH === :aarch64
+num_l2cache() = static(1)
+num_l3cache() = static(0)
+else
 num_l2cache() = num_l1cache()
 num_l3cache() = static(1)
+end
 num_l4cache() = static(0)
 
 if Sys.CPU_NAME === "tigerlake" || Sys.CPU_NAME === "icelake" || Sys.CPU_NAME === "icelake-server"
   cache_size(::Union{Val{1},StaticInt{1}}) = StaticInt{49152}()
+elseif Sys.ARCH === :aarch64 && Sys.isapple()
+  cache_size(::Union{Val{1},StaticInt{1}}) = StaticInt{131072}()
 else
   cache_size(::Union{Val{1},StaticInt{1}}) = StaticInt{32768}()
 end
@@ -30,6 +40,8 @@ elseif Sys.CPU_NAME === "tigerlake" || Sys.CPU_NAME === "icelake-server"
   cache_size(::Union{Val{2},StaticInt{2}}) = StaticInt{1310720}()
 elseif occursin("zn", Sys.CPU_NAME) || occursin("icelake", Sys.CPU_NAME)
   cache_size(::Union{Val{2},StaticInt{2}}) = StaticInt{524288}()
+elseif Sys.ARCH === :aarch64 && Sys.isapple()
+  cache_size(::Union{Val{2},StaticInt{2}}) = StaticInt{12582912}()
 else
   cache_size(::Union{Val{2},StaticInt{2}}) = StaticInt{262144}()
 end
@@ -48,7 +60,7 @@ cache_size(::Union{Val{3},StaticInt{3}}) = num_cores() * StaticInt{1441792}()
 
 function __init__()
   ccall(:jl_generating_output, Cint, ()) == 1 && return
-  nc = (Sys.CPU_THREADS)::Int>>1
+  nc = _get_num_threads()
   syst = Sys.CPU_THREADS::Int
   nt = Threads.nthreads()
   if nc != num_l1cache()