diff mbox series

[meta-oe,2/2] opencl-cts: build GL, GL ES and Vulkan interoperability tests

Message ID 20250929024025.3210337-2-dmitry.baryshkov@oss.qualcomm.com
State Accepted
Headers show
Series [meta-oe,1/2] opencl-cts: build SPIR-V files for the spirv-new test | expand

Commit Message

Dmitry Baryshkov Sept. 29, 2025, 2:40 a.m. UTC
Follow DISTRO_FEATURES and build optional GL, GL ES and Vulkan
interoperability tests.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
---
 meta-oe/recipes-core/opencl/opencl-cts_2025.04.14.bb | 9 +++++++++
 1 file changed, 9 insertions(+)

Comments

Ryan Eatmon Oct. 2, 2025, 3 p.m. UTC | #1
I'm seeing build errors with this patch.

ERROR: opencl-cts-2025.04.14-r0 do_package_qa: QA Issue: File 
/usr/bin/opencl_test_conformance/vulkan/test_vulkan in package 
opencl-cts contains reference to TMPDIR [buildpaths]
ERROR: opencl-cts-2025.04.14-r0 do_package_qa: QA Issue: File 
/usr/bin/opencl_test_conformance/extensions/cl_khr_external_semaphore/test_cl_khr_external_semaphore 
in package opencl-cts contains reference to TMPDIR [buildpaths]
ERROR: opencl-cts-2025.04.14-r0 do_package_qa: Fatal QA errors were 
found, failing task.




