[CMake] Replace logic that checks removed tbb build option

A long time ago, ROOT had a `tbb` build option, but it was removed in
the ROOT 6.08 development cycle in dd899a5 from 2015, by @peremato.

However, some build configurations still use it, like CMSSW and Conda:
  * https://github.com/cms-sw/cmsdist/blob/IB/CMSSW_15_1_X/master/root.spec#L78
  * https://github.com/conda-forge/root-feedstock/blob/main/recipe/build_root.sh#L342

That would not be a problem per se, but then, in 2021, @bendavid
introduced a new optimization that is enabled only with the long-time
removed `tbb` flag (or `builtin_tbb`), in 6c8b77d:

  * #7260

So we ended up with a secret `tbb=ON` configuration that our CI doesn't
test, and a CMake configuration option that has a pretty fundamental
effect but is not documented.

In the discussions in #19798 with @bendavid, we concluded that it would
not be a problem to enable the optimized locks with TBB always when TBB
is available during the ROOT build. See:
#19798 (comment)

Closes #19798.

Author: guitargeek

cmake/modules/RootConfiguration.cmake

@@ -392,11 +392,6 @@ if(dev)
 else()
   set(use_less_includes undef)
 endif()
-if((tbb OR builtin_tbb) AND NOT MSVC)
-  set(hastbb define)
-else()
-  set(hastbb undef)
-endif()
 if(root7)
   set(hasroot7 define)
 else()

config/RConfigure.in

@@ -51,7 +51,6 @@
 #@hasdataframe@ R__HAS_DATAFRAME /**/
 #@hasroot7@ R__HAS_ROOT7 /**/
 #@use_less_includes@ R__LESS_INCLUDES /**/
-#@hastbb@ R__HAS_TBB /**/
 #define R__HARDWARE_INTERFERENCE_SIZE @hardwareinterferencesize@ /*Determined at CMake configure to be stable across all TUs*/
 
 #if defined(R__HAS_VECCORE) && defined(R__HAS_VC)

core/thread/CMakeLists.txt

@@ -77,10 +77,11 @@ target_include_directories(Thread PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/inc>
 )
 
-if((tbb OR builtin_tbb) AND NOT MSVC)
+if((TBB_FOUND OR builtin_tbb) AND NOT MSVC)
   target_include_directories(Thread PRIVATE ${TBB_INCLUDE_DIRS})
   target_link_libraries(Thread PRIVATE ${TBB_LIBRARIES})
   set_target_properties(Thread PROPERTIES COMPILE_FLAGS "${TBB_CXXFLAGS}")
+  target_compile_definitions(Thread PUBLIC ROOT_CORE_THREAD_TBB)
 endif()
 
 if(WIN32)

core/thread/src/TRWMutexImp.cxx

@@ -114,7 +114,7 @@ template class TRWMutexImp<std::mutex>;
 template class TRWMutexImp<TMutex, ROOT::Internal::UniqueLockRecurseCount>;
 template class TRWMutexImp<ROOT::TSpinMutex, ROOT::Internal::UniqueLockRecurseCount>;
 
-#ifdef R__HAS_TBB
+#ifdef ROOT_CORE_THREAD_TBB
 template class TRWMutexImp<std::mutex, ROOT::Internal::RecurseCountsTBB>;
 template class TRWMutexImp<std::mutex, ROOT::Internal::RecurseCountsTBBUnique>;
 #endif

core/thread/src/TReentrantRWLock.cxx

@@ -414,7 +414,7 @@ template class TReentrantRWLock<ROOT::TSpinMutex, ROOT::Internal::UniqueLockRecu
 template class TReentrantRWLock<TMutex, ROOT::Internal::UniqueLockRecurseCount>;
 template class TReentrantRWLock<std::mutex, ROOT::Internal::UniqueLockRecurseCount>;
 
-#ifdef R__HAS_TBB
+#ifdef ROOT_CORE_THREAD_TBB
 template class TReentrantRWLock<std::mutex, ROOT::Internal::RecurseCountsTBB>;
 template class TReentrantRWLock<std::mutex, ROOT::Internal::RecurseCountsTBBUnique>;
 #endif

core/thread/src/TReentrantRWLock.hxx

@@ -22,7 +22,7 @@
 #include <thread>
 #include <unordered_map>
 
-#ifdef R__HAS_TBB
+#ifdef ROOT_CORE_THREAD_TBB
 #include "tbb/enumerable_thread_specific.h"
 #endif
 
@@ -152,7 +152,7 @@ struct RecurseCounts {
 
 };
 
