Build opencl-clang with llvm-15 and point to latest from ocl-open-150
branch.

Signed-off-by: Naveen Saini <[email protected]>
---
 conf/machine/include/meta-intel.inc            |  4 ++++
 .../opencl-clang/opencl-clang.inc              |  5 -----
 .../opencl-clang/opencl-clang_14.0.0.bb        |  5 +++++
 .../opencl-clang/opencl-clang_15.0.0.bb        | 18 ++++++++++++++++++
 4 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 
dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_15.0.0.bb

diff --git a/conf/machine/include/meta-intel.inc 
b/conf/machine/include/meta-intel.inc
index f50c6576..6fb0d515 100644
--- a/conf/machine/include/meta-intel.inc
+++ b/conf/machine/include/meta-intel.inc
@@ -21,6 +21,10 @@ PREFERRED_PROVIDER_libva-utils = "libva-intel-utils"
 PREFERRED_PROVIDER_libva-utils-native = "libva-intel-utils-native"
 PREFERRED_PROVIDER_nativesdk-libva-utils = "nativesdk-libva-intel-utils"
 
+PREFERRED_VERSION_opencl-clang ?= "${@bb.utils.contains('LLVMVERSION', 
'14.0.3', '14.0.0', '15.0.0', d)}"
+PREFERRED_VERSION_opencl-clang-native ?= "${@bb.utils.contains('LLVMVERSION', 
'14.0.3', '14.0.0', '15.0.0', d)}"
+
+
 XSERVER_X86_ASPEED_AST = "xf86-video-ast \
            "
 
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"
 COMPATIBLE_HOST = '(x86_64).*-linux'
 COMPATIBLE_HOST:libc-musl = "null"
 
-do_install:append:class-native() {
-        install -d ${D}${bindir}
-        install -m 0755 ${B}/linux_linker/linux_resource_linker ${D}${bindir}/
-}
-
 BBCLASSEXTEND = "native nativesdk"
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..a590b38d 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
@@ -13,3 +13,8 @@ EXTRA_OECMAKE += "\
                   -DCMAKE_SKIP_RPATH=TRUE \
                   -DPREFERRED_LLVM_VERSION=${LLVMVERSION} \
                   "
+
+do_install:append:class-native() {
+        install -d ${D}${bindir}
+        install -m 0755 ${B}/linux_linker/linux_resource_linker ${D}${bindir}/
+}
diff --git 
a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_15.0.0.bb 
b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_15.0.0.bb
new file mode 100644
index 00000000..217158e9
--- /dev/null
+++ 
b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_15.0.0.bb
@@ -0,0 +1,18 @@
+require opencl-clang.inc
+
+SRCREV = "c78c1f884ffe8b40e1681a90ebde1a919c08ddb1"
+
+BRANCH = "ocl-open-150"
+
+DEPENDS += " spirv-llvm-translator"
+
+EXTRA_OECMAKE += "\
+                  -DLLVM_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
+                  -DCMAKE_SKIP_RPATH=TRUE \
+                  -DPREFERRED_LLVM_VERSION=${LLVMVERSION} \
+                  "
+
+do_install:append:class-native() {
+        install -d ${D}${bindir}
+        install -m 0755 ${B}/bin/linux_resource_linker ${D}${bindir}/
+}
-- 
2.25.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#7693): 
https://lists.yoctoproject.org/g/meta-intel/message/7693
Mute This Topic: https://lists.yoctoproject.org/mt/94276569/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to