aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2022-02-08 17:15:01 +0200
committerEfraim Flashner <efraim@flashner.co.il>2022-02-13 14:48:08 +0200
commit73373ce5f89ecff98d76a6b73a27ab70f5d8c448 (patch)
tree1dd0c3c47023e99bdab780da178788b4465fe1d1
parent1ddef634b048e50b120c2c70c2e1a03f9d956267 (diff)
downloadguix-73373ce5f89ecff98d76a6b73a27ab70f5d8c448.tar
guix-73373ce5f89ecff98d76a6b73a27ab70f5d8c448.tar.gz
guix: cpu: Rewrite based on feature flags.
* guix/cpu.scm (cpu->gcc-architecture): Rewrite detection based on detected feature flags.
-rw-r--r--guix/cpu.scm56
1 files changed, 34 insertions, 22 deletions
diff --git a/guix/cpu.scm b/guix/cpu.scm
index e1911f52a8..5bb3fa9d2f 100644
--- a/guix/cpu.scm
+++ b/guix/cpu.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -87,28 +88,39 @@ corresponds to CPU, a record as returned by 'current-cpu'."
("x86_64"
;; Transcribed from GCC's 'host_detect_local_cpu' in driver-i386.c.
(or (and (= 6 (cpu-family cpu)) ;the "Pentium Pro" family
- (letrec-syntax ((model (syntax-rules (=>)
- ((_) #f)
- ((_ (candidate => integers ...) rest
- ...)
- (or (and (= (cpu-model cpu) integers)
- candidate)
- ...
- (model rest ...))))))
- (model ("bonnel" => #x1c #x26)
- ("silvermont" => #x37 #x4a #x4d #x5a #x5d)
- ("core2" => #x0f #x17 #x1d)
- ("nehalem" => #x1a #x1e #x1f #x2e)
- ("westmere" => #x25 #x2c #x2f)
- ("sandybridge" => #x2a #x2d)
- ("ivybridge" => #x3a #x3e)
- ("haswell" => #x3c #x3f #x45 #x46)
- ("broadwell" => #x3d #x47 #x4f #x56)
- ("skylake" => #x4e #x5e #x8e #x9e)
- ("skylake-avx512" => #x55) ;TODO: cascadelake
- ("knl" => #x57)
- ("cannonlake" => #x66)
- ("knm" => #x85))))
+ (letrec-syntax ((if-flags (syntax-rules (=>)
+ ((_)
+ #f)
+ ((_ (flags ... => name) rest ...)
+ (if (every (lambda (flag)
+ (set-contains? (cpu-flags cpu)
+ flag))
+ '(flags ...))
+ name
+ (if-flags rest ...))))))
+
+ (if-flags ("avx" "avx512vp2intersect" "tsxldtrk" => "sapphirerapids")
+ ("avx" "avx512vp2intersect" => "tigerlake")
+ ("avx" "avx512bf16" => "cooperlake")
+ ("avx" "wbnoinvd" => "icelake-server")
+ ("avx" "avx512bitalg" => "icelake-client")
+ ("avx" "avx512vbmi" => "cannonlake")
+ ("avx" "avx5124vnniw" => "knm")
+ ("avx" "avx512er" => "knl")
+ ("avx" "avx512f" => "skylake-avx512")
+ ("avx" "serialize" => "alderlake")
+ ("avx" "clflushopt" => "skylake")
+ ("avx" "adx" => "broadwell")
+ ("avx" "avx2" => "haswell")
+ ("avx" => "sandybridge")
+ ("sse4_2" "gfni" => "tremont")
+ ("sse4_2" "sgx" => "goldmont-plus")
+ ("sse4_2" "xsave" => "goldmont")
+ ("sse4_2" "movbe" => "silvermont")
+ ("sse4_2" => "nehalem")
+ ("ssse3" "movbe" => "bonnell")
+ ("ssse3" => "core2")
+ ("longmode" => "x86-64"))))
;; Fallback case for non-Intel processors or for Intel processors not
;; recognized above.