Skip to content

Commit fe02130

Browse files
mayankfzMayank Singh
andauthored
Upgrade: tbb version to 2021.13.0 (microsoft#12568)
Signed-off-by: Mayank Singh <[email protected]> Co-authored-by: Mayank Singh <[email protected]>
1 parent 712c3f6 commit fe02130

10 files changed

+262
-300
lines changed

SPECS-EXTENDED/tbb/tbb-2019-dont-snip-Wall.patch

Lines changed: 0 additions & 43 deletions
This file was deleted.

SPECS-EXTENDED/tbb/tbb-2019-fetchadd4.patch

Lines changed: 0 additions & 12 deletions
This file was deleted.

SPECS-EXTENDED/tbb/tbb-2019-test-task-scheduler-init.patch

Lines changed: 0 additions & 12 deletions
This file was deleted.

SPECS-EXTENDED/tbb/tbb-2019-test-thread-monitor.patch

Lines changed: 0 additions & 47 deletions
This file was deleted.

SPECS-EXTENDED/tbb/tbb-2020-attributes.patch

Lines changed: 0 additions & 54 deletions
This file was deleted.
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
diff -up oneTBB-2021.12.0/cmake/compilers/Clang.cmake.orig oneTBB-2021.12.0/cmake/compilers/Clang.cmake
2+
--- oneTBB-2021.12.0/cmake/compilers/Clang.cmake.orig 2024-02-13 04:49:20.000000000 -0700
3+
+++ oneTBB-2021.12.0/cmake/compilers/Clang.cmake 2024-06-07 13:22:47.627930378 -0600
4+
@@ -48,11 +48,6 @@ endif()
5+
set(TBB_WARNING_LEVEL -Wall -Wextra $<$<BOOL:${TBB_STRICT}>:-Werror>)
6+
set(TBB_TEST_WARNING_FLAGS -Wshadow -Wcast-qual -Woverloaded-virtual -Wnon-virtual-dtor)
7+
8+
-# Ignore -Werror set through add_compile_options() or added to CMAKE_CXX_FLAGS if TBB_STRICT is disabled.
9+
-if (NOT TBB_STRICT AND COMMAND tbb_remove_compile_flag)
10+
- tbb_remove_compile_flag(-Werror)
11+
-endif()
12+
-
13+
# Enable Intel(R) Transactional Synchronization Extensions (-mrtm) and WAITPKG instructions support (-mwaitpkg) on relevant processors
14+
if (CMAKE_SYSTEM_PROCESSOR MATCHES "(AMD64|amd64|i.86|x86)" AND NOT EMSCRIPTEN)
15+
set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},12.0>>:-mwaitpkg>)
16+
diff -up oneTBB-2021.12.0/cmake/compilers/GNU.cmake.orig oneTBB-2021.12.0/cmake/compilers/GNU.cmake
17+
--- oneTBB-2021.12.0/cmake/compilers/GNU.cmake.orig 2024-02-13 04:49:20.000000000 -0700
18+
+++ oneTBB-2021.12.0/cmake/compilers/GNU.cmake 2024-06-07 13:22:47.627930378 -0600
19+
@@ -42,11 +42,6 @@ endif()
20+
21+
set(TBB_COMMON_LINK_LIBS ${CMAKE_DL_LIBS})
22+
23+
-# Ignore -Werror set through add_compile_options() or added to CMAKE_CXX_FLAGS if TBB_STRICT is disabled.
24+
-if (NOT TBB_STRICT AND COMMAND tbb_remove_compile_flag)
25+
- tbb_remove_compile_flag(-Werror)
26+
-endif()
27+
-
28+
if (NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL Intel)
29+
# gcc 6.0 and later have -flifetime-dse option that controls elimination of stores done outside the object lifetime
30+
set(TBB_DSE_FLAG $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},6.0>>:-flifetime-dse=1>)

SPECS-EXTENDED/tbb/tbb.pc

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
{
22
"Signatures": {
3-
"tbb-2020.2.tar.gz": "4804320e1e6cbe3a5421997b52199e3c1a3829b2ecb6489641da4b8e32faf500",
4-
"tbb.pc": "a57a64e7507b3d6a92b616c100e44896487d9eb408254ff84a5b22753d0a7fb4",
3+
"tbb-2021.13.0.tar.gz": "3ad5dd08954b39d113dc5b3f8a8dc6dc1fd5250032b7c491eb07aed5c94133e1",
54
"tbbmalloc.pc": "d424f8851b7a998b4b0e47626f03c43437e059788ac1692e78c41751b37d3270",
65
"tbbmalloc_proxy.pc": "b2c80fcd0c2b33690c18319802735d9d5a77b5fee50bbab6847f76280dd4d9c9"
7-
}
6+
}
87
}

0 commit comments

Comments
 (0)