clean up thread_pool_3 thing

petiaccja · Feb 29, 2024 · 6f7d76b · 6f7d76b
1 parent 4dcf76b
commit 6f7d76b
Show file tree

Hide file tree

Showing 7 changed files with 169 additions and 354 deletions.
diff --git a/benchmark/benchmark_atomic.cpp b/benchmark/benchmark_atomic.cpp
@@ -1,3 +1,5 @@
+#include <asyncpp/threading/cache.hpp>
+
 #include <array>
 #include <atomic>
 #include <thread>
@@ -10,11 +12,14 @@
 // achievable and reasonable on the hardware.
 
 
+using namespace asyncpp;
+
+
 static constexpr size_t base_reps = 4'000'000;
 
 
 BASELINE(atomic_rmw, x1_thread, 30, 1) {
-    alignas(64) std::atomic_size_t counter = 0;
+    alignas(avoid_false_sharing) std::atomic_size_t counter = 0;
     static constexpr size_t reps = base_reps;
 
     static const auto func = [&counter] {
@@ -29,7 +34,7 @@ BASELINE(atomic_rmw, x1_thread, 30, 1) {
 
 
 BENCHMARK(atomic_rmw, x2_thread, 30, 1) {
-    alignas(64) std::atomic_size_t counter = 0;
+    alignas(avoid_false_sharing) std::atomic_size_t counter = 0;
     static constexpr size_t reps = base_reps / 2;
 
     static const auto func = [&counter] {
@@ -44,7 +49,7 @@ BENCHMARK(atomic_rmw, x2_thread, 30, 1) {
 
 
 BENCHMARK(atomic_rmw, x4_thread, 30, 1) {
-    alignas(64) std::atomic_size_t counter = 0;
+    alignas(avoid_false_sharing) std::atomic_size_t counter = 0;
     static constexpr size_t reps = base_reps / 4;
 
     static const auto func = [&counter] {
@@ -59,7 +64,7 @@ BENCHMARK(atomic_rmw, x4_thread, 30, 1) {
 
 
 BENCHMARK(atomic_rmw, x8_thread, 30, 1) {
-    alignas(64) std::atomic_size_t counter = 0;
+    alignas(avoid_false_sharing) std::atomic_size_t counter = 0;
     static constexpr size_t reps = base_reps / 8;
 
     static const auto func = [&counter] {
@@ -74,7 +79,7 @@ BENCHMARK(atomic_rmw, x8_thread, 30, 1) {
 
 
 BASELINE(atomic_read, x1_thread, 30, 1) {
-    alignas(64) std::atomic_size_t counter = 0;
+    alignas(avoid_false_sharing) std::atomic_size_t counter = 0;
     static constexpr size_t reps = base_reps;
 
     static const auto func = [&counter] {
@@ -89,7 +94,7 @@ BASELINE(atomic_read, x1_thread, 30, 1) {
 
 
 BENCHMARK(atomic_read, x2_thread, 30, 1) {
-    alignas(64) std::atomic_size_t counter = 0;
+    alignas(avoid_false_sharing) std::atomic_size_t counter = 0;
     static constexpr size_t reps = base_reps / 2;
 
     static const auto func = [&counter] {
@@ -104,7 +109,7 @@ BENCHMARK(atomic_read, x2_thread, 30, 1) {
 
 
 BENCHMARK(atomic_read, x4_thread, 30, 1) {
-    alignas(64) std::atomic_size_t counter = 0;
+    alignas(avoid_false_sharing) std::atomic_size_t counter = 0;
     static constexpr size_t reps = base_reps / 4;
 
     static const auto func = [&counter] {
@@ -119,7 +124,7 @@ BENCHMARK(atomic_read, x4_thread, 30, 1) {
 
 
 BENCHMARK(atomic_read, x8_thread, 30, 1) {
-    alignas(64) std::atomic_size_t counter = 0;
+    alignas(avoid_false_sharing) std::atomic_size_t counter = 0;
     static constexpr size_t reps = base_reps / 8;
 
     static const auto func = [&counter] {

diff --git a/benchmark/benchmark_task_spawn.cpp b/benchmark/benchmark_task_spawn.cpp
@@ -1,5 +1,6 @@
 #include <asyncpp/join.hpp>
 #include <asyncpp/task.hpp>
+#include <asyncpp/threading/cache.hpp>
 
 #include <array>
 #include <memory_resource>
@@ -56,7 +57,7 @@ struct FixtureStack : celero::TestFixture {
 private:
     static constexpr inline size_t size = 10485760;
     struct block {
-        alignas(64) std::byte content[64];
+        alignas(avoid_false_sharing) std::byte content[avoid_false_sharing];
     };
     std::unique_ptr<block[]> buffer = std::make_unique_for_overwrite<block[]>(size / sizeof(block));
     std::pmr::monotonic_buffer_resource resource;

diff --git a/benchmark/benchmark_thread_pool.cpp b/benchmark/benchmark_thread_pool.cpp
@@ -40,7 +40,7 @@ struct FixturePool : celero::TestFixture {
         sync();
     }
 
-    thread_pool_3 pool;
+    thread_pool pool;
     std::atomic_size_t num_running;
     std::vector<noop_promise> promises;
 };
@@ -68,7 +68,7 @@ BENCHMARK_F(tp_schedule_outside, x4_thread, FixturePool<4>, 30, 1) {
 
 
 BASELINE_F(tp_schedule_inside, x1_thread, FixturePool<1>, 30, 1) {
-    static constexpr auto coro = [](std::span<noop_promise> promises, thread_pool_3& pool) -> task<void> {
+    static constexpr auto coro = [](std::span<noop_promise> promises, thread_pool& pool) -> task<void> {
         for (auto& promise : promises) {
             pool.schedule(promise);
         }
@@ -80,7 +80,7 @@ BASELINE_F(tp_schedule_inside, x1_thread, FixturePool<1>, 30, 1) {
 
 
 BENCHMARK_F(tp_schedule_inside, x2_thread, FixturePool<2>, 30, 1) {
-    static constexpr auto coro = [](std::span<noop_promise> promises, thread_pool_3& pool) -> task<void> {
+    static constexpr auto coro = [](std::span<noop_promise> promises, thread_pool& pool) -> task<void> {
         for (auto& promise : promises) {
             pool.schedule(promise);
         }
@@ -95,7 +95,7 @@ BENCHMARK_F(tp_schedule_inside, x2_thread, FixturePool<2>, 30, 1) {
 
 
 BENCHMARK_F(tp_schedule_inside, x4_thread, FixturePool<4>, 30, 1) {
-    static constexpr auto coro = [](std::span<noop_promise> promises, thread_pool_3& pool) -> task<void> {
+    static constexpr auto coro = [](std::span<noop_promise> promises, thread_pool& pool) -> task<void> {
         for (auto& promise : promises) {
             pool.schedule(promise);
         }
@@ -114,7 +114,7 @@ BENCHMARK_F(tp_schedule_inside, x4_thread, FixturePool<4>, 30, 1) {
 
 
 BASELINE_F(tp_stealing, x1_thread, FixturePool<1 + 1>, 30, 1) {
-    static constexpr auto coro = [](std::span<noop_promise> promises, thread_pool_3& pool) -> task<void> {
+    static constexpr auto coro = [](std::span<noop_promise> promises, thread_pool& pool) -> task<void> {
         for (auto& promise : promises) {
             pool.schedule(promise);
         }
@@ -125,7 +125,7 @@ BASELINE_F(tp_stealing, x1_thread, FixturePool<1 + 1>, 30, 1) {
 
 
 BENCHMARK_F(tp_stealing, x2_thread, FixturePool<2 + 1>, 30, 1) {
-    static constexpr auto coro = [](std::span<noop_promise> promises, thread_pool_3& pool) -> task<void> {
+    static constexpr auto coro = [](std::span<noop_promise> promises, thread_pool& pool) -> task<void> {
         for (auto& promise : promises) {
             pool.schedule(promise);
         }
@@ -136,7 +136,7 @@ BENCHMARK_F(tp_stealing, x2_thread, FixturePool<2 + 1>, 30, 1) {
 
 
 BENCHMARK_F(tp_stealing, x4_thread, FixturePool<4 + 1>, 30, 1) {
-    static constexpr auto coro = [](std::span<noop_promise> promises, thread_pool_3& pool) -> task<void> {
+    static constexpr auto coro = [](std::span<noop_promise> promises, thread_pool& pool) -> task<void> {
         for (auto& promise : promises) {
             pool.schedule(promise);
         }