Merge pull request #1 from dbrumbaugh/new-buffer

Initial Concurrency Implementation

1 files changed, 112 insertions, 31 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f642714..81fdb63 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,11 +8,15 @@ project("Practical Dynamic Extension" VERSION 0.1.0)
 
 set(debug false)
 set(tests True)
-set(bench false)
+set(bench true)
+set(old_bench False)
+
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/bin")
+set(CMAKE_CXX_FLAGS=-latomic -mcx16)
 
-add_compile_options(-Iinclude -Iexternal/PLEX/include)
+add_compile_options(-Iinclude -Iexternal/PLEX/include -Iexternal -mcx16 -fconcepts-diagnostics-depth=3)
 
 if (debug) 
     add_compile_options(-g -O0)
@@ -29,64 +33,141 @@ if (tests)
     set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/bin/tests")
     file(MAKE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/tests/data")
 
-    add_executable(wirs_tests ${CMAKE_CURRENT_SOURCE_DIR}/tests/wirs_tests.cpp)
-    target_link_libraries(wirs_tests PUBLIC gsl check subunit pthread)
-    target_include_directories(wirs_tests PRIVATE include external/psudb-common/cpp/include)
+    add_executable(augbtree_tests ${CMAKE_CURRENT_SOURCE_DIR}/tests/augbtree_tests.cpp)
+    target_link_libraries(augbtree_tests PUBLIC gsl check subunit pthread atomic)
+    target_link_options(augbtree_tests PUBLIC -mcx16)
+    target_include_directories(augbtree_tests PRIVATE include external/psudb-common/cpp/include external/ctpl)
 
     add_executable(internal_level_tests ${CMAKE_CURRENT_SOURCE_DIR}/tests/internal_level_tests.cpp)
-    target_link_libraries(internal_level_tests PUBLIC gsl check subunit pthread)
+    target_link_libraries(internal_level_tests PUBLIC gsl check subunit pthread atomic)
+    target_link_options(internal_level_tests PUBLIC -mcx16)
     target_include_directories(internal_level_tests PRIVATE include external/psudb-common/cpp/include)
 
     add_executable(mutable_buffer_tests ${CMAKE_CURRENT_SOURCE_DIR}/tests/mutable_buffer_tests.cpp)
-    target_link_libraries(mutable_buffer_tests PUBLIC gsl check subunit pthread)
+    target_link_libraries(mutable_buffer_tests PUBLIC gsl check subunit pthread atomic)
+    target_link_options(mutable_buffer_tests PUBLIC -mcx16)
     target_include_directories(mutable_buffer_tests PRIVATE include external/psudb-common/cpp/include)
 
-    add_executable(vptree_tests ${CMAKE_CURRENT_SOURCE_DIR}/tests/vptree_tests.cpp)
-    target_link_libraries(vptree_tests PUBLIC gsl check subunit pthread)
-    target_include_directories(vptree_tests PRIVATE include external/vptree external/psudb-common/cpp/include)
+    add_executable(rangequery_tests ${CMAKE_CURRENT_SOURCE_DIR}/tests/rangequery_tests.cpp)
+    target_link_libraries(rangequery_tests PUBLIC gsl check subunit pthread atomic)
+    target_link_options(rangequery_tests PUBLIC -mcx16)
+    target_include_directories(rangequery_tests PRIVATE include external/psudb-common/cpp/include)
 
-    #add_executable(dynamic_extension_tests ${CMAKE_CURRENT_SOURCE_DIR}/tests/dynamic_extension_tests.cpp)
-    #target_link_libraries(dynamic_extension_tests PUBLIC gsl check subunit pthread)
-    #target_include_directories(dynamic_extension_tests PRIVATE include)
 
+    add_executable(rangecount_tests ${CMAKE_CURRENT_SOURCE_DIR}/tests/rangecount_tests.cpp)
+    target_link_libraries(rangecount_tests PUBLIC gsl check subunit pthread atomic)
+    target_link_options(rangecount_tests PUBLIC -mcx16)
+    target_include_directories(rangecount_tests PRIVATE include external/psudb-common/cpp/include)
+
+
+    add_executable(vptree_tests ${CMAKE_CURRENT_SOURCE_DIR}/tests/vptree_tests.cpp)
+    target_link_libraries(vptree_tests PUBLIC gsl check subunit pthread atomic)
+    target_link_options(vptree_tests PUBLIC -mcx16)
+    target_include_directories(vptree_tests PRIVATE include external/vptree external/psudb-common/cpp/include)
+    
     add_executable(de_tier_tag ${CMAKE_CURRENT_SOURCE_DIR}/tests/de_tier_tag.cpp)
-    target_link_libraries(de_tier_tag PUBLIC gsl check subunit pthread)
-    target_include_directories(de_tier_tag PRIVATE include external/psudb-common/cpp/include)
+    target_link_libraries(de_tier_tag PUBLIC gsl check subunit pthread atomic)
+    target_link_options(de_tier_tag PUBLIC -mcx16)
+    target_include_directories(de_tier_tag PRIVATE include external/psudb-common/cpp/include external)
 
     add_executable(de_tier_tomb ${CMAKE_CURRENT_SOURCE_DIR}/tests/de_tier_tomb.cpp)
-    target_link_libraries(de_tier_tomb PUBLIC gsl check subunit pthread)
-    target_include_directories(de_tier_tomb PRIVATE include external/psudb-common/cpp/include)
+    target_link_libraries(de_tier_tomb PUBLIC gsl check subunit pthread atomic)
+    target_link_options(de_tier_tomb PUBLIC -mcx16)
+    target_include_directories(de_tier_tomb PRIVATE include external/PLEX/include external/psudb-common/cpp/include external)
 
     add_executable(de_level_tag ${CMAKE_CURRENT_SOURCE_DIR}/tests/de_level_tag.cpp)
-    target_link_libraries(de_level_tag PUBLIC gsl check subunit pthread)
-    target_include_directories(de_level_tag PRIVATE include external/psudb-common/cpp/include)
+    target_link_libraries(de_level_tag PUBLIC gsl check subunit pthread atomic)
+    target_link_options(de_level_tag PUBLIC -mcx16)
+    target_include_directories(de_level_tag PRIVATE include external/psudb-common/cpp/include external)
 
     add_executable(de_level_tomb ${CMAKE_CURRENT_SOURCE_DIR}/tests/de_level_tomb.cpp)
-    target_link_libraries(de_level_tomb PUBLIC gsl check subunit pthread)
-    target_include_directories(de_level_tomb PRIVATE include external/psudb-common/cpp/include)
+    target_link_libraries(de_level_tomb PUBLIC gsl check subunit pthread atomic)
+    target_link_options(de_level_tomb PUBLIC -mcx16)
+    target_include_directories(de_level_tomb PRIVATE include external/ctpl external/PLEX/include external/psudb-common/cpp/include external)
+
+    add_executable(de_level_concurrent ${CMAKE_CURRENT_SOURCE_DIR}/tests/de_level_concurrent.cpp)
+    target_link_libraries(de_level_concurrent PUBLIC gsl check subunit pthread atomic)
+    target_link_options(de_level_concurrent PUBLIC -mcx16)
+    target_include_directories(de_level_concurrent PRIVATE include external/ctpl external/PLEX/include external/psudb-common/cpp/include external)
+
+    add_executable(de_tier_concurrent ${CMAKE_CURRENT_SOURCE_DIR}/tests/de_tier_concurrent.cpp)
+    target_link_libraries(de_tier_concurrent PUBLIC gsl check subunit pthread atomic)
+    target_link_options(de_tier_concurrent PUBLIC -mcx16)
+    target_include_directories(de_tier_concurrent PRIVATE include external/ctpl external/PLEX/include external/psudb-common/cpp/include external)
     
     add_executable(memisam_tests ${CMAKE_CURRENT_SOURCE_DIR}/tests/memisam_tests.cpp)
-    target_link_libraries(memisam_tests PUBLIC gsl check subunit pthread)
+    target_link_libraries(memisam_tests PUBLIC gsl check subunit pthread atomic)
+    target_link_options(memisam_tests PUBLIC -mcx16)
     target_include_directories(memisam_tests PRIVATE include external/psudb-common/cpp/include)
 
-    add_executable(wss_tests ${CMAKE_CURRENT_SOURCE_DIR}/tests/wss_tests.cpp)
-    target_link_libraries(wss_tests PUBLIC gsl check subunit pthread)
-    target_include_directories(wss_tests PRIVATE include external/psudb-common/cpp/include)
-
     add_executable(triespline_tests ${CMAKE_CURRENT_SOURCE_DIR}/tests/triespline_tests.cpp)
-    target_link_libraries(triespline_tests PUBLIC gsl check subunit pthread)
-    target_include_directories(triespline_tests PRIVATE include external/PLEX/include external/psudb-common/cpp/include)
+    target_link_libraries(triespline_tests PUBLIC gsl check subunit pthread atomic)
+    target_link_options(triespline_tests PUBLIC -mcx16)
+    target_include_directories(triespline_tests PRIVATE include external/psudb-common/cpp/include external/PLEX/include)
+
+    add_executable(alias_tests ${CMAKE_CURRENT_SOURCE_DIR}/tests/alias_tests.cpp)
+    target_link_libraries(alias_tests PUBLIC gsl check subunit pthread atomic)
+    target_link_options(alias_tests PUBLIC -mcx16)
+    target_include_directories(alias_tests PRIVATE include external/psudb-common/cpp/include)
 
     add_executable(pgm_tests ${CMAKE_CURRENT_SOURCE_DIR}/tests/pgm_tests.cpp)
-    target_link_libraries(pgm_tests PUBLIC gsl check subunit pthread gomp)
+    target_link_libraries(pgm_tests PUBLIC gsl check subunit pthread gomp atomic)
     target_include_directories(pgm_tests PRIVATE include external/PGM-index/include external/psudb-common/cpp/include)
+    target_link_options(pgm_tests PUBLIC -mcx16)
     target_compile_options(pgm_tests PUBLIC -fopenmp)
 endif()
 
-# Benchmark build instructions
-if (bench)
+if (bench) 
     set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/bin/benchmarks")
 
+    add_executable(reconstruction_interference ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/reconstruction_interference.cpp)
+    target_link_libraries(reconstruction_interference PUBLIC gsl pthread gomp atomic)
+    target_link_options(reconstruction_interference PUBLIC -mcx16)
+    target_include_directories(reconstruction_interference PRIVATE include external external/m-tree/cpp external/PGM-index/include external/PLEX/include bench/include external/psudb-common/cpp/include)
+
+    add_executable(insertion_tput ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/insertion_tput.cpp)
+    target_link_libraries(insertion_tput PUBLIC gsl pthread gomp atomic)
+    target_include_directories(insertion_tput PRIVATE include external external/m-tree/cpp external/PGM-index/include external/PLEX/include bench/include external/psudb-common/cpp/include)
+    target_link_options(insertion_tput PUBLIC -mcx16)
+
+    add_executable(query_workload_bench ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/query_workload_bench.cpp)
+    target_link_libraries(query_workload_bench PUBLIC gsl pthread gomp atomic)
+    target_include_directories(query_workload_bench PRIVATE include external external/m-tree/cpp external/PGM-index/include external/PLEX/include bench/include external/psudb-common/cpp/include)
+    target_link_options(query_workload_bench PUBLIC -mcx16)
+
+    add_executable(insert_query_tput ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/insert_query_tput.cpp)
+    target_link_libraries(insert_query_tput PUBLIC gsl pthread gomp atomic)
+    target_include_directories(insert_query_tput PRIVATE include external external/m-tree/cpp external/PGM-index/include external/PLEX/include bench/include external/psudb-common/cpp/include)
+    target_link_options(insert_query_tput PUBLIC -mcx16)
+
+
+    add_executable(btree_insert_query_tput ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/btree_insert_query_tput.cpp)
+    target_link_libraries(btree_insert_query_tput PUBLIC gsl pthread gomp atomic)
+    target_include_directories(btree_insert_query_tput PRIVATE include external external/m-tree/cpp external/PGM-index/include external/PLEX/include bench/include external/psudb-common/cpp/include)
+    target_link_options(btree_insert_query_tput PUBLIC -mcx16)
+
+    add_executable(watermark_testing ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/watermark_testing.cpp)
+    target_link_libraries(watermark_testing PUBLIC gsl pthread gomp atomic)
+    target_include_directories(watermark_testing PRIVATE include external external/m-tree/cpp external/PGM-index/include external/PLEX/include bench/include external/psudb-common/cpp/include)
+    target_link_options(watermark_testing PUBLIC -mcx16)
+
+    add_executable(irs_bench ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/irs_bench.cpp)
+    target_link_libraries(irs_bench PUBLIC gsl pthread gomp atomic)
+    target_include_directories(irs_bench PRIVATE include external external/m-tree/cpp external/PGM-index/include external/PLEX/include bench/include external/psudb-common/cpp/include)
+    target_link_options(irs_bench PUBLIC -mcx16)
+
+    #add_executable(static_dynamic_comp ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/static_dynamic_comp.cpp)
+    #target_link_libraries(static_dynamic_comp PUBLIC gsl pthread gomp atomic)
+    #target_include_directories(static_dynamic_comp PRIVATE include external external/m-tree/cpp external/PGM-index/include external/PLEX/include bench/include external/psudb-common/cpp/include)
+    #target_link_options(static_dynamic_comp PUBLIC -mcx16)
+
+    add_executable(insert_tail_latency ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/insert_tail_latency.cpp)
+    target_link_libraries(insert_tail_latency PUBLIC gsl pthread gomp atomic)
+    target_include_directories(insert_tail_latency PRIVATE include external external/m-tree/cpp external/PGM-index/include external/PLEX/include bench/include external/psudb-common/cpp/include)
+    target_link_options(insert_tail_latency PUBLIC -mcx16)
+endif()
+
+if (old_bench)
     add_executable(alias_wss_bench ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/alias_wss_bench.cpp)
     target_link_libraries(alias_wss_bench PUBLIC gsl pthread gomp)
     target_include_directories(alias_wss_bench PRIVATE include external/m-tree/cpp external/PGM-index/include external/PLEX/include bench/include)