From a9d764744f071751241783524910375d9faf7b09 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Tue, 29 Jul 2025 19:43:30 +0300 Subject: opencl-cts: update to release 2025-04-14 Update OpenCL CTS to the latest release. Signed-off-by: Dmitry Baryshkov Signed-off-by: Khem Raj --- .../0001-Always-enable-beta-extensions-2330.patch | 32 ---------------------- .../recipes-core/opencl/opencl-cts_2025.01.22.bb | 31 --------------------- .../recipes-core/opencl/opencl-cts_2025.04.14.bb | 30 ++++++++++++++++++++ 3 files changed, 30 insertions(+), 63 deletions(-) delete mode 100644 meta-oe/recipes-core/opencl/files/0001-Always-enable-beta-extensions-2330.patch delete mode 100644 meta-oe/recipes-core/opencl/opencl-cts_2025.01.22.bb create mode 100644 meta-oe/recipes-core/opencl/opencl-cts_2025.04.14.bb (limited to 'meta-oe/recipes-core/opencl') diff --git a/meta-oe/recipes-core/opencl/files/0001-Always-enable-beta-extensions-2330.patch b/meta-oe/recipes-core/opencl/files/0001-Always-enable-beta-extensions-2330.patch deleted file mode 100644 index 430f9575c4..0000000000 --- a/meta-oe/recipes-core/opencl/files/0001-Always-enable-beta-extensions-2330.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 3a275fe81b6d436194f563e7a3d24f302d14a211 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?K=C3=A9vin=20Petit?= -Date: Tue, 11 Mar 2025 18:40:29 +0000 -Subject: [PATCH] Always enable beta extensions (#2330) - -`CL_ENABLE_BETA_EXTENSIONS` was just introduced in -https://github.com/KhronosGroup/OpenCL-Headers/pull/276 -to guard provisional and other experimental extensions. The CTS -currently assumes -all definitions are always present. - -Signed-off-by: Kevin Petit -Upstream-Status: Backport [https://github.com/KhronosGroup/OpenCL-CTS/commit/3a275fe81b6d436194f563e7a3d24f302d14a211] ---- - CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 898f62e97bdc..8a93ea9fb843 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -18,6 +18,7 @@ add_definitions(-DCL_USE_DEPRECATED_OPENCL_1_2_APIS=1) - add_definitions(-DCL_USE_DEPRECATED_OPENCL_1_1_APIS=1) - add_definitions(-DCL_USE_DEPRECATED_OPENCL_1_0_APIS=1) - add_definitions(-DCL_NO_EXTENSION_PROTOTYPES) -+add_definitions(-DCL_ENABLE_BETA_EXTENSIONS) - - option(USE_CL_EXPERIMENTAL "Use Experimental definitions" OFF) - if(USE_CL_EXPERIMENTAL) --- -2.47.2 - diff --git a/meta-oe/recipes-core/opencl/opencl-cts_2025.01.22.bb b/meta-oe/recipes-core/opencl/opencl-cts_2025.01.22.bb deleted file mode 100644 index 52c8c59f27..0000000000 --- a/meta-oe/recipes-core/opencl/opencl-cts_2025.01.22.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "OpenCL CTS" -DESCRIPTION = "OpenCL CTS test suite" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" - -inherit pkgconfig cmake - -DEPENDS += "opencl-headers opencl-icd-loader" -RDEPENDS:${PN} += "python3-core python3-io" - - -SRC_URI = "git://github.com/KhronosGroup/OpenCL-CTS.git;protocol=https;branch=main;lfs=0 \ - file://0001-Always-enable-beta-extensions-2330.patch \ - file://0001-Ignore-Compiler-Warnings.patch" - -SRCREV = "5b3518096ca7b82854daadb2b2fae704fe2d9cb5" - -EXTRA_OECMAKE:append = " -DENABLE_WERROR=OFF -DCL_INCLUDE_DIR=${STAGING_INCDIR} -DCL_LIB_DIR=${STAGING_LIBDIR} -DOPENCL_LIBRARIES=OpenCL" - -SECURITY_STRINGFORMAT:remove = "-Werror=format-security" - -do_install() { - install -d ${D}${bindir}/opencl_test_conformance - 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 CMakeFiles -type d -exec rm -rf "{}" \; -depth -} - -COMPATIBLE_HOST:riscv64 = "null" -COMPATIBLE_HOST:riscv32 = "null" 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 new file mode 100644 index 0000000000..9c6a55691f --- /dev/null +++ b/meta-oe/recipes-core/opencl/opencl-cts_2025.04.14.bb @@ -0,0 +1,30 @@ +SUMMARY = "OpenCL CTS" +DESCRIPTION = "OpenCL CTS test suite" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" + +inherit pkgconfig cmake + +DEPENDS += "opencl-headers opencl-icd-loader" +RDEPENDS:${PN} += "python3-core python3-io" + + +SRC_URI = "git://github.com/KhronosGroup/OpenCL-CTS.git;protocol=https;branch=main;lfs=0 \ + file://0001-Ignore-Compiler-Warnings.patch" + +SRCREV = "e96edaef8b582c2412a2aab4b82f5c88af88617d" + +EXTRA_OECMAKE:append = " -DENABLE_WERROR=OFF -DCL_INCLUDE_DIR=${STAGING_INCDIR} -DCL_LIB_DIR=${STAGING_LIBDIR} -DOPENCL_LIBRARIES=OpenCL" + +SECURITY_STRINGFORMAT:remove = "-Werror=format-security" + +do_install() { + install -d ${D}${bindir}/opencl_test_conformance + 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 CMakeFiles -type d -exec rm -rf "{}" \; -depth +} + +COMPATIBLE_HOST:riscv64 = "null" +COMPATIBLE_HOST:riscv32 = "null" -- cgit v1.2.3-54-g00ecf