Adding more mature build system

dima424658 · Mar 1, 2024 · 975fd72 · 975fd72
1 parent c62e137
commit 975fd72
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,8 @@ cmake_minimum_required(VERSION 3.11)
 project("benchmarks")
 
 enable_testing()
-file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/CSVS)
+set(CSVS ${CMAKE_BINARY_DIR}/CSVS)
+file(MAKE_DIRECTORY ${CSVS})
 
 find_package(cppbenchmark REQUIRED)
 

diff --git a/coro-fibs/CMakeLists.txt b/coro-fibs/CMakeLists.txt
@@ -6,6 +6,7 @@ target_link_libraries(${TNAME} cppbenchmark::cppbenchmark)
 
 add_test(
   NAME TEST_${TNAME}
-  COMMAND ${TNAME} -q -o csv > ${CMAKE_BINARY_DIR}/CSVS/${TNAME}.csv)
+  COMMAND sh -c "./${TNAME} -q -o csv > ${CSVS}/${TNAME}.csv"
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 set_tests_properties(${TEST_TARGET} PROPERTIES DEPENDS ${TNAME})
 
diff --git a/excret/CMakeLists.txt b/excret/CMakeLists.txt
@@ -6,6 +6,6 @@ target_link_libraries(${TNAME} cppbenchmark::cppbenchmark)
 
 add_test(
   NAME TEST_${TNAME}
-  COMMAND ${TNAME} -q -o csv > ${CMAKE_BINARY_DIR}/CSVS/${TNAME}.csv)
+  COMMAND sh -c "./${TNAME} -q -o csv > ${CSVS}/${TNAME}.csv"
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 set_tests_properties(${TEST_TARGET} PROPERTIES DEPENDS ${TNAME})
-
diff --git a/inline/CMakeLists.txt b/inline/CMakeLists.txt
@@ -6,6 +6,7 @@ target_link_libraries(${TNAME} cppbenchmark::cppbenchmark)
 
 add_test(
   NAME TEST_${TNAME}
-  COMMAND ${TNAME} -q -o csv > ${CMAKE_BINARY_DIR}/CSVS/${TNAME}.csv)
+  COMMAND sh -c "./${TNAME} -q -o csv > ${CSVS}/${TNAME}.csv"
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 set_tests_properties(${TEST_TARGET} PROPERTIES DEPENDS ${TNAME})
 
diff --git a/noexcept-qsort/CMakeLists.txt b/noexcept-qsort/CMakeLists.txt
@@ -6,7 +6,8 @@ target_link_libraries(${TNAME} cppbenchmark::cppbenchmark)
 
 add_test(
   NAME TEST_${TNAME}
-  COMMAND ${TNAME} -q -o csv > ${CMAKE_BINARY_DIR}/CSVS/${TNAME}.csv)
+  COMMAND sh -c "./${TNAME} -q -o csv > ${CSVS}/${TNAME}.csv"
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 set_tests_properties(${TEST_TARGET} PROPERTIES DEPENDS ${TNAME})
 
 SET(TNAME exc_partition)
@@ -17,6 +18,8 @@ target_link_libraries(${TNAME} cppbenchmark::cppbenchmark)
 
 add_test(
   NAME TEST_${TNAME}
-  COMMAND ${TNAME} -q -o csv > ${CMAKE_BINARY_DIR}/CSVS/${TNAME}.csv)
+  COMMAND sh -c "./${TNAME} -q -o csv > ${CSVS}/${TNAME}.csv"
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 set_tests_properties(${TEST_TARGET} PROPERTIES DEPENDS ${TNAME})
 
+
diff --git a/ranges-filter/CMakeLists.txt b/ranges-filter/CMakeLists.txt
@@ -6,6 +6,8 @@ target_link_libraries(${TNAME} cppbenchmark::cppbenchmark)
 
 add_test(
   NAME TEST_${TNAME}
-  COMMAND ${TNAME} -q -o csv > ${CMAKE_BINARY_DIR}/CSVS/${TNAME}.csv)
+  COMMAND sh -c "./${TNAME} -q -o csv > ${CSVS}/${TNAME}.csv"
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 set_tests_properties(${TEST_TARGET} PROPERTIES DEPENDS ${TNAME})
 
