have cache_size always refer to per core

Author: chriselrod

Project.toml

@@ -1,7 +1,7 @@
 name = "CPUSummary"
 uuid = "2a0fbf3d-bb9c-48f3-b0a9-814d99fd7ab9"
 authors = ["chriselrod <[email protected]> and contributors"]
-version = "0.1.25"
+version = "0.1.26"
 
 [deps]
 CpuId = "adafc99b-e345-5852-983c-f28acb93d879"

src/CPUSummary.jl

@@ -35,6 +35,13 @@ export cache_size,
 #     include("generic_topology.jl")
 #   end
 # else
+"""
+    cache_size(::Val{N})
+
+Returns the cache size per core of the `N`th cache
+"""
+function cache_size end
+
 if (Sys.ARCH === :x86_64)
   include("x86.jl")
 else

src/x86.jl

@@ -26,7 +26,7 @@ else
 end
 num_l4cache() = static(0)
 
-const PrecompiledCacheSize = CpuId.cachesize()
+const PrecompiledCacheSize = CpuId.cachesize() .÷ (1, 1, CpuId.cpucores())
 const PrecompiledCacheInclusive = CpuId.cacheinclusive()
 cache_inclusive(_) = False()
 @noinline function _eval_cache_size(cachesize)
@@ -56,12 +56,7 @@ cache_size(_) = StaticInt{0}()
 
 # cache_size(::Union{Val{3},StaticInt{3}}) = num_cores() * StaticInt{1441792}()
 function _extra_init()
-  nc = _get_num_cores()
-  if (nc != CpuId.cpucores())
-    cache_l3_per_core = CpuId.cachesize(3) ÷ max(CpuId.cpucores(), 1)
-    @eval cache_size(::Union{Val{3},StaticInt{3}}) = $(static(cache_l3_per_core * nc))
-  end
-  cs = CpuId.cachesize()
+  cs = CpuId.cachesize() .÷ (1, 1, CpuId.cpucores())
   cs === PrecompiledCacheSize || _eval_cache_size(cs)
   ci = CpuId.cacheinclusive()
   ci === PrecompiledCacheInclusive || _eval_cache_inclusive(ci)