alderlake, and don't create a project that tries to install hwloc

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.15"
+version = "0.1.16"
 
 [deps]
 Hwloc = "0e44f5e4-bd66-52a0-8798-143a42290a1d"

src/CPUSummary.jl

@@ -10,9 +10,8 @@ const USE_HWLOC = @load_preference("hwloc", Sys.ARCH !== :aarch64 || !Sys.isappl
 use_hwloc(b) = @set_preferences!("hwloc" => b)
 
 @static if USE_HWLOC
-  tmpd = mktempdir()
   try
-    p = run(`$(Base.julia_cmd()) --project=$tmpd -e'using Pkg; Pkg.add("Hwloc"); using Hwloc; Hwloc.gettopology()'`, wait=false)
+    p = run(`$(Base.julia_cmd()) --project=$(Base.active_project()) -e'using Hwloc; Hwloc.gettopology()'`, wait=false)
     wait(p)
     if p.exitcode == 0 && p.termsignal == 0
       include("topology.jl")
@@ -23,8 +22,6 @@ use_hwloc(b) = @set_preferences!("hwloc" => b)
   catch
     use_hwloc(false)
     include("generic_topology.jl")
-  finally
-    rm(tmpd, recursive=true)
   end
 else
   include("generic_topology.jl")

src/generic_topology.jl

@@ -23,7 +23,7 @@ num_l3cache() = static(1)
 end
 num_l4cache() = static(0)
 
-if Sys.CPU_NAME === "tigerlake" || Sys.CPU_NAME === "icelake" || Sys.CPU_NAME === "icelake-server"
+if Sys.CPU_NAME === "tigerlake" || Sys.CPU_NAME === "icelake" || Sys.CPU_NAME === "icelake-server" || Sys.CPU_NAME === "alderlake"
   cache_size(::Union{Val{1},StaticInt{1}}) = StaticInt{49152}()
 elseif Sys.ARCH === :aarch64 && Sys.isapple()
   cache_size(::Union{Val{1},StaticInt{1}}) = StaticInt{131072}()
@@ -36,7 +36,7 @@ cache_inclusive(::Union{Val{1},StaticInt{1}}) = False()
 
 if Sys.CPU_NAME === "skylake-avx512" || Sys.CPU_NAME === "cascadelake"
   cache_size(::Union{Val{2},StaticInt{2}}) = StaticInt{1048576}()
-elseif Sys.CPU_NAME === "tigerlake" || Sys.CPU_NAME === "icelake-server"
+elseif Sys.CPU_NAME === "tigerlake" || Sys.CPU_NAME === "icelake-server" || Sys.CPU_NAME === "alderlake"
   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}()