GNU bug report logs - #72043
[CORE-UPDATES PATCH 0/3] Fix mesa for aarch64-linux.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 72043 in the body.
You can then email your comments to 72043 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Efraim Flashner <efraim <at> flashner.co.il>
To: guix-patches <at> gnu.org
Cc: Efraim Flashner <efraim <at> flashner.co.il>
Subject: [CORE-UPDATES PATCH 0/3] Fix mesa for aarch64-linux.
Date: Wed, 10 Jul 2024 23:25:52 +0300

The first patch fixes mesa for aarch64 by providing libclc and then
making some other changes needed around the version of the spirv
packages.  The next two patches are updates surrounding the change. I
test built mesa and mesa-opencl on aarch64-linux and x86_64-linux.

Efraim Flashner (3):
  gnu: mesa: Fix building on aarch64-linux.
  gnu: python-lit: Update to 18.1.8.
  gnu: libclc: Update to 18.1.8.

 gnu/packages/check.scm  |  7 +++---
 gnu/packages/gl.scm     | 56 +++++++++++++++++++++++++----------------
 gnu/packages/llvm.scm   |  7 +++---
 gnu/packages/vulkan.scm |  1 +
 4 files changed, 44 insertions(+), 27 deletions(-)


base-commit: 7369390373464e1a6ad475b7301ff04e046427b2
-- 
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

Message #8 received at 72043 <at> debbugs.gnu.org (full text, mbox):

From: Efraim Flashner <efraim <at> flashner.co.il>
To: 72043 <at> debbugs.gnu.org
Cc: Efraim Flashner <efraim <at> flashner.co.il>
Subject: [PATCH 1/3] gnu: mesa: Fix building on aarch64-linux.
Date: Wed, 10 Jul 2024 23:28:02 +0300

* gnu/packages/gl.scm (mesa)[inputs]: When building for aarch64-linux
use clang-18 and llvm-18 instead of llvm-for-mesa.
[native-inputs]: When building for aarch64-linux add libclc.
[arguments]: Adjust the 'disable-failing-test phase when building for
aarch64-linux to skip a test.
(mesa-opencl)[native-inputs]: When building for aarch64-linux don't add
clang-15.
* gnu/packages/check.scm (python-lit),
* gnu/packages/llvm.scm (libclc),
* gnu/packages/vulkan.scm (spirv-llvm-translator): Add a note about it
being a dependency for mesa.

Change-Id: I0bf5ab019ffd0626ad2d0c38bafceec401e3c886
---
 gnu/packages/check.scm  |  1 +
 gnu/packages/gl.scm     | 56 +++++++++++++++++++++++++----------------
 gnu/packages/llvm.scm   |  1 +
 gnu/packages/vulkan.scm |  1 +
 4 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index bc341943f02..c24878937f3 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -2577,6 +2577,7 @@ (define-public python-hypothesmith
 programs, something like CSmith, a random generator of C programs.")
     (license license:mpl2.0)))
 
