Skip to content

Commit

Permalink
benchmark update
Browse files Browse the repository at this point in the history
  • Loading branch information
@kkli08
kkli08 committed Oct 4, 2024
1 parent a479d92 commit 111b7b9
Show file tree
Hide file tree
Showing 3 changed files with 68 additions and 147 deletions.
80 changes: 17 additions & 63 deletions Benchmark/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,77 +1,31 @@
# Minimum required version of CMake
cmake_minimum_required(VERSION 3.10)
cmake_minimum_required(VERSION 3.14)

# Project name
project(Benchmark)

# Set C++ standard
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

# Find Protobuf package
find_package(Protobuf REQUIRED)
if(APPLE)
set(CMAKE_OSX_ARCHITECTURES arm64)
endif()

# Specify the path to the .proto files
set(PROTO_FILES
${PROJECT_SOURCE_DIR}/../protobuf/KeyValue.proto
# Source files for the benchmark
set(BENCHMARK_SRCS
put_throughput_benchmark.cpp
)

# Set the output directory for the generated .pb.cc and .pb.h files
set(GENERATED_PROTO_DIR ${PROJECT_SOURCE_DIR}/../protobuf)

# Include the generated protobuf files
set(PROTO_SRCS
${GENERATED_PROTO_DIR}/KeyValue.pb.cc
)
set(PROTO_HDRS
${GENERATED_PROTO_DIR}/KeyValue.pb.h
# Add executable for the benchmark
add_executable(put_benchmark
${BENCHMARK_SRCS}
)

# Include directories
include_directories(
${PROJECT_SOURCE_DIR}/../protobuf
${PROJECT_SOURCE_DIR}/../kv
${PROJECT_SOURCE_DIR}/../Memory/Memtable
${PROJECT_SOURCE_DIR}/../Memory/BufferPool
${PROJECT_SOURCE_DIR}/../Storage/Page
${PROJECT_SOURCE_DIR}/../Storage/PageManager
${PROJECT_SOURCE_DIR}/../Storage/SstFileManager
${PROJECT_SOURCE_DIR}/../Storage/FileManager
${PROJECT_SOURCE_DIR}/../Storage/DiskBTree
${PROJECT_SOURCE_DIR}/../Tree/BinaryTree
${PROJECT_SOURCE_DIR}/../Tree/BTree
${PROJECT_SOURCE_DIR}/../Tree/RedBlackTree
${PROJECT_SOURCE_DIR}/../Tree/TreeNode
${PROJECT_SOURCE_DIR}/../VeloxDB
${PROJECT_SOURCE_DIR}
${GENERATED_PROTO_DIR} # Include generated protobuf directory
# Include directories for the benchmark executable
target_include_directories(put_benchmark PRIVATE
${CMAKE_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
)

# List of source files for VeloxDB
set(VELOXDB_SRCS
put_throughput_benchmark.cpp
../Memory/Memtable/Memtable.cpp
../kv/KeyValue.cpp
../Tree/BTree/BTree.cpp
../Tree/RedBlackTree/RedBlackTree.cpp
../Tree/TreeNode/TreeNode.cpp
../Tree/BinaryTree/BinaryTree.cpp
../Storage/Page/Page.cpp
../Storage/PageManager/PageManager.cpp
../Storage/DiskBTree/DiskBTree.cpp
../Storage/SstFileManager/SstFileManager.cpp
../VeloxDB/VeloxDB.cpp
../Memory/BufferPool/BufferPool.cpp
# Link libraries to the benchmark executable
target_link_libraries(put_benchmark PRIVATE
veloxdb_lib
)

# Specify the source files for the benchmark
set(BENCHMARK_SRCS
put_throughput_benchmark.cpp # Ensure this file contains `main` function
)

# Add executable for the benchmark, ensuring main function is included
add_executable(put_benchmark ${BENCHMARK_SRCS} ${PROTO_SRCS} ${VELOXDB_SRCS})

# Link libraries for the benchmark executable
target_link_libraries(put_benchmark ${Protobuf_LIBRARIES})

2 changes: 1 addition & 1 deletion Benchmark/put_throughput_benchmark.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ void benchmarkPut(std::unique_ptr<VeloxDB>& db, size_t dataSizeMB, size_t memtab

int main() {
// Define the output directory for the CSV file
std::string outputDir = "../put_throughput";
std::string outputDir = "./put_throughput";
std::string outputFilePath = outputDir + "/put_throughput.csv";

// Create the directory if it does not exist
Expand Down
133 changes: 50 additions & 83 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
cmake_minimum_required(VERSION 3.14)

# Set CMake policies
if(POLICY CMP0135)
cmake_policy(SET CMP0135 NEW)
endif()

# Project name
project(VeloxDB)

Expand Down Expand Up @@ -29,41 +34,32 @@ set(GENERATED_PROTO_DIR ${PROJECT_SOURCE_DIR}/protobuf)
# Include FetchContent module
include(FetchContent)

# Set Abseil option
set(ABSL_PROPAGATE_CXX_STD ON)

# Fetch Abseil library
FetchContent_Declare(
abseil
GIT_REPOSITORY https://github.com/abseil/abseil-cpp.git
GIT_TAG 20230802.0 # Use the latest stable release tag
DOWNLOAD_EXTRACT_TIMESTAMP TRUE
)
FetchContent_MakeAvailable(abseil)

# Fetch GoogleTest
FetchContent_Declare(
googletest
URL https://github.com/google/googletest/archive/refs/tags/release-1.12.1.zip
DOWNLOAD_EXTRACT_TIMESTAMP TRUE
)
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
FetchContent_MakeAvailable(googletest)

# Enable testing
enable_testing()

# ---- TEST TARGET ----
add_executable(runTests
# Test files
tests/binarytree_tests.cpp
tests/redblacktree_unittest.cpp
tests/memtable_unittest.cpp
tests/kvpair_unittest.cpp
tests/treenode_unittests.cpp
tests/page_unittests.cpp
tests/page_manager_unittest.cpp
tests/DiskBTree_unittest.cpp
tests/SST_File_Manager_unittest.cpp
tests/VeloxDB_api_unittest.cpp
tests/veloxdb_GET_benchmark.cpp

# Source files required by tests
# ---- DEFINE SHARED LIBRARY ----
add_library(veloxdb_lib STATIC
# kv
kv/KeyValue.cpp
kv/KeyValue.tpp
Expand Down Expand Up @@ -96,8 +92,8 @@ add_executable(runTests
${PROTO_SRCS}
)

# Include directories for runTests
target_include_directories(runTests PRIVATE
# Include directories for veloxdb_lib
target_include_directories(veloxdb_lib PUBLIC
${PROJECT_SOURCE_DIR}/kv
${PROJECT_SOURCE_DIR}/Memory/Memtable
${PROJECT_SOURCE_DIR}/Memory/BufferPool
Expand All @@ -121,12 +117,10 @@ target_include_directories(runTests PRIVATE
${absl_BINARY_DIR}
)

# Link libraries to runTests
target_link_libraries(runTests PRIVATE
gtest
gtest_main
# Link libraries to veloxdb_lib
target_link_libraries(veloxdb_lib PUBLIC
protobuf::libprotobuf
absl::check # Corrected from absl::checks to absl::check
absl::check
absl::log
absl::strings
absl::status
Expand All @@ -137,80 +131,53 @@ target_link_libraries(runTests PRIVATE
absl::base
)

# ---- TEST TARGET ----
add_executable(runTests
# Test files
tests/binarytree_tests.cpp
tests/redblacktree_unittest.cpp
tests/memtable_unittest.cpp
tests/kvpair_unittest.cpp
tests/treenode_unittests.cpp
tests/page_unittests.cpp
tests/page_manager_unittest.cpp
tests/DiskBTree_unittest.cpp
tests/SST_File_Manager_unittest.cpp
tests/VeloxDB_api_unittest.cpp
tests/veloxdb_GET_benchmark.cpp
)

# Include directories for runTests
target_include_directories(runTests PRIVATE
${PROJECT_SOURCE_DIR}/tests
${CMAKE_CURRENT_BINARY_DIR}
)

# Link libraries to runTests
target_link_libraries(runTests PRIVATE
veloxdb_lib
gtest
gtest_main
)

# Register tests with CTest
add_test(NAME runTests COMMAND runTests)

# ---- MAIN TARGET ----
add_executable(main
main.cpp

# Source files
kv/KeyValue.cpp
kv/KeyValue.tpp

Memory/Memtable/Memtable.cpp
Memory/BufferPool/BufferPool.cpp

Tree/TreeNode/TreeNode.cpp
Tree/TreeNode/TreeNode.tpp
Tree/BinaryTree/BinaryTree.cpp
Tree/BinaryTree/BinaryTree.tpp
Tree/RedBlackTree/RedBlackTree.cpp
Tree/BTree/BTree.cpp

Storage/FileManager/FileManager.cpp
Storage/Page/Page.cpp
Storage/PageManager/PageManager.cpp
Storage/DiskBTree/DiskBTree.cpp
Storage/SstFileManager/SstFileManager.cpp

VeloxDB/VeloxDB.cpp
VeloxDB/VeloxDB.h
VeloxDB/VeloxDB.tpp

# Generated Protobuf source files
${PROTO_SRCS}
)

# Include directories for main
target_include_directories(main PRIVATE
${PROJECT_SOURCE_DIR}/kv
${PROJECT_SOURCE_DIR}/Memory/Memtable
${PROJECT_SOURCE_DIR}/Memory/BufferPool
${PROJECT_SOURCE_DIR}/Storage/BloomFilter
${PROJECT_SOURCE_DIR}/Storage/Page
${PROJECT_SOURCE_DIR}/Storage/PageManager
${PROJECT_SOURCE_DIR}/Storage/SstFileManager
${PROJECT_SOURCE_DIR}/Storage/FileManager
${PROJECT_SOURCE_DIR}/Storage/DiskBTree
${PROJECT_SOURCE_DIR}/Tree/BinaryTree
${PROJECT_SOURCE_DIR}/Tree/BTree
${PROJECT_SOURCE_DIR}/Tree/LSMTree
${PROJECT_SOURCE_DIR}/Tree/RedBlackTree
${PROJECT_SOURCE_DIR}/Tree/TreeNode
${PROJECT_SOURCE_DIR}/VeloxDB
${CMAKE_CURRENT_BINARY_DIR}
${PROJECT_SOURCE_DIR}
${GENERATED_PROTO_DIR}
${Protobuf_INCLUDE_DIRS}
${absl_SOURCE_DIR}
${absl_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
)

# Link libraries to main
target_link_libraries(main PRIVATE
protobuf::libprotobuf
absl::check # Corrected from absl::checks to absl::check
absl::log
absl::strings
absl::status
absl::synchronization
absl::time
absl::memory
absl::flat_hash_map
absl::base
veloxdb_lib
)

# Optionally include the Benchmark directory
# Uncomment the following line if you have a Benchmark directory to include
# add_subdirectory(Benchmark)
# Include the Benchmark directory
add_subdirectory(Benchmark)

0 comments on commit 111b7b9

Please sign in to comment.