diff options
5 files changed, 81 insertions, 27 deletions
diff --git a/conf/machine/include/meta-intel.inc b/conf/machine/include/meta-intel.inc index 266f5c4e..f92438cb 100644 --- a/conf/machine/include/meta-intel.inc +++ b/conf/machine/include/meta-intel.inc | |||
@@ -25,6 +25,9 @@ PREFERRED_VERSION_linux-intel-rt ?= "5.4%" | |||
25 | PREFERRED_VERSION_linux-intel_poky-altcfg ?= "5.4%" | 25 | PREFERRED_VERSION_linux-intel_poky-altcfg ?= "5.4%" |
26 | PREFERRED_VERSION_linux-intel-rt_poky-altcfg ?= "5.4%" | 26 | PREFERRED_VERSION_linux-intel-rt_poky-altcfg ?= "5.4%" |
27 | 27 | ||
28 | PREFERRED_VERSION_opencl-clang ?= "${@bb.utils.contains('LLVMVERSION', '9.0.1', '9.0.0', '10.0.0', d)}" | ||
29 | PREFERRED_VERSION_opencl-clang-native ?= "${@bb.utils.contains('LLVMVERSION', '9.0.1', '9.0.0', '10.0.0', d)}" | ||
30 | |||
28 | XSERVER_X86_ASPEED_AST = "xf86-video-ast \ | 31 | XSERVER_X86_ASPEED_AST = "xf86-video-ast \ |
29 | " | 32 | " |
30 | 33 | ||
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 new file mode 100644 index 00000000..417e0221 --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/point-to-correct-llvm-tblgen.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | From 2ce2619b544678541e0cc56494e2927086718613 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Tue, 26 Mar 2019 14:11:29 +0800 | ||
4 | Subject: [PATCH] point to correct llvm-tblgen | ||
5 | |||
6 | Let llvm-tblgen path be passed from recipe itself. | ||
7 | |||
8 | Also since we're going to do the patching ourselves, no need to look for | ||
9 | git through cmake. | ||
10 | |||
11 | Upstream-Status: Inappropriate [OE specific] | ||
12 | |||
13 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
14 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | ||
15 | --- | ||
16 | CMakeLists.txt | 4 ++-- | ||
17 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
18 | |||
19 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
20 | index 1371a67..f83ffcc 100644 | ||
21 | --- a/CMakeLists.txt | ||
22 | +++ b/CMakeLists.txt | ||
23 | @@ -53,7 +53,7 @@ endif(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) | ||
24 | include(AddLLVM) | ||
25 | include(TableGen) | ||
26 | |||
27 | -find_package(Git REQUIRED) | ||
28 | +#find_package(Git REQUIRED) | ||
29 | |||
30 | if (NOT WIN32) | ||
31 | add_subdirectory( linux_linker ) | ||
32 | @@ -138,7 +138,7 @@ endif(NOT USE_PREBUILT_LLVM) | ||
33 | set (COMPILE_OPTIONS_TD opencl_clang_options.td) | ||
34 | set (COMPILE_OPTIONS_INC opencl_clang_options.inc) | ||
35 | |||
36 | -set(LLVM_TABLEGEN_EXE "llvm-tblgen") | ||
37 | +#set(LLVM_TABLEGEN_EXE "llvm-tblgen") | ||
38 | set(LLVM_TARGET_DEFINITIONS ${COMPILE_OPTIONS_TD}) | ||
39 | if(USE_PREBUILT_LLVM) | ||
40 | set(TABLEGEN_ADDITIONAL -I ${LLVM_INCLUDE_DIRS}) | ||
41 | -- | ||
42 | 2.17.1 | ||
43 | |||
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc new file mode 100644 index 00000000..c099a509 --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc | |||
@@ -0,0 +1,27 @@ | |||
1 | SUMMARY = "Common clang is a thin wrapper library around clang" | ||
2 | DESCRIPTION = "Common clang has OpenCL-oriented API and is capable \ | ||
3 | to compile OpenCL C kernels to SPIR-V modules." | ||
4 | |||
5 | LICENSE = "NCSA" | ||
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e8a15bf1416762a09ece07e44c79118c" | ||
7 | |||
8 | S = "${WORKDIR}/git" | ||
9 | |||
10 | inherit cmake | ||
11 | DEPENDS += "clang" | ||
12 | DEPENDS_append_class-target = " opencl-clang-native" | ||
13 | |||
14 | COMPATIBLE_HOST = '(x86_64).*-linux' | ||
15 | COMPATIBLE_HOST_libc-musl = "null" | ||
16 | |||
17 | EXTRA_OECMAKE += "\ | ||
18 | -DLLVM_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ | ||
19 | -DCMAKE_SKIP_RPATH=TRUE \ | ||
20 | " | ||
21 | |||
22 | do_install_append_class-native() { | ||
23 | install -d ${D}${bindir} | ||
24 | install -m 0755 ${B}/linux_linker/linux_resource_linker ${D}${bindir}/ | ||
25 | } | ||
26 | |||
27 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_10.0.0.bb b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_10.0.0.bb index 042cfa30..dcee4fa0 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_10.0.0.bb +++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_10.0.0.bb | |||
@@ -1,9 +1,4 @@ | |||
1 | SUMMARY = "Common clang is a thin wrapper library around clang" | 1 | require opencl-clang.inc |
2 | DESCRIPTION = "Common clang has OpenCL-oriented API and is capable \ | ||
3 | to compile OpenCL C kernels to SPIR-V modules." | ||
4 | |||
5 | LICENSE = "NCSA" | ||
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e8a15bf1416762a09ece07e44c79118c" | ||
7 | 2 | ||
8 | SRC_URI = "git://github.com/intel/opencl-clang.git;branch=ocl-open-100;protocol=https \ | 3 | SRC_URI = "git://github.com/intel/opencl-clang.git;branch=ocl-open-100;protocol=https \ |
9 | file://0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch \ | 4 | file://0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch \ |
@@ -12,24 +7,3 @@ SRC_URI = "git://github.com/intel/opencl-clang.git;branch=ocl-open-100;protocol= | |||
12 | SRC_URI_append_class-native = " file://0002-make-sure-only-static-libraries-linked-for-native-bu.patch" | 7 | SRC_URI_append_class-native = " file://0002-make-sure-only-static-libraries-linked-for-native-bu.patch" |
13 | 8 | ||
14 | SRCREV = "9f0c2c0f5ddea1accc921aed4c94bc52c1b85637" | 9 | SRCREV = "9f0c2c0f5ddea1accc921aed4c94bc52c1b85637" |
15 | |||
16 | S = "${WORKDIR}/git" | ||
17 | |||
18 | inherit cmake | ||
19 | DEPENDS += "clang" | ||
20 | DEPENDS_append_class-target = " opencl-clang-native" | ||
21 | |||
22 | COMPATIBLE_HOST = '(x86_64).*-linux' | ||
23 | COMPATIBLE_HOST_libc-musl = "null" | ||
24 | |||
25 | EXTRA_OECMAKE += "\ | ||
26 | -DLLVM_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ | ||
27 | -DCMAKE_SKIP_RPATH=TRUE \ | ||
28 | " | ||
29 | |||
30 | do_install_append_class-native() { | ||
31 | install -d ${D}${bindir} | ||
32 | install -m 0755 ${B}/linux_linker/linux_resource_linker ${D}${bindir}/ | ||
33 | } | ||
34 | |||
35 | BBCLASSEXTEND = "native nativesdk" | ||
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..f262a5eb --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_9.0.0.bb | |||
@@ -0,0 +1,7 @@ | |||
1 | require opencl-clang.inc | ||
2 | |||
3 | SRC_URI = "git://github.com/intel/opencl-clang.git;branch=ocl-open-90;protocol=https \ | ||
4 | file://point-to-correct-llvm-tblgen.patch \ | ||
5 | " | ||
6 | |||
7 | SRCREV = "6f8c329bea44321aef1a1716dd206c1f7bed23cf" | ||