From a89665f17ce0856e88bc073594ce9ccdc9e0c2e5 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Tue, 27 Feb 2024 23:01:58 +0800 Subject: intel-compute-runtime: upgrade 23.22.26516.18 -> 24.05.28454.6 Drop the patch that has already been merged. License-Update: OpenCL-Headers are now Apache-2.0 licensed. Signed-off-by: Anuj Mittal --- ...-cstdint-header-to-fix-compile-with-gcc13.patch | 56 ------------------- .../allow-to-find-cpp-generation-tool.patch | 25 ++++++--- .../intel-compute-runtime_23.22.26516.18.bb | 65 ---------------------- .../intel-compute-runtime_24.05.28454.6.bb | 64 +++++++++++++++++++++ 4 files changed, 80 insertions(+), 130 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 delete mode 100644 dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_23.22.26516.18.bb create mode 100644 dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.05.28454.6.bb 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 -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 ---- - 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 - #include -+#include - - namespace NEO { - std::vector 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 - #include - #include - #include -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 - #include -+#include - - #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 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 Signed-off-by: Dongwon Kim --- - 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 $ --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 $ --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() -@@ -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_23.22.26516.18.bb deleted file mode 100644 index f3372672..00000000 --- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_23.22.26516.18.bb +++ /dev/null @@ -1,65 +0,0 @@ -SUMMARY = "The Intel(R) Graphics Compute Runtime for OpenCL(TM)" -DESCRIPTION = "The Intel(R) Graphics Compute Runtime for OpenCL(TM) \ -is an open source project to converge Intel's development efforts \ -on OpenCL(TM) compute stacks supporting the GEN graphics hardware \ -architecture." - -LICENSE = "MIT" -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=releases/23.22 \ - 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" - -S = "${WORKDIR}/git" - -DEPENDS += " intel-graphics-compiler gmmlib libva qemu-native" - -RDEPENDS:${PN} += " intel-graphics-compiler gmmlib" - -inherit cmake pkgconfig qemu - -COMPATIBLE_HOST = '(x86_64).*-linux' -COMPATIBLE_HOST:libc-musl = "null" - -EXTRA_OECMAKE = " \ - -DIGC_DIR=${STAGING_INCDIR}/igc \ - -DBUILD_TYPE=Release \ - -DSKIP_UNIT_TESTS=1 \ - -DCCACHE_ALLOWED=FALSE \ - -DNEO_DISABLE_LD_LLD=ON \ - -DNEO_DISABLE_LD_GOLD=ON \ - " - -EXTRA_OECMAKE:append:class-target = " \ - -Docloc_cmd_prefix=ocloc \ - -DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper \ - " - -PACKAGECONFIG ??= "" -PACKAGECONFIG[levelzero] = "-DBUILD_WITH_L0=ON, -DBUILD_WITH_L0=OFF, level-zero" - -do_configure:prepend:class-target () { - # Write out a qemu wrapper that will be used by cmake. - qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${B}/bin'),d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}" - cat > ${WORKDIR}/qemuwrapper << EOF -#!/bin/sh -$qemu_binary "\$@" -EOF - chmod +x ${WORKDIR}/qemuwrapper -} - -FILES:${PN} += " \ - ${libdir}/intel-opencl/libigdrcl.so \ - ${libdir}/libocloc.so \ - " - -FILES:${PN}-dev = "${includedir}" - -UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.05.28454.6.bb b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.05.28454.6.bb new file mode 100644 index 00000000..60125171 --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.05.28454.6.bb @@ -0,0 +1,64 @@ +SUMMARY = "The Intel(R) Graphics Compute Runtime for OpenCL(TM)" +DESCRIPTION = "The Intel(R) Graphics Compute Runtime for OpenCL(TM) \ +is an open source project to converge Intel's development efforts \ +on OpenCL(TM) compute stacks supporting the GEN graphics hardware \ +architecture." + +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.05 \ + file://disable-werror.patch \ + file://allow-to-find-cpp-generation-tool.patch \ + file://external-ocloc.patch \ + " + +SRCREV = "23a9725e62c8181193c90e5e5207507a1f136587" + +S = "${WORKDIR}/git" + +DEPENDS += " intel-graphics-compiler gmmlib libva qemu-native" + +RDEPENDS:${PN} += " intel-graphics-compiler gmmlib" + +inherit cmake pkgconfig qemu + +COMPATIBLE_HOST = '(x86_64).*-linux' +COMPATIBLE_HOST:libc-musl = "null" + +EXTRA_OECMAKE = " \ + -DIGC_DIR=${STAGING_INCDIR}/igc \ + -DBUILD_TYPE=Release \ + -DSKIP_UNIT_TESTS=1 \ + -DCCACHE_ALLOWED=FALSE \ + -DNEO_DISABLE_LD_LLD=ON \ + -DNEO_DISABLE_LD_GOLD=ON \ + " + +EXTRA_OECMAKE:append:class-target = " \ + -Docloc_cmd_prefix=ocloc \ + -DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper \ + " + +PACKAGECONFIG ??= "" +PACKAGECONFIG[levelzero] = "-DBUILD_WITH_L0=ON, -DBUILD_WITH_L0=OFF, level-zero" + +do_configure:prepend:class-target () { + # Write out a qemu wrapper that will be used by cmake. + qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${B}/bin'),d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}" + cat > ${WORKDIR}/qemuwrapper << EOF +#!/bin/sh +$qemu_binary "\$@" +EOF + chmod +x ${WORKDIR}/qemuwrapper +} + +FILES:${PN} += " \ + ${libdir}/intel-opencl/libigdrcl.so \ + ${libdir}/libocloc.so \ + " + +FILES:${PN}-dev = "${includedir}" + +UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" -- cgit v1.2.3-54-g00ecf