* 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 <yogesh.ty...@intel.com> --- ...ompute-runtime-fix-build-with-gcc13.patch} | 15 +++++- ...-able-to-locate-cpp_generation_tool.patch} | 6 +-- ...-ocloc.patch => 0003-external-ocloc.patch} | 8 +-- ...39aea214984a060566831f63d3aa198ef1b8.patch | 54 ------------------- ...> intel-compute-runtime_24.22.29735.20.bb} | 11 ++-- 5 files changed, 25 insertions(+), 69 deletions(-) rename dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/{disable-werror.patch => 0001-intel-compute-runtime-fix-build-with-gcc13.patch} (58%) rename dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/{allow-to-find-cpp-generation-tool.patch => 0002-Build-not-able-to-locate-cpp_generation_tool.patch} (94%) rename dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/{external-ocloc.patch => 0003-external-ocloc.patch} (90%) delete mode 100644 dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/f10439aea214984a060566831f63d3aa198ef1b8.patch rename dynamic-layers/clang-layer/recipes-opencl/compute-runtime/{intel-compute-runtime_24.13.29138.7.bb => intel-compute-runtime_24.22.29735.20.bb} (87%) 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/0001-intel-compute-runtime-fix-build-with-gcc13.patch similarity index 58% rename from dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/disable-werror.patch rename to dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0001-intel-compute-runtime-fix-build-with-gcc13.patch index 20d9b847..bc718eed 100644 --- 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/0001-intel-compute-runtime-fix-build-with-gcc13.patch @@ -1,11 +1,19 @@ +From a40ed1c5274f867385610bb57ceee75bf4722de9 Mon Sep 17 00:00:00 2001 +From: Anuj Mittal <anuj.mit...@intel.com> +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 <anuj.mit...@intel.com> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index d52e089778..bc0cf35014 100644 +index 5e43b4ad76..619243913b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -727,7 +727,7 @@ if(NOT MSVC) +@@ -811,7 +811,7 @@ if(NOT MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-noexcept-type") # Added for gtest endif() endif() @@ -14,3 +22,6 @@ index d52e089778..bc0cf35014 100644 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/allow-to-find-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 similarity index 94% rename from dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/allow-to-find-cpp-generation-tool.patch rename to dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0002-Build-not-able-to-locate-cpp_generation_tool.patch index 265fcfa2..1ac21766 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/0002-Build-not-able-to-locate-cpp_generation_tool.patch @@ -1,7 +1,7 @@ -From a6361d635e5f3046853883f3ac06fb175116933c Mon Sep 17 00:00:00 2001 +From 8c330d0cb5167612296801f0202b0de35e9ca88d Mon Sep 17 00:00:00 2001 From: Dongwon Kim <dongwon....@intel.com> Date: Sat, 21 Aug 2021 16:09:39 -0700 -Subject: [PATCH] Build not able to locate cpp_generation_tool. +Subject: [PATCH 2/5] Build not able to locate cpp_generation_tool. Upstream-Status: Inappropriate [oe specific] @@ -47,5 +47,5 @@ index ed85a37c52..f7c9e79137 100644 \ No newline at end of file +apply_macro_for_each_core_type("SUPPORTED") -- -2.43.2 +2.34.1 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/0003-external-ocloc.patch similarity index 90% rename from dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/external-ocloc.patch rename to dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0003-external-ocloc.patch index 5f93b7b6..a0dec8af 100644 --- 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/0003-external-ocloc.patch @@ -1,7 +1,7 @@ -From 1f58c22992ddea4167b01b44448528de427f50d5 Mon Sep 17 00:00:00 2001 +From 0006db5f55a9f08bd3452558a53704cd3bbb790f Mon Sep 17 00:00:00 2001 From: Dongwon Kim <dongwon....@intel.com> Date: Wed, 2 Mar 2022 15:52:45 -0800 -Subject: [PATCH] external ocloc +Subject: [PATCH 3/5] external ocloc Upstream-Status: Inappropriate @@ -11,7 +11,7 @@ Signed-off-by: Dongwon Kim <dongwon....@intel.com> 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 +index 3fcadb682d..6d8022db2e 100644 --- a/cmake/ocloc_cmd_prefix.cmake +++ b/cmake/ocloc_cmd_prefix.cmake @@ -4,12 +4,14 @@ @@ -36,5 +36,5 @@ index 2b44330831..03067c9df0 100644 endif() endif() -- -2.37.3 +2.34.1 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 <pawel.cies...@intel.com> -Date: Tue, 14 May 2024 14:20:24 +0000 -Subject: [PATCH] fix: include <algorithm> where std::find is used - -Related-To: NEO-11375 -Signed-off-by: Pawel Cieslak <pawel.cies...@intel.com> - -Upstream-Status: Backport [https://github.com/intel/compute-runtime/commit/f10439aea214984a060566831f63d3aa198ef1b8] -Signed-off-by: Anuj Mittal <anuj.mit...@intel.com> ---- - .../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 <algorithm> - #include <limits> - #include <netlink/handlers.h> - -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 <algorithm> -+ - using namespace NEO; - - struct MockGmmHandleAllocator : NEO::GmmHandleAllocator { diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.13.29138.7.bb b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.22.29735.20.bb similarity index 87% rename from dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.13.29138.7.bb rename to dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.22.29735.20.bb index 7280ed03..c7756bc6 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.13.29138.7.bb +++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.22.29735.20.bb @@ -8,14 +8,13 @@ LICENSE = "MIT & Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eca6ec6997e18db166db7109cdbe611c \ file://third_party/opencl_headers/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https;branch=releases/24.13 \ - file://disable-werror.patch \ - file://allow-to-find-cpp-generation-tool.patch \ - file://external-ocloc.patch \ - file://f10439aea214984a060566831f63d3aa198ef1b8.patch \ +SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https;branch=releases/24.22 \ + file://0001-intel-compute-runtime-fix-build-with-gcc13.patch \ + file://0002-Build-not-able-to-locate-cpp_generation_tool.patch \ + file://0003-external-ocloc.patch \ " -SRCREV = "7131387cdbb02d480a225c70daef913a6c024a6e" +SRCREV = "6aa72243a0916e05a6c1dbe8a0a46711a96fda98" S = "${WORKDIR}/git" -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8361): https://lists.yoctoproject.org/g/meta-intel/message/8361 Mute This Topic: https://lists.yoctoproject.org/mt/107537545/21656 Group Owner: meta-intel+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
