From 4f9aa9cd83a18f4cf4ee5ae593d449f46c5f31e8 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Tue, 13 Oct 2020 23:46:22 +0800 Subject: compute-runtime: upgrade 20.33.17675 -> 20.40.18075 Release notes: https://github.com/intel/compute-runtime/releases/tag/20.40.18075 Signed-off-by: Anuj Mittal --- .../allow-to-find-cpp-generation-tool.patch | 34 ++++++++----- .../intel-compute-runtime_20.33.17675.bb | 56 ---------------------- .../intel-compute-runtime_20.40.18075.bb | 56 ++++++++++++++++++++++ 3 files changed, 79 insertions(+), 67 deletions(-) delete mode 100644 dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.33.17675.bb create mode 100644 dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.40.18075.bb 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 eae129c7..881359c8 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 d6c5bf050f3d50ca02866ec90e474ef540df2ffa Mon Sep 17 00:00:00 2001 +From bde2a2b58d7f7b3063406db600e5b988fbcf01aa Mon Sep 17 00:00:00 2001 From: Naveen Saini Date: Wed, 27 May 2020 11:12:09 +0000 Subject: [PATCH] intel-compute-runtime: allow to find cpp_generation_tool @@ -8,25 +8,37 @@ Build not able to locate cpp_generation_tool. Upstream-Status: Inappropriate [oe specific] Signed-off-by: Naveen Saini --- - shared/source/built_ins/kernels/CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + 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 308a6cb3b..9f34359c3 100644 +index 84935be2d..150c450d7 100644 --- a/shared/source/built_ins/kernels/CMakeLists.txt +++ b/shared/source/built_ins/kernels/CMakeLists.txt @@ -84,9 +84,9 @@ function(compile_builtin gen_type platform_type builtin bits builtin_options) ) add_custom_command( - OUTPUT ${OUTPUT_FILE_CPP} -- COMMAND $ --file ${OUTPUTPATH_BASE}.gen --output ${OUTPUT_FILE_CPP} --array ${BASENAME} --platform ${family_name_with_type} -+ COMMAND cpp_generate_tool --file ${OUTPUTPATH_BASE}.gen --output ${OUTPUT_FILE_CPP} --array ${BASENAME} --platform ${family_name_with_type} - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -- DEPENDS ${OUTPUTPATH_BASE}.gen $ -+ DEPENDS ${OUTPUTPATH_BASE}.gen cpp_generate_tool + OUTPUT ${OUTPUT_FILE_CPP} +- COMMAND $ --file ${OUTPUTPATH_BASE}.gen --output ${OUTPUT_FILE_CPP} --array ${BASENAME} --platform ${family_name_with_type} ++ COMMAND cpp_generate_tool --file ${OUTPUTPATH_BASE}.gen --output ${OUTPUT_FILE_CPP} --array ${BASENAME} --platform ${family_name_with_type} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- DEPENDS ${OUTPUTPATH_BASE}.gen $ ++ DEPENDS ${OUTPUTPATH_BASE}.gen cpp_generate_tool + ) + endfunction() + +@@ -127,9 +127,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 ) endfunction() -- -2.24.1 +2.26.2 diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.33.17675.bb b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.33.17675.bb deleted file mode 100644 index 19d52926..00000000 --- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.33.17675.bb +++ /dev/null @@ -1,56 +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;md5=ae27f47fd6755510247c19e547e4c804 \ - file://third_party/opencl_headers/LICENSE;md5=dcefc90f4c3c689ec0c2489064e7273b" - -SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https \ - " -SRC_URI_append_class-target = " file://allow-to-find-cpp-generation-tool.patch" - -SRCREV = "cc3186c413cc680e9fab628ac425311fe758eb57" - -S = "${WORKDIR}/git" - -DEPENDS += " intel-graphics-compiler gmmlib clang" -DEPENDS_append_class-target = " intel-compute-runtime-native" - -RDEPENDS_${PN} += " intel-graphics-compiler gmmlib" - -inherit cmake pkgconfig - -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 \ - " -EXTRA_OECMAKE_append_class-target = " \ - -Dcloc_cmd_prefix=ocloc \ - " - -PACKAGECONFIG ??= "" -PACKAGECONFIG[levelzero] = "-DBUILD_WITH_L0=ON, -DBUILD_WITH_L0=OFF, level-zero" - -do_install_append_class-native() { - install -d ${D}${bindir} - install ${B}/bin/cpp_generate_tool ${D}${bindir}/ -} - -FILES_${PN} += " \ - ${libdir}/intel-opencl/libigdrcl.so \ - ${libdir}/libocloc.so \ - " - -FILES_${PN}-dev = "${includedir}" - -BBCLASSEXTEND = "native nativesdk" - -UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.40.18075.bb b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.40.18075.bb new file mode 100644 index 00000000..c0c289c8 --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.40.18075.bb @@ -0,0 +1,56 @@ +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;md5=ae27f47fd6755510247c19e547e4c804 \ + file://third_party/opencl_headers/LICENSE;md5=dcefc90f4c3c689ec0c2489064e7273b" + +SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https \ + " +SRC_URI_append_class-target = " file://allow-to-find-cpp-generation-tool.patch" + +SRCREV = "7e31ec37d78693c08a1fcb2ec31801e64cb497d3" + +S = "${WORKDIR}/git" + +DEPENDS += " intel-graphics-compiler gmmlib clang" +DEPENDS_append_class-target = " intel-compute-runtime-native" + +RDEPENDS_${PN} += " intel-graphics-compiler gmmlib" + +inherit cmake pkgconfig + +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 \ + " +EXTRA_OECMAKE_append_class-target = " \ + -Dcloc_cmd_prefix=ocloc \ + " + +PACKAGECONFIG ??= "" +PACKAGECONFIG[levelzero] = "-DBUILD_WITH_L0=ON, -DBUILD_WITH_L0=OFF, level-zero" + +do_install_append_class-native() { + install -d ${D}${bindir} + install ${B}/bin/cpp_generate_tool ${D}${bindir}/ +} + +FILES_${PN} += " \ + ${libdir}/intel-opencl/libigdrcl.so \ + ${libdir}/libocloc.so \ + " + +FILES_${PN}-dev = "${includedir}" + +BBCLASSEXTEND = "native nativesdk" + +UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" -- cgit v1.2.3-54-g00ecf