From 844480fc1e31fb5d9dc218107006e78d9f447685 Mon Sep 17 00:00:00 2001 From: Paul Ferrand Date: Tue, 30 Jul 2019 16:58:47 +0200 Subject: [PATCH] Cleaned the benchmarks --- CMakeLists.txt | 19 ++++++------------- benchmarks/AudioBuffers.cpp | 3 ++- benchmarks/Main.cpp | 3 --- 3 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 benchmarks/Main.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 52b5ae0d..9400fcad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,17 +13,14 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT ANDROID) add_link_options(-stdlib=libc++) # New command on CMake master, not in 3.12 release endif() -# Disable Abseil tests -set(BUILD_TESTING OFF) +set(BUILD_TESTING OFF CACHE BOOL "Disable Abseil's tests") add_subdirectory(external/abseil-cpp) add_subdirectory(external/spdlog) add_subdirectory(external/Catch2) add_subdirectory(external/cxxopts) -#Disable Benchmark tests and installation -set(BENCHMARK_ENABLE_TESTING OFF) -set(BENCHMARK_ENABLE_INSTALL OFF) -set(BENCHMARK_ENABLE_GTEST_TESTS OFF) +set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "Disable Google Benchmark tests") +set(BENCHMARK_ENABLE_INSTALL OFF CACHE BOOL "Disable Google Benchmark install") add_subdirectory(external/benchmark) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) @@ -48,10 +45,6 @@ set(TEST_SOURCES tests/Main.cpp ) -set(BENCHMARK_SOURCES - benchmarks/Main.cpp - benchmarks/AudioBuffers.cpp -) ############################### add_executable(sfzprint sources/ParserMain.cpp ${COMMON_SOURCES}) @@ -83,9 +76,9 @@ target_include_directories(sfizz_tests SYSTEM PRIVATE sources) file(COPY "tests" DESTINATION ${CMAKE_BINARY_DIR}) ############################### -add_executable(sfizz_bench ${BENCHMARK_SOURCES} ${COMMON_SOURCES}) +add_executable(bench_audiobuffers benchmarks/AudioBuffers.cpp ${COMMON_SOURCES}) # Per OS properties if(UNIX) - target_link_libraries(sfizz_bench stdc++fs) + target_link_libraries(bench_audiobuffers stdc++fs) endif(UNIX) -target_link_libraries(sfizz_bench absl::strings benchmark) \ No newline at end of file +target_link_libraries(bench_audiobuffers absl::strings benchmark) \ No newline at end of file diff --git a/benchmarks/AudioBuffers.cpp b/benchmarks/AudioBuffers.cpp index c8bee337..c820ee2c 100644 --- a/benchmarks/AudioBuffers.cpp +++ b/benchmarks/AudioBuffers.cpp @@ -46,4 +46,5 @@ static void AB_Split_Fill_double(benchmark::State& state) { fillValue += 1.0; } } -BENCHMARK(AB_Split_Fill_double); \ No newline at end of file +BENCHMARK(AB_Split_Fill_double); +BENCHMARK_MAIN(); \ No newline at end of file diff --git a/benchmarks/Main.cpp b/benchmarks/Main.cpp deleted file mode 100644 index 71fefa04..00000000 --- a/benchmarks/Main.cpp +++ /dev/null @@ -1,3 +0,0 @@ -#include - -BENCHMARK_MAIN();