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 new file mode 100644 index 0000000000..430f9575c4 --- /dev/null +++ b/meta-oe/recipes-core/opencl/files/0001-Always-enable-beta-extensions-2330.patch @@ -0,0 +1,32 @@ +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/files/0001-Command-buffer-supported-queue-properties-265.patch b/meta-oe/recipes-core/opencl/files/0001-Command-buffer-supported-queue-properties-265.patch deleted file mode 100644 index 1654bf48c6..0000000000 --- a/meta-oe/recipes-core/opencl/files/0001-Command-buffer-supported-queue-properties-265.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 85888592e178c7923cd1bc1d69cee530906c80a4 Mon Sep 17 00:00:00 2001 -From: Ewan Crawford -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 ---- - 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 index 2e8b52d794..2495f195c1 100644 --- a/meta-oe/recipes-core/opencl/files/0001-Ignore-Compiler-Warnings.patch +++ b/meta-oe/recipes-core/opencl/files/0001-Ignore-Compiler-Warnings.patch @@ -17,8 +17,8 @@ Signed-off-by: Khem Raj --- 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) + add_definitions(-DCL_ENABLE_BETA_EXTENSIONS) +option(ENABLE_WERROR "Enable warnings as errors" ON) + diff --git a/meta-oe/recipes-core/opencl/opencl-clhpp_2024.10.24.bb b/meta-oe/recipes-core/opencl/opencl-clhpp_2025.07.22.bb similarity index 91% rename from meta-oe/recipes-core/opencl/opencl-clhpp_2024.10.24.bb rename to meta-oe/recipes-core/opencl/opencl-clhpp_2025.07.22.bb index 7335712d6f..e1302f4963 100644 --- a/meta-oe/recipes-core/opencl/opencl-clhpp_2024.10.24.bb +++ b/meta-oe/recipes-core/opencl/opencl-clhpp_2025.07.22.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" DEPENDS = "opencl-headers" -SRCREV = "c7b4aded1cab9560b226041dd962f63375a9a384" +SRCREV = "2a608428f725cad7903ef55e1ce5b995895838f5" SRC_URI = "git://github.com/KhronosGroup/OpenCL-CLHPP.git;protocol=https;branch=main" 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 index c766a66640..52c8c59f27 100644 --- a/meta-oe/recipes-core/opencl/opencl-cts_2025.01.22.bb +++ b/meta-oe/recipes-core/opencl/opencl-cts_2025.01.22.bb @@ -10,6 +10,7 @@ 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" diff --git a/meta-oe/recipes-core/opencl/opencl-headers_2024.10.24.bb b/meta-oe/recipes-core/opencl/opencl-headers_2025.07.22.bb similarity index 76% rename from meta-oe/recipes-core/opencl/opencl-headers_2024.10.24.bb rename to meta-oe/recipes-core/opencl/opencl-headers_2025.07.22.bb index 0ec2fe5f33..3b5f948e7d 100644 --- a/meta-oe/recipes-core/opencl/opencl-headers_2024.10.24.bb +++ b/meta-oe/recipes-core/opencl/opencl-headers_2025.07.22.bb @@ -4,9 +4,8 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SECTION = "base" -SRCREV = "4ea6df132107e3b4b9407f903204b5522fdffcd6" +SRCREV = "8a97ebc88daa3495d6f57ec10bb515224400186f" SRC_URI = "git://github.com/KhronosGroup/OpenCL-Headers.git;branch=main;protocol=https \ - file://0001-Command-buffer-supported-queue-properties-265.patch \ " inherit cmake