Actually can't use onetbb with STL algorithms

Author: jmarrec

CMakeLists.txt

@@ -193,7 +193,7 @@ conan_cmake_configure(
   gtest/1.13.0
   pugixml/1.12.1
   xerces-c/3.2.3
-  onetbb/2021.9.0
+  tbb/2020.3  # onetbb/2021.9.0 is incompatible with STL algorithms, the tbb::task is removed
   GENERATORS ${CONAN_GENERATOR}
 )
 
@@ -285,7 +285,7 @@ foreach( bench_file ${BENCH_FILES} )
       add_executable( ${bench_name} ${bench_file} )
       target_link_libraries(${bench_name} PRIVATE
         CONAN_PKG::benchmark
-        CONAN_PKG::onetbb
+        CONAN_PKG::tbb
       )
     endif()
   elseif(bench_name MATCHES "bench_string_trim")
@@ -325,6 +325,12 @@ int main() { }"
 
 endforeach()
 
+add_executable( test_regex test.cpp )
+target_link_libraries(test_regex PRIVATE
+  CONAN_PKG::boost
+  CONAN_PKG::fmt
+)
+
 
 add_library(testlib
   TestClass.hpp

bench_embedded.cpp

@@ -9,16 +9,16 @@ static void CurrentCLike(benchmark::State& state) {
 
     static constexpr size_t embedded_file_count = 2;
 
-    static const char *embedded_file_name_0 = ":/Resources/sandia/Sandia_Modules.json";
-    static const char *embedded_file_name_1 = ":/Resources/sandia/Sandia_Modules2.json";
+    static const char* embedded_file_name_0 = ":/Resources/sandia/Sandia_Modules.json";
+    static const char* embedded_file_name_1 = ":/Resources/sandia/Sandia_Modules2.json";
 
-    static const uint8_t embedded_file_0[] = {0x78,0x9c,0xed,0xbd,0x5d,0xaf,0xe3,0xd8};
-    static const uint8_t embedded_file_1[] = {0xed,0xaf,0xe3, 0xbd,0x5d,0xaf,0xe3,0xd8,0xe3};
+    static const uint8_t embedded_file_0[] = {0x78, 0x9c, 0xed, 0xbd, 0x5d, 0xaf, 0xe3, 0xd8};
+    static const uint8_t embedded_file_1[] = {0xed, 0xaf, 0xe3, 0xbd, 0x5d, 0xaf, 0xe3, 0xd8, 0xe3};
 
     static const size_t embedded_file_len_0 = 8;
     static const size_t embedded_file_len_1 = 9;
 
-    static const char *embedded_file_names[] = {
+    static const char* embedded_file_names[] = {
       embedded_file_name_0,
       embedded_file_name_1,
 
@@ -28,14 +28,14 @@ static void CurrentCLike(benchmark::State& state) {
       embedded_file_len_1,
 
     };
-    static const uint8_t *embedded_files[] = {
+    static const uint8_t* embedded_files[] = {
       embedded_file_0,
       embedded_file_1,
     };
 
     // Make sure the variable is not optimized away by compiler
     benchmark::DoNotOptimize(embedded_file_names);
-    benchmark::DoNotOptimize(embedded_file_lens);
+    // benchmark::DoNotOptimize(embedded_file_lens);
     benchmark::DoNotOptimize(embedded_files);
 
     for (size_t i = 0; i < embedded_file_count; ++i) {
@@ -60,13 +60,13 @@ static void ConstexprCLike(benchmark::State& state) {
     static constexpr auto embedded_file_name_0 = ":/Resources/sandia/Sandia_Modules.json";
     static constexpr auto embedded_file_name_1 = ":/Resources/sandia/Sandia_Modules2.json";
 
-    static constexpr uint8_t embedded_file_0[] = {0x78,0x9c,0xed,0xbd,0x5d,0xaf,0xe3,0xd8};
-    static constexpr uint8_t embedded_file_1[] = {0xed,0xaf,0xe3, 0xbd,0x5d,0xaf,0xe3,0xd8,0xe3};
+    static constexpr uint8_t embedded_file_0[] = {0x78, 0x9c, 0xed, 0xbd, 0x5d, 0xaf, 0xe3, 0xd8};
+    static constexpr uint8_t embedded_file_1[] = {0xed, 0xaf, 0xe3, 0xbd, 0x5d, 0xaf, 0xe3, 0xd8, 0xe3};
 
     static constexpr size_t embedded_file_len_0 = 8;
     static constexpr size_t embedded_file_len_1 = 9;
 
-    static const char *embedded_file_names[] = {
+    static const char* embedded_file_names[] = {
       embedded_file_name_0,
       embedded_file_name_1,
 
@@ -76,14 +76,14 @@ static void ConstexprCLike(benchmark::State& state) {
       embedded_file_len_1,
 
     };
-    static const uint8_t *embedded_files[] = {
+    static const uint8_t* embedded_files[] = {
       embedded_file_0,
       embedded_file_1,
     };
 
     // Make sure the variable is not optimized away by compiler
     benchmark::DoNotOptimize(embedded_file_names);
-    benchmark::DoNotOptimize(embedded_file_lens);
+    // benchmark::DoNotOptimize(embedded_file_lens);
     benchmark::DoNotOptimize(embedded_files);
 
     for (size_t i = 0; i < embedded_file_count; ++i) {
@@ -97,8 +97,6 @@ static void ConstexprCLike(benchmark::State& state) {
   }
 }
 
-
-
 // Register the function as a benchmark
 BENCHMARK(ConstexprCLike);
 

bench_string_trim.cpp

@@ -64,6 +64,33 @@ std::string trim2(std::string_view const in) {
   return {view.begin(), view.end()};
 }
 
+}  // namespace range
+
+static void BM_Trim_Ranges(benchmark::State& state) {
+  for (auto _ : state) {
+    std::string str = getTestString();
+    str = range::trim(str);
+    benchmark::DoNotOptimize(str);
+  }
+}
+
+static void BM_Trim_Ranges2(benchmark::State& state) {
+  for (auto _ : state) {
+    std::string str = getTestString();
+    str = range::trim2(str);
+    benchmark::DoNotOptimize(str);
+  }
+}
+
+// Register the function as a benchmark
+BENCHMARK(BM_Trim_Boost);
+BENCHMARK(BM_Trim_ASCII);
+BENCHMARK(BM_Trim_Ranges);
+BENCHMARK(BM_Trim_Ranges2);
+
+#if 0
+namespace range {
+
 template <std::ranges::view V, typename Pred>
 requires std::ranges::bidirectional_range<V>&& std::indirect_unary_predicate<Pred, std::ranges::iterator_t<V>> class drop_last_while_view
   : public std::ranges::view_interface<drop_last_while_view<V, Pred>>
@@ -93,17 +120,17 @@ requires std::ranges::bidirectional_range<V>&& std::indirect_unary_predicate<Pre
 
 namespace myviews {
 
-#ifdef __GNUC__
+#  ifdef __GNUC__
 using std::views::__adaptor::_RangeAdaptor;
 
 struct drop_last_while_fn : _RangeAdaptor<drop_last_while_fn>
 {
   using _RangeAdaptor<drop_last_while_fn>::operator();
   static constexpr int _S_arity = 2;
-#else
+#  else
 struct drop_last_while_fn
 {
-#endif
+#  endif
   template <std::ranges::viewable_range R, typename Pred>
   constexpr auto operator()(R&& r, Pred pred) const -> range::drop_last_while_view<std::views::all_t<R>, Pred> {
     return range::drop_last_while_view<std::views::all_t<R>, Pred>(std::views::all(std::forward<R>(r)), std::move(pred));
@@ -118,25 +145,8 @@ std::string trim3(std::string_view const in) {
   auto view = in | std::views::drop_while(isspace) | myviews::drop_last_while(isspace);
   return {view.begin(), view.end()};
 }
-
 }  // namespace range
 
-static void BM_Trim_Ranges(benchmark::State& state) {
-  for (auto _ : state) {
-    std::string str = getTestString();
-    str = range::trim(str);
-    benchmark::DoNotOptimize(str);
-  }
-}
-
-static void BM_Trim_Ranges2(benchmark::State& state) {
-  for (auto _ : state) {
-    std::string str = getTestString();
-    str = range::trim2(str);
-    benchmark::DoNotOptimize(str);
-  }
-}
-
 static void BM_Trim_Ranges3(benchmark::State& state) {
   for (auto _ : state) {
     std::string str = getTestString();
@@ -145,9 +155,5 @@ static void BM_Trim_Ranges3(benchmark::State& state) {
   }
 }
 
-// Register the function as a benchmark
-BENCHMARK(BM_Trim_Boost);
-BENCHMARK(BM_Trim_ASCII);
-BENCHMARK(BM_Trim_Ranges);
-BENCHMARK(BM_Trim_Ranges2);
 BENCHMARK(BM_Trim_Ranges3);
+#endif