mesa: add intel raytracing support to opencl build
A message that is not in the archive (sent off-list or not yet received): [email protected]
v2 adds mesa-native to DEPENDS only when needed
Quoted 236 lines · Markus Volk
Recently mesa added a patch that allows to cross-compile Intel Vulkan ray tracing support.
- Backport this patch
- Build and installintel_clcfor mesa-native
- Add a dependency on mesa-native to provideintel_clcfor target build
- Add a dependency on python3-ply-native as needed to build intel-clc
- Automatically build Intel Vulkan ray tracing support if the opencl packageconfig was addedSigned-off-by Markus Volk <[email protected] <mailto:[email protected]>>--- ...llow-using-intel_clc-from-the-system.patch | 99 +++++++++++++++++++ meta/recipes-graphics/mesa/mesa.inc | 15 ++- 2 files changed, 112 insertions(+), 2 deletions(-) create mode 100644
meta/recipes-graphics/mesa/files/0001-intel-Allow-using-intel_clc-from-the-system.patch(quoted diff) +0
-0
b/meta/recipes-graphics/mesa/files/0001-intel-Allow-using-intel_clc-from-the-system.patch(quoted diff) +1
-0@@ -0,0 +1,99 @@ +From ac503f5d7bf36f021c576029a64ac1a3199f6b5a Mon Sep 17 00:00:002001
(quoted diff) +5
-0+From: Matt Turner <[email protected] <mailto:[email protected]>> +Date: Thu, 31 Aug 2023 13:16:29 -0400 +Subject: [PATCH] intel: Allow using intel_clc from the system + +With -Dintel-clc=system, the build system will search for an
intel_clc(quoted diff) +4
-0+binary and use it instead of building `intel_clc` itself. + +This allows Intel Vulkan ray tracing support to be built when cross +compiling without terrible hacks (that would otherwise be necessarydue
+tointel_clc's dependence on SPIRV-LLVM-Translator, libclc, clang, and(quoted diff) +3
-0+LLVM). + +Part-of:<<https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24983>>
(quoted diff) +2
-0+ +Upstream-Status: Backport[<https://gitlab.freedesktop.org/mesa/mesa/-/commit/28c1053c07c177854520f6283fa665f17618adb5>]
(quoted diff) +24
-0+ +--- + meson.build | 6 +++--- + meson_options.txt | 5 ++++- + src/intel/compiler/meson.build | 6 +++++- + src/intel/vulkan/grl/meson.build | 2 +- + 4 files changed, 13 insertions(+), 6 deletions(-) + +diff --git a/meson.build b/meson.build +index 16e86ec..00a6953 100644 +--- a/meson.build ++++ b/meson.build +@@ -259,12 +259,12 @@ endif + + with_microsoft_clc = get_option('microsoft-clc').enabled() + if ['x86_64'].contains(host_machine.cpu_family()) +- with_intel_clc = get_option('intel-clc').enabled() +- with_intel_vk_rt = with_intel_vk and with_intel_clc ++ with_intel_clc = get_option('intel-clc') == 'enabled' + else + with_intel_clc = false +- with_intel_vk_rt = false + endif ++with_intel_vk_rt = with_intel_vk and get_option('intel-clc') !='disabled'
++
+with_clc=with_microsoft_clcorwith_intel_clc
+with_libclc=with_clc
+with_spirv_to_dxil=get_option('spirv-to-dxil')(quoted diff) +16
-0+diff --git a/meson_options.txt b/meson_options.txt +index 379aea3..9800531 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -607,9 +607,12 @@ option( + + option( + 'intel-clc', +- type : 'feature', ++ type : 'combo', + deprecated: {'true': 'enabled', 'false': 'disabled'}, + value : 'disabled', ++ choices : [ ++ 'enabled', 'disabled', 'system', ++ ], + description : 'Build the intel-clc compiler (enables Vulkan Intel' +
(quoted diff) +3
-0+ 'Ray Tracing on supported hardware).' + ) +diff --git a/src/intel/compiler/meson.buildb/src/intel/compiler/meson.build
(quoted diff) +17
-0+index 9a03d37..774e955 100644 +--- a/src/intel/compiler/meson.build ++++ b/src/intel/compiler/meson.build +@@ -168,7 +168,10 @@ libintel_compiler = static_library( + ) + + # For now this tool is only going to be used by Anv +-if with_intel_clc ++if get_option('intel-clc') == 'system' ++ prog_intel_clc = find_program('intel_clc', native : true) ++ dep_prog_intel_clc = [] ++elif with_intel_clc + prog_intel_clc = executable( + 'intel_clc', + ['intel_clc.c'], +@@ -181,6 +184,7 @@ if with_intel_clc + dependencies : [idep_nir, idep_clc, idep_mesautil,
idep_intel_dev],(quoted diff) +7
-0+ native : true, + ) ++ dep_prog_intel_clc = [prog_intel_clc] + endif + + if with_tests +diff --git a/src/intel/vulkan/grl/meson.buildb/src/intel/vulkan/grl/meson.build
(quoted diff) +12
-0+index c0056b3..02a72f5 100644 +--- a/src/intel/vulkan/grl/meson.build ++++ b/src/intel/vulkan/grl/meson.build +@@ -143,7 +143,7 @@ foreach t : [['125', 'gfx125', 'dg2']] + # if fixed there + ], + env: ['MESA_SHADER_CACHE_DISABLE=true'], +- depends : [prog_intel_clc] ++ depends : dep_prog_intel_clc + ) + endforeach +meta/recipes-graphics/mesa/mesa.inc +0
-0@@ -18,6 +18,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-meson.build-check-for-all-linux-host_os-combinations.patch <file://0001-meson.build-check-for-all-linux-host_os-combinations.patch/> \ file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch <file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch/> \ file://0001-gallium-Fix-build-with-llvm-17.patch<file://0001-gallium-fix-build-with-llvm-17.patch/> \
+file://0001-intel-Allow-using-intel_clc-from-the-system.patch <file://0001-intel-allow-using-intel_clc-from-the-system.patch/> \ "SRC_URI[sha256sum] =
"2f6d7381bc10fbd2d6263ad1022785b8b511046c1a904162f8f7da18eea8aed9"meta/recipes-graphics/mesa/mesa.inc +0
-0@@ -35,6 +36,7 @@ do_install:append() { } DEPENDS = "expat makedepend-native flex-native bison-nativelibxml2-native zlib chrpath-replacement-native python3-mako-native gettext-native" +DEPENDS:append:class-target = " ${@bb.utils.contains <mailto:${@bb.utils.contains>('PACKAGECONFIG', 'opencl', 'mesa-native', '', d)}"
EXTRANATIVEPATH += "chrpath-native"PROVIDES = " \ ${@bb.utils.contains<mailto:${@bb.utils.contains>('PACKAGECONFIG', 'opengl', 'virtual/libgl', '', d)} \
meta/recipes-graphics/mesa/mesa.inc +1
-0@@ -72,6 +74,9 @@ EXTRA_OEMESON = " \ -Dplatforms='${@",".join("${PLATFORMS}".split())}' \ " +EXTRA_OEMESON:append:class-target = " ${@bb.utils.contains<mailto:${@bb.utils.contains>('PACKAGECONFIG', 'opencl', '-Dintel-clc=system', '', d)}" +EXTRA_OEMESON:append:class-native = " ${@bb.utils.contains <mailto:${@bb.utils.contains>('PACKAGECONFIG', 'opencl', '-Dintel-clc=enabled', '', d)}"
meta/recipes-graphics/mesa/mesa.inc +1
-1+ def strip_comma(s): return s.strip(',')@@ -137,7 +142,7 @@ PACKAGECONFIG[egl] = "-Degl=enabled, -Degl=disabled" # "opencl" requires libclc from meta-clang and spirv-tools fromOE-Core
OPENCL_NATIVE= "${@bb.utils.contains
<mailto:${@bb.utils.contains>('PACKAGECONFIG', 'freedreno', '-Dopencl-native=true', '', d)}" -PACKAGECONFIG[opencl] = "-Dgallium-opencl=icd -Dopencl-spirv=true ${OPENCL_NATIVE},-Dgallium-opencl=disabledmeta/recipes-graphics/mesa/mesa.inc +1
-1-Dopencl-spirv=false,libclc spirv-tools" +PACKAGECONFIG[opencl] = "-Dgallium-opencl=icd -Dopencl-spirv=true${OPENCL_NATIVE},-Dgallium-opencl=disabled
meta/recipes-graphics/mesa/mesa.inc +0
-2-Dopencl-spirv=false,libclc spirv-tools python3-ply-native" PACKAGECONFIG[broadcom] = "" PACKAGECONFIG[etnaviv] = ""@@ -181,7 +186,6 @@ PACKAGECONFIG[gallium] = "-Dgallium-drivers=${@strip_comma('${GALLIUMDRIVERS}')} PACKAGECONFIG[gallium-llvm] = "-Dllvm=enabled -Dshared-llvm=enabled, -Dllvm=disabled, llvm llvm-native elfutils" PACKAGECONFIG[xa] = "-Dgallium-xa=enabled, -Dgallium-xa=disabled" PACKAGECONFIG[va] ="-Dgallium-va=enabled,-Dgallium-va=disabled,libva-initial" -
PACKAGECONFIG[vdpau] =
"-Dgallium-vdpau=enabled,-Dgallium-vdpau=disabled,libvdpau"PACKAGECONFIG[lima] = ""
meta/recipes-graphics/mesa/mesa.inc +2
-0@@ -248,6 +252,13 @@ do_install:append () { rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc } +do_install:append:class-native () { + if ${@bb.utils.contains<mailto:${@bb.utils.contains>('PACKAGECONFIG', 'opencl', 'true', 'false', d)}; then
meta/recipes-graphics/mesa/mesa.inc +2
-0+ install -d ${D}${bindir} + install -m0755 ${B}/src/intel/compiler/intel_clc${D}${bindir}
meta/recipes-graphics/mesa/mesa.inc +3
-0+ fi +} + # For the packages that make up the OpenGL interfaces, injectvariables so that
# they don't get Debian-renamed (which would remove the -mesa suffix), and # RPROVIDEs/RCONFLICTs on the generic libgl name. -- 2.41.0-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#187362): <https://lists.openembedded.org/g/openembedded-core/message/187362>
Mute This Topic: <https://lists.openembedded.org/mt/101210696/3618223>
Group Owner: [email protected] <mailto:[email protected]>
Unsubscribe: <https://lists.openembedded.org/g/openembedded-core/unsub> [[email protected] <mailto:[email protected]>]
-=-=-=-=-=-=-=-=-=-=-=-