Package: guix-patches;
Reported by: Efraim Flashner <efraim <at> flashner.co.il>
Date: Tue, 20 Jun 2023 07:49:01 UTC
Severity: normal
Tags: patch
Done: Ludovic Courtès <ludo <at> gnu.org>
Bug is archived. No further changes may be made.
Message #65 received at 64188 <at> debbugs.gnu.org (full text, mbox):
From: Efraim Flashner <efraim <at> flashner.co.il> To: 64188 <at> debbugs.gnu.org Cc: Efraim Flashner <efraim <at> flashner.co.il> Subject: [PATCH v2 4/7] guix: cpu: Refactor cpu->gcc-architecture. Date: Mon, 26 Jun 2023 15:38:40 +0300
* 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 @@ (define (cpu->gcc-architecture 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 @@ (define (cpu->gcc-architecture 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 @@ (define (cpu->gcc-architecture 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 @@ (define (cpu->gcc-architecture 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?
--
Efraim Flashner <efraim <at> flashner.co.il> רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.