-#ifdef R__HAS_TBB
+#ifdef ROOT_CORE_THREAD_TBB
 struct RecurseCountsTBB {
    using Hint_t = TVirtualRWMutex::Hint_t;
 

core/thread/src/TThread.cxx

@@ -346,7 +346,7 @@ void TThread::Init()
      if (!ROOT::gCoreMutex) {
         // To avoid dead locks, caused by shared library opening and/or static initialization
         // taking the same lock as 'tls_get_addr_tail', we can not use UniqueLockRecurseCount.
-#ifdef R__HAS_TBB
+#ifdef ROOT_CORE_THREAD_TBB
         ROOT::gCoreMutex = new ROOT::TRWMutexImp<std::mutex, ROOT::Internal::RecurseCountsTBBUnique>();
 #else
         ROOT::gCoreMutex = new ROOT::TRWMutexImp<std::mutex, ROOT::Internal::RecurseCounts>();

core/thread/test/testRWLock.cxx

@@ -250,14 +250,14 @@ auto gMutex = new TMutex(kTRUE);
 auto gRWMutex = new TRWMutexImp<TMutex>();
 auto gRWMutexSpin = new TRWMutexImp<ROOT::TSpinMutex>();
 auto gRWMutexStd = new TRWMutexImp<std::mutex>();
-#ifdef R__HAS_TBB
+#ifdef ROOT_CORE_THREAD_TBB
 auto gRWMutexStdTBB = new TRWMutexImp<std::mutex, ROOT::Internal::RecurseCountsTBB>();
 auto gRWMutexStdTBBUnique = new TRWMutexImp<std::mutex, ROOT::Internal::RecurseCountsTBBUnique>();
 #endif
 auto gReentrantRWMutex = new ROOT::TReentrantRWLock<TMutex>();
 auto gReentrantRWMutexSM = new ROOT::TReentrantRWLock<ROOT::TSpinMutex>();
 auto gReentrantRWMutexStd = new ROOT::TReentrantRWLock<std::mutex>();
-#ifdef R__HAS_TBB
+#ifdef ROOT_CORE_THREAD_TBB
 auto gReentrantRWMutexStdTBB = new ROOT::TReentrantRWLock<std::mutex, ROOT::Internal::RecurseCountsTBB>();
 auto gReentrantRWMutexStdTBBUnique = new ROOT::TReentrantRWLock<std::mutex, ROOT::Internal::RecurseCountsTBBUnique>();
 #endif
@@ -335,7 +335,7 @@ TEST(RWLock, WriteStdDirectUnLock)
    testWriteUnLock(gReentrantRWMutexStd, gRepetition, gWriteHint);
 }
 
-#ifdef R__HAS_TBB
+#ifdef ROOT_CORE_THREAD_TBB
 TEST(RWLock, WriteStdTBBDirectLock)
 {
    gWriteHint = testWriteLock(gReentrantRWMutexStdTBB, gRepetition);
@@ -387,7 +387,7 @@ TEST(RWLock, ReadUnLockStdDirect)
    testReadUnLock(gReentrantRWMutexStd, gRepetition, gReadHint);
 }
 
-#ifdef R__HAS_TBB
+#ifdef ROOT_CORE_THREAD_TBB
 TEST(RWLock, ReadLockStdTBBDirect)
 {
    gReadHint = testReadLock(gReentrantRWMutexStdTBB, gRepetition);
@@ -494,7 +494,7 @@ TEST(RWLock, ReentrantStd)
    Reentrant(*gReentrantRWMutexStd);
 }
 
-#ifdef R__HAS_TBB
+#ifdef ROOT_CORE_THREAD_TBB
 TEST(RWLock, ReentrantStdTBB)
 {
    Reentrant(*gReentrantRWMutexStdTBB);
@@ -531,7 +531,7 @@ TEST(RWLock, ResetRestoreStd)
    ResetRestore(*gReentrantRWMutexStd);
 }
 
-#ifdef R__HAS_TBB
+#ifdef ROOT_CORE_THREAD_TBB
 TEST(RWLock, ResetRestoreStdTBB)
 {
    ResetRestore(*gReentrantRWMutexStdTBB);
@@ -579,7 +579,7 @@ TEST(RWLock, concurrentResetRestoreStd)
    concurrentResetRestore(gRWMutexStd, 2, gRepetition / 10000);
 }
 
-#ifdef R__HAS_TBB
+#ifdef ROOT_CORE_THREAD_TBB
 TEST(RWLock, concurrentResetRestoreStdTBB)
 {
    concurrentResetRestore(gRWMutexStdTBB, 2, gRepetition / 10000);
@@ -629,7 +629,7 @@ TEST(RWLock, concurrentReadsAndWritesStd)
    concurrentReadsAndWrites(gRWMutexStd, 1, 2, gRepetition / 10000);
 }
 
-#ifdef R__HAS_TBB
+#ifdef ROOT_CORE_THREAD_TBB
 TEST(RWLock, concurrentReadsAndWritesStdTBB)
 {
    concurrentReadsAndWrites(gRWMutexStdTBB, 1, 2, gRepetition / 10000);
@@ -651,7 +651,7 @@ TEST(RWLock, LargeconcurrentReadsAndWritesStd)
    concurrentReadsAndWrites(gRWMutex, 10, 20, gRepetition / 10000);
 }
 
-#ifdef R__HAS_TBB
+#ifdef ROOT_CORE_THREAD_TBB
 TEST(RWLock, LargeconcurrentReadsAndWritesStdTBB)
 {
    concurrentReadsAndWrites(gRWMutexStdTBB, 10, 20, gRepetition / 10000);
@@ -678,7 +678,7 @@ TEST(RWLock, VeryLargeconcurrentReadsAndWritesStd)
    concurrentReadsAndWrites(gRWMutexStd, 10, 200, gRepetition / 10000);
 }
 
-#ifdef R__HAS_TBB
+#ifdef ROOT_CORE_THREAD_TBB
 TEST(RWLock, VeryLargeconcurrentReadsAndWritesStdTBB)
 {
    concurrentReadsAndWrites(gRWMutexStdTBB, 10, 200, gRepetition / 10000);
@@ -706,7 +706,7 @@ TEST(RWLock, VeryLargeconcurrentReadsStd)
    concurrentReadsAndWrites(gRWMutexStd, 0, 200, gRepetition / 10000);
 }
 
-#ifdef R__HAS_TBB
+#ifdef ROOT_CORE_THREAD_TBB
 TEST(RWLock, VeryLargeconcurrentReadsStdTBB)
 {
    concurrentReadsAndWrites(gRWMutexStdTBB, 0, 200, gRepetition / 10000);