From ece4cf8c320f50ead885fe4357fe7e1dc07d2bb9 Mon Sep 17 00:00:00 2001 From: Yogesh Tyagi Date: Thu, 25 Jul 2024 10:19:23 +0530 Subject: intel-compute-runtime : upgrade 24.13.29138.7 -> 24.22.29735.20 * Refresh patches * Drop backported patch f10439aea214984a060566831f63d3aa198ef1b8.patch Release Notes: https://github.com/intel/compute-runtime/releases/tag/24.22.29735.20 Signed-off-by: Yogesh Tyagi Signed-off-by: Anuj Mittal --- ...ntel-compute-runtime-fix-build-with-gcc13.patch | 27 +++++++++++ ...ld-not-able-to-locate-cpp_generation_tool.patch | 51 ++++++++++++++++++++ .../0003-external-ocloc.patch | 40 ++++++++++++++++ .../allow-to-find-cpp-generation-tool.patch | 51 -------------------- .../intel-compute-runtime/disable-werror.patch | 16 ------- .../intel-compute-runtime/external-ocloc.patch | 40 ---------------- .../f10439aea214984a060566831f63d3aa198ef1b8.patch | 54 ---------------------- 7 files changed, 118 insertions(+), 161 deletions(-) create mode 100644 dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0001-intel-compute-runtime-fix-build-with-gcc13.patch create mode 100644 dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0002-Build-not-able-to-locate-cpp_generation_tool.patch create mode 100644 dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0003-external-ocloc.patch delete mode 100644 dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/allow-to-find-cpp-generation-tool.patch delete mode 100644 dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/disable-werror.patch delete mode 100644 dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/external-ocloc.patch delete mode 100644 dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/f10439aea214984a060566831f63d3aa198ef1b8.patch (limited to 'dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime') diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0001-intel-compute-runtime-fix-build-with-gcc13.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0001-intel-compute-runtime-fix-build-with-gcc13.patch new file mode 100644 index 00000000..bc718eed --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0001-intel-compute-runtime-fix-build-with-gcc13.patch @@ -0,0 +1,27 @@ +From a40ed1c5274f867385610bb57ceee75bf4722de9 Mon Sep 17 00:00:00 2001 +From: Anuj Mittal +Date: Tue, 30 May 2023 09:03:01 +0800 +Subject: [PATCH 1/5] intel-compute-runtime: fix build with gcc13 + +Upstream-Status: Inappropriate +Signed-off-by: Anuj Mittal +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5e43b4ad76..619243913b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -811,7 +811,7 @@ if(NOT MSVC) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-noexcept-type") # Added for gtest + endif() + endif() +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Werror=vla") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=vla") + + if(USE_SANITIZE_UB) + check_cxx_compiler_flag(-fsanitize=undefined COMPILER_SUPPORTS_UNDEFINED_BEHAVIOR_SANITIZER) +-- +2.34.1 + diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0002-Build-not-able-to-locate-cpp_generation_tool.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0002-Build-not-able-to-locate-cpp_generation_tool.patch new file mode 100644 index 00000000..1ac21766 --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0002-Build-not-able-to-locate-cpp_generation_tool.patch @@ -0,0 +1,51 @@ +From 8c330d0cb5167612296801f0202b0de35e9ca88d Mon Sep 17 00:00:00 2001 +From: Dongwon Kim +Date: Sat, 21 Aug 2021 16:09:39 -0700 +Subject: [PATCH 2/5] Build not able to locate cpp_generation_tool. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Naveen Saini +Signed-off-by: Dongwon Kim +--- + 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 ed85a37c52..f7c9e79137 100644 +--- a/shared/source/built_ins/kernels/CMakeLists.txt ++++ b/shared/source/built_ins/kernels/CMakeLists.txt +@@ -107,9 +107,9 @@ function(compile_builtin core_type platform_it builtin bits builtin_options mode + ) + add_custom_command( + OUTPUT ${OUTPUT_FILE_CPP} +- COMMAND $ --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} $ ++ DEPENDS ${OUTPUT_FILES_BINARIES} cpp_generate_tool + ) + list(APPEND BUILTINS_COMMANDS "${OUTPUT_FILE_CPP}") + else() +@@ -159,9 +159,9 @@ function(generate_cpp_spirv builtin) + ) + add_custom_command( + OUTPUT ${OUTPUT_FILE_CPP} +- COMMAND $ --file ${GENERATED_SPV_INPUT} --output ${OUTPUT_FILE_CPP} --array ${BASENAME} ++ COMMAND cpp_generate_tool --file ${GENERATED_SPV_INPUT} --output ${OUTPUT_FILE_CPP} --array ${BASENAME} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- DEPENDS ${GENERATED_SPV_INPUT} $ ++ DEPENDS ${GENERATED_SPV_INPUT} cpp_generate_tool + ) + 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.34.1 + diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0003-external-ocloc.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0003-external-ocloc.patch new file mode 100644 index 00000000..a0dec8af --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0003-external-ocloc.patch @@ -0,0 +1,40 @@ +From 0006db5f55a9f08bd3452558a53704cd3bbb790f Mon Sep 17 00:00:00 2001 +From: Dongwon Kim +Date: Wed, 2 Mar 2022 15:52:45 -0800 +Subject: [PATCH 3/5] external ocloc + +Upstream-Status: Inappropriate + +Signed-off-by: Dongwon Kim +--- + cmake/ocloc_cmd_prefix.cmake | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +diff --git a/cmake/ocloc_cmd_prefix.cmake b/cmake/ocloc_cmd_prefix.cmake +index 3fcadb682d..6d8022db2e 100644 +--- a/cmake/ocloc_cmd_prefix.cmake ++++ b/cmake/ocloc_cmd_prefix.cmake +@@ -4,12 +4,14 @@ + # SPDX-License-Identifier: MIT + # + +-if(WIN32) +- set(ocloc_cmd_prefix ocloc) +-else() +- if(DEFINED NEO__IGC_LIBRARY_PATH) +- set(ocloc_cmd_prefix ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${NEO__IGC_LIBRARY_PATH}:$" $) ++if(NOT DEFINED ocloc_cmd_prefix) ++ if(WIN32) ++ set(ocloc_cmd_prefix ocloc) + else() +- set(ocloc_cmd_prefix ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$" $) ++ if(DEFINED NEO__IGC_LIBRARY_PATH) ++ set(ocloc_cmd_prefix LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${NEO__IGC_LIBRARY_PATH}:$ $) ++ else() ++ set(ocloc_cmd_prefix LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$ $) ++ endif() + endif() + endif() +-- +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 deleted file mode 100644 index 265fcfa2..00000000 --- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/allow-to-find-cpp-generation-tool.patch +++ /dev/null @@ -1,51 +0,0 @@ -From a6361d635e5f3046853883f3ac06fb175116933c Mon Sep 17 00:00:00 2001 -From: Dongwon Kim -Date: Sat, 21 Aug 2021 16:09:39 -0700 -Subject: [PATCH] Build not able to locate cpp_generation_tool. - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Naveen Saini -Signed-off-by: Dongwon Kim ---- - 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 ed85a37c52..f7c9e79137 100644 ---- a/shared/source/built_ins/kernels/CMakeLists.txt -+++ b/shared/source/built_ins/kernels/CMakeLists.txt -@@ -107,9 +107,9 @@ function(compile_builtin core_type platform_it builtin bits builtin_options mode - ) - add_custom_command( - OUTPUT ${OUTPUT_FILE_CPP} -- COMMAND $ --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} $ -+ DEPENDS ${OUTPUT_FILES_BINARIES} cpp_generate_tool - ) - list(APPEND BUILTINS_COMMANDS "${OUTPUT_FILE_CPP}") - else() -@@ -159,9 +159,9 @@ function(generate_cpp_spirv builtin) - ) - add_custom_command( - OUTPUT ${OUTPUT_FILE_CPP} -- COMMAND $ --file ${GENERATED_SPV_INPUT} --output ${OUTPUT_FILE_CPP} --array ${BASENAME} -+ COMMAND cpp_generate_tool --file ${GENERATED_SPV_INPUT} --output ${OUTPUT_FILE_CPP} --array ${BASENAME} - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -- DEPENDS ${GENERATED_SPV_INPUT} $ -+ DEPENDS ${GENERATED_SPV_INPUT} cpp_generate_tool - ) - 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.43.2 - diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/disable-werror.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/disable-werror.patch deleted file mode 100644 index 20d9b847..00000000 --- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/disable-werror.patch +++ /dev/null @@ -1,16 +0,0 @@ -Upstream-Status: Inappropriate -Signed-off-by: Anuj Mittal - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d52e089778..bc0cf35014 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -727,7 +727,7 @@ if(NOT MSVC) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-noexcept-type") # Added for gtest - endif() - endif() -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Werror=vla") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=vla") - - if(USE_SANITIZE_UB) - check_cxx_compiler_flag(-fsanitize=undefined COMPILER_SUPPORTS_UNDEFINED_BEHAVIOR_SANITIZER) diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/external-ocloc.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/external-ocloc.patch deleted file mode 100644 index 5f93b7b6..00000000 --- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/external-ocloc.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 1f58c22992ddea4167b01b44448528de427f50d5 Mon Sep 17 00:00:00 2001 -From: Dongwon Kim -Date: Wed, 2 Mar 2022 15:52:45 -0800 -Subject: [PATCH] external ocloc - -Upstream-Status: Inappropriate - -Signed-off-by: Dongwon Kim ---- - cmake/ocloc_cmd_prefix.cmake | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - -diff --git a/cmake/ocloc_cmd_prefix.cmake b/cmake/ocloc_cmd_prefix.cmake -index 2b44330831..03067c9df0 100644 ---- a/cmake/ocloc_cmd_prefix.cmake -+++ b/cmake/ocloc_cmd_prefix.cmake -@@ -4,12 +4,14 @@ - # SPDX-License-Identifier: MIT - # - --if(WIN32) -- set(ocloc_cmd_prefix ocloc) --else() -- if(DEFINED NEO__IGC_LIBRARY_PATH) -- set(ocloc_cmd_prefix ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${NEO__IGC_LIBRARY_PATH}:$" $) -+if(NOT DEFINED ocloc_cmd_prefix) -+ if(WIN32) -+ set(ocloc_cmd_prefix ocloc) - else() -- set(ocloc_cmd_prefix ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$" $) -+ if(DEFINED NEO__IGC_LIBRARY_PATH) -+ set(ocloc_cmd_prefix LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${NEO__IGC_LIBRARY_PATH}:$ $) -+ else() -+ set(ocloc_cmd_prefix LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$ $) -+ endif() - endif() - endif() --- -2.37.3 - diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/f10439aea214984a060566831f63d3aa198ef1b8.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/f10439aea214984a060566831f63d3aa198ef1b8.patch deleted file mode 100644 index b7fcb3d1..00000000 --- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/f10439aea214984a060566831f63d3aa198ef1b8.patch +++ /dev/null @@ -1,54 +0,0 @@ -From f10439aea214984a060566831f63d3aa198ef1b8 Mon Sep 17 00:00:00 2001 -From: Pawel Cieslak -Date: Tue, 14 May 2024 14:20:24 +0000 -Subject: [PATCH] fix: include where std::find is used - -Related-To: NEO-11375 -Signed-off-by: Pawel Cieslak - -Upstream-Status: Backport [https://github.com/intel/compute-runtime/commit/f10439aea214984a060566831f63d3aa198ef1b8] -Signed-off-by: Anuj Mittal ---- - .../sources/linux/nl_api/test_sysman_iaf_nl_api_prelim.cpp | 3 ++- - shared/test/unit_test/gmm_helper/gmm_resource_info_tests.cpp | 4 +++- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/test_sysman_iaf_nl_api_prelim.cpp b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/test_sysman_iaf_nl_api_prelim.cpp -index 6ab1b751d866..8a224752c8fc 100644 ---- a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/test_sysman_iaf_nl_api_prelim.cpp -+++ b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/test_sysman_iaf_nl_api_prelim.cpp -@@ -1,5 +1,5 @@ - /* -- * Copyright (C) 2021-2023 Intel Corporation -+ * Copyright (C) 2021-2024 Intel Corporation - * - * SPDX-License-Identifier: MIT - * -@@ -13,6 +13,7 @@ - - #include "gtest/gtest.h" - -+#include - #include - #include - -diff --git a/shared/test/unit_test/gmm_helper/gmm_resource_info_tests.cpp b/shared/test/unit_test/gmm_helper/gmm_resource_info_tests.cpp -index 206c272c5bb2..e961248e73a3 100644 ---- a/shared/test/unit_test/gmm_helper/gmm_resource_info_tests.cpp -+++ b/shared/test/unit_test/gmm_helper/gmm_resource_info_tests.cpp -@@ -1,5 +1,5 @@ - /* -- * Copyright (C) 2021-2023 Intel Corporation -+ * Copyright (C) 2021-2024 Intel Corporation - * - * SPDX-License-Identifier: MIT - * -@@ -17,6 +17,8 @@ - - #include "gtest/gtest.h" - -+#include -+ - using namespace NEO; - - struct MockGmmHandleAllocator : NEO::GmmHandleAllocator { -- cgit v1.2.3-54-g00ecf