8 files changed, 145 insertions, 17 deletions

diff --git a/meta-oe/recipes-core/opencl/clpeak_1.1.5.bb b/meta-oe/recipes-core/opencl/clpeak_1.1.5.bb
new file mode 100644
index 0000000000..a765f1530f
--- /dev/null
+++ b/meta-oe/recipes-core/opencl/clpeak_1.1.5.bb
@@ -0,0 +1,14 @@
+SUMMARY  = "OpenCL synthetic benchmarking tool"
+DESCRIPTION = "OpenCL benchmarking tool to measure peak capabilities"
+
+SRC_URI = "git://github.com/krrishnarraj/clpeak.git;protocol=https;branch=master"
+
+LICENSE  = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
+
+SRCREV = "b2e647ffb8f42aa22ce4b0194d6ef6d16d5002b0"
+
+
+inherit cmake
+
+DEPENDS += "opencl-clhpp virtual/opencl-icd"
diff --git a/meta-oe/recipes-core/opencl/files/0001-Command-buffer-supported-queue-properties-265.patch b/meta-oe/recipes-core/opencl/files/0001-Command-buffer-supported-queue-properties-265.patch
new file mode 100644
index 0000000000..1654bf48c6
--- /dev/null
+++ b/meta-oe/recipes-core/opencl/files/0001-Command-buffer-supported-queue-properties-265.patch
@@ -0,0 +1,42 @@
+From 85888592e178c7923cd1bc1d69cee530906c80a4 Mon Sep 17 00:00:00 2001
+From: Ewan Crawford <ewan@codeplay.com>
+Date: Tue, 14 Jan 2025 17:14:29 +0000
+Subject: [PATCH] Command-buffer supported queue properties (#265)
+
+Header update generated from OpenCL-Docs PR XML change
+https://github.com/KhronosGroup/OpenCL-Docs/pull/850
+
+Upstream-Status: Backport [https://github.com/KhronosGroup/OpenCL-Headers/commit/d32c5bb219d7ba90ad4f251cf0bb903c08f8e5db]
+Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
+---
+ CL/cl_ext.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CL/cl_ext.h b/CL/cl_ext.h
+index 1a48985e167b..be5b473ff150 100644
+--- a/CL/cl_ext.h
++++ b/CL/cl_ext.h
+@@ -52,7 +52,7 @@ extern "C" {
+     "cl_khr_command_buffer"
+ 
+ 
+-#define CL_KHR_COMMAND_BUFFER_EXTENSION_VERSION CL_MAKE_VERSION(0, 9, 5)
++#define CL_KHR_COMMAND_BUFFER_EXTENSION_VERSION CL_MAKE_VERSION(0, 9, 6)
+ 
+ typedef cl_bitfield         cl_device_command_buffer_capabilities_khr;
+ typedef struct _cl_command_buffer_khr* cl_command_buffer_khr;
+@@ -66,13 +66,13 @@ typedef struct _cl_mutable_command_khr* cl_mutable_command_khr;
+ 
+ /* cl_device_info */
+ #define CL_DEVICE_COMMAND_BUFFER_CAPABILITIES_KHR           0x12A9
++#define CL_DEVICE_COMMAND_BUFFER_SUPPORTED_QUEUE_PROPERTIES_KHR 0x129A
+ #define CL_DEVICE_COMMAND_BUFFER_REQUIRED_QUEUE_PROPERTIES_KHR 0x12AA
+ 
+ /* cl_device_command_buffer_capabilities_khr - bitfield */
+ #define CL_COMMAND_BUFFER_CAPABILITY_KERNEL_PRINTF_KHR      (1 << 0)
+ #define CL_COMMAND_BUFFER_CAPABILITY_DEVICE_SIDE_ENQUEUE_KHR (1 << 1)
+ #define CL_COMMAND_BUFFER_CAPABILITY_SIMULTANEOUS_USE_KHR   (1 << 2)
+-#define CL_COMMAND_BUFFER_CAPABILITY_OUT_OF_ORDER_KHR       (1 << 3)
+ 
+ /* cl_command_buffer_properties_khr */
+ #define CL_COMMAND_BUFFER_FLAGS_KHR                         0x1293
diff --git a/meta-oe/recipes-core/opencl/files/0001-Ignore-Compiler-Warnings.patch b/meta-oe/recipes-core/opencl/files/0001-Ignore-Compiler-Warnings.patch
new file mode 100644
index 0000000000..2e8b52d794
--- /dev/null
+++ b/meta-oe/recipes-core/opencl/files/0001-Ignore-Compiler-Warnings.patch
@@ -0,0 +1,43 @@
+From 082ce10dd191f036f5a6e1fb31134e9736ba3643 Mon Sep 17 00:00:00 2001
+From: Antonios Christidis <a-christidis@ti.com>
+Date: Fri, 17 Jan 2025 15:05:39 -0600
+Subject: [PATCH] Create CMake option ENABLE_WERROR
+
+This creates an option that can be toggled on or off when configuring the project.
+By default, it's set to ON
+
+Upstream-Status: Pending
+Signed-off-by: Antonios Christidis <a-christidis@ti.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+---
+ CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -19,6 +19,16 @@ add_definitions(-DCL_USE_DEPRECATED_OPEN
+ add_definitions(-DCL_USE_DEPRECATED_OPENCL_1_0_APIS=1)
+ add_definitions(-DCL_NO_EXTENSION_PROTOTYPES)
+ 
++option(ENABLE_WERROR "Enable warnings as errors" ON)
++
++if(ENABLE_WERROR)
++  if(MSVC)
++    add_compile_options(/WX)
++  else()
++    add_compile_options(-Werror)
++  endif()
++endif()
++
+ option(USE_CL_EXPERIMENTAL "Use Experimental definitions" OFF)
+ if(USE_CL_EXPERIMENTAL)
+   add_definitions(-DCL_EXPERIMENTAL)
+@@ -99,7 +109,6 @@ if(CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_C
+     add_cxx_flag_if_supported(-Wmisleading-indentation)
+     add_cxx_flag_if_supported(-Wunused-function)
+     add_cxx_flag_if_supported(-Wunused-variable)
+-    add_cxx_flag_if_supported(-Werror)
+     if(NOT CMAKE_BUILD_TYPE MATCHES "Release|RelWithDebInfo|MinSizeRel")
+         # Enable more warnings if not doing a release build.
+         add_cxx_flag_if_supported(-Wall)
diff --git a/meta-oe/recipes-core/opencl/ocl-icd_2.3.2.bb b/meta-oe/recipes-core/opencl/ocl-icd_2.3.2.bb
index d43ea281ae..9e32242e31 100644
--- a/meta-oe/recipes-core/opencl/ocl-icd_2.3.2.bb
+++ b/meta-oe/recipes-core/opencl/ocl-icd_2.3.2.bb
@@ -9,7 +9,6 @@ SRC_URI = "git://github.com/OCL-dev/ocl-icd.git;protocol=https;branch=master"
 
 SRCREV = "fdde6677b21329432db8b481e2637cd10f7d3cb2"
 
-S = "${WORKDIR}/git"
 
 inherit autotools
 
diff --git a/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb b/meta-oe/recipes-core/opencl/opencl-clhpp_2024.10.24.bb
index 7ae0362d37..7335712d6f 100644
--- a/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb
+++ b/meta-oe/recipes-core/opencl/opencl-clhpp_2024.10.24.bb
@@ -1,23 +1,25 @@
 SUMMARY  = "OpenCL API C++ bindings"
 DESCRIPTION = "OpenCL API C++ bindings from Khronos"
 
-SRC_URI = "git://github.com/KhronosGroup/OpenCL-CLHPP.git;protocol=https;branch=main"
-
 LICENSE  = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-PV = "2.0.16+git"
-SRCREV = "1df82b9749739f2681081092ae163bb0f0d40f66"
+DEPENDS = "opencl-headers"
+
+SRCREV = "c7b4aded1cab9560b226041dd962f63375a9a384"
+
+SRC_URI = "git://github.com/KhronosGroup/OpenCL-CLHPP.git;protocol=https;branch=main"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
 EXTRA_OECMAKE = " \
                   -DBUILD_DOCS=OFF \
                   -DBUILD_EXAMPLES=OFF \
-                  -DBUILD_TESTS=OFF \
+                  -DBUILD_TESTING=OFF \
                   "
 
 # Headers only so PN is empty
 RDEPENDS:${PN}-dev = ""
+
+BBCLASSEXTEND += "native nativesdk"
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
new file mode 100644
index 0000000000..c766a66640
--- /dev/null
+++ b/meta-oe/recipes-core/opencl/opencl-cts_2025.01.22.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 = "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-headers_2024.05.08.bb b/meta-oe/recipes-core/opencl/opencl-headers_2024.10.24.bb
index 01e83c812c..0ec2fe5f33 100644
--- a/meta-oe/recipes-core/opencl/opencl-headers_2024.05.08.bb
+++ b/meta-oe/recipes-core/opencl/opencl-headers_2024.10.24.bb
@@ -4,16 +4,15 @@ LICENSE  = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 SECTION = "base"
 
-S = "${WORKDIR}/git"
-SRCREV = "8275634cf9ec31b6484c2e6be756237cb583999d"
-SRC_URI = "git://github.com/KhronosGroup/OpenCL-Headers.git;branch=main;protocol=https"
+SRCREV = "4ea6df132107e3b4b9407f903204b5522fdffcd6"
+SRC_URI = "git://github.com/KhronosGroup/OpenCL-Headers.git;branch=main;protocol=https \
+           file://0001-Command-buffer-supported-queue-properties-265.patch \
+           "
+
+inherit cmake
+
+EXTRA_OECMAKE = "-DBUILD_TESTING=OFF"
 
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
 ALLOW_EMPTY:${PN} = "1"
 
-do_install () {
-        install -d ${D}${includedir}/CL/
-        install -m 0644 ${S}/CL/*.h ${D}${includedir}/CL
-}
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-core/opencl/opencl-icd-loader_2024.05.08.bb b/meta-oe/recipes-core/opencl/opencl-icd-loader_2024.05.08.bb
index 38db7a2453..7cfc75f5ed 100644
--- a/meta-oe/recipes-core/opencl/opencl-icd-loader_2024.05.08.bb
+++ b/meta-oe/recipes-core/opencl/opencl-icd-loader_2024.05.08.bb
@@ -11,7 +11,6 @@ DEPENDS += "opencl-headers"
 PROVIDES = "virtual/opencl-icd"
 RPROVIDES:${PN} = "virtual-opencl-icd"
 
-S = "${WORKDIR}/git"
 
 SRCREV = "861b68b290e76d08e7241608479c16431f529945"
 SRC_URI = "git://github.com/KhronosGroup/OpenCL-ICD-Loader.git;branch=main;protocol=https"