Drop the patch that has already been merged. License-Update: OpenCL-Headers are now Apache-2.0 licensed.
Signed-off-by: Anuj Mittal <[email protected]> --- ...int-header-to-fix-compile-with-gcc13.patch | 56 ------------------- .../allow-to-find-cpp-generation-tool.patch | 25 ++++++--- ...=> intel-compute-runtime_24.05.28454.6.bb} | 9 ++- 3 files changed, 20 insertions(+), 70 deletions(-) delete mode 100644 dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/add-missing-cstdint-header-to-fix-compile-with-gcc13.patch rename dynamic-layers/clang-layer/recipes-opencl/compute-runtime/{intel-compute-runtime_23.22.26516.18.bb => intel-compute-runtime_24.05.28454.6.bb} (91%) diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/add-missing-cstdint-header-to-fix-compile-with-gcc13.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/add-missing-cstdint-header-to-fix-compile-with-gcc13.patch deleted file mode 100644 index e39d801b..00000000 --- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/add-missing-cstdint-header-to-fix-compile-with-gcc13.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 41d9b88b2edfcb9fee82ccfc68bd6030a282292c Mon Sep 17 00:00:00 2001 -From: Anuj Mittal <[email protected]> -Date: Tue, 30 May 2023 11:07:10 +0800 -Subject: [PATCH] add missing cstdint header to fix compile with gcc13 - -Include the headers as per: -https://gcc.gnu.org/gcc-13/porting_to.html - -Upstream-Status: Pending - -Signed-off-by: Anuj Mittal <[email protected]> ---- - opencl/test/unit_test/built_ins/built_ins_file_names.h | 1 + - shared/test/common/os_interface/linux/sys_calls_linux_ult.h | 1 + - third_party/aot_config_headers/platforms.h | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/opencl/test/unit_test/built_ins/built_ins_file_names.h b/opencl/test/unit_test/built_ins/built_ins_file_names.h -index 08dc38d406..e04f916e71 100644 ---- a/opencl/test/unit_test/built_ins/built_ins_file_names.h -+++ b/opencl/test/unit_test/built_ins/built_ins_file_names.h -@@ -9,6 +9,7 @@ - - #include <string> - #include <vector> -+#include <cstdint> - - namespace NEO { - std::vector<std::string> getBuiltInFileNames(bool imagesSupport); -diff --git a/shared/test/common/os_interface/linux/sys_calls_linux_ult.h b/shared/test/common/os_interface/linux/sys_calls_linux_ult.h -index f30d425abe..1bc78d3335 100644 ---- a/shared/test/common/os_interface/linux/sys_calls_linux_ult.h -+++ b/shared/test/common/os_interface/linux/sys_calls_linux_ult.h -@@ -7,6 +7,7 @@ - - #pragma once - -+#include <cstdint> - #include <dirent.h> - #include <iostream> - #include <poll.h> -diff --git a/third_party/aot_config_headers/platforms.h b/third_party/aot_config_headers/platforms.h -index 919e2714f2..ee82cb7ff2 100644 ---- a/third_party/aot_config_headers/platforms.h -+++ b/third_party/aot_config_headers/platforms.h -@@ -7,6 +7,7 @@ - - #include <map> - #include <string> -+#include <cstdint> - - #pragma once - --- -2.34.1 - diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/allow-to-find-cpp-generation-tool.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/allow-to-find-cpp-generation-tool.patch index 7bbe9e8e..265fcfa2 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/allow-to-find-cpp-generation-tool.patch +++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/allow-to-find-cpp-generation-tool.patch @@ -1,4 +1,4 @@ -From 0521d87f3f2cc1ceab89e72e1015d195cb9d17f0 Mon Sep 17 00:00:00 2001 +From a6361d635e5f3046853883f3ac06fb175116933c Mon Sep 17 00:00:00 2001 From: Dongwon Kim <[email protected]> Date: Sat, 21 Aug 2021 16:09:39 -0700 Subject: [PATCH] Build not able to locate cpp_generation_tool. @@ -8,26 +8,26 @@ Upstream-Status: Inappropriate [oe specific] Signed-off-by: Naveen Saini <[email protected]> Signed-off-by: Dongwon Kim <[email protected]> --- - shared/source/built_ins/kernels/CMakeLists.txt | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) + shared/source/built_ins/kernels/CMakeLists.txt | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/shared/source/built_ins/kernels/CMakeLists.txt b/shared/source/built_ins/kernels/CMakeLists.txt -index 8ac6faf4d6..031e128149 100644 +index ed85a37c52..f7c9e79137 100644 --- a/shared/source/built_ins/kernels/CMakeLists.txt +++ b/shared/source/built_ins/kernels/CMakeLists.txt -@@ -81,9 +81,9 @@ function(compile_builtin core_type platform_type builtin bits builtin_options mo +@@ -107,9 +107,9 @@ function(compile_builtin core_type platform_it builtin bits builtin_options mode ) add_custom_command( OUTPUT ${OUTPUT_FILE_CPP} -- COMMAND $<TARGET_FILE:cpp_generate_tool> --file ${BINARY_OUTPUT}.bin --output ${OUTPUT_FILE_CPP} --array ${mode}_${BASENAME} --platform ${platform_it_lower} --revision_id ${REVISION_ID} -+ COMMAND cpp_generate_tool --file ${BINARY_OUTPUT}.bin --output ${OUTPUT_FILE_CPP} --array ${mode}_${BASENAME} --platform ${platform_it_lower} --revision_id ${REVISION_ID} +- COMMAND $<TARGET_FILE:cpp_generate_tool> --file ${BINARY_OUTPUT}.bin --output ${OUTPUT_FILE_CPP} --array ${mode}_${BASENAME} --device ${RELEASE_FILENAME} ++ COMMAND cpp_generate_tool --file ${BINARY_OUTPUT}.bin --output ${OUTPUT_FILE_CPP} --array ${mode}_${BASENAME} --device ${RELEASE_FILENAME} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS ${OUTPUT_FILES_BINARIES} $<TARGET_FILE:cpp_generate_tool> + DEPENDS ${OUTPUT_FILES_BINARIES} cpp_generate_tool ) list(APPEND BUILTINS_COMMANDS "${OUTPUT_FILE_CPP}") else() -@@ -134,9 +134,9 @@ function(generate_cpp_spirv builtin) +@@ -159,9 +159,9 @@ function(generate_cpp_spirv builtin) ) add_custom_command( OUTPUT ${OUTPUT_FILE_CPP} @@ -39,6 +39,13 @@ index 8ac6faf4d6..031e128149 100644 ) set(OUTPUT_LIST_CPP_FILES ${OUTPUT_LIST_CPP_FILES} ${OUTPUT_FILE_CPP} PARENT_SCOPE) else() +@@ -277,4 +277,4 @@ if(NOT "${OUTPUT_LIST_CPP_FILES}" STREQUAL "") + ) + endif() + +-apply_macro_for_each_core_type("SUPPORTED") +\ No newline at end of file ++apply_macro_for_each_core_type("SUPPORTED") -- -2.37.3 +2.43.2 diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_23.22.26516.18.bb b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.05.28454.6.bb similarity index 91% rename from dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_23.22.26516.18.bb rename to dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.05.28454.6.bb index f3372672..60125171 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_23.22.26516.18.bb +++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.05.28454.6.bb @@ -4,18 +4,17 @@ is an open source project to converge Intel's development efforts \ on OpenCL(TM) compute stacks supporting the GEN graphics hardware \ architecture." -LICENSE = "MIT" +LICENSE = "MIT & Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eca6ec6997e18db166db7109cdbe611c \ - file://third_party/opencl_headers/LICENSE;md5=dcefc90f4c3c689ec0c2489064e7273b" + file://third_party/opencl_headers/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https;branch=releases/23.22 \ +SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https;branch=releases/24.05 \ file://disable-werror.patch \ - file://add-missing-cstdint-header-to-fix-compile-with-gcc13.patch \ file://allow-to-find-cpp-generation-tool.patch \ file://external-ocloc.patch \ " -SRCREV = "f6bf19f1dde6b852676c319a7c67a0a4c3f25d02" +SRCREV = "23a9725e62c8181193c90e5e5207507a1f136587" S = "${WORKDIR}/git" -- 2.43.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8236): https://lists.yoctoproject.org/g/meta-intel/message/8236 Mute This Topic: https://lists.yoctoproject.org/mt/104624406/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
