From b7d87376c71ecbbc74eea1100b6d12cfb8eba3fd Mon Sep 17 00:00:00 2001 From: Naveen Saini Date: Mon, 13 Apr 2020 13:23:13 +0800 Subject: intel-compute-runtime: upgrade 20.12.16259 -> 20.14.16441 Dropped the backported patch. Signed-off-by: Naveen Saini Signed-off-by: Anuj Mittal --- .../enable-external-offline-compiler.patch | 44 ---------------------- .../intel-compute-runtime_20.12.16259.bb | 44 ---------------------- .../intel-compute-runtime_20.14.16441.bb | 43 +++++++++++++++++++++ 3 files changed, 43 insertions(+), 88 deletions(-) delete mode 100644 dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/enable-external-offline-compiler.patch delete mode 100644 dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.12.16259.bb create mode 100644 dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.14.16441.bb diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/enable-external-offline-compiler.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/enable-external-offline-compiler.patch deleted file mode 100644 index d3e7d14a..00000000 --- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/enable-external-offline-compiler.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 6f6d64569d75f6fc352ce7ce3a65dd88f0f84b99 Mon Sep 17 00:00:00 2001 -From: Dongwon Kim -Date: Wed, 25 Mar 2020 15:02:43 -0700 -Subject: [PATCH] Optionally enable external ocl offline compiler - -Expand commit af78548e80cb293ccc6b02b45ac03d249de03bc6 to -scheduler's build configuration - -Change-Id: I04a5fc5f85d15bac040ad699df4c39cc2e0182aa -Signed-off-by: Dongwon Kim - -Upstream-Status: Backport -Signed-off-by: Anuj Mittal ---- - opencl/source/scheduler/scheduler_binary.cmake | 15 +++++++++------ - 1 file changed, 9 insertions(+), 6 deletions(-) - -diff --git a/opencl/source/scheduler/scheduler_binary.cmake b/opencl/source/scheduler/scheduler_binary.cmake -index 740ff7d63..c57e28f78 100644 ---- a/opencl/source/scheduler/scheduler_binary.cmake -+++ b/opencl/source/scheduler/scheduler_binary.cmake -@@ -31,13 +31,16 @@ function(compile_kernel target gen_type platform_type kernel) - set(OUTPUTPATH "${OUTPUTDIR}/${BASENAME}_${family_name_with_type}.bin") - - set(SCHEDULER_CPP "${OUTPUTDIR}/${BASENAME}_${family_name_with_type}.cpp") -- if(WIN32) -- set(cloc_cmd_prefix ocloc) -- else() -- if(DEFINED NEO__IGC_LIBRARY_PATH) -- set(cloc_cmd_prefix LD_LIBRARY_PATH=${NEO__IGC_LIBRARY_PATH}:$ $) -+ -+ if(NOT DEFINED cloc_cmd_prefix) -+ if(WIN32) -+ set(cloc_cmd_prefix ocloc) - else() -- set(cloc_cmd_prefix LD_LIBRARY_PATH=$ $) -+ if(DEFINED NEO__IGC_LIBRARY_PATH) -+ set(cloc_cmd_prefix LD_LIBRARY_PATH=${NEO__IGC_LIBRARY_PATH}:$ $) -+ else() -+ set(cloc_cmd_prefix LD_LIBRARY_PATH=$ $) -+ endif() - endif() - endif() - list(APPEND __cloc__options__ "-cl-kernel-arg-info") diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.12.16259.bb b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.12.16259.bb deleted file mode 100644 index 0eb0655a..00000000 --- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.12.16259.bb +++ /dev/null @@ -1,44 +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 \ - file://enable-external-offline-compiler.patch \ - " - -SRCREV = "43016c65591bd125a9590ea05ca83d094a628f79" - -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 \ - -Dcloc_cmd_prefix=ocloc \ - " - -FILES_${PN} += " \ - ${libdir}/intel-opencl/libigdrcl.so \ - ${libdir}/intel-opencl/libocloc.so \ - " - -BBCLASSEXTEND = "native nativesdk" - -UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.14.16441.bb b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.14.16441.bb new file mode 100644 index 00000000..d8b2fab5 --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.14.16441.bb @@ -0,0 +1,43 @@ +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 \ + " + +SRCREV = "4786f1a6c2910207b9f544ef3a087c4cb04280dc" + +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 \ + -Dcloc_cmd_prefix=ocloc \ + " + +FILES_${PN} += " \ + ${libdir}/intel-opencl/libigdrcl.so \ + ${libdir}/intel-opencl/libocloc.so \ + " + +BBCLASSEXTEND = "native nativesdk" + +UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" -- cgit v1.2.3-54-g00ecf