+;; WARNING: This package is a dependency of mesa.
 (define-public python-lit
   (package
     (name "python-lit")
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 80ba2cdcb09..43a452acb6a 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -320,19 +320,24 @@ (define-public mesa
            libxxf86vm
            xorgproto))
     (inputs
-     (list elfutils                  ;libelf required for r600 when using llvm
-           expat
-           (force libva-without-mesa)
-           libxml2
-           libxrandr
-           libxvmc
-           llvm-for-mesa
-           vulkan-loader
-           wayland
-           wayland-protocols
-           `(,zstd "lib")))
+     (append
+       (if (target-aarch64?)
+           (list clang-18
+                 llvm-18)
+           (list llvm-for-mesa))
+       (list elfutils                   ;libelf required for r600 when using llvm
+             expat
+             (force libva-without-mesa)
+             libxml2
+             libxrandr
+             libxvmc
+             vulkan-loader
+             wayland
+             wayland-protocols
+             `(,zstd "lib"))))
     (native-inputs
-     (cons* bison
+     (append
+      (list bison
             flex
             gettext-minimal
             glslang
@@ -340,13 +345,16 @@ (define-public mesa
             python-libxml2              ;for OpenGL ES 1.1 and 2.0 support
             python-mako
             python-wrapper
-            (@ (gnu packages base) which)
-            (if (%current-target-system)
-              (list cmake-minimal-cross
-                    pkg-config-for-build
-                    wayland
-                    wayland-protocols)
-              '())))
+            (@ (gnu packages base) which))
+      (if (target-aarch64?)
+          (list libclc)
+          '())
+      (if (%current-target-system)
+          (list cmake-minimal-cross
+                pkg-config-for-build
+                wayland
+                wayland-protocols)
+          '())))
     (outputs '("out" "bin"))
     (arguments
      (list
@@ -464,6 +472,10 @@ (define-public mesa
                   ;; https://gitlab.freedesktop.org/mesa/mesa/-/issues/4091).
                   `((substitute* "src/util/meson.build"
                       ((".*'tests/u_debug_stack_test.cpp',.*") ""))))
+                 ("aarch64-linux"
+                  ;; Disable some of the llvmpipe tests.
+                  `((substitute* "src/gallium/drivers/llvmpipe/meson.build"
+                      (("'lp_test_format', ") ""))))
                  ("armhf-linux"
                   ;; Disable some of the llvmpipe tests.
                   `((substitute* "src/gallium/drivers/llvmpipe/meson.build"
@@ -586,8 +598,10 @@ (define-public mesa-opencl
      (modify-inputs (package-inputs mesa)
        (prepend libclc)))
     (native-inputs
-     (modify-inputs (package-native-inputs mesa)
-       (prepend clang-15)))))
+     (if (target-aarch64?)
+         (package-native-inputs mesa)
+         (modify-inputs (package-native-inputs mesa)
+           (prepend clang-15))))))
 
 (define-public mesa-opencl-icd
   (package/inherit mesa-opencl
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index a1a2c9dc1b9..b32b4b5955c 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -1915,6 +1915,7 @@ (define-public libcxx+libcxxabi-6
     (native-inputs
      (list clang-6 llvm-6 libcxxabi-6))))
 
+;; WARNING: This package is a dependency of mesa.
 (define-public libclc
   (package
     (name "libclc")
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index 25542c1e064..befd5325b58 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -152,6 +152,7 @@ (define-public spirv-cross
 SPIR-V, aiming to emit GLSL or MSL that looks like human-written code.")
     (license license:asl2.0)))
 
+;; WARNING: This package is a dependency of mesa.
 (define-public spirv-llvm-translator
   (package
     (name "spirv-llvm-translator")
-- 
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

Message #11 received at 72043 <at> debbugs.gnu.org (full text, mbox):

From: Efraim Flashner <efraim <at> flashner.co.il>
To: 72043 <at> debbugs.gnu.org
Cc: Efraim Flashner <efraim <at> flashner.co.il>
Subject: [PATCH 2/3] gnu: python-lit: Update to 18.1.8.
Date: Wed, 10 Jul 2024 23:28:03 +0300

* gnu/packages/check.scm (python-lit): Update to 18.1.8.

Change-Id: I7f77079c83c0caa42b3ddfc8e1f12373c13aaca6
---
 gnu/packages/check.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index c24878937f3..0ec375069ec 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -7,7 +7,7 @@
 ;;; Copyright © 2015, 2017 Cyril Roelandt <tipecaml <at> gmail.com>
 ;;; Copyright © 2015 Federico Beffa <beffa <at> fbengineering.ch>
 ;;; Copyright © 2015 Andreas Enge <andreas <at> enge.fr>
-;;; Copyright © 2015, 2016, 2018-2023 Efraim Flashner <efraim <at> flashner.co.il>
+;;; Copyright © 2015, 2016, 2018-2024 Efraim Flashner <efraim <at> flashner.co.il>
 ;;; Copyright © 2016, 2017 Leo Famulari <leo <at> famulari.name>
 ;;; Copyright © 2016 Christine Lemmer-Webber <cwebber <at> dustycloud.org>
 ;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym+a <at> scratchpost.org>
@@ -2581,14 +2581,14 @@ (define-public python-hypothesmith
 (define-public python-lit
   (package
     (name "python-lit")
-    (version "17.0.6")
+    (version "18.1.8")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "lit" version))
         (sha256
          (base32
-          "06z3p85gsy5hw3rbk0ym8aig9mvry1327gz7dfjhjigwandszafz"))))
+          "1nsf3ikvlgvqqf185yz5smkvw0268jipdvady0qfh6llhshp9ha7"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
-- 
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

Message #14 received at 72043 <at> debbugs.gnu.org (full text, mbox):

From: Efraim Flashner <efraim <at> flashner.co.il>
To: 72043 <at> debbugs.gnu.org
Cc: Efraim Flashner <efraim <at> flashner.co.il>
Subject: [PATCH 3/3] gnu: libclc: Update to 18.1.8.
Date: Wed, 10 Jul 2024 23:28:04 +0300

* gnu/packages/llvm.scm (libclc): Update to 18.1.8.
[native-inputs]: Replace clang-15, llvm-15 with clang-18, llvm-18.

Change-Id: I2f676eb2db9c3a8c808e1c26e3f93b9ed085b675
---
 gnu/packages/llvm.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index b32b4b5955c..cf4d511412a 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -7,7 +7,7 @@
 ;;; Copyright © 2017 Roel Janssen <roel <at> gnu.org>
 ;;; Copyright © 2018–2022 Marius Bakke <mbakke <at> fastmail.com>
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me <at> tobias.gr>
-;;; Copyright © 2018, 2021-2023 Efraim Flashner <efraim <at> flashner.co.il>
+;;; Copyright © 2018, 2021-2024 Efraim Flashner <efraim <at> flashner.co.il>
 ;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen <at> yahoo.de>
 ;;; Copyright © 2018 Pierre Neidhardt <mail <at> ambrevar.xyz>
 ;;; Copyright © 2019 Rutger Helling <rhelling <at> mykolab.com>
@@ -1919,7 +1919,7 @@ (define-public libcxx+libcxxabi-6
 (define-public libclc
   (package
     (name "libclc")
-    (version (package-version llvm-15))
+    (version (package-version llvm-18))
     (source (llvm-monorepo version))
     (build-system cmake-build-system)
     (arguments
@@ -1943,7 +1943,7 @@ (define-public libclc
     (propagated-inputs
      (list spirv-llvm-translator spirv-tools))
     (native-inputs
-     (list clang-15 llvm-15 python))
+     (list clang-18 llvm-18 python))
     (home-page "https://libclc.llvm.org")
     (synopsis "Libraries for the OpenCL programming language")
     (description
-- 
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

Message #28 received at 72043-done <at> debbugs.gnu.org (full text, mbox):

From: Efraim Flashner <efraim <at> flashner.co.il>
To: 72043-done <at> debbugs.gnu.org
Subject: Re: [CORE-UPDATES PATCH 0/3] Fix mesa for aarch64-linux.
Date: Wed, 17 Jul 2024 19:06:31 +0300

[Message part 1 (text/plain, inline)]

Patches pushed.

-- 
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

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.