From 9a9d8cb2343a4c7eae7b6ee4ea61e2a554c4cf7a Mon Sep 17 00:00:00 2001 From: Naveen Saini Date: Thu, 12 Sep 2019 22:21:44 +0800 Subject: opencl-clang: upgrade 8.0.1 -> 9.0.0 With this upgrade, by default -DPREFERRED_LLVM_VERSION="9.0.0" is set. Changes can be check here: https://github.com/intel/opencl-clang Signed-off-by: Naveen Saini Signed-off-by: Anuj Mittal --- .../files/point-to-correct-llvm-tblgen.patch | 11 +++++-- .../opencl-clang/opencl-clang_8.0.1.bb | 37 ---------------------- .../opencl-clang/opencl-clang_9.0.0.bb | 37 ++++++++++++++++++++++ 3 files changed, 45 insertions(+), 40 deletions(-) delete mode 100644 dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_8.0.1.bb create mode 100644 dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_9.0.0.bb diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/point-to-correct-llvm-tblgen.patch b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/point-to-correct-llvm-tblgen.patch index b0bfa6ee..417e0221 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/point-to-correct-llvm-tblgen.patch +++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/point-to-correct-llvm-tblgen.patch @@ -1,4 +1,4 @@ -From 40be69a2c9460aea40beab8734684050988b9322 Mon Sep 17 00:00:00 2001 +From 2ce2619b544678541e0cc56494e2927086718613 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Tue, 26 Mar 2019 14:11:29 +0800 Subject: [PATCH] point to correct llvm-tblgen @@ -10,12 +10,14 @@ git through cmake. Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Anuj Mittal +Signed-off-by: Naveen Saini --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 174133b..be409e5 100644 +index 1371a67..f83ffcc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,7 +53,7 @@ endif(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) @@ -27,7 +29,7 @@ index 174133b..be409e5 100644 if (NOT WIN32) add_subdirectory( linux_linker ) -@@ -102,7 +102,7 @@ endif(NOT USE_PREBUILT_LLVM) +@@ -138,7 +138,7 @@ endif(NOT USE_PREBUILT_LLVM) set (COMPILE_OPTIONS_TD opencl_clang_options.td) set (COMPILE_OPTIONS_INC opencl_clang_options.inc) @@ -36,3 +38,6 @@ index 174133b..be409e5 100644 set(LLVM_TARGET_DEFINITIONS ${COMPILE_OPTIONS_TD}) if(USE_PREBUILT_LLVM) set(TABLEGEN_ADDITIONAL -I ${LLVM_INCLUDE_DIRS}) +-- +2.17.1 + diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_8.0.1.bb b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_8.0.1.bb deleted file mode 100644 index c45c36d8..00000000 --- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_8.0.1.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "Common clang is a thin wrapper library around clang" -DESCRIPTION = "Common clang has OpenCL-oriented API and is capable \ - to compile OpenCL C kernels to SPIR-V modules." - -LICENSE = "NCSA" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e8a15bf1416762a09ece07e44c79118c" - -SRC_URI = "git://github.com/intel/opencl-clang.git;branch=ocl-open-80;protocol=https \ - file://point-to-correct-llvm-tblgen.patch \ - " - -SRCREV = "94af090661d7c953c516c97a25ed053c744a0737" - -S = "${WORKDIR}/git" - -inherit cmake -DEPENDS += "clang" - -DEPENDS_append_class-target = " opencl-clang-native" -LDFLAGS_append_class-native = " -fuse-ld=lld" - -COMPATIBLE_HOST = '(x86_64).*-linux' -COMPATIBLE_HOST_libc-musl = "null" - -EXTRA_OECMAKE += "\ - -DLLVM_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ - -DCMAKE_SKIP_RPATH=TRUE \ - " - -do_install_append_class-native() { - install -d ${D}${bindir} - install -m 0755 ${B}/linux_linker/linux_resource_linker ${D}${bindir}/ -} - -BBCLASSEXTEND = "native nativesdk" - -TOOLCHAIN_class-native = "clang" diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_9.0.0.bb b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_9.0.0.bb new file mode 100644 index 00000000..e4209234 --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_9.0.0.bb @@ -0,0 +1,37 @@ +SUMMARY = "Common clang is a thin wrapper library around clang" +DESCRIPTION = "Common clang has OpenCL-oriented API and is capable \ + to compile OpenCL C kernels to SPIR-V modules." + +LICENSE = "NCSA" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e8a15bf1416762a09ece07e44c79118c" + +SRC_URI = "git://github.com/intel/opencl-clang.git;branch=ocl-open-90;protocol=https \ + file://point-to-correct-llvm-tblgen.patch \ + " + +SRCREV = "6f8c329bea44321aef1a1716dd206c1f7bed23cf" + +S = "${WORKDIR}/git" + +inherit cmake +DEPENDS += "clang" + +DEPENDS_append_class-target = " opencl-clang-native" +LDFLAGS_append_class-native = " -fuse-ld=lld" + +COMPATIBLE_HOST = '(x86_64).*-linux' +COMPATIBLE_HOST_libc-musl = "null" + +EXTRA_OECMAKE += "\ + -DLLVM_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ + -DCMAKE_SKIP_RPATH=TRUE \ + " + +do_install_append_class-native() { + install -d ${D}${bindir} + install -m 0755 ${B}/linux_linker/linux_resource_linker ${D}${bindir}/ +} + +BBCLASSEXTEND = "native nativesdk" + +TOOLCHAIN_class-native = "clang" -- cgit v1.2.3-54-g00ecf