diff options
Diffstat (limited to 'dynamic-layers/clang-layer/recipes-opencl/compute-runtime')
6 files changed, 140 insertions, 139 deletions
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..45288ce1 --- /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,41 @@ | |||
| 1 | From 8c330d0cb5167612296801f0202b0de35e9ca88d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Dongwon Kim <dongwon.kim@intel.com> | ||
| 3 | Date: Sat, 21 Aug 2021 16:09:39 -0700 | ||
| 4 | Subject: [PATCH 2/5] Build not able to locate cpp_generation_tool. | ||
| 5 | |||
| 6 | Upstream-Status: Inappropriate [oe specific] | ||
| 7 | |||
| 8 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | ||
| 9 | Signed-off-by: Dongwon Kim <dongwon.kim@intel.com> | ||
| 10 | --- | ||
| 11 | shared/source/built_ins/kernels/CMakeLists.txt | 10 +++++----- | ||
| 12 | 1 file changed, 5 insertions(+), 5 deletions(-) | ||
| 13 | |||
| 14 | Index: git/shared/source/built_ins/kernels/CMakeLists.txt | ||
| 15 | =================================================================== | ||
| 16 | --- git.orig/shared/source/built_ins/kernels/CMakeLists.txt | ||
| 17 | +++ git/shared/source/built_ins/kernels/CMakeLists.txt | ||
| 18 | @@ -122,9 +122,9 @@ function(compile_builtin core_type platf | ||
| 19 | endif() | ||
| 20 | add_custom_command( | ||
| 21 | OUTPUT ${OUTPUT_FILE_CPP} | ||
| 22 | - COMMAND $<TARGET_FILE:cpp_generate_tool> --file ${BINARY_OUTPUT}.bin --output ${OUTPUT_FILE_CPP} --array ${mode}_${BASENAME} --device ${RELEASE_FILENAME} | ||
| 23 | + COMMAND cpp_generate_tool --file ${BINARY_OUTPUT}.bin --output ${OUTPUT_FILE_CPP} --array ${mode}_${BASENAME} --device ${RELEASE_FILENAME} | ||
| 24 | WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} | ||
| 25 | - DEPENDS ${OUTPUT_FILES_BINARIES} $<TARGET_FILE:cpp_generate_tool> | ||
| 26 | + DEPENDS ${OUTPUT_FILES_BINARIES} cpp_generate_tool | ||
| 27 | ) | ||
| 28 | list(APPEND BUILTINS_COMMANDS "${OUTPUT_FILE_CPP}") | ||
| 29 | else() | ||
| 30 | @@ -176,9 +176,9 @@ function(generate_cpp_spirv builtin) | ||
| 31 | endif() | ||
| 32 | add_custom_command( | ||
| 33 | OUTPUT ${OUTPUT_FILE_CPP} | ||
| 34 | - COMMAND $<TARGET_FILE:cpp_generate_tool> --file ${GENERATED_SPV_INPUT} --output ${OUTPUT_FILE_CPP} --array ${BASENAME} | ||
| 35 | + COMMAND cpp_generate_tool --file ${GENERATED_SPV_INPUT} --output ${OUTPUT_FILE_CPP} --array ${BASENAME} | ||
| 36 | WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} | ||
| 37 | - DEPENDS ${GENERATED_SPV_INPUT} $<TARGET_FILE:cpp_generate_tool> | ||
| 38 | + DEPENDS ${GENERATED_SPV_INPUT} cpp_generate_tool | ||
| 39 | ) | ||
| 40 | set(OUTPUT_LIST_CPP_FILES ${OUTPUT_LIST_CPP_FILES} ${OUTPUT_FILE_CPP} PARENT_SCOPE) | ||
| 41 | else() | ||
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..2001d839 --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0003-external-ocloc.patch | |||
| @@ -0,0 +1,38 @@ | |||
| 1 | From 0006db5f55a9f08bd3452558a53704cd3bbb790f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Dongwon Kim <dongwon.kim@intel.com> | ||
| 3 | Date: Wed, 2 Mar 2022 15:52:45 -0800 | ||
| 4 | Subject: [PATCH 3/5] external ocloc | ||
| 5 | |||
| 6 | Upstream-Status: Inappropriate | ||
| 7 | |||
| 8 | Signed-off-by: Dongwon Kim <dongwon.kim@intel.com> | ||
| 9 | --- | ||
| 10 | cmake/ocloc_cmd_prefix.cmake | 14 ++++++++------ | ||
| 11 | 1 file changed, 8 insertions(+), 6 deletions(-) | ||
| 12 | |||
| 13 | Index: git/cmake/ocloc_cmd_prefix.cmake | ||
| 14 | =================================================================== | ||
| 15 | --- git.orig/cmake/ocloc_cmd_prefix.cmake | ||
| 16 | +++ git/cmake/ocloc_cmd_prefix.cmake | ||
| 17 | @@ -4,13 +4,15 @@ | ||
| 18 | # SPDX-License-Identifier: MIT | ||
| 19 | # | ||
| 20 | |||
| 21 | -if(WIN32) | ||
| 22 | - set(ocloc_cmd_prefix ocloc) | ||
| 23 | -else() | ||
| 24 | - if(DEFINED NEO__IGC_LIBRARY_PATH) | ||
| 25 | - set(ocloc_cmd_prefix ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${NEO__IGC_LIBRARY_PATH}:$<TARGET_FILE_DIR:ocloc_lib>" $<TARGET_FILE:ocloc>) | ||
| 26 | +if(NOT DEFINED ocloc_cmd_prefix) | ||
| 27 | + if(WIN32) | ||
| 28 | + set(ocloc_cmd_prefix ocloc) | ||
| 29 | else() | ||
| 30 | - set(ocloc_cmd_prefix ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$<TARGET_FILE_DIR:ocloc_lib>" $<TARGET_FILE:ocloc>) | ||
| 31 | + if(DEFINED NEO__IGC_LIBRARY_PATH) | ||
| 32 | + set(ocloc_cmd_prefix LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${NEO__IGC_LIBRARY_PATH}:$<TARGET_FILE_DIR:ocloc_lib> $<TARGET_FILE:ocloc>) | ||
| 33 | + else() | ||
| 34 | + set(ocloc_cmd_prefix LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$<TARGET_FILE_DIR:ocloc_lib> $<TARGET_FILE:ocloc>) | ||
| 35 | + endif() | ||
| 36 | endif() | ||
| 37 | endif() | ||
| 38 | |||
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/dont-use-ld-library-path.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/dont-use-ld-library-path.patch deleted file mode 100644 index 6f7cdff8..00000000 --- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/dont-use-ld-library-path.patch +++ /dev/null | |||
| @@ -1,46 +0,0 @@ | |||
| 1 | From ad3e325c1af4d6533fd9b3dfc5208267b678327a Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Naveen Saini <naveen.kumar.saini@intel.com> | ||
| 3 | Date: Thu, 6 Feb 2020 18:25:19 +0800 | ||
| 4 | Subject: [PATCH] don't use LD_LIBRARY_PATH for native offline compiler | ||
| 5 | |||
| 6 | Let us supply the correct path for it to be able to find the correct | ||
| 7 | libraries. | ||
| 8 | |||
| 9 | Upstream-Status: Inappropriate | ||
| 10 | |||
| 11 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
| 12 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | ||
| 13 | --- | ||
| 14 | runtime/built_ins/kernels/CMakeLists.txt | 2 +- | ||
| 15 | runtime/scheduler/scheduler_binary.cmake | 2 +- | ||
| 16 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
| 17 | |||
| 18 | diff --git a/runtime/built_ins/kernels/CMakeLists.txt b/runtime/built_ins/kernels/CMakeLists.txt | ||
| 19 | index 863dba145..a385cf768 100644 | ||
| 20 | --- a/runtime/built_ins/kernels/CMakeLists.txt | ||
| 21 | +++ b/runtime/built_ins/kernels/CMakeLists.txt | ||
| 22 | @@ -66,7 +66,7 @@ function(compile_builtin gen_type platform_type builtin bits builtin_options) | ||
| 23 | if(DEFINED NEO__IGC_LIBRARY_PATH) | ||
| 24 | set(cloc_cmd_prefix LD_LIBRARY_PATH=${NEO__IGC_LIBRARY_PATH} $<TARGET_FILE:ocloc>) | ||
| 25 | else() | ||
| 26 | - set(cloc_cmd_prefix LD_LIBRARY_PATH=$<TARGET_FILE_DIR:ocloc> $<TARGET_FILE:ocloc>) | ||
| 27 | + set(cloc_cmd_prefix ocloc) | ||
| 28 | endif() | ||
| 29 | endif() | ||
| 30 | list(APPEND __cloc__options__ "-cl-kernel-arg-info") | ||
| 31 | diff --git a/runtime/scheduler/scheduler_binary.cmake b/runtime/scheduler/scheduler_binary.cmake | ||
| 32 | index a7015b909..a720d2f5c 100644 | ||
| 33 | --- a/runtime/scheduler/scheduler_binary.cmake | ||
| 34 | +++ b/runtime/scheduler/scheduler_binary.cmake | ||
| 35 | @@ -37,7 +37,7 @@ function(compile_kernel target gen_type platform_type kernel) | ||
| 36 | if(DEFINED NEO__IGC_LIBRARY_PATH) | ||
| 37 | set(cloc_cmd_prefix LD_LIBRARY_PATH=${NEO__IGC_LIBRARY_PATH} $<TARGET_FILE:ocloc>) | ||
| 38 | else() | ||
| 39 | - set(cloc_cmd_prefix LD_LIBRARY_PATH=$<TARGET_FILE_DIR:ocloc> $<TARGET_FILE:ocloc>) | ||
| 40 | + set(cloc_cmd_prefix ocloc) | ||
| 41 | endif() | ||
| 42 | endif() | ||
| 43 | list(APPEND __cloc__options__ "-cl-kernel-arg-info") | ||
| 44 | -- | ||
| 45 | 2.17.1 | ||
| 46 | |||
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/fix-missing-header-path.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/fix-missing-header-path.patch deleted file mode 100644 index dbeeb1d3..00000000 --- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/fix-missing-header-path.patch +++ /dev/null | |||
| @@ -1,49 +0,0 @@ | |||
| 1 | From c5cbcef415b16a8d0168c0d6b9da467d8c4e59a3 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Naveen Saini <naveen.kumar.saini@intel.com> | ||
| 3 | Date: Thu, 6 Feb 2020 16:01:39 +0800 | ||
| 4 | Subject: [PATCH] linker.cpp: fix for missing RelocationInfo.h | ||
| 5 | |||
| 6 | Facing build failure with below error: | ||
| 7 | |||
| 8 | git/core/compiler_interface/linker.cpp:14:10: fatal error: RelocationInfo.h: No such file or directory | ||
| 9 | | 14 | #include "RelocationInfo.h" | ||
| 10 | | | ^~~~~~~~~~~~~~~~~~ | ||
| 11 | | compilation terminated. | ||
| 12 | |||
| 13 | Upstream-Status: Submitted [https://github.com/intel/compute-runtime/pull/256] | ||
| 14 | |||
| 15 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | ||
| 16 | --- | ||
| 17 | core/compiler_interface/linker.cpp | 2 +- | ||
| 18 | core/unit_tests/compiler_interface/linker_tests.cpp | 2 +- | ||
| 19 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
| 20 | |||
| 21 | diff --git a/core/compiler_interface/linker.cpp b/core/compiler_interface/linker.cpp | ||
| 22 | index a5b0386e9..c1445b336 100644 | ||
| 23 | --- a/core/compiler_interface/linker.cpp | ||
| 24 | +++ b/core/compiler_interface/linker.cpp | ||
| 25 | @@ -11,7 +11,7 @@ | ||
| 26 | #include "core/helpers/debug_helpers.h" | ||
| 27 | #include "core/helpers/ptr_math.h" | ||
| 28 | |||
| 29 | -#include "RelocationInfo.h" | ||
| 30 | +#include "visa/RelocationInfo.h" | ||
| 31 | |||
| 32 | #include <sstream> | ||
| 33 | |||
| 34 | diff --git a/core/unit_tests/compiler_interface/linker_tests.cpp b/core/unit_tests/compiler_interface/linker_tests.cpp | ||
| 35 | index 6bb7e987c..f2d0b5632 100644 | ||
| 36 | --- a/core/unit_tests/compiler_interface/linker_tests.cpp | ||
| 37 | +++ b/core/unit_tests/compiler_interface/linker_tests.cpp | ||
| 38 | @@ -11,7 +11,7 @@ | ||
| 39 | |||
| 40 | #include <string> | ||
| 41 | |||
| 42 | -#include "RelocationInfo.h" | ||
| 43 | +#include "visa/RelocationInfo.h" | ||
| 44 | |||
| 45 | TEST(LinkerInputTests, givenGlobalsSymbolTableThenProperlyDecodesGlobalVariablesAndGlobalConstants) { | ||
| 46 | NEO::LinkerInput linkerInput; | ||
| 47 | -- | ||
| 48 | 2.17.1 | ||
| 49 | |||
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.04.15428.bb b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.04.15428.bb deleted file mode 100644 index a910ab34..00000000 --- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.04.15428.bb +++ /dev/null | |||
| @@ -1,44 +0,0 @@ | |||
| 1 | SUMMARY = "The Intel(R) Graphics Compute Runtime for OpenCL(TM)" | ||
| 2 | DESCRIPTION = "The Intel(R) Graphics Compute Runtime for OpenCL(TM) \ | ||
| 3 | is an open source project to converge Intel's development efforts \ | ||
| 4 | on OpenCL(TM) compute stacks supporting the GEN graphics hardware \ | ||
| 5 | architecture." | ||
| 6 | |||
| 7 | LICENSE = "MIT" | ||
| 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=ae27f47fd6755510247c19e547e4c804 \ | ||
| 9 | file://third_party/opencl_headers/LICENSE;md5=dcefc90f4c3c689ec0c2489064e7273b" | ||
| 10 | |||
| 11 | SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https \ | ||
| 12 | " | ||
| 13 | |||
| 14 | SRC_URI_append_class-target = " \ | ||
| 15 | file://dont-use-ld-library-path.patch \ | ||
| 16 | file://fix-missing-header-path.patch \ | ||
| 17 | " | ||
| 18 | |||
| 19 | SRCREV = "98006aa2bf282ebc5914359e0e4c5f1c539de56f" | ||
| 20 | |||
| 21 | S = "${WORKDIR}/git" | ||
| 22 | |||
| 23 | DEPENDS += " intel-graphics-compiler gmmlib clang" | ||
| 24 | DEPENDS_append_class-target = " intel-compute-runtime-native" | ||
| 25 | |||
| 26 | RDEPENDS_${PN} += " intel-graphics-compiler gmmlib" | ||
| 27 | |||
| 28 | inherit cmake pkgconfig | ||
| 29 | |||
| 30 | COMPATIBLE_HOST = '(x86_64).*-linux' | ||
| 31 | COMPATIBLE_HOST_libc-musl = "null" | ||
| 32 | |||
| 33 | EXTRA_OECMAKE = " \ | ||
| 34 | -DBUILD_TYPE=Release \ | ||
| 35 | -DSKIP_UNIT_TESTS=1 \ | ||
| 36 | -DCCACHE_ALLOWED=FALSE \ | ||
| 37 | " | ||
| 38 | |||
| 39 | FILES_${PN} += "${libdir}/intel-opencl/libigdrcl.so" | ||
| 40 | |||
| 41 | BBCLASSEXTEND = "native nativesdk" | ||
| 42 | |||
| 43 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" | ||
| 44 | EXCLUDE_FROM_WORLD = "1" | ||
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_25.13.33276.16.bb b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_25.13.33276.16.bb new file mode 100644 index 00000000..b13daaa8 --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_25.13.33276.16.bb | |||
| @@ -0,0 +1,61 @@ | |||
| 1 | SUMMARY = "The Intel(R) Graphics Compute Runtime for OpenCL(TM)" | ||
| 2 | DESCRIPTION = "The Intel(R) Graphics Compute Runtime for OpenCL(TM) \ | ||
| 3 | is an open source project to converge Intel's development efforts \ | ||
| 4 | on OpenCL(TM) compute stacks supporting the GEN graphics hardware \ | ||
| 5 | architecture." | ||
| 6 | |||
| 7 | LICENSE = "MIT & Apache-2.0" | ||
| 8 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eca6ec6997e18db166db7109cdbe611c \ | ||
| 9 | file://third_party/opencl_headers/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | ||
| 10 | |||
| 11 | SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https;branch=releases/25.13 \ | ||
| 12 | file://0002-Build-not-able-to-locate-cpp_generation_tool.patch \ | ||
| 13 | file://0003-external-ocloc.patch \ | ||
| 14 | " | ||
| 15 | |||
| 16 | SRCREV = "a9961bdfaa07250fd52ff930bf8f31fb4e3b7799" | ||
| 17 | |||
| 18 | DEPENDS += " intel-graphics-compiler gmmlib libva qemu-native" | ||
| 19 | |||
| 20 | RDEPENDS:${PN} += " intel-graphics-compiler gmmlib" | ||
| 21 | |||
| 22 | inherit cmake pkgconfig qemu | ||
| 23 | |||
| 24 | COMPATIBLE_HOST = '(x86_64).*-linux' | ||
| 25 | COMPATIBLE_HOST:libc-musl = "null" | ||
| 26 | |||
| 27 | EXTRA_OECMAKE = " \ | ||
| 28 | -DIGC_DIR=${STAGING_INCDIR}/igc \ | ||
| 29 | -DBUILD_TYPE=Release \ | ||
| 30 | -DSKIP_UNIT_TESTS=1 \ | ||
| 31 | -DCCACHE_ALLOWED=FALSE \ | ||
| 32 | -DNEO_DISABLE_LD_LLD=ON \ | ||
| 33 | -DNEO_DISABLE_LD_GOLD=ON \ | ||
| 34 | " | ||
| 35 | |||
| 36 | EXTRA_OECMAKE:append:class-target = " \ | ||
| 37 | -Docloc_cmd_prefix=ocloc \ | ||
| 38 | -DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper \ | ||
| 39 | " | ||
| 40 | |||
| 41 | PACKAGECONFIG ??= "" | ||
| 42 | PACKAGECONFIG[levelzero] = "-DBUILD_WITH_L0=ON, -DBUILD_WITH_L0=OFF, level-zero" | ||
| 43 | |||
| 44 | do_configure:prepend:class-target () { | ||
| 45 | # Write out a qemu wrapper that will be used by cmake. | ||
| 46 | 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}')])}" | ||
| 47 | cat > ${WORKDIR}/qemuwrapper << EOF | ||
| 48 | #!/bin/sh | ||
| 49 | $qemu_binary "\$@" | ||
| 50 | EOF | ||
| 51 | chmod +x ${WORKDIR}/qemuwrapper | ||
| 52 | } | ||
| 53 | |||
| 54 | FILES:${PN} += " \ | ||
| 55 | ${libdir}/intel-opencl/libigdrcl.so \ | ||
| 56 | ${libdir}/libocloc.so \ | ||
| 57 | " | ||
| 58 | |||
| 59 | FILES:${PN}-dev = "${includedir}" | ||
| 60 | |||
| 61 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" | ||
