Re: [OE-core] mesa: build failure in CI, dependency not found

Wed, 05 Jun 2024 05:25:19 -0700 

Hi Alex, Markus,

On 6/5/24 1:35 PM, Alexander Kanavin wrote:

I think we could ask Markus to look at this update to 24.1, as he's
done work with libclc  dependency previously (and authored the patch
for it, which should preferably be dropped).



Yeah, I'm hitting a lot of issues right now :/

I can provide the following info already though (patches not tested):

"""
commit 9d03be215762c45ad547446a29865c20c9ed4c2c
Author: Quentin Schulz <quentin.sch...@cherry.de>
Date:   Wed Jun 5 13:31:29 2024 +0200

    mesa: enable RayTracing by default on intel if clc is enabled

    This was the default before 012489e55ce3c88615c5fb2667e10e9cfd7b7edb

    Signed-off-by: Quentin Schulz <quentin.sch...@cherry.de>
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc 
index cb1c9b7b349..a2314a6f22e 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -73,7 +73,7 @@ EXTRA_OEMESON = " \
 "
EXTRA_OEMESON:append:class-target = " ${@bb.utils.contains('PACKAGECONFIG', 'opencl', '-Dintel-clc=system', '', d)}" -EXTRA_OEMESON:append:class-native = " ${@bb.utils.contains('PACKAGECONFIG', 'opencl', '-Dintel-clc=enabled', '', d)}" +EXTRA_OEMESON:append:class-native = " ${@bb.utils.contains('PACKAGECONFIG', 'opencl', '-Dintel-clc=enabled -Dintel-rt=enabled', '', d)}" 

 def strip_comma(s):
     return s.strip(',')
"""
"""
commit d0fbbca90047248d97ddcc90e3699dfb998f3fad
Author: Quentin Schulz <quentin.sch...@cherry.de>
Date:   Wed Jun 5 13:54:16 2024 +0200

    mesa: use new option for installing intel_clc binary

    Comes from 1e31fd5f4268b134b26cd9d82d76d406332a3d8d

    Signed-off-by: Quentin Schulz <quentin.sch...@cherry.de>
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc 
index cbd2a11b6ef..3b32ff635a1 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -73,7 +73,7 @@ EXTRA_OEMESON = " \
 "
EXTRA_OEMESON:append:class-target = " ${@bb.utils.contains('PACKAGECONFIG', 'opencl', '-Dintel-clc=system', '', d)}" -EXTRA_OEMESON:append:class-native = " ${@bb.utils.contains('PACKAGECONFIG', 'opencl', '-Dintel-clc=enabled -Dintel-rt=enabled', '', d)}" +EXTRA_OEMESON:append:class-native = " ${@bb.utils.contains('PACKAGECONFIG', 'opencl', '-Dintel-clc=enabled -Dintel-rt=enabled -Dinstall-intel-clc=true', '', d)}" 

 def strip_comma(s):
     return s.strip(',')
@@ -254,13 +254,6 @@ do_install:append () {
     rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc
 }

-do_install:append:class-native () {
- if ${@bb.utils.contains('PACKAGECONFIG', 'opencl', 'true', 'false', d)}; then 
-        install -d ${D}${bindir}
-        install -m0755 ${B}/src/intel/compiler/intel_clc ${D}${bindir}
-    fi
-}
-
# For the packages that make up the OpenGL interfaces, inject variables so that 
 # they don't get Debian-renamed (which would remove the -mesa suffix), and
 # RPROVIDEs/RCONFLICTs on the generic libgl name.
"""
Additionally, Intel Vulkan driver forces libclc dependency if intel-clc option is not "system" (so either "enabled" or "disabled" or "auto"), since commit b52e25d3a8eee702ff5d21e4cdb9a4dc0736282a.
Moreover, Intel Iris Gallium driver forces libclc dependency if intel-clc option is not "system", since commit 5438b1910464e4b17fe0248a96a6ed98f0280a20.
Now, if I add libclc to the dependencies, I need meta-clang for this but then llvm + libclc as DEPENDS is not working, I get the following error: 
"""
Exception: FileExistsError: [Errno 17] File exists: '/hdd5tb/qschulz/work/upstream/yocto/build/tmp/sysroots-components/x86_64/clang-native/usr/lib/libLLVMPasses.a' -> '/hdd5tb/qschulz/work/upstream/yocto/build/tmp/work/x86_64-linux/mesa-native/24.1.0/recipe-sysroot-native/usr/lib/libLLVMPasses.a' 
"""
We probably also should migrate to rusticl instead of keeping Markus's patch but I have no idea how to do that properly.
Finally, I have no clue how to test any of this so even if it passes the build, I wouldn't be able to trust it works :) 

Cheers,
Quentin

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#200362): 
https://lists.openembedded.org/g/openembedded-core/message/200362
Mute This Topic: https://lists.openembedded.org/mt/106464279/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to