check length of cachesize(), fixes #13

JuliaSIMD · Sep 8, 2022 · 6b35f33 · 6b35f33 · chriselrod · Sep 8, 2022
1 parent 8eb4d42
commit 6b35f33
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "CPUSummary"
 uuid = "2a0fbf3d-bb9c-48f3-b0a9-814d99fd7ab9"
 authors = ["chriselrod <[email protected]> and contributors"]
-version = "0.1.26"
+version = "0.1.27"
 
 [deps]
 CpuId = "adafc99b-e345-5852-983c-f28acb93d879"

diff --git a/src/x86.jl b/src/x86.jl
@@ -26,7 +26,9 @@ else
 end
 num_l4cache() = static(0)
 
-const PrecompiledCacheSize = CpuId.cachesize() .÷ (1, 1, CpuId.cpucores())
+const PrecompiledCacheSize = let cs = CpuId.cachesize()
+  ntuple(i -> i == 3 ? cs[3] ÷ CpuId.cpucores() : cs[i], length(cs))
+end
 const PrecompiledCacheInclusive = CpuId.cacheinclusive()
 cache_inclusive(_) = False()
 @noinline function _eval_cache_size(cachesize)
@@ -56,7 +58,9 @@ cache_size(_) = StaticInt{0}()
 
 # cache_size(::Union{Val{3},StaticInt{3}}) = num_cores() * StaticInt{1441792}()
 function _extra_init()
-  cs = CpuId.cachesize() .÷ (1, 1, CpuId.cpucores())
+  cs = let cs=CpuId.cachesize()
+    ntuple(i -> i == 3 ? cs[3] ÷ CpuId.cpucores() : cs[i], length(cs))
+  end
   cs === PrecompiledCacheSize || _eval_cache_size(cs)
   ci = CpuId.cacheinclusive()
   ci === PrecompiledCacheInclusive || _eval_cache_inclusive(ci)