[pkgsrc/trunk]: pkgsrc/parallel/threadingbuildingblocks threadingbuildingbloc...

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/891f386e8158
branches:  trunk
changeset: 381172:891f386e8158
user:      adam <adam%pkgsrc.org@localhost>
date:      Fri Jul 01 16:21:08 2022 +0000

description:
threadingbuildingblocks: updated to 2021.5.0

oneTBB 2021.5.0

What's New

Reworked synchronization mechanism to reduce contention when multiple task_arena’s are used concurrently.
Fixed sporadic memory corruption.
Enabled Microsoft Visual Studio* 2022 and Python 3.9 support.

Preview features

Extended task_group interface with a new run_and_wait overload to accept task_handle.

Fixed Issues

Fixed possible correctness issue in queuing_rw_mutex on non-Intel platforms.
Fixed GCC* 11 warnings.
Fixed sporadic memory corruption.

diffstat:

 parallel/threadingbuildingblocks/Makefile                                  |   8 +++-
 parallel/threadingbuildingblocks/PLIST                                     |  13 +++++--
 parallel/threadingbuildingblocks/distinfo                                  |  10 ++---
 parallel/threadingbuildingblocks/patches/patch-cmake_compilers_Clang.cmake |  17 ----------
 parallel/threadingbuildingblocks/patches/patch-cmake_compilers_GNU.cmake   |  17 ----------
 5 files changed, 19 insertions(+), 46 deletions(-)

diffs (147 lines):

diff -r 20f50ae66003 -r 891f386e8158 parallel/threadingbuildingblocks/Makefile
--- a/parallel/threadingbuildingblocks/Makefile Fri Jul 01 16:18:44 2022 +0000
+++ b/parallel/threadingbuildingblocks/Makefile Fri Jul 01 16:21:08 2022 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2022/05/16 17:09:50 jperkin Exp $
+# $NetBSD: Makefile,v 1.13 2022/07/01 16:21:08 adam Exp $
 
-DISTNAME=      oneTBB-2021.3.0
+DISTNAME=      oneTBB-2021.5.0
 PKGNAME=       ${DISTNAME:S/oneTBB-/threadingbuildingblocks-/}
 CATEGORIES=    parallel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=oneapi-src/}
@@ -14,8 +14,12 @@
 
 USE_CMAKE=     yes
 USE_LANGUAGES= c c++11
+# Use one build directory across platforms.
+CMAKE_ARGS+=   -DTBB_OUTPUT_DIR_BASE=pkgsrc
 CMAKE_ARGS+=   -DTBB_STRICT=OFF
 TEST_TARGET=   test
+# For Darwin
+TEST_ENV+=     DYLD_LIBRARY_PATH=${WRKSRC}/pkgsrc_relwithdebinfo
 
 BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,--version-script=${WRKSRC}/src/tbb/def/lin64-tbb.def
 BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,--version-script=${WRKSRC}/src/tbbmalloc/def/lin64-tbbmalloc.def
diff -r 20f50ae66003 -r 891f386e8158 parallel/threadingbuildingblocks/PLIST
--- a/parallel/threadingbuildingblocks/PLIST    Fri Jul 01 16:18:44 2022 +0000
+++ b/parallel/threadingbuildingblocks/PLIST    Fri Jul 01 16:21:08 2022 +0000
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2021/07/14 17:56:16 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2022/07/01 16:21:08 adam Exp $
 include/oneapi/tbb.h
 include/oneapi/tbb/blocked_range.h
 include/oneapi/tbb/blocked_range2d.h
 include/oneapi/tbb/blocked_range3d.h
 include/oneapi/tbb/blocked_rangeNd.h
 include/oneapi/tbb/cache_aligned_allocator.h
+include/oneapi/tbb/collaborative_call_once.h
 include/oneapi/tbb/combinable.h
 include/oneapi/tbb/concurrent_hash_map.h
 include/oneapi/tbb/concurrent_lru_cache.h
@@ -25,6 +26,7 @@
 include/oneapi/tbb/detail/_config.h
 include/oneapi/tbb/detail/_containers_helpers.h
 include/oneapi/tbb/detail/_exception.h
+include/oneapi/tbb/detail/_export.h
 include/oneapi/tbb/detail/_flow_graph_body_impl.h
 include/oneapi/tbb/detail/_flow_graph_cache_impl.h
 include/oneapi/tbb/detail/_flow_graph_impl.h
@@ -38,6 +40,7 @@
 include/oneapi/tbb/detail/_flow_graph_trace_impl.h
 include/oneapi/tbb/detail/_flow_graph_types_impl.h
 include/oneapi/tbb/detail/_hash_compare.h
+include/oneapi/tbb/detail/_intrusive_list_node.h
 include/oneapi/tbb/detail/_machine.h
 include/oneapi/tbb/detail/_mutex_common.h
 include/oneapi/tbb/detail/_namespace_injection.h
@@ -52,6 +55,7 @@
 include/oneapi/tbb/detail/_small_object_pool.h
 include/oneapi/tbb/detail/_string_resource.h
 include/oneapi/tbb/detail/_task.h
+include/oneapi/tbb/detail/_task_handle.h
 include/oneapi/tbb/detail/_template_helpers.h
 include/oneapi/tbb/detail/_utils.h
 include/oneapi/tbb/detail/_waitable_atomic.h
