Fix a bug in navigating Hwloc's topology.

JuliaSIMD · Dec 14, 2020 · dd7bfcd · dd7bfcd · chriselrod · Dec 14, 2020
1 parent 95935bb
commit dd7bfcd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 18 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "VectorizationBase"
 uuid = "3d5dd08c-fd9d-11e8-17fa-ed2836048c2f"
 authors = ["Chris Elrod <elrodc@gmail.com>"]
-version = "0.13.11"
+version = "0.13.12"
 
 [deps]
 ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"

diff --git a/src/topology.jl b/src/topology.jl
@@ -1,5 +1,4 @@
 
-
 const TOPOLOGY = Hwloc.topology_load();
 const CACHE = TOPOLOGY.children[1].children[1];
 const COUNTS = Hwloc.histmap(TOPOLOGY);
@@ -26,16 +25,14 @@ function define_cache(N)
             type = nothing
         )
     end
-    c = CACHE
-    for n ∈ 1:CACHE_LEVELS-N
-        c = first(c.children)
-    end
+    cache_name = (:L1Cache, :L2Cache, :L3Cache, :L4Cache)[N]
+    c = first(t for t in TOPOLOGY if t.type_ == cache_name && t.attr.depth == N).attr
     (
-        size = c.attr.size,
-        depth = c.attr.depth,
-        linesize = c.attr.linesize,
-        associativity = c.attr.associativity,
-        type = c.attr.type_
+        size = c.size,
+        depth = c.depth,
+        linesize = c.linesize,
+        associativity = c.associativity,
+        type = c.type_
     )
 end
 
@@ -45,18 +42,12 @@ const L₂CACHE = define_cache(2)
 const L₃CACHE = define_cache(3)
 const L₄CACHE = define_cache(4)
 """
-L₁, L₂, L₃ cache size
+L₁, L₂, L₃, L₄ cache size
 """
 const CACHE_SIZE = (
     L₁CACHE.size,
     L₂CACHE.size,
     L₃CACHE.size,
     L₄CACHE.size
 )
-# const CACHE_NEST_COUNT = (
-#     length(CACHE.children[1].children),
-#     length(CACHE.children),
-#     length(TOPOLOGY.children[1].children)
-# )
-