Add cilk_scope to bench/main

Author: ProExpertProg

cpp/bench/CMakeLists.txt

@@ -19,17 +19,17 @@ FetchContent_Declare(
 )
 FetchContent_MakeAvailable(google-benchmark)
 
-add_executable(bench-naive naive.cpp main-no-log.cpp)
+add_executable(bench-naive naive.cpp main.cpp)
 target_link_libraries(bench-naive src-lib benchmark::benchmark)
 
-add_executable(bench-hl-filter hl-filter.cpp)
-target_link_libraries(bench-hl-filter src-lib benchmark::benchmark_main)
+add_executable(bench-hl-filter hl-filter.cpp main.cpp)
+target_link_libraries(bench-hl-filter src-lib benchmark::benchmark)
 
-add_executable(bench-exps exps.cpp)
-target_link_libraries(bench-exps src-lib benchmark::benchmark_main)
+add_executable(bench-exps exps.cpp main.cpp)
+target_link_libraries(bench-exps src-lib benchmark::benchmark)
 
-add_executable(bench-prepare prepare-derivatives.cpp)
-target_link_libraries(bench-prepare src-lib benchmark::benchmark_main)
+add_executable(bench-prepare prepare-derivatives.cpp main.cpp)
+target_link_libraries(bench-prepare src-lib benchmark::benchmark)
 
 if (ENABLE_CILK)
     add_executable(bench-fftw-cilk fftw-cilk.cpp)

cpp/bench/main-no-log.cpp renamed to cpp/bench/main.cpp

@@ -2,12 +2,17 @@
 #include <spdlog/cfg/env.h>
 #include <spdlog/spdlog.h>
 
+#include "cilk.hpp"
+
 int main(int argc, char **argv) {
   // No logging in benchmarks (unless overridden via environment variable)
   spdlog::set_level(spdlog::level::off);
   spdlog::cfg::load_env_levels();
 
-  benchmark::Initialize(&argc, argv);
-  benchmark::RunSpecifiedBenchmarks();
-  benchmark::Shutdown();
+  // Invoke a cilk_scope to avoid Cilk startup/shutdown in benchmarks
+  cilk_scope {
+    benchmark::Initialize(&argc, argv);
+    benchmark::RunSpecifiedBenchmarks();
+    benchmark::Shutdown();
+  }
 }