some more benchmarking work

Author: Florian Wagner

benchmarking/glkernel_bench_auto.sh

@@ -6,14 +6,14 @@ cd ..
 
 
 rebuild(){
-rm -r build
-mkdir build
+rm -r build_bench
+mkdir build_bench
 build_it
 }
 
 build_it(){
 
-cd build
+cd build_bench
 mkdir benchmark
 cmake .. -doption_build_benchmarks=true -doption_build_tools=false -dcmake_build_type=release
 make -j4
@@ -23,20 +23,20 @@ cd ..
 bench_omp(){
 build_omp
 run
-cp build/benchmark/results.csv benchmarking/omp_result.csv
+cp build_bench/benchmark/results.csv benchmarking/omp_result.csv
 }
 
 bench_no_omp(){
 build_no_omp
 run
-cp build/benchmark/results.csv benchmarking/no_omp_result.csv
+cp build_bench/benchmark/results.csv benchmarking/no_omp_result.csv
 }
 
 build_omp()
 {
-rm -r build
-mkdir build
-cd build
+rm -r build_bench
+mkdir build_bench
+cd build_bench
 mkdir benchmark
 cmake .. -DOPTION_BUILD_BENCHMARKS=true -DOPTION_BUILD_TOOLS=false -DCMAKE_BUILD_TYPE=release
 make -j4
@@ -45,9 +45,9 @@ cd ..
 
 build_no_omp()
 {
-rm -r build
-mkdir build
-cd build
+rm -r build_bench
+mkdir build_bench
+cd build_bench
 mkdir benchmark
 cmake .. -DOPTION_BUILD_BENCHMARKS=true -DOPTION_BUILD_TOOLS=false -DCMAKE_BUILD_TYPE=release -DUSE_OPENMP=FALSE
 make -j4
@@ -57,12 +57,11 @@ cd ..
 run(){
 build/glkernel-benchmark --benchmark_out=build/benchmark/results.csv \
                      --benchmark_out_format=csv \
-                     --benchmark_repetitions=$REPITITIONS \
-                     --benchmark_filter=strati
+                     --benchmark_repetitions=$REPITITIONS
 }
 
-#build_it
-#rebuild
+build_it
+rebuild
 bench_omp
 bench_no_omp
 

source/benchmarks/glkernel-benchmarks/CMakeLists.txt

@@ -18,7 +18,7 @@ message(STATUS "Benchmark ${target}")
 if (NOT OPENMP_FOUND)
     message("Loop parallelization in ${target} skipped: OpenMP not found")
 else ()
-    set(USE_OPENMP TRUE CACHE BOOL "Whether to use OpenMP or not")
+    option(USE_OPENMP "Whether to use OpenMP or not" FALSE)
 endif()
 
 
@@ -90,18 +90,18 @@ target_link_libraries(${target}
 target_compile_definitions(${target}
     PRIVATE
     GLM_FORCE_RADIANS
-    $<$<BOOL:"${OPENMP_FOUND}">:USE_OPENMP>
+    $<$<BOOL:"${USE_OPENMP}">:USE_OPENMP>
     ${DEFAULT_COMPILE_DEFINITIONS}
 )
 
 
 # 
 # Compile options
-# 
+#
 
 target_compile_options(${target}
     PRIVATE
-    $<$<BOOL:"${OPENMP_FOUND}">:${OpenMP_CXX_FLAGS}>
+    $<$<BOOL:${USE_OPENMP}>:${OpenMP_CXX_FLAGS}>
     ${DEFAULT_COMPILE_OPTIONS}
 )
 
@@ -113,5 +113,5 @@ target_compile_options(${target}
 target_link_libraries(${target}
     PRIVATE
     ${DEFAULT_LINKER_OPTIONS}
-    $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:$<$<BOOL:"${OPENMP_FOUND}">:${OpenMP_CXX_FLAGS}>>
+    $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:$<$<BOOL:${USE_OPENMP}>:${OpenMP_CXX_FLAGS}>>
 )