Move channels to new synchronization module

STEllAR-GROUP · Nov 29, 2019 · d91737d · d91737d
1 parent d56f59b
commit d91737d
Show file tree

Hide file tree

Showing 17 changed files with 66 additions and 39 deletions.
diff --git a/libs/synchronization/CMakeLists.txt b/libs/synchronization/CMakeLists.txt
@@ -17,6 +17,9 @@ set(synchronization_headers
   hpx/synchronization/detail/counting_semaphore.hpp
   hpx/synchronization/detail/sliding_semaphore.hpp
   hpx/synchronization/event.hpp
+  hpx/synchronization/channel_mpmc.hpp
+  hpx/synchronization/channel_mpsc.hpp
+  hpx/synchronization/channel_spsc.hpp
   hpx/synchronization/latch.hpp
   hpx/synchronization/mutex.hpp
   hpx/synchronization/no_mutex.hpp

diff --git a/hpx/lcos/local/channel_mpmc.hpp → ...lude/hpx/synchronization/channel_mpmc.hpp b/hpx/lcos/local/channel_mpmc.hpp → ...lude/hpx/synchronization/channel_mpmc.hpp
@@ -13,7 +13,7 @@
 #include <hpx/assertion.hpp>
 #include <hpx/concurrency.hpp>
 #include <hpx/errors.hpp>
-#include <hpx/lcos/local/spinlock.hpp>
+#include <hpx/synchronization/spinlock.hpp>
 #include <hpx/thread_support.hpp>
 
 #include <cstddef>

diff --git a/hpx/lcos/local/channel_mpsc.hpp → ...lude/hpx/synchronization/channel_mpsc.hpp b/hpx/lcos/local/channel_mpsc.hpp → ...lude/hpx/synchronization/channel_mpsc.hpp
@@ -13,7 +13,7 @@
 #include <hpx/assertion.hpp>
 #include <hpx/concurrency.hpp>
 #include <hpx/errors.hpp>
-#include <hpx/lcos/local/spinlock.hpp>
+#include <hpx/synchronization/spinlock.hpp>
 #include <hpx/thread_support.hpp>
 
 #include <atomic>

diff --git a/hpx/lcos/local/channel_spsc.hpp → ...lude/hpx/synchronization/channel_spsc.hpp b/hpx/lcos/local/channel_spsc.hpp → ...lude/hpx/synchronization/channel_spsc.hpp
diff --git a/libs/synchronization/tests/performance/CMakeLists.txt b/libs/synchronization/tests/performance/CMakeLists.txt
@@ -1,5 +1,42 @@
-# Copyright (c) 2019 The STE||AR-Group
+# Copyright (c) 2019 Hartmut Kaiser
 #
 # SPDX-License-Identifier: BSL-1.0
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+set(benchmarks
+  channel_mpmc_throughput
+  channel_mpsc_throughput
+  channel_spsc_throughput
+)
+
+set(channel_mpmc_throughput_FLAGS DEPENDENCIES
+    hpx_assertion hpx_concurrency hpx_errors hpx_synchronization hpx_timing hpx_thread_support)
+set(channel_mpmc_throughput_PARAMETERS THREADS_PER_LOCALITY 2)
+set(channel_mpsc_throughput_FLAGS DEPENDENCIES
+    hpx_assertion hpx_concurrency hpx_errors hpx_synchronization hpx_timing hpx_thread_support)
+set(channel_mpsc_throughput_PARAMETERS THREADS_PER_LOCALITY 2)
+set(channel_spsc_throughput_FLAGS DEPENDENCIES
+    hpx_assertion hpx_concurrency hpx_errors hpx_synchronization hpx_timing hpx_thread_support)
+set(channel_spsc_throughputs_PARAMETERS THREADS_PER_LOCALITY 2)
+
+foreach(benchmark ${benchmarks})
+
+  set(sources ${benchmark}.cpp)
+
+  source_group("Source Files" FILES ${sources})
+
+  # add benchmark executable
+  add_hpx_executable(${benchmark}_test
+    INTERNAL_FLAGS
+    SOURCES ${sources}
+    EXCLUDE_FROM_ALL
+    ${${benchmark}_FLAGS}
+    FOLDER "Benchmarks/Modules/Synchronization"
+  )
+
+  # add a custom target for this benchmark
+  add_hpx_performance_test("modules.synchronization"
+    ${benchmark} ${${benchmark}_PARAMETERS})
+
+endforeach()
diff --git a/...ormance/local/channel_mpmc_throughput.cpp → ...s/performance/channel_mpmc_throughput.cpp b/...ormance/local/channel_mpmc_throughput.cpp → ...s/performance/channel_mpmc_throughput.cpp
@@ -9,7 +9,7 @@
 #include <hpx/hpx.hpp>
 #include <hpx/hpx_main.hpp>
 
-#include <hpx/lcos/local/channel_mpmc.hpp>
+#include <hpx/synchronization/channel_mpmc.hpp>
 #include <hpx/timing.hpp>
 
 #include <cstddef>

diff --git a/...ormance/local/channel_mpsc_throughput.cpp → ...s/performance/channel_mpsc_throughput.cpp b/...ormance/local/channel_mpsc_throughput.cpp → ...s/performance/channel_mpsc_throughput.cpp
@@ -9,7 +9,7 @@
 #include <hpx/hpx.hpp>
 #include <hpx/hpx_main.hpp>
 
-#include <hpx/lcos/local/channel_mpsc.hpp>
+#include <hpx/synchronization/channel_mpsc.hpp>
 #include <hpx/timing.hpp>
 
 #include <cstddef>

diff --git a/...ormance/local/channel_spsc_throughput.cpp → ...s/performance/channel_spsc_throughput.cpp b/...ormance/local/channel_spsc_throughput.cpp → ...s/performance/channel_spsc_throughput.cpp
@@ -9,7 +9,7 @@
 #include <hpx/hpx.hpp>
 #include <hpx/hpx_main.hpp>
 
-#include <hpx/lcos/local/channel_spsc.hpp>
+#include <hpx/synchronization/channel_spsc.hpp>
 #include <hpx/timing.hpp>
 
 #include <cstddef>

diff --git a/libs/synchronization/tests/unit/CMakeLists.txt b/libs/synchronization/tests/unit/CMakeLists.txt
@@ -5,6 +5,12 @@
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 set(tests
+  channel_mpmc_fib
+  channel_mpmc_shift
+  channel_mpsc_fib
+  channel_mpsc_shift
+  channel_spsc_fib
+  channel_spsc_shift
   condition_variable
   counting_semaphore
   local_latch
@@ -16,6 +22,13 @@ set(tests
   sliding_semaphore
   )
 
+set(channel_mpmc_fib_PARAMETERS THREADS_PER_LOCALITY 4)
+set(channel_mpmc_shift_PARAMETERS THREADS_PER_LOCALITY 4)
+set(channel_mpsc_fib_PARAMETERS THREADS_PER_LOCALITY 4)
+set(channel_mpsc_shift_PARAMETERS THREADS_PER_LOCALITY 4)
+set(channel_spsc_fib_PARAMETERS THREADS_PER_LOCALITY 4)
+set(channel_spsc_shift_PARAMETERS THREADS_PER_LOCALITY 4)
+
 set(counting_semaphore_PARAMETERS THREADS_PER_LOCALITY 4)
 
 set(local_barrier_PARAMETERS THREADS_PER_LOCALITY 4)
@@ -78,7 +91,7 @@ if(HPX_WITH_COMPILE_ONLY_TESTS)
 
 endif()
 
-#########################################################################################
+################################################################################
 set(subdirs
     shared_mutex
    )

diff --git a/tests/unit/lcos/channel_mpmc_fib.cpp → ...onization/tests/unit/channel_mpmc_fib.cpp b/tests/unit/lcos/channel_mpmc_fib.cpp → ...onization/tests/unit/channel_mpmc_fib.cpp
@@ -8,7 +8,7 @@
 
 #include <hpx/hpx.hpp>
 #include <hpx/hpx_main.hpp>
-#include <hpx/lcos/local/channel_mpmc.hpp>
+#include <hpx/synchronization/channel_mpmc.hpp>
 
 #include <hpx/testing.hpp>
 

diff --git a/tests/unit/lcos/channel_mpmc_shift.cpp → ...ization/tests/unit/channel_mpmc_shift.cpp b/tests/unit/lcos/channel_mpmc_shift.cpp → ...ization/tests/unit/channel_mpmc_shift.cpp
@@ -8,7 +8,7 @@
 
 #include <hpx/hpx.hpp>
 #include <hpx/hpx_main.hpp>
-#include <hpx/lcos/local/channel_mpmc.hpp>
+#include <hpx/synchronization/channel_mpmc.hpp>
 
 #include <hpx/testing.hpp>
 

diff --git a/tests/unit/lcos/channel_mpsc_fib.cpp → ...onization/tests/unit/channel_mpsc_fib.cpp b/tests/unit/lcos/channel_mpsc_fib.cpp → ...onization/tests/unit/channel_mpsc_fib.cpp
@@ -8,7 +8,7 @@
 
 #include <hpx/hpx.hpp>
 #include <hpx/hpx_main.hpp>
-#include <hpx/lcos/local/channel_mpsc.hpp>
+#include <hpx/synchronization/channel_mpsc.hpp>
 
 #include <hpx/testing.hpp>
 

diff --git a/tests/unit/lcos/channel_mpsc_shift.cpp → ...ization/tests/unit/channel_mpsc_shift.cpp b/tests/unit/lcos/channel_mpsc_shift.cpp → ...ization/tests/unit/channel_mpsc_shift.cpp
@@ -8,7 +8,7 @@
 
 #include <hpx/hpx.hpp>
 #include <hpx/hpx_main.hpp>
-#include <hpx/lcos/local/channel_mpsc.hpp>
+#include <hpx/synchronization/channel_mpsc.hpp>
 
 #include <hpx/testing.hpp>
 

diff --git a/tests/unit/lcos/channel_spsc_fib.cpp → ...onization/tests/unit/channel_spsc_fib.cpp b/tests/unit/lcos/channel_spsc_fib.cpp → ...onization/tests/unit/channel_spsc_fib.cpp
@@ -8,7 +8,7 @@
 
 #include <hpx/hpx.hpp>
 #include <hpx/hpx_main.hpp>
-#include <hpx/lcos/local/channel_spsc.hpp>
+#include <hpx/synchronization/channel_spsc.hpp>
 
 #include <hpx/testing.hpp>
 

diff --git a/tests/unit/lcos/channel_spsc_shift.cpp → ...ization/tests/unit/channel_spsc_shift.cpp b/tests/unit/lcos/channel_spsc_shift.cpp → ...ization/tests/unit/channel_spsc_shift.cpp
@@ -8,7 +8,7 @@
 
 #include <hpx/hpx.hpp>
 #include <hpx/hpx_main.hpp>
-#include <hpx/lcos/local/channel_spsc.hpp>
+#include <hpx/synchronization/channel_spsc.hpp>
 
 #include <hpx/testing.hpp>
 

diff --git a/tests/performance/local/CMakeLists.txt b/tests/performance/local/CMakeLists.txt
@@ -10,9 +10,6 @@ set(boost_library_dependencies ${Boost_LIBRARIES})
 set(benchmarks
     agas_cache_timings
     async_overheads
-    channel_mpmc_throughput
-    channel_mpsc_throughput
-    channel_spsc_throughput
     delay_baseline
     delay_baseline_threaded
     hpx_homogeneous_timed_task_spawn_executors
@@ -147,16 +144,6 @@ set(benchmarks ${benchmarks}
     partitioned_vector_foreach
    )
 
-set(channel_mpmc_throughput_FLAGS DEPENDENCIES
-    hpx_assertion hpx_concurrency hpx_errors hpx_timing hpx_thread_support)
-set(channel_mpmc_throughput_PARAMETERS THREADS_PER_LOCALITY 2)
-set(channel_mpsc_throughput_FLAGS DEPENDENCIES
-    hpx_assertion hpx_concurrency hpx_errors hpx_timing hpx_thread_support)
-set(channel_mpsc_throughput_PARAMETERS THREADS_PER_LOCALITY 2)
-set(channel_spsc_throughput_FLAGS DEPENDENCIES
-    hpx_assertion hpx_concurrency hpx_errors hpx_timing hpx_thread_support)
-set(channel_spsc_throughputs_PARAMETERS THREADS_PER_LOCALITY 2)
-
 set(foreach_scaling_FLAGS DEPENDENCIES iostreams_component hpx_timing)
 set(function_object_wrapper_overhead_FLAGS DEPENDENCIES hpx_timing)
 set(hpx_tls_overhead_FLAGS DEPENDENCIES hpx_timing)

diff --git a/tests/unit/lcos/CMakeLists.txt b/tests/unit/lcos/CMakeLists.txt
@@ -23,12 +23,6 @@ set(tests
     async_remote_client
     async_unwrap_result
     channel
-    channel_mpmc_fib
-    channel_mpmc_shift
-    channel_mpsc_fib
-    channel_mpsc_shift
-    channel_spsc_fib
-    channel_spsc_shift
     client_then
     future
     future_ref
@@ -80,13 +74,6 @@ set(async_remote_client_PARAMETERS LOCALITIES 2)
 set(async_cb_remote_PARAMETERS LOCALITIES 2)
 set(async_cb_remote_client_PARAMETERS LOCALITIES 2)
 
-set(channel_mpmc_fib_PARAMETERS THREADS_PER_LOCALITY 4)
-set(channel_mpmc_shift_PARAMETERS THREADS_PER_LOCALITY 4)
-set(channel_mpsc_fib_PARAMETERS THREADS_PER_LOCALITY 4)
-set(channel_mpsc_shift_PARAMETERS THREADS_PER_LOCALITY 4)
-set(channel_spsc_fib_PARAMETERS THREADS_PER_LOCALITY 4)
-set(channel_spsc_shift_PARAMETERS THREADS_PER_LOCALITY 4)
-
 set(future_PARAMETERS THREADS_PER_LOCALITY 4)
 set(future_then_PARAMETERS THREADS_PER_LOCALITY 4)
 set(future_then_executor_PARAMETERS THREADS_PER_LOCALITY 4)