[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#69581] [PATCH 03/11] guix: cpu: Be consistent with x86_64 micro-arc
From: |
Efraim Flashner |
Subject: |
[bug#69581] [PATCH 03/11] guix: cpu: Be consistent with x86_64 micro-architecture names. |
Date: |
Wed, 6 Mar 2024 13:06:04 +0200 |
* gnu/packages/golang.scm (%go-1.18-x86_64-micro-architectures): Rename
micro-architectures from x86_64-v* to x86-64-v*.
* guix/cpu.scm (cpu->gcc-architecture): Return x86-64 as the fallback.
(cpu->micro-architecture-level): Rename micro-architectures from
x86_64-v* to x86-64-v*.
(gcc-architecture->micro-architecture-level): Same.
Change-Id: I37db65970417c22699ae8097b0361bccf76c1267
---
gnu/packages/golang.scm | 2 +-
guix/cpu.scm | 20 ++++++++++----------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 0bcd231a93..d781cc6055 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -870,7 +870,7 @@ (define-public go-1.17
("powerpc64le" ,@%go-1.17-powerpc64le-micro-architectures))))))
(define %go-1.18-x86_64-micro-architectures
- (list "x86_64-v1" "x86_64-v2" "x86_64-v3" "x86_64-v4"))
+ (list "x86-64-v1" "x86-64-v2" "x86-64-v3" "x86-64-v4"))
(define-public go-1.18
(package
diff --git a/guix/cpu.scm b/guix/cpu.scm
index e80b74f161..b69c9b5360 100644
--- a/guix/cpu.scm
+++ b/guix/cpu.scm
@@ -200,7 +200,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?
@@ -290,12 +290,12 @@ (define (cpu->micro-architecture-level cpu)
;; v2: CMPXCHG16B, LAHF, SAHF, POPCNT, SSE3, SSE4.1, SSE4.2, SSSE3
("avx512f" "avx512bw" "abx512cd" "abx512dq" "avx512vl"
"avx" "avx2" "bmi1" "bmi2" "f16c" "fma" "movbe"
- "popcnt" "sse3" "sse4_1" "sse4_2" "ssse3" => "x86_64-v4")
+ "popcnt" "sse3" "sse4_1" "sse4_2" "ssse3" => "x86-64-v4")
("avx" "avx2" "bmi1" "bmi2" "f16c" "fma" "movbe"
- "popcnt" "sse3" "sse4_1" "sse4_2" "ssse3" => "x86_64-v3")
- ("popcnt" "sse3" "sse4_1" "sse4_2" "ssse3" => "x86_64-v2")
- (_ => "x86_64-v1")))
- "x86_64-v1"))
+ "popcnt" "sse3" "sse4_1" "sse4_2" "ssse3" => "x86-64-v3")
+ ("popcnt" "sse3" "sse4_1" "sse4_2" "ssse3" => "x86-64-v2")
+ (_ => "x86-64-v1")))
+ "x86-64-v1"))
(architecture
;; TODO: More architectures
architecture)))
@@ -304,22 +304,22 @@ (define (gcc-architecture->micro-architecture-level
gcc-architecture)
"Return a matching psABI micro-architecture, allowing optimizations for
x86_64
CPUs for compilers which don't allow for more focused optimizing."
;; Matching gcc-architectures isn't an easy task, with the rule-of-thumb
being
- ;; AVX512F+ for x86_64-v4, AVX+ for x86_64-v3.
+ ;; AVX512F+ for x86-64-v4, AVX+ for x86-64-v3.
;;
https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex
(match gcc-architecture
((or "graniterapids-d" "graniterapids" "tigerlake" "sapphirerapids"
"cooperlake" "icelake-server" "icelake-client" "cannonlake" "knm"
"knl" "skylake-avx512"
"znver4")
- "x86_64-v4")
+ "x86-64-v4")
((or "pantherlake" "clearwaterforest" "arrowlake-s" "sierraforest"
"alderlake" "skylake" "broadwell" "haswell"
"znver3" "znver2" "znver1" "bdver4")
- "x86_64-v3")
+ "x86-64-v3")
((or "sandybridge" "tremont" "goldmont-plus" "goldmont" "silvermont"
"nehalem" "bonnell" "core2"
"btver2" "athalon" "k8-sse3" "k8" "bdver3" "bdver2" "bdver1" "btver1"
"amdfam10"
"lujiazui" "yongfeng" "x86-64")
- "x86_64-v1")
+ "x86-64-v1")
(_ gcc-architecture)))
--
Efraim Flashner <efraim@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
- [bug#69581] [PATCH 07/11] gnu: rust: Add tuning information., (continued)
- [bug#69581] [PATCH 07/11] gnu: rust: Add tuning information., Ludovic Courtès, 2024/03/06
- [bug#69581] [PATCH 07/11] gnu: rust: Add tuning information., Efraim Flashner, 2024/03/07
- [bug#69581] [PATCH 07/11] gnu: rust: Add tuning information., Ludovic Courtès, 2024/03/07
- [bug#69581] [PATCH 07/11] gnu: rust: Add tuning information., Efraim Flashner, 2024/03/08
- [bug#69581] [PATCH 07/11] gnu: rust: Add tuning information., Ludovic Courtès, 2024/03/08
- [bug#69581] [PATCH 07/11] gnu: rust: Add tuning information., Efraim Flashner, 2024/03/10
[bug#69581] [PATCH 09/11] gnu: rav1e: Mark as tunable., Efraim Flashner, 2024/03/06
[bug#69581] [PATCH 05/11] guix: cpu: Enable tuning for i686-linux., Efraim Flashner, 2024/03/06
[bug#69581] [PATCH 03/11] guix: cpu: Be consistent with x86_64 micro-architecture names.,
Efraim Flashner <=
[bug#69581] [PATCH 11/11] gnu: clang-properties: Add micro-architecture support for powerpc64le., Efraim Flashner, 2024/03/06
[bug#69581] [PATCH 01/11] gnu: opus: Mark as tunable., Efraim Flashner, 2024/03/06
[bug#69581] [PATCH 10/11] gnu: clang-properties: Update x86_64 micro-architectures., Efraim Flashner, 2024/03/06