diff options
Diffstat (limited to 'dynamic-layers/clang-layer/recipes-opencl')
7 files changed, 47 insertions, 42 deletions
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.11702.1.bb b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.11702.1.bb index 0442bec9..7a994ebe 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.11702.1.bb +++ b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.11702.1.bb | |||
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://IGC/BiFModule/Implementation/ExternalLibraries/libclc | |||
9 | file://NOTICES.txt;md5=7f4fbc3eb2c34807465e63b1ec3c9d1a" | 9 | file://NOTICES.txt;md5=7f4fbc3eb2c34807465e63b1ec3c9d1a" |
10 | 10 | ||
11 | SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;name=igc;branch=releases/igc-1.0.11702 \ | 11 | SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;name=igc;branch=releases/igc-1.0.11702 \ |
12 | git://github.com/intel/vc-intrinsics.git;protocol=https;destsuffix=git/vc-intrinsics;name=vc;branch=master \ | 12 | git://github.com/intel/vc-intrinsics.git;protocol=https;destsuffix=git/vc-intrinsics;name=vc;nobranch=1 \ |
13 | git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=SPIRV-Tools;name=spirv-tools;branch=sdk-1.3.204 \ | 13 | git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=SPIRV-Tools;name=spirv-tools;branch=sdk-1.3.204 \ |
14 | git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=SPIRV-Headers;name=spirv-headers;branch=master \ | 14 | git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=SPIRV-Headers;name=spirv-headers;branch=master \ |
15 | file://0003-Improve-Reproducibility-for-src-package.patch \ | 15 | file://0003-Improve-Reproducibility-for-src-package.patch \ |
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-Fix-standalone-build-415.patch b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-Fix-standalone-build-415.patch new file mode 100644 index 00000000..732589f2 --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-Fix-standalone-build-415.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From 3a281f634be5e56d5fb49d07da85fe24e5971dd0 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <Zatloukal.Frantisek@gmail.com> | ||
3 | Date: Fri, 21 Apr 2023 04:07:21 +0200 | ||
4 | Subject: [PATCH] Fix standalone build (#415) | ||
5 | |||
6 | Fixes https://github.com/intel/opencl-clang/issues/406 | ||
7 | Fixes https://github.com/intel/opencl-clang/issues/374 | ||
8 | |||
9 | Upstream-Status: Backport [https://github.com/intel/opencl-clang/commit/529a9188114bcbd8ed753d2276942384fa50d7a1] | ||
10 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
11 | --- | ||
12 | cl_headers/CMakeLists.txt | 6 +++++- | ||
13 | 1 file changed, 5 insertions(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/cl_headers/CMakeLists.txt b/cl_headers/CMakeLists.txt | ||
16 | index 69cf11e..a258b62 100644 | ||
17 | --- a/cl_headers/CMakeLists.txt | ||
18 | +++ b/cl_headers/CMakeLists.txt | ||
19 | @@ -1,5 +1,9 @@ | ||
20 | set(CL_HEADERS_LIB cl_headers) | ||
21 | -set(CLANG_COMMAND $<TARGET_FILE:clang> ) | ||
22 | +if(USE_PREBUILT_LLVM) | ||
23 | + find_program(CLANG_COMMAND clang PATHS ${LLVM_TOOLS_BINARY_DIR}) | ||
24 | +else() | ||
25 | + set(CLANG_COMMAND $<TARGET_FILE:clang>) | ||
26 | +endif() | ||
27 | if(LLVM_USE_HOST_TOOLS AND NOT OPENCL_CLANG_BUILD_EXTERNAL) | ||
28 | build_native_tool(clang CLANG_COMMAND) | ||
29 | endif() | ||
30 | -- | ||
31 | 2.34.1 | ||
32 | |||
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch deleted file mode 100644 index 8df7e3ab..00000000 --- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From f3ef79a6301bab0b3a447f07ceb94c39a95009df Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Thu, 2 Apr 2020 08:59:20 +0800 | ||
4 | Subject: [PATCH] don't redefine LLVM_TABLEGEN_EXE | ||
5 | |||
6 | Use the value that has been passed by the user. | ||
7 | |||
8 | Upstream-Status: Submitted | ||
9 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
10 | --- | ||
11 | CMakeLists.txt | 5 ++++- | ||
12 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
15 | index 6893e97..941b0ae 100644 | ||
16 | --- a/CMakeLists.txt | ||
17 | +++ b/CMakeLists.txt | ||
18 | @@ -137,7 +137,10 @@ endif(NOT USE_PREBUILT_LLVM) | ||
19 | set (COMPILE_OPTIONS_TD opencl_clang_options.td) | ||
20 | set (COMPILE_OPTIONS_INC opencl_clang_options.inc) | ||
21 | |||
22 | -set(LLVM_TABLEGEN_EXE "llvm-tblgen") | ||
23 | +if(NOT DEFINED LLVM_TABLEGEN_EXE) | ||
24 | + set(LLVM_TABLEGEN_EXE "llvm-tblgen") | ||
25 | +endif() | ||
26 | + | ||
27 | set(LLVM_TARGET_DEFINITIONS ${COMPILE_OPTIONS_TD}) | ||
28 | if(USE_PREBUILT_LLVM) | ||
29 | set(TABLEGEN_ADDITIONAL -I ${LLVM_INCLUDE_DIRS}) | ||
30 | -- | ||
31 | 2.25.1 | ||
32 | |||
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 index 1d9b4d51..0886e43b 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc +++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc | |||
@@ -16,9 +16,4 @@ DEPENDS:append:class-target = " opencl-clang-native" | |||
16 | COMPATIBLE_HOST = '(x86_64).*-linux' | 16 | COMPATIBLE_HOST = '(x86_64).*-linux' |
17 | COMPATIBLE_HOST:libc-musl = "null" | 17 | COMPATIBLE_HOST:libc-musl = "null" |
18 | 18 | ||
19 | do_install:append:class-native() { | ||
20 | install -d ${D}${bindir} | ||
21 | install -m 0755 ${B}/linux_linker/linux_resource_linker ${D}${bindir}/ | ||
22 | } | ||
23 | |||
24 | BBCLASSEXTEND = "native nativesdk" | 19 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_12.0.0.bb b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_12.0.0.bb index d0b2acfb..6cab99c2 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_12.0.0.bb +++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_12.0.0.bb | |||
@@ -10,3 +10,8 @@ EXTRA_OECMAKE += "\ | |||
10 | -DCMAKE_SKIP_RPATH=TRUE \ | 10 | -DCMAKE_SKIP_RPATH=TRUE \ |
11 | -DPREFERRED_LLVM_VERSION="12.0.0" \ | 11 | -DPREFERRED_LLVM_VERSION="12.0.0" \ |
12 | " | 12 | " |
13 | |||
14 | do_install:append:class-native() { | ||
15 | install -d ${D}${bindir} | ||
16 | install -m 0755 ${B}/linux_linker/linux_resource_linker ${D}${bindir}/ | ||
17 | } | ||
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_14.0.0.bb b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_14.0.0.bb index 367ca7e9..2af08f39 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_14.0.0.bb +++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_14.0.0.bb | |||
@@ -1,8 +1,8 @@ | |||
1 | require opencl-clang.inc | 1 | require opencl-clang.inc |
2 | 2 | ||
3 | SRC_URI:append = " file://0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch \ | 3 | SRC_URI:append = " file://0001-Fix-standalone-build-415.patch \ |
4 | " | 4 | " |
5 | SRCREV = "06c7c0d7f5cbd13810d79489a533fa6c5b6c7d9f" | 5 | SRCREV = "cf95b338d14685e4f3402ab1828bef31d48f1fd6" |
6 | 6 | ||
7 | BRANCH = "ocl-open-140" | 7 | BRANCH = "ocl-open-140" |
8 | 8 | ||
@@ -13,3 +13,8 @@ EXTRA_OECMAKE += "\ | |||
13 | -DCMAKE_SKIP_RPATH=TRUE \ | 13 | -DCMAKE_SKIP_RPATH=TRUE \ |
14 | -DPREFERRED_LLVM_VERSION=${LLVMVERSION} \ | 14 | -DPREFERRED_LLVM_VERSION=${LLVMVERSION} \ |
15 | " | 15 | " |
16 | |||
17 | do_install:append:class-native() { | ||
18 | install -d ${D}${bindir} | ||
19 | install -m 0755 ${B}/bin/linux_resource_linker ${D}${bindir}/ | ||
20 | } | ||
diff --git a/dynamic-layers/clang-layer/recipes-opencl/vc-intrinsics/vc-intrinsics_0.1.0.bb b/dynamic-layers/clang-layer/recipes-opencl/vc-intrinsics/vc-intrinsics_0.1.0.bb index dfdb4450..87cb1c1c 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/vc-intrinsics/vc-intrinsics_0.1.0.bb +++ b/dynamic-layers/clang-layer/recipes-opencl/vc-intrinsics/vc-intrinsics_0.1.0.bb | |||
@@ -6,7 +6,7 @@ targeting GPU" | |||
6 | LICENSE = "MIT" | 6 | LICENSE = "MIT" |
7 | LIC_FILES_CHKSUM = "file://Readme.md;beginline=1;endline=7;md5=3b2db19c3b0877bb312b7adbcb815adc" | 7 | LIC_FILES_CHKSUM = "file://Readme.md;beginline=1;endline=7;md5=3b2db19c3b0877bb312b7adbcb815adc" |
8 | 8 | ||
9 | SRC_URI = "git://github.com/intel/vc-intrinsics.git;protocol=https;branch=master \ | 9 | SRC_URI = "git://github.com/intel/vc-intrinsics.git;protocol=https;nobranch=1 \ |
10 | " | 10 | " |
11 | SRCREV = "99ac111c2604a47d865bd4d7996be8cfaf2af146" | 11 | SRCREV = "99ac111c2604a47d865bd4d7996be8cfaf2af146" |
12 | 12 | ||