+
diff --git a/ranges-projector/CMakeLists.txt b/ranges-projector/CMakeLists.txt
@@ -6,6 +6,8 @@ target_link_libraries(${TNAME} cppbenchmark::cppbenchmark)
 
 add_test(
   NAME TEST_${TNAME}
-  COMMAND ${TNAME} -q -o csv > ${CMAKE_BINARY_DIR}/CSVS/${TNAME}.csv)
+  COMMAND sh -c "./${TNAME} -q -o csv > ${CSVS}/${TNAME}.csv"
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 set_tests_properties(${TEST_TARGET} PROPERTIES DEPENDS ${TNAME})
 
+
diff --git a/readme.md b/readme.md
@@ -0,0 +1,24 @@
+# Benchmarks for Yadro C++ meetup talk
+
+This repo consists of Yadro C++ talk benchmarks.
+
+## Building and running
+
+We are using CppBenchmark via Conan repo. To guarantee clean conan setup please use venv. See full build sequence below.
+
+```
+git clone https://github.com/tilir/benchmarks.git
+cd benchmarks
+python3 -m venv .venv
+source .venv/bin/activate
+pip3 install conan
+conan install conanfile.txt --build=missing
+cmake -S . -B build/Release --toolchain build/Release/generators/conan_toolchain.cmake  -DCMAKE_BUILD_TYPE=Release
+cmake --build build/Release
+env CTEST_OUTPUT_ON_FAILURE=1 cmake --build build/Release --target test --parallel 1
+```
+
+This will take some time, be patient. Benchmarking results will be created in the build/Release/CSVS folder. 
+
+You are welcome to create MR in results folder with your architecture and name it will help my talk!
+
diff --git a/virtual-inherit/CMakeLists.txt b/virtual-inherit/CMakeLists.txt
@@ -6,6 +6,8 @@ target_link_libraries(${TNAME} cppbenchmark::cppbenchmark)
 
 add_test(
   NAME TEST_${TNAME}
-  COMMAND ${TNAME} -q -o csv > ${CMAKE_BINARY_DIR}/CSVS/${TNAME}.csv)
+  COMMAND sh -c "./${TNAME} -q -o csv > ${CSVS}/${TNAME}.csv"
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 set_tests_properties(${TEST_TARGET} PROPERTIES DEPENDS ${TNAME})
 
+
diff --git a/virtual-inline/CMakeLists.txt b/virtual-inline/CMakeLists.txt
@@ -6,6 +6,8 @@ target_link_libraries(${TNAME} cppbenchmark::cppbenchmark)
 
 add_test(
   NAME TEST_${TNAME}
-  COMMAND ${TNAME} -q -o csv > ${CMAKE_BINARY_DIR}/CSVS/${TNAME}.csv)
+  COMMAND sh -c "./${TNAME} -q -o csv > ${CSVS}/${TNAME}.csv"
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 set_tests_properties(${TEST_TARGET} PROPERTIES DEPENDS ${TNAME})
 
+
diff --git a/virtual-overhead/CMakeLists.txt b/virtual-overhead/CMakeLists.txt
@@ -6,7 +6,8 @@ target_link_libraries(${TNAME} cppbenchmark::cppbenchmark)
 
 add_test(
   NAME TEST_${TNAME}
-  COMMAND ${TNAME} -q -o csv > ${CMAKE_BINARY_DIR}/CSVS/${TNAME}.csv)
+  COMMAND sh -c "./${TNAME} -q -o csv > ${CSVS}/${TNAME}.csv"
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 set_tests_properties(${TEST_TARGET} PROPERTIES DEPENDS ${TNAME})
 
 SET(TNAME virtual-shuffle)
@@ -17,6 +18,8 @@ target_link_libraries(${TNAME} cppbenchmark::cppbenchmark)
 
 add_test(
   NAME TEST_${TNAME}
-  COMMAND ${TNAME} -q -o csv > ${CMAKE_BINARY_DIR}/CSVS/${TNAME}.csv)
+  COMMAND sh -c "./${TNAME} -q -o csv > ${CSVS}/${TNAME}.csv"
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 set_tests_properties(${TEST_TARGET} PROPERTIES DEPENDS ${TNAME})
 
+