From 3289c1c659539bfdfc453f51959c1b5e12a37b93 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Fri, 24 Feb 2023 11:58:20 +0800 Subject: [PATCH] intel-compute-runtime: upgrade 22.38.24278 -> 22.49.25018.24 Release notes: https://github.com/intel/compute-runtime/releases/tag/22.49.25018.24 License-Update: Includes full text of license now. Signed-off-by: Anuj Mittal --- .../allow-to-find-cpp-generation-tool.patch | 16 +++++++++------- .../intel-compute-runtime/external-ocloc.patch | 14 +++++++------- ...b => intel-compute-runtime_22.49.25018.24.bb} | 6 +++--- 3 files changed, 19 insertions(+), 17 deletions(-) rename dynamic-layers/clang-layer/recipes-opencl/compute-runtime/{intel-compute-runtime_22.38.24278.bb => intel-compute-runtime_22.49.25018.24.bb} (92%) 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 4646856d..bac0e107 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 40e9344d37d62158e6c9f72919f0595ef5fde61a Mon Sep 17 00:00:00 2001 +From 0521d87f3f2cc1ceab89e72e1015d195cb9d17f0 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. @@ -7,28 +7,27 @@ Upstream-Status: Inappropriate [oe specific] Signed-off-by: Naveen Saini Signed-off-by: Dongwon Kim - --- shared/source/built_ins/kernels/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/shared/source/built_ins/kernels/CMakeLists.txt b/shared/source/built_ins/kernels/CMakeLists.txt -index 769e2a100..eef25747e 100644 +index 8ac6faf4d6..031e128149 100644 --- a/shared/source/built_ins/kernels/CMakeLists.txt +++ b/shared/source/built_ins/kernels/CMakeLists.txt -@@ -94,9 +94,9 @@ function(compile_builtin core_type platform_type builtin bits builtin_options mo +@@ -81,9 +81,9 @@ function(compile_builtin core_type platform_type builtin bits builtin_options mo ) add_custom_command( OUTPUT ${OUTPUT_FILE_CPP} -- COMMAND $ --file ${BINARY_OUTPUT}.gen --output ${OUTPUT_FILE_CPP} --array ${mode}_${BASENAME} --platform ${family_name_with_type} --revision_id ${REVISION_ID} -+ COMMAND cpp_generate_tool --file ${BINARY_OUTPUT}.gen --output ${OUTPUT_FILE_CPP} --array ${mode}_${BASENAME} --platform ${family_name_with_type} --revision_id ${REVISION_ID} +- COMMAND $ --file ${BINARY_OUTPUT}.bin --output ${OUTPUT_FILE_CPP} --array ${mode}_${BASENAME} --platform ${family_name_with_type} --revision_id ${REVISION_ID} ++ COMMAND cpp_generate_tool --file ${BINARY_OUTPUT}.bin --output ${OUTPUT_FILE_CPP} --array ${mode}_${BASENAME} --platform ${family_name_with_type} --revision_id ${REVISION_ID} 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() -@@ -147,9 +147,9 @@ function(generate_cpp_spirv builtin) +@@ -134,9 +134,9 @@ function(generate_cpp_spirv builtin) ) add_custom_command( OUTPUT ${OUTPUT_FILE_CPP} @@ -40,3 +39,6 @@ index 769e2a100..eef25747e 100644 ) set(OUTPUT_LIST_CPP_FILES ${OUTPUT_LIST_CPP_FILES} ${OUTPUT_FILE_CPP} PARENT_SCOPE) else() +-- +2.37.3 + 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 index 9ee8c96a..c3c5d017 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/external-ocloc.patch @@ -1,4 +1,4 @@ -From 1189028d9f77265edf6258a66f8ecadf3aad556a Mon Sep 17 00:00:00 2001 +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 @@ -11,7 +11,7 @@ Signed-off-by: Dongwon Kim 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/cmake/ocloc_cmd_prefix.cmake b/cmake/ocloc_cmd_prefix.cmake -index 9b6bd3cd3..0aba48709 100644 +index 2b44330831..03067c9df0 100644 --- a/cmake/ocloc_cmd_prefix.cmake +++ b/cmake/ocloc_cmd_prefix.cmake @@ -4,12 +4,14 @@ @@ -22,19 +22,19 @@ index 9b6bd3cd3..0aba48709 100644 - set(ocloc_cmd_prefix ocloc) -else() - if(DEFINED NEO__IGC_LIBRARY_PATH) -- set(ocloc_cmd_prefix LD_LIBRARY_PATH=${NEO__IGC_LIBRARY_PATH}:$ $) +- set(ocloc_cmd_prefix 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 LD_LIBRARY_PATH=$ $) +- set(ocloc_cmd_prefix LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$ $) + if(DEFINED NEO__IGC_LIBRARY_PATH) -+ set(ocloc_cmd_prefix LD_LIBRARY_PATH=${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=$ $) ++ set(ocloc_cmd_prefix LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$ $) + endif() endif() endif() -- -2.20.1 +2.37.3 diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_22.38.24278.bb b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_22.49.25018.24.bb similarity index 92% rename from dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_22.38.24278.bb rename to dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_22.49.25018.24.bb index f7043a18..011a5df6 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_22.38.24278.bb +++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_22.49.25018.24.bb @@ -5,17 +5,17 @@ on OpenCL(TM) compute stacks supporting the GEN graphics hardware \ architecture." LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=9280143b568466d8fbe385f838078b93 \ +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eca6ec6997e18db166db7109cdbe611c \ file://third_party/opencl_headers/LICENSE;md5=dcefc90f4c3c689ec0c2489064e7273b" -SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https;branch=master \ +SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https;branch=releases/22.49 \ " SRC_URI:append:class-target = "file://allow-to-find-cpp-generation-tool.patch \ file://external-ocloc.patch \ " -SRCREV = "f7a4790d84eba7d0ee2028a900625bdfc0c557b3" +SRCREV = "50d8b6a29829d46360c3b75987fd5b92df71ccb5" S = "${WORKDIR}/git"