@@ -92,6 +96,7 @@
 include/tbb/blocked_range3d.h
 include/tbb/blocked_rangeNd.h
 include/tbb/cache_aligned_allocator.h
+include/tbb/collaborative_call_once.h
 include/tbb/combinable.h
 include/tbb/concurrent_hash_map.h
 include/tbb/concurrent_lru_cache.h
@@ -139,12 +144,12 @@
 lib/cmake/TBB/TBBTargets.cmake
 lib/libtbb.so
 lib/libtbb.so.12
-lib/libtbb.so.12.3
+lib/libtbb.so.12.5
 lib/libtbbmalloc.so
 lib/libtbbmalloc.so.2
-lib/libtbbmalloc.so.2.3
+lib/libtbbmalloc.so.2.5
 lib/libtbbmalloc_proxy.so
 lib/libtbbmalloc_proxy.so.2
-lib/libtbbmalloc_proxy.so.2.3
+lib/libtbbmalloc_proxy.so.2.5
 lib/pkgconfig/tbb.pc
 share/doc/TBB/README.md
diff -r 20f50ae66003 -r 891f386e8158 parallel/threadingbuildingblocks/distinfo
--- a/parallel/threadingbuildingblocks/distinfo Fri Jul 01 16:18:44 2022 +0000
+++ b/parallel/threadingbuildingblocks/distinfo Fri Jul 01 16:21:08 2022 +0000
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.11 2022/05/16 17:09:50 jperkin Exp $
+$NetBSD: distinfo,v 1.12 2022/07/01 16:21:08 adam Exp $
 
-BLAKE2s (oneTBB-2021.3.0.tar.gz) = d6d10b35108642bfba06cd85a1d6628affb59aac7951d97f6e7a9b387b1aa172
-SHA512 (oneTBB-2021.3.0.tar.gz) = 969bc8d1dcf50bd12f70633d0319e46308eb1667cdc6f0503b373a35dcb2fe6b2adf59c26bd3c8e2a99a8d2d8b9f64088db5a43e784218b163b3661d12908c0e
-Size (oneTBB-2021.3.0.tar.gz) = 1651329 bytes
-SHA1 (patch-cmake_compilers_Clang.cmake) = e61f17d9df4dd06b2c42a6e450fdc3a452b10516
-SHA1 (patch-cmake_compilers_GNU.cmake) = c52042af12a3f90822a70ba6ec0e943deeb24eb7
+BLAKE2s (oneTBB-2021.5.0.tar.gz) = 570452be4c16d646d781f41449c52caa4d9e580ba7bbd777085e88b955979e26
+SHA512 (oneTBB-2021.5.0.tar.gz) = 0e7b71022e397a6d7abb0cea106847935ae79a1e12a6976f8d038668c6eca8775ed971202c5bd518f7e517092b67af805cc5feb04b5c3a40e9fbf972cc703a46
+Size (oneTBB-2021.5.0.tar.gz) = 2463218 bytes
 SHA1 (patch-test_tbb_test__composite__node.cpp) = 1c48644e8cbee6622e2cf4a91901db217cee2ff3
diff -r 20f50ae66003 -r 891f386e8158 parallel/threadingbuildingblocks/patches/patch-cmake_compilers_Clang.cmake
--- a/parallel/threadingbuildingblocks/patches/patch-cmake_compilers_Clang.cmake        Fri Jul 01 16:18:44 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-cmake_compilers_Clang.cmake,v 1.2 2021/07/29 20:03:28 fcambus Exp $
-
-Only link against dl on Linux.
-
---- cmake/compilers/Clang.cmake.orig   2021-07-29 16:43:27.979066736 +0000
-+++ cmake/compilers/Clang.cmake
-@@ -42,7 +42,9 @@ if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86
-     set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},12.0>>:-mwaitpkg>)
- endif()
- 
--set(TBB_COMMON_LINK_LIBS dl)
-+if (CMAKE_SYSTEM_NAME MATCHES "Linux")
-+    set(TBB_COMMON_LINK_LIBS dl)
-+endif()
- 
- if (ANDROID_PLATFORM)
-     set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} $<$<NOT:$<CONFIG:Debug>>:-D_FORTIFY_SOURCE=2>)
diff -r 20f50ae66003 -r 891f386e8158 parallel/threadingbuildingblocks/patches/patch-cmake_compilers_GNU.cmake
--- a/parallel/threadingbuildingblocks/patches/patch-cmake_compilers_GNU.cmake  Fri Jul 01 16:18:44 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-cmake_compilers_GNU.cmake,v 1.2 2021/07/29 20:03:28 fcambus Exp $
-
-Only link against dl on Linux.
-
---- cmake/compilers/GNU.cmake.orig     2021-07-29 16:43:31.799016814 +0000
-+++ cmake/compilers/GNU.cmake
-@@ -37,7 +37,9 @@ if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86
-     set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$<AND:$<NOT:$<CXX_COMPILER_ID:Intel>>,$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},11.0>>>:-mwaitpkg>)
- endif()
- 
--set(TBB_COMMON_LINK_LIBS dl)
-+if (CMAKE_SYSTEM_NAME MATCHES "Linux")
-+    set(TBB_COMMON_LINK_LIBS dl)
-+endif()
- 
- # Ignore -Werror set through add_compile_options() or added to CMAKE_CXX_FLAGS if TBB_STRICT is disabled.
- if (NOT TBB_STRICT AND COMMAND tbb_remove_compile_flag)