[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/07: guix: cpu: Refactor cpu->gcc-architecture.
From: |
guix-commits |
Subject: |
04/07: guix: cpu: Refactor cpu->gcc-architecture. |
Date: |
Wed, 12 Jul 2023 09:51:28 -0400 (EDT) |
efraim pushed a commit to branch master
in repository guix.
commit 4dd5fa9e766a164acd5f1b639e4ed1d0a917b203
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Mon Jun 19 17:02:34 2023 +0300
guix: cpu: Refactor cpu->gcc-architecture.
* guix/cpu.scm (cpu->gcc-architecture): Refactor to wrap all the x86_64
options inside a common letrec-syntax.
---
guix/cpu.scm | 57 ++++++++++++++++++---------------------------------------
1 file changed, 18 insertions(+), 39 deletions(-)
diff --git a/guix/cpu.scm b/guix/cpu.scm
index 1a75b8ac62..30cd860a19 100644
--- a/guix/cpu.scm
+++ b/guix/cpu.scm
@@ -114,19 +114,19 @@ corresponds to CPU, a record as returned by
'current-cpu'."
(match (cpu-architecture cpu)
("x86_64"
;; Transcribed from GCC's 'host_detect_local_cpu' in driver-i386.cc.
- (or (and (equal? "GenuineIntel" (cpu-vendor cpu))
- (= 6 (cpu-family cpu)) ;the "Pentium Pro" family
- (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 ...))))))
+ (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 ...))))))
+ (or (and (equal? "GenuineIntel" (cpu-vendor cpu))
+ (= 6 (cpu-family cpu)) ;the "Pentium Pro" family
(if-flags ("avx" "raoint" => "grandridge")
("avx" "amx_fp16" => "graniterapids")
("avx" "avxvnniint8" => "sierraforest")
@@ -152,20 +152,9 @@ corresponds to CPU, a record as returned by 'current-cpu'."
("ssse3" "movbe" => "bonnell")
("ssse3" => "core2")
("longmode" => "x86-64")
- ("lm" => "x86-64"))))
-
- (and (equal? "AuthenticAMD" (cpu-vendor cpu))
- (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 ...))))))
+ ("lm" => "x86-64")))
+ (and (equal? "AuthenticAMD" (cpu-vendor cpu))
(or (and (= 22 (cpu-family cpu))
(if-flags ("movbe" => "btver2")))
(and (= 6 (cpu-family cpu))
@@ -192,20 +181,10 @@ corresponds to CPU, a record as returned by
'current-cpu'."
("lm" => "k8")
("mmx" "3dnow" => "k6-3")
("mmx" => "k6")
- (_ => "pentium")))))
+ (_ => "pentium"))))
- ;; Fallback case for non-Intel processors or for Intel processors not
- ;; recognized above.
- (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 ...))))))
+ ;; Fallback case for non-Intel processors or for processors not
+ ;; recognized above.
(if (and (= 7 (cpu-family cpu))
(= #x3b (cpu-model cpu)))
"lujiazui"
@@ -213,7 +192,7 @@ corresponds to CPU, a record as returned by 'current-cpu'."
;; TODO: Recognize CENTAUR/CYRIX/NSC?
- "x86_64"))
+ "x86_64")))
("aarch64"
;; Transcribed from GCC's list of aarch64 processors in aarch64-cores.def
;; What to do with big.LITTLE cores?
- branch master updated (f2f27c4952 -> 691b97aed9), guix-commits, 2023/07/12
- 03/07: guix: cpu: Rewrite fallback for x86_64 cpu->gcc-architecture., guix-commits, 2023/07/12
- 02/07: guix: cpu: Add generalized CPU matching., guix-commits, 2023/07/12
- 07/07: transformations: Allow tuning go packages., guix-commits, 2023/07/12
- 05/07: guix: cpu: Add gcc-architecture->micro-architecture-level mapping., guix-commits, 2023/07/12
- 04/07: guix: cpu: Refactor cpu->gcc-architecture.,
guix-commits <=
- 06/07: gnu: go: Add CPU tuning targets., guix-commits, 2023/07/12
- 01/07: gnu: %gcc-11-x86_64-micro-architectures: Add psabi entries., guix-commits, 2023/07/12