From 1faa1dba74233b8b668575ef5f9db85852ddfc74 Mon Sep 17 00:00:00 2001 From: Emery Berger Date: Thu, 11 Aug 2022 13:58:49 -0400 Subject: [PATCH] Fixed benchmark cmake files. --- benchmarks/CMakeLists.txt | 1 + benchmarks/histogram/CMakeLists.txt | 2 +- benchmarks/kmeans/CMakeLists.txt | 2 +- benchmarks/linear_regression/CMakeLists.txt | 2 +- benchmarks/matrix_multiply/CMakeLists.txt | 2 +- benchmarks/pbzip2/CMakeLists.txt | 2 +- benchmarks/pca/CMakeLists.txt | 2 +- benchmarks/producer_consumer/CMakeLists.txt | 2 +- benchmarks/sqlite-modified/CMakeLists.txt | 2 +- benchmarks/sqlite/CMakeLists.txt | 2 +- benchmarks/string_match/CMakeLists.txt | 2 +- benchmarks/toy/CMakeLists.txt | 2 +- benchmarks/word_count/CMakeLists.txt | 2 +- 13 files changed, 13 insertions(+), 12 deletions(-) diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt index 7182564..9bfbdd9 100644 --- a/benchmarks/CMakeLists.txt +++ b/benchmarks/CMakeLists.txt @@ -1,3 +1,4 @@ +add_compile_options(-g -O3 -DNDEBUG) function(add_coz_run_target name) set(one_value_args "") set(multi_value_args COMMAND) diff --git a/benchmarks/histogram/CMakeLists.txt b/benchmarks/histogram/CMakeLists.txt index 59c48d7..1abdec8 100644 --- a/benchmarks/histogram/CMakeLists.txt +++ b/benchmarks/histogram/CMakeLists.txt @@ -1,5 +1,5 @@ add_executable(histogram histogram-pthread.c) -target_link_libraries(histogram PRIVATE coz-instrumentation pthread) +target_link_libraries(histogram PRIVATE pthread) add_custom_command( COMMENT "Downloading histogram inputs" diff --git a/benchmarks/kmeans/CMakeLists.txt b/benchmarks/kmeans/CMakeLists.txt index 5ffce05..fec8a02 100644 --- a/benchmarks/kmeans/CMakeLists.txt +++ b/benchmarks/kmeans/CMakeLists.txt @@ -1,5 +1,5 @@ add_executable(kmeans kmeans-pthread.c) -target_link_libraries(kmeans PRIVATE coz-instrumentation pthread) +target_link_libraries(kmeans PRIVATE pthread) add_coz_run_target(run_kmeans_small COMMAND $ -d 3 -c 100 -p 10000 -s 100) add_coz_run_target(run_kmeans_large COMMAND $ -d 3 -c 100 -p 100000 -s 1000) diff --git a/benchmarks/linear_regression/CMakeLists.txt b/benchmarks/linear_regression/CMakeLists.txt index 6201b64..3e9f51e 100644 --- a/benchmarks/linear_regression/CMakeLists.txt +++ b/benchmarks/linear_regression/CMakeLists.txt @@ -1,5 +1,5 @@ add_executable(linear_regression linear_regression-pthread.c) -target_link_libraries(linear_regression PRIVATE coz-instrumentation pthread) +target_link_libraries(linear_regression PRIVATE pthread) add_custom_command( COMMENT "Downloading linear_regression inputs" diff --git a/benchmarks/matrix_multiply/CMakeLists.txt b/benchmarks/matrix_multiply/CMakeLists.txt index c3f8184..702de10 100644 --- a/benchmarks/matrix_multiply/CMakeLists.txt +++ b/benchmarks/matrix_multiply/CMakeLists.txt @@ -1,5 +1,5 @@ add_executable(matrix_multiply matrix_multiply-pthread.c) -target_link_libraries(matrix_multiply PRIVATE coz-instrumentation pthread) +target_link_libraries(matrix_multiply PRIVATE pthread) target_compile_options(matrix_multiply PRIVATE -Wno-format) add_custom_command( diff --git a/benchmarks/pbzip2/CMakeLists.txt b/benchmarks/pbzip2/CMakeLists.txt index b191307..786c9b6 100644 --- a/benchmarks/pbzip2/CMakeLists.txt +++ b/benchmarks/pbzip2/CMakeLists.txt @@ -1,5 +1,5 @@ add_executable(pbzip2 BZ2StreamScanner.cpp ErrorContext.cpp pbzip2.cpp) -target_link_libraries(pbzip2 PRIVATE BZip2::BZip2 coz-instrumentation pthread) +target_link_libraries(pbzip2 PRIVATE bz2 pthread) target_compile_options(pbzip2 PRIVATE -Wno-format) set(datafiles ${CMAKE_CURRENT_BINARY_DIR}/../linear_regression/linear_regression_datafiles) diff --git a/benchmarks/pca/CMakeLists.txt b/benchmarks/pca/CMakeLists.txt index d898777..08da5e2 100644 --- a/benchmarks/pca/CMakeLists.txt +++ b/benchmarks/pca/CMakeLists.txt @@ -1,4 +1,4 @@ add_executable(pca pca-pthread.c) -target_link_libraries(pca PRIVATE coz-instrumentation pthread) +target_link_libraries(pca PRIVATE pthread) add_coz_run_target(run_pca COMMAND $ > /dev/null) diff --git a/benchmarks/producer_consumer/CMakeLists.txt b/benchmarks/producer_consumer/CMakeLists.txt index 4ab3a77..efa192f 100644 --- a/benchmarks/producer_consumer/CMakeLists.txt +++ b/benchmarks/producer_consumer/CMakeLists.txt @@ -1,4 +1,4 @@ add_executable(producer_consumer producer_consumer.cpp) -target_link_libraries(producer_consumer PRIVATE coz-instrumentation pthread) +target_link_libraries(producer_consumer PRIVATE pthread) add_coz_run_target(run_producer_consumer COMMAND $) diff --git a/benchmarks/sqlite-modified/CMakeLists.txt b/benchmarks/sqlite-modified/CMakeLists.txt index 0d178b3..b046ff4 100644 --- a/benchmarks/sqlite-modified/CMakeLists.txt +++ b/benchmarks/sqlite-modified/CMakeLists.txt @@ -1,5 +1,5 @@ add_executable(sqlite-bench-modified main.c sqlite3.c) target_compile_definitions(sqlite-bench-modified PRIVATE SQLITE_THREADSAFE=2) -target_link_libraries(sqlite-bench-modified PRIVATE SQLite::SQLite3 coz-instrumentation pthread) +target_link_libraries(sqlite-bench-modified PRIVATE sqlite3 pthread dl) add_coz_run_target(run_sqlite_bench_modified COMMAND $) diff --git a/benchmarks/sqlite/CMakeLists.txt b/benchmarks/sqlite/CMakeLists.txt index d3a1fba..daef3c4 100644 --- a/benchmarks/sqlite/CMakeLists.txt +++ b/benchmarks/sqlite/CMakeLists.txt @@ -1,5 +1,5 @@ add_executable(sqlite-bench main.c sqlite3.c) target_compile_definitions(sqlite-bench PRIVATE SQLITE_THREADSAFE=2) -target_link_libraries(sqlite-bench PRIVATE SQLite::SQLite3 coz-instrumentation pthread) +target_link_libraries(sqlite-bench PRIVATE sqlite3 pthread dl) add_coz_run_target(run_sqlite_bench COMMAND $) diff --git a/benchmarks/string_match/CMakeLists.txt b/benchmarks/string_match/CMakeLists.txt index 0eec4e3..1f3feef 100644 --- a/benchmarks/string_match/CMakeLists.txt +++ b/benchmarks/string_match/CMakeLists.txt @@ -1,5 +1,5 @@ add_executable(string_match string_match-pthread.c) -target_link_libraries(string_match PRIVATE coz-instrumentation pthread) +target_link_libraries(string_match PRIVATE pthread) add_custom_command( COMMENT "Downloading string_match inputs" diff --git a/benchmarks/toy/CMakeLists.txt b/benchmarks/toy/CMakeLists.txt index eb4112c..59c91c3 100644 --- a/benchmarks/toy/CMakeLists.txt +++ b/benchmarks/toy/CMakeLists.txt @@ -1,4 +1,4 @@ add_executable(toy toy.cpp) -target_link_libraries(toy PRIVATE coz-instrumentation pthread) +target_link_libraries(toy PRIVATE pthread) add_coz_run_target(run_toy COMMAND $) diff --git a/benchmarks/word_count/CMakeLists.txt b/benchmarks/word_count/CMakeLists.txt index 3d4a38e..496f7b9 100644 --- a/benchmarks/word_count/CMakeLists.txt +++ b/benchmarks/word_count/CMakeLists.txt @@ -1,5 +1,5 @@ add_executable(word_count sort-pthread.c word_count-pthread.c) -target_link_libraries(word_count PRIVATE coz-instrumentation pthread) +target_link_libraries(word_count PRIVATE pthread) add_custom_command( COMMENT "Downloading word_count inputs"