On 9/28/2025 9:40 PM, Dmitry Baryshkov via lists.openembedded.org wrote:
> Follow DISTRO_FEATURES and build optional GL, GL ES and Vulkan
> interoperability tests.
> 
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> ---
>   meta-oe/recipes-core/opencl/opencl-cts_2025.04.14.bb | 9 +++++++++
>   1 file changed, 9 insertions(+)
> 
> diff --git a/meta-oe/recipes-core/opencl/opencl-cts_2025.04.14.bb b/meta-oe/recipes-core/opencl/opencl-cts_2025.04.14.bb
> index ebf83d1a1a2d..fe1d6075e27b 100644
> --- a/meta-oe/recipes-core/opencl/opencl-cts_2025.04.14.bb
> +++ b/meta-oe/recipes-core/opencl/opencl-cts_2025.04.14.bb
> @@ -18,6 +18,14 @@ SRCREV = "e96edaef8b582c2412a2aab4b82f5c88af88617d"
>   
>   EXTRA_OECMAKE:append = " -DENABLE_WERROR=OFF -DCL_INCLUDE_DIR=${STAGING_INCDIR} -DCL_LIB_DIR=${STAGING_LIBDIR} -DOPENCL_LIBRARIES=OpenCL"
>   
> +PACKAGECONFIG = " \
> +	${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl gles', '', d)} \
> +	${@bb.utils.filter('DISTRO_FEATURES', 'vulkan', d)} \
> +"
> +PACKAGECONFIG[opengl] = "-DGL_IS_SUPPORTED=ON,-DGL_IS_SUPPORTED=OFF,virtual/libgl glew freeglut"
> +PACKAGECONFIG[gles] = "-DGLES_IS_SUPPORTED=ON,-DGLES_IS_SUPPORTED=OFF,virtual/egl virtual/libgles2"
> +PACKAGECONFIG[vulkan] = "-DVULKAN_IS_SUPPORTED=ON,-DVULKAN_IS_SUPPORTED=OFF,vulkan-headers glslang-native"
> +
>   SECURITY_STRINGFORMAT:remove = "-Werror=format-security"
>   
>   do_install() {
> @@ -25,6 +33,7 @@ do_install() {
>           cp -r ${B}/test_conformance/* ${D}${bindir}/opencl_test_conformance
>           sed -i 's:/usr/bin/python:/usr/bin/python3:g' ${D}${bindir}/opencl_test_conformance/run_conformance.py
>   	 find "${D}${bindir}/opencl_test_conformance" -name cmake_install.cmake -type f -delete
> +        find "${D}${bindir}/opencl_test_conformance" -name libvulkan_wrapper.a -type f -delete
>           find "${D}${bindir}/opencl_test_conformance" -name CMakeFiles -type d -exec rm -rf "{}" \; -depth
>   }
>   
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#120005): https://lists.openembedded.org/g/openembedded-devel/message/120005
> Mute This Topic: https://lists.openembedded.org/mt/115489531/6551054
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [reatmon@ti.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Dmitry Baryshkov Oct. 3, 2025, 2:18 p.m. UTC | #2
On Thu, 2 Oct 2025 at 18:00, Ryan Eatmon <reatmon@ti.com> wrote:
>
>
> I'm seeing build errors with this patch.
>
> ERROR: opencl-cts-2025.04.14-r0 do_package_qa: QA Issue: File
> /usr/bin/opencl_test_conformance/vulkan/test_vulkan in package
> opencl-cts contains reference to TMPDIR [buildpaths]
> ERROR: opencl-cts-2025.04.14-r0 do_package_qa: QA Issue: File
> /usr/bin/opencl_test_conformance/extensions/cl_khr_external_semaphore/test_cl_khr_external_semaphore
> in package opencl-cts contains reference to TMPDIR [buildpaths]
> ERROR: opencl-cts-2025.04.14-r0 do_package_qa: Fatal QA errors were
> found, failing task.

Interesting, I can't reproduce it here. What is your configuration?
diff mbox series

Patch

diff --git a/meta-oe/recipes-core/opencl/opencl-cts_2025.04.14.bb b/meta-oe/recipes-core/opencl/opencl-cts_2025.04.14.bb
index ebf83d1a1a2d..fe1d6075e27b 100644
--- a/meta-oe/recipes-core/opencl/opencl-cts_2025.04.14.bb
+++ b/meta-oe/recipes-core/opencl/opencl-cts_2025.04.14.bb
@@ -18,6 +18,14 @@  SRCREV = "e96edaef8b582c2412a2aab4b82f5c88af88617d"
 
 EXTRA_OECMAKE:append = " -DENABLE_WERROR=OFF -DCL_INCLUDE_DIR=${STAGING_INCDIR} -DCL_LIB_DIR=${STAGING_LIBDIR} -DOPENCL_LIBRARIES=OpenCL"
 
+PACKAGECONFIG = " \
+	${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl gles', '', d)} \
+	${@bb.utils.filter('DISTRO_FEATURES', 'vulkan', d)} \
+"
+PACKAGECONFIG[opengl] = "-DGL_IS_SUPPORTED=ON,-DGL_IS_SUPPORTED=OFF,virtual/libgl glew freeglut"
+PACKAGECONFIG[gles] = "-DGLES_IS_SUPPORTED=ON,-DGLES_IS_SUPPORTED=OFF,virtual/egl virtual/libgles2"
+PACKAGECONFIG[vulkan] = "-DVULKAN_IS_SUPPORTED=ON,-DVULKAN_IS_SUPPORTED=OFF,vulkan-headers glslang-native"
+
 SECURITY_STRINGFORMAT:remove = "-Werror=format-security"
 
 do_install() {
@@ -25,6 +33,7 @@  do_install() {
         cp -r ${B}/test_conformance/* ${D}${bindir}/opencl_test_conformance
         sed -i 's:/usr/bin/python:/usr/bin/python3:g' ${D}${bindir}/opencl_test_conformance/run_conformance.py
 	 find "${D}${bindir}/opencl_test_conformance" -name cmake_install.cmake -type f -delete
+        find "${D}${bindir}/opencl_test_conformance" -name libvulkan_wrapper.a -type f -delete
         find "${D}${bindir}/opencl_test_conformance" -name CMakeFiles -type d -exec rm -rf "{}" \; -depth
 }