4 files changed, 88 insertions, 3 deletions

diff --git a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_2.6.1.bb b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_2.6.3.bb
index ee39f51b..f7ec5f61 100644
--- a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_2.6.1.bb
+++ b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_2.6.3.bb
@@ -13,7 +13,7 @@ SECTION = "lib"
 inherit pkgconfig cmake ptest
 
 S = "${WORKDIR}/git"
-SRCREV = "58be3660fb57c4c4a3d306730e849237d1271572"
+SRCREV = "92ac40077b3b5816c7b78cdf39a988599929f0e9"
 SRC_URI = "git://github.com/oneapi-src/oneDNN.git;branch=rls-v2.6;protocol=https \
            file://run-ptest \
            "
diff --git a/dynamic-layers/clang-layer/recipes-core/ispc/ispc/0001-CMakeLists.txt-allow-to-pick-llvm-config-from-usr-bi.patch b/dynamic-layers/clang-layer/recipes-core/ispc/ispc/0001-CMakeLists.txt-allow-to-pick-llvm-config-from-usr-bi.patch
new file mode 100644
index 00000000..79e8e683
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-core/ispc/ispc/0001-CMakeLists.txt-allow-to-pick-llvm-config-from-usr-bi.patch
@@ -0,0 +1,37 @@
+From 51d248d3b470f3fa1cf2ed3f5742851091acb65f Mon Sep 17 00:00:00 2001
+From: Naveen Saini <naveen.kumar.saini@intel.com>
+Date: Fri, 12 May 2023 09:10:11 +0800
+Subject: [PATCH] CMakeLists.txt: allow to pick llvm-config from
+ usr/bin/crossscripts/
+
+ispc needs to invoke native llvm-config from target sysroot to list LLVM
+lib libraries. clang already provides crossscripts/llvm-config, which does
+the job.
+
+However, using LLVM_TOOLS_BINARY_DIR leads to wrong llvm-config being
+used. So remove it from search path for llvm-config.
+
+Upstream-Status: Inappropriate
+
+Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+---
+ cmake/FindLLVM.cmake | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake
+index d0297d5d..90d9fed2 100644
+--- a/cmake/FindLLVM.cmake
++++ b/cmake/FindLLVM.cmake
+@@ -41,8 +41,7 @@ find_package(LLVM REQUIRED CONFIG)
+     set(LLVM_VERSION "LLVM_${LLVM_VERSION_MAJOR}_${LLVM_VERSION_MINOR}")
+     message(STATUS "Found LLVM ${LLVM_VERSION}")
+ 
+-find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config
+-    PATHS ${LLVM_TOOLS_BINARY_DIR} PATH_SUFFIXES bin NO_DEFAULT_PATH)
++find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config)
+     if (NOT LLVM_CONFIG_EXECUTABLE)
+         message(FATAL_ERROR "Failed to find llvm-config")
+     endif()
+-- 
+2.37.3
+
diff --git a/dynamic-layers/clang-layer/recipes-core/ispc/ispc/0001-Produce-position-independent-code-for-testing.patch b/dynamic-layers/clang-layer/recipes-core/ispc/ispc/0001-Produce-position-independent-code-for-testing.patch
new file mode 100644
index 00000000..37dbd862
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-core/ispc/ispc/0001-Produce-position-independent-code-for-testing.patch
@@ -0,0 +1,42 @@
+From 14cfd056fe69dc652f824f31462033e82cd54513 Mon Sep 17 00:00:00 2001
+From: Arina Neshlyaeva <arina.neshlyaeva@intel.com>
+Date: Tue, 23 Aug 2022 15:26:21 -0700
+Subject: [PATCH] Produce position independent code for testing
+
+Upstream-Status: Backport [https://github.com/ispc/ispc/commit/522a7395d762c7f2a3b1f76c6f352b5e5977f08a]
+
+Signed-off-by: Arina Neshlyaeva <arina.neshlyaeva@intel.com>
+Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+---
+ run_tests.py | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/run_tests.py b/run_tests.py
+index d4a40978..3520d376 100755
+--- a/run_tests.py
++++ b/run_tests.py
+@@ -515,6 +515,11 @@ def run_test(testname, host, target):
+                 cc_cmd = "%s -O2 -I. %s test_static.cpp -DTEST_SIG=%d -DTEST_WIDTH=%d %s -o %s" % \
+                     (options.compiler_exe, gcc_arch, match, width, obj_name, exe_name)
+ 
++                # Produce position independent code for both c++ and ispc compilations.
++                # The motivation for this is that Clang 15 changed default
++                # from "-mrelocation-model static" to "-mrelocation-model pic", so
++                # we enable PIC compilation to have it consistently regardless compiler version.
++                cc_cmd += ' -fPIE'
+                 if should_fail:
+                     cc_cmd += " -DEXPECT_FAILURE"
+ 
+@@ -526,8 +531,7 @@ def run_test(testname, host, target):
+                              match, width, exe_name)
+                     exe_name = "./" + exe_name
+                     cc_cmd += " -DTEST_ZEBIN" if options.ispc_output == "ze" else " -DTEST_SPV"
+-
+-            ispc_cmd = ispc_exe_rel + " --woff %s -o %s --arch=%s --target=%s -DTEST_SIG=%d" % \
++            ispc_cmd = ispc_exe_rel + " --pic --woff %s -o %s --arch=%s --target=%s -DTEST_SIG=%d" % \
+                         (filename, obj_name, options.arch, xe_target if target.is_xe() else options.target, match)
+ 
+             if target.is_xe():
+-- 
+2.37.3
+
diff --git a/dynamic-layers/clang-layer/recipes-core/ispc/ispc_1.17.0.bb b/dynamic-layers/clang-layer/recipes-core/ispc/ispc_1.17.0.bb
index cfd8e5bc..c50d8ef3 100644
--- a/dynamic-layers/clang-layer/recipes-core/ispc/ispc_1.17.0.bb
+++ b/dynamic-layers/clang-layer/recipes-core/ispc/ispc_1.17.0.bb
@@ -15,13 +15,15 @@ SRC_URI = "git://github.com/ispc/ispc.git;protocol=https;branch=main \
            file://0001-CMakeLists.txt-link-with-libclang-cpp-library-instea.patch \
            file://0002-cmake-don-t-build-for-32-bit-targets.patch \
            file://0001-Enable-LLVM-15.0-support.patch \
+           file://0001-CMakeLists.txt-allow-to-pick-llvm-config-from-usr-bi.patch \
+           file://0001-Produce-position-independent-code-for-testing.patch \
            "
 SRCREV = "7ad8429369a4d5ced6b524fdfffe623939d8fe9a"
 
 COMPATIBLE_HOST = '(x86_64).*-linux'
 
 DEPENDS += " clang-native bison-native "
-RDEPENDS:${PN} += " clang-libllvm clang"
+DEPENDS:append:class-target = " clang"
 
 EXTRA_OECMAKE += " \
                   -DISPC_INCLUDE_TESTS=OFF  \
@@ -34,7 +36,11 @@ EXTRA_OECMAKE += " \
                   -DISPC_WINDOWS_TARGET=OFF  \
                   -DISPC_IOS_TARGET=OFF  \
                   -DISPC_PS4_TARGET=OFF  \
-                  -DSYSROOT_DIR=${STAGING_DIR_NATIVE}  \
+                  -DSYSROOT_DIR=${STAGING_DIR} \
+                  -DCLANG_EXECUTABLE=${STAGING_BINDIR_NATIVE}/clang \
+                  -DCLANGPP_EXECUTABLE=${STAGING_BINDIR_NATIVE}/clang++ \
+                  -DLLVM_DIS_EXECUTABLE=${STAGING_BINDIR_NATIVE}/llvm-dis \
+                  -DLLVM_AS_EXECUTABLE=${STAGING_BINDIR_NATIVE}/llvm-as \
                   "
 
 TOOLCHAIN = "clang"