me/guix
Archived
1
0
Fork 0
Code Activity

cpu: Rename x86-64-v1 to x86-64.

Browse source 
This is the actual micro-architecture designation used by compilers.

* gnu/packages/gcc.scm (%gcc-11-x86_64-micro-architectures): Rename
x86-64-v1 to x86-64.
* gnu/packages/golang.scm (%go-1.18-x86_64-micro-architectures): Same.
* guix/cpu.scm (cpu->micro-architecture-level): Same.
(gcc-architecture->micro-architecture-level): Same.

Change-Id: I19ed556a7e8deb4a77f4c63fca3b794f25092788
This commit is contained in:
Efraim Flashner 2024-03-06 09:14:03 +02:00
parent 63165a9486
commit 7700dc2cf5
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gnu/packages/gcc.scm
View file

@ -624,7 +624,7 @@ Go. It also includes runtime support libraries for these languages.")
"btver1" "btver2" ;AMD "btver1" "btver2" ;AMD
;; psABI micro-architecture levels ;; psABI micro-architecture levels
"x86-64-v1" "x86-64-v2" "x86-64-v3" "x86-64-v4"))) "x86-64" "x86-64-v2" "x86-64-v3" "x86-64-v4")))
;; Suitable '-march' values for GCC 12. ;; Suitable '-march' values for GCC 12.
(define %gcc-12-aarch64-micro-architectures (define %gcc-12-aarch64-micro-architectures

3
gnu/packages/golang.scm
View file

@ -870,7 +870,8 @@ in the style of communicating sequential processes (@dfn{CSP}).")
("powerpc64le" ,@%go-1.17-powerpc64le-micro-architectures)))))) ("powerpc64le" ,@%go-1.17-powerpc64le-micro-architectures))))))
(define %go-1.18-x86_64-micro-architectures (define %go-1.18-x86_64-micro-architectures
(list "x86-64-v1" "x86-64-v2" "x86-64-v3" "x86-64-v4")) ;; GOAMD defaults to 'v1' so we match the default elsewhere.
(list "x86-64" "x86-64-v2" "x86-64-v3" "x86-64-v4"))
(define-public go-1.18 (define-public go-1.18
(package (package

6
guix/cpu.scm
View file

@ -294,8 +294,8 @@ correspond roughly to CPU, a record as returned by 'current-cpu'."
("avx" "avx2" "bmi1" "bmi2" "f16c" "fma" "movbe" ("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-v3")
("popcnt" "sse3" "sse4_1" "sse4_2" "ssse3" => "x86-64-v2") ("popcnt" "sse3" "sse4_1" "sse4_2" "ssse3" => "x86-64-v2")
(_ => "x86-64-v1"))) (_ => "x86-64")))
"x86-64-v1")) "x86-64"))
(architecture (architecture
;; TODO: More architectures ;; TODO: More architectures
architecture))) architecture)))
@ -321,5 +321,5 @@ CPUs for compilers which don't allow for more focused optimizing."
"btver2" "athalon" "k8-sse3" "k8" "bdver3" "bdver2" "bdver1" "btver1" "btver2" "athalon" "k8-sse3" "k8" "bdver3" "bdver2" "bdver1" "btver1"
"amdfam10" "amdfam10"
"lujiazui" "yongfeng" "x86-64") "lujiazui" "yongfeng" "x86-64")
"x86-64-v1") "x86-64")
(_ gcc-architecture))) (_ gcc-architecture)))