mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-04 16:10:10 +00:00
tbb: upgrade 2021.5.0 -> 2021.7.0
Drop patches which are already merged. Also drop which are not required anymore. Tested following machines with both gcc and clang: qemuarm qemuarm64 qemuriscv32 qemuriscv64 Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Naveen Saini
Khem Raj
parent
1c43607069
commit
211e4988da
|
|
@ -1,29 +0,0 @@
|
|||
From 95a5c97122b7c5bdeba61f2e890bae9a961dd4bf Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Wed, 8 Dec 2021 10:01:22 -0800
|
||||
Subject: [PATCH] Disable LTO on clang/riscv
|
||||
|
||||
With clang in OE LTO does not work as it does not seem to carry right
|
||||
target info and mixes ABIs
|
||||
|
||||
| Hard-float 'd' ABI can't be used for a target that doesn't support the D instruction set extension (ignoring target-abi)
|
||||
| /mnt/b/yoe/master/build/tmp/work/riscv32-yoe-linux/tbb/1_2021.4.0-r0/recipe-sysroot-native/usr/bin/riscv32-yoe-linux/riscv32-yoe-linux-ld: /tmp/lto-llvm-3fb1bf.o: can't link soft-float modules with double-float modules
|
||||
| /mnt/b/yoe/master/build/tmp/work/riscv32-yoe-linux/tbb/1_2021.4.0-r0/recipe-sysroot-native/usr/bin/riscv32-yoe-linux/riscv32-yoe-linux-ld: failed to merge target specific data of file /tmp/lto-llvm-3fb1bf.o
|
||||
|
||||
Upstream-Status: Inappropriate [ OE-Specific ]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
cmake/compilers/Clang.cmake | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/cmake/compilers/Clang.cmake
|
||||
+++ b/cmake/compilers/Clang.cmake
|
||||
@@ -60,7 +60,7 @@ endif()
|
||||
|
||||
# Enabling LTO on Android causes the NDK bug.
|
||||
# NDK throws the warning: "argument unused during compilation: '-Wa,--noexecstack'"
|
||||
-if (NOT ANDROID_PLATFORM AND BUILD_SHARED_LIBS)
|
||||
+if (NOT ANDROID_PLATFORM AND BUILD_SHARED_LIBS AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "(riscv32|riscv64|arm)")
|
||||
set(TBB_IPO_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
|
||||
set(TBB_IPO_LINK_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
|
||||
endif()
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
From 26bc87fdad9f29c00a5e37d6d9aed7f6dc7ff416 Mon Sep 17 00:00:00 2001
|
||||
From: Anuj Mittal <anuj.mittal@intel.com>
|
||||
Date: Mon, 12 Apr 2021 14:15:53 +0800
|
||||
Subject: [PATCH] Disable use of _tpause instruction
|
||||
|
||||
It is assuming right now that WAITPKG instructions are available when using
|
||||
gcc 11 or clang 12. It's possible that we are building for a
|
||||
CPU where it's not available - in this case anything older than Alder Lake.
|
||||
|
||||
Disable for now until the detection isn't fixed upstream.
|
||||
|
||||
Upstream-Status: Inappropriate
|
||||
|
||||
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
|
||||
---
|
||||
src/tbb/scheduler_common.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/src/tbb/scheduler_common.h
|
||||
+++ b/src/tbb/scheduler_common.h
|
||||
@@ -220,7 +220,7 @@ inline void prolonged_pause_impl() {
|
||||
#endif
|
||||
|
||||
inline void prolonged_pause() {
|
||||
-#if __TBB_WAITPKG_INTRINSICS_PRESENT && (_WIN32 || _WIN64 || __unix__) && (__TBB_x86_32 || __TBB_x86_64)
|
||||
+#if 0
|
||||
if (governor::wait_package_enabled()) {
|
||||
std::uint64_t time_stamp = machine_time_stamp();
|
||||
// _tpause function directs the processor to enter an implementation-dependent optimized state
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
From a7289eeff4ac9e3ca2d2289672c923518433124c Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Wed, 8 Dec 2021 09:26:58 -0800
|
||||
Subject: [PATCH] Musl/linux can not use RTLD_DEEPBIND
|
||||
|
||||
Exclude non-glibc linux systems along with android
|
||||
Fixes
|
||||
src/tbb/dynamic_link.cpp:417:29: error: use
|
||||
of undeclared identifier 'RTLD_DEEPBIND' | flags = flags | RTLD_DEEPBIND;
|
||||
| ^
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/oneapi-src/oneTBB/pull/684]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
src/tbb/dynamic_link.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
|
||||
index 12f35cfd..942c1c64 100644
|
||||
--- a/src/tbb/dynamic_link.cpp
|
||||
+++ b/src/tbb/dynamic_link.cpp
|
||||
@@ -413,7 +413,7 @@ namespace r1 {
|
||||
int flags = RTLD_NOW;
|
||||
if (local_binding) {
|
||||
flags = flags | RTLD_LOCAL;
|
||||
-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
|
||||
+#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
|
||||
flags = flags | RTLD_DEEPBIND;
|
||||
#endif
|
||||
} else {
|
||||
--
|
||||
2.34.1
|
||||
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
From 52c1586bff0ecb418ac21d6678f8963d70959f04 Mon Sep 17 00:00:00 2001
|
||||
From: Naveen Saini <naveen.kumar.saini@intel.com>
|
||||
Date: Wed, 7 Apr 2021 11:14:13 +0800
|
||||
Subject: [PATCH] mallinfo() is glibc specific API mark it so
|
||||
|
||||
Helps compiling with musl
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
|
||||
---
|
||||
src/tbbmalloc_proxy/proxy.cpp | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
--- a/src/tbbmalloc_proxy/proxy.cpp
|
||||
+++ b/src/tbbmalloc_proxy/proxy.cpp
|
||||
@@ -260,6 +260,7 @@ int mallopt(int /*param*/, int /*value*/
|
||||
return 1;
|
||||
}
|
||||
|
||||
+#ifdef __GLIBC__
|
||||
struct mallinfo mallinfo() __THROW
|
||||
{
|
||||
struct mallinfo m;
|
||||
@@ -267,6 +268,7 @@ struct mallinfo mallinfo() __THROW
|
||||
|
||||
return m;
|
||||
}
|
||||
+#endif
|
||||
|
||||
#if __ANDROID__
|
||||
// Android doesn't have malloc_usable_size, provide it to be compatible
|
||||
|
|
@ -12,15 +12,10 @@ DEPENDS:append:libc-musl = " libucontext"
|
|||
PE = "1"
|
||||
|
||||
BRANCH = "onetbb_2021"
|
||||
SRCREV = "3df08fe234f23e732a122809b40eb129ae22733f"
|
||||
SRCREV = "7673da272f7e1592876b42cfe98b9f4cadf6ae41"
|
||||
SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH} \
|
||||
file://0001-mallinfo-is-glibc-specific-API-mark-it-so.patch \
|
||||
file://0001-CMakeLists.txt-exclude-riscv64-riscv32.patch \
|
||||
file://0001-Disable-use-of-_tpause-instruction.patch \
|
||||
file://0001-Musl-linux-can-not-use-RTLD_DEEPBIND.patch \
|
||||
file://0001-Disable-LTO-on-clang-riscv32.patch \
|
||||
"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
inherit cmake
|
||||
|
|
@ -30,7 +25,11 @@ EXTRA_OECMAKE += " \
|
|||
-DTBB_TEST=OFF \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
"
|
||||
|
||||
# Hard-float 'd' ABI can't be used for a target that doesn't support the D instruction set extension (ignoring target-abi)
|
||||
# tmp-glibc/work/riscv64-oe-linux/tbb/1_2021.7.0-r0/recipe-sysroot-native/usr/bin/riscv64-oe-linux/riscv64-oe-linux-ld: /tmp/lto-llvm-264bc2.o: can't link soft-float modules with double-float modules
|
||||
# tmp-glibc/work/riscv64-oe-linux/tbb/1_2021.7.0-r0/recipe-sysroot-native/usr/bin/riscv64-oe-linux/riscv64-oe-linux-ld: failed to merge target specific data of file /tmp/lto-llvm-264bc2.o
|
||||
EXTRA_OECMAKE:append:riscv32:toolchain-clang = " -DTBB_ENABLE_IPO=OFF "
|
||||
EXTRA_OECMAKE:append:riscv64:toolchain-clang = " -DTBB_ENABLE_IPO=OFF "
|
||||
|
||||
# fails with thumb enabled:
|
||||
# | arm-oe-linux-gnueabi-g++ -march=armv7-a -mthumb -mthumb-interwork -mfloat-abi=softfp -mfpu=neon -mtune=cortex-a9 -mcpu=cortex-a9 -D__ARM__ -D__LINUX_ARM_ARCH__=7 -funwind-tables -mvectorize-with-neon-quad -rdynamic --sysroot=/OE/sysroots/m14tv -c -MMD -DTBB_USE_DEBUG -g -O0 -DUSE_PTHREAD -fPIC -D__TBB_BUILD=1 -Wall -Wno-parentheses -Wno-non-virtual-dtor -O2 -pipe -g -feliminate-unused-debug-types -fpermissive -fvisibility-inlines-hidden -I../../src -I../../src/rml/include -I../../include ../../src/tbb/concurrent_queue.cpp
|
||||
Loading…
Reference in New Issue
Block a user