Implement review comments from the std::copy code review

Author: ldionne

libcxx/test/benchmarks/algorithms/modifying/fill.bench.cpp

@@ -20,64 +20,66 @@
 #include "../../GenerateInput.h"
 #include "test_macros.h"
 
-template <class Container, class Operation>
-void bm(std::string operation_name, Operation fill) {
-  auto bench = [fill](auto& st) {
-    std::size_t const size = st.range(0);
-    using ValueType        = typename Container::value_type;
-    ValueType x            = Generate<ValueType>::random();
-    ValueType y            = Generate<ValueType>::random();
-    Container c(size, y);
-
-    for ([[maybe_unused]] auto _ : st) {
-      fill(c.begin(), c.end(), x);
-      std::swap(x, y);
-      benchmark::DoNotOptimize(c);
-      benchmark::DoNotOptimize(x);
-      benchmark::DoNotOptimize(y);
-      benchmark::ClobberMemory();
-    }
-  };
-  benchmark::RegisterBenchmark(operation_name, bench)->Arg(32)->Arg(1024)->Arg(8192);
-}
-
-template <class Operation>
-void bm_vector_bool(std::string operation_name, Operation fill) {
-  auto bench = [fill](auto& st) {
-    std::size_t const size = st.range(0);
-    bool x                 = true;
-    bool y                 = false;
-    std::vector<bool> c(size, y);
+int main(int argc, char** argv) {
+  auto std_fill = [](auto first, auto last, auto const& value) { return std::fill(first, last, value); };
 
-    for ([[maybe_unused]] auto _ : st) {
-      fill(c.begin(), c.end(), x);
-      std::swap(x, y);
-      benchmark::DoNotOptimize(c);
-      benchmark::DoNotOptimize(x);
-      benchmark::DoNotOptimize(y);
-      benchmark::ClobberMemory();
-    }
-  };
-  benchmark::RegisterBenchmark(operation_name, bench)->Arg(32)->Arg(1024)->Arg(8192);
-}
+  // {std,ranges}::fill(normal container)
+  {
+    auto bm = []<class Container>(std::string name, auto fill) {
+      benchmark::RegisterBenchmark(
+          name,
+          [fill](auto& st) {
+            std::size_t const size = st.range(0);
+            using ValueType        = typename Container::value_type;
+            ValueType x            = Generate<ValueType>::random();
+            ValueType y            = Generate<ValueType>::random();
+            Container c(size, y);
 
-int main(int argc, char** argv) {
-  auto std_fill    = [](auto first, auto last, auto const& value) { return std::fill(first, last, value); };
-  auto ranges_fill = [](auto first, auto last, auto const& value) { return std::ranges::fill(first, last, value); };
+            for ([[maybe_unused]] auto _ : st) {
+              fill(c.begin(), c.end(), x);
+              std::swap(x, y);
+              benchmark::DoNotOptimize(c);
+              benchmark::DoNotOptimize(x);
+              benchmark::DoNotOptimize(y);
+              benchmark::ClobberMemory();
+            }
+          })
+          ->Arg(32)
+          ->Arg(1024)
+          ->Arg(8192);
+    };
+    bm.operator()<std::vector<int>>("std::fill(vector<int>)", std_fill);
+    bm.operator()<std::deque<int>>("std::fill(deque<int>)", std_fill);
+    bm.operator()<std::list<int>>("std::fill(list<int>)", std_fill);
+    bm.operator()<std::vector<int>>("rng::fill(vector<int>)", std::ranges::fill);
+    bm.operator()<std::deque<int>>("rng::fill(deque<int>)", std::ranges::fill);
+    bm.operator()<std::list<int>>("rng::fill(list<int>)", std::ranges::fill);
+  }
 
-  // std::fill
-  bm<std::vector<int>>("std::fill(vector<int>)", std_fill);
-  bm<std::deque<int>>("std::fill(deque<int>)", std_fill);
-  bm<std::list<int>>("std::fill(list<int>)", std_fill);
-  bm_vector_bool("std::fill(vector<bool>)", std_fill);
+  // {std,ranges}::fill(vector<bool>)
+  {
+    auto bm = [](std::string name, auto fill) {
+      benchmark::RegisterBenchmark(name, [fill](auto& st) {
+        std::size_t const size = st.range(0);
+        bool x                 = true;
+        bool y                 = false;
+        std::vector<bool> c(size, y);
 
-  // ranges::fill
-  bm<std::vector<int>>("ranges::fill(vector<int>)", ranges_fill);
-  bm<std::deque<int>>("ranges::fill(deque<int>)", ranges_fill);
-  bm<std::list<int>>("ranges::fill(list<int>)", ranges_fill);
+        for ([[maybe_unused]] auto _ : st) {
+          fill(c.begin(), c.end(), x);
+          std::swap(x, y);
+          benchmark::DoNotOptimize(c);
+          benchmark::DoNotOptimize(x);
+          benchmark::DoNotOptimize(y);
+          benchmark::ClobberMemory();
+        }
+      })->Range(64, 1 << 20);
+    };
+    bm("std::fill(vector<bool>)", std_fill);
 #if TEST_STD_VER >= 23 // vector<bool>::iterator is not an output_iterator before C++23
-  bm_vector_bool("ranges::fill(vector<bool>)", ranges_fill);
+    bm("rng::fill(vector<bool>)", std::ranges::fill);
 #endif
+  }
 
   benchmark::Initialize(&argc, argv);
   benchmark::RunSpecifiedBenchmarks();

libcxx/test/benchmarks/algorithms/modifying/fill_n.bench.cpp

@@ -20,64 +20,66 @@
 #include "../../GenerateInput.h"
 #include "test_macros.h"
 
-template <class Container, class Operation>
-void bm(std::string operation_name, Operation fill_n) {
-  auto bench = [fill_n](auto& st) {
-    std::size_t const size = st.range(0);
-    using ValueType        = typename Container::value_type;
-    ValueType x            = Generate<ValueType>::random();
-    ValueType y            = Generate<ValueType>::random();
-    Container c(size, y);
-
-    for ([[maybe_unused]] auto _ : st) {
-      fill_n(c.begin(), size, x);
-      std::swap(x, y);
-      benchmark::DoNotOptimize(c);
-      benchmark::DoNotOptimize(x);
-      benchmark::DoNotOptimize(y);
-      benchmark::ClobberMemory();
-    }
-  };
-  benchmark::RegisterBenchmark(operation_name, bench)->Arg(32)->Arg(1024)->Arg(8192);
-}
-
-template <class Operation>
-void bm_vector_bool(std::string operation_name, Operation fill_n) {
-  auto bench = [fill_n](auto& st) {
-    std::size_t const size = st.range(0);
-    bool x                 = true;
-    bool y                 = false;
-    std::vector<bool> c(size, y);
+int main(int argc, char** argv) {
+  auto std_fill_n = [](auto out, auto n, auto const& value) { return std::fill_n(out, n, value); };
 
-    for ([[maybe_unused]] auto _ : st) {
-      fill_n(c.begin(), size, x);
-      std::swap(x, y);
-      benchmark::DoNotOptimize(c);
-      benchmark::DoNotOptimize(x);
-      benchmark::DoNotOptimize(y);
-      benchmark::ClobberMemory();
-    }
-  };
-  benchmark::RegisterBenchmark(operation_name, bench)->Arg(32)->Arg(1024)->Arg(8192);
-}
+  // {std,ranges}::fill_n(normal container)
+  {
+    auto bm = []<class Container>(std::string name, auto fill_n) {
+      benchmark::RegisterBenchmark(
+          name,
+          [fill_n](auto& st) {
+            std::size_t const size = st.range(0);
+            using ValueType        = typename Container::value_type;
+            ValueType x            = Generate<ValueType>::random();
+            ValueType y            = Generate<ValueType>::random();
+            Container c(size, y);
 
-int main(int argc, char** argv) {
-  auto std_fill_n    = [](auto out, auto n, auto const& value) { return std::fill_n(out, n, value); };
-  auto ranges_fill_n = [](auto out, auto n, auto const& value) { return std::ranges::fill_n(out, n, value); };
+            for ([[maybe_unused]] auto _ : st) {
+              fill_n(c.begin(), size, x);
+              std::swap(x, y);
+              benchmark::DoNotOptimize(c);
+              benchmark::DoNotOptimize(x);
+              benchmark::DoNotOptimize(y);
+              benchmark::ClobberMemory();
+            }
+          })
+          ->Arg(32)
+          ->Arg(1024)
+          ->Arg(8192);
+    };
+    bm.operator()<std::vector<int>>("std::fill_n(vector<int>)", std_fill_n);
+    bm.operator()<std::deque<int>>("std::fill_n(deque<int>)", std_fill_n);
+    bm.operator()<std::list<int>>("std::fill_n(list<int>)", std_fill_n);
+    bm.operator()<std::vector<int>>("rng::fill_n(vector<int>)", std::ranges::fill_n);
+    bm.operator()<std::deque<int>>("rng::fill_n(deque<int>)", std::ranges::fill_n);
+    bm.operator()<std::list<int>>("rng::fill_n(list<int>)", std::ranges::fill_n);
+  }
 
-  // std::fill_n
-  bm<std::vector<int>>("std::fill_n(vector<int>)", std_fill_n);
-  bm<std::deque<int>>("std::fill_n(deque<int>)", std_fill_n);
-  bm<std::list<int>>("std::fill_n(list<int>)", std_fill_n);
-  bm_vector_bool("std::fill_n(vector<bool>)", std_fill_n);
+  // {std,ranges}::fill_n(vector<bool>)
+  {
+    auto bm = [](std::string name, auto fill_n) {
+      benchmark::RegisterBenchmark(name, [fill_n](auto& st) {
+        std::size_t const size = st.range(0);
+        bool x                 = true;
+        bool y                 = false;
+        std::vector<bool> c(size, y);
 
-  // ranges::fill_n
-  bm<std::vector<int>>("ranges::fill_n(vector<int>)", ranges_fill_n);
-  bm<std::deque<int>>("ranges::fill_n(deque<int>)", ranges_fill_n);
-  bm<std::list<int>>("ranges::fill_n(list<int>)", ranges_fill_n);
+        for ([[maybe_unused]] auto _ : st) {
+          fill_n(c.begin(), size, x);
+          std::swap(x, y);
+          benchmark::DoNotOptimize(c);
+          benchmark::DoNotOptimize(x);
+          benchmark::DoNotOptimize(y);
+          benchmark::ClobberMemory();
+        }
+      })->Range(64, 1 << 20);
+    };
+    bm("std::fill_n(vector<bool>)", std_fill_n);
 #if TEST_STD_VER >= 23 // vector<bool>::iterator is not an output_iterator before C++23
-  bm_vector_bool("ranges::fill_n(vector<bool>)", ranges_fill_n);
+    bm("rng::fill_n(vector<bool>)", std::ranges::fill_n);
 #endif
+  }
 
   benchmark::Initialize(&argc, argv);
   benchmark::RunSpecifiedBenchmarks();

libcxx/test/benchmarks/algorithms/modifying/generate.bench.cpp

@@ -19,38 +19,39 @@
 #include "benchmark/benchmark.h"
 #include "../../GenerateInput.h"
 
-template <class Container, class Operation>
-void bm(std::string operation_name, Operation generate) {
-  auto bench = [generate](auto& st) {
-    std::size_t const size = st.range(0);
-    Container c(size);
-    using ValueType = typename Container::value_type;
-    ValueType x     = Generate<ValueType>::random();
-
-    for ([[maybe_unused]] auto _ : st) {
-      auto f = [&x] { return x; };
-      generate(c.begin(), c.end(), f);
-      benchmark::DoNotOptimize(c);
-      benchmark::DoNotOptimize(x);
-      benchmark::ClobberMemory();
-    }
-  };
-  benchmark::RegisterBenchmark(operation_name, bench)->Arg(32)->Arg(1024)->Arg(8192);
-}
-
 int main(int argc, char** argv) {
-  auto std_generate    = [](auto first, auto last, auto f) { return std::generate(first, last, f); };
-  auto ranges_generate = [](auto first, auto last, auto f) { return std::ranges::generate(first, last, f); };
-
-  // std::generate
-  bm<std::vector<int>>("std::generate(vector<int>)", std_generate);
-  bm<std::deque<int>>("std::generate(deque<int>)", std_generate);
-  bm<std::list<int>>("std::generate(list<int>)", std_generate);
-
-  // ranges::generate
-  bm<std::vector<int>>("ranges::generate(vector<int>)", ranges_generate);
-  bm<std::deque<int>>("ranges::generate(deque<int>)", ranges_generate);
-  bm<std::list<int>>("ranges::generate(list<int>)", ranges_generate);
+  auto std_generate = [](auto first, auto last, auto f) { return std::generate(first, last, f); };
+
+  // {std,ranges}::generate
+  {
+    auto bm = []<class Container>(std::string name, auto generate) {
+      benchmark::RegisterBenchmark(
+          name,
+          [generate](auto& st) {
+            std::size_t const size = st.range(0);
+            Container c(size);
+            using ValueType = typename Container::value_type;
+            ValueType x     = Generate<ValueType>::random();
+
+            for ([[maybe_unused]] auto _ : st) {
+              auto f = [&x] { return x; };
+              generate(c.begin(), c.end(), f);
+              benchmark::DoNotOptimize(c);
+              benchmark::DoNotOptimize(x);
+              benchmark::ClobberMemory();
+            }
+          })
+          ->Arg(32)
+          ->Arg(1024)
+          ->Arg(8192);
+    };
+    bm.operator()<std::vector<int>>("std::generate(vector<int>)", std_generate);
+    bm.operator()<std::deque<int>>("std::generate(deque<int>)", std_generate);
+    bm.operator()<std::list<int>>("std::generate(list<int>)", std_generate);
+    bm.operator()<std::vector<int>>("rng::generate(vector<int>)", std::ranges::generate);
+    bm.operator()<std::deque<int>>("rng::generate(deque<int>)", std::ranges::generate);
+    bm.operator()<std::list<int>>("rng::generate(list<int>)", std::ranges::generate);
+  }
 
   benchmark::Initialize(&argc, argv);
   benchmark::RunSpecifiedBenchmarks();

libcxx/test/benchmarks/algorithms/modifying/generate_n.bench.cpp

@@ -19,38 +19,39 @@
 #include "benchmark/benchmark.h"
 #include "../../GenerateInput.h"
 
-template <class Container, class Operation>
-void bm(std::string operation_name, Operation generate_n) {
-  auto bench = [generate_n](auto& st) {
-    std::size_t const size = st.range(0);
-    Container c(size);
-    using ValueType = typename Container::value_type;
-    ValueType x     = Generate<ValueType>::random();
-
-    for ([[maybe_unused]] auto _ : st) {
-      auto f = [&x] { return x; };
-      generate_n(c.begin(), size, f);
-      benchmark::DoNotOptimize(c);
-      benchmark::DoNotOptimize(x);
-      benchmark::ClobberMemory();
-    }
-  };
-  benchmark::RegisterBenchmark(operation_name, bench)->Arg(32)->Arg(1024)->Arg(8192);
-}
-
 int main(int argc, char** argv) {
-  auto std_generate_n    = [](auto out, auto n, auto f) { return std::generate_n(out, n, f); };
-  auto ranges_generate_n = [](auto out, auto n, auto f) { return std::ranges::generate_n(out, n, f); };
-
-  // std::generate_n
-  bm<std::vector<int>>("std::generate_n(vector<int>)", std_generate_n);
-  bm<std::deque<int>>("std::generate_n(deque<int>)", std_generate_n);
-  bm<std::list<int>>("std::generate_n(list<int>)", std_generate_n);
-
-  // ranges::generate_n
-  bm<std::vector<int>>("ranges::generate_n(vector<int>)", ranges_generate_n);
-  bm<std::deque<int>>("ranges::generate_n(deque<int>)", ranges_generate_n);
-  bm<std::list<int>>("ranges::generate_n(list<int>)", ranges_generate_n);
+  auto std_generate_n = [](auto out, auto n, auto f) { return std::generate_n(out, n, f); };
+
+  // {std,ranges}::generate_n
+  {
+    auto bm = []<class Container>(std::string name, auto generate_n) {
+      benchmark::RegisterBenchmark(
+          name,
+          [generate_n](auto& st) {
+            std::size_t const size = st.range(0);
+            Container c(size);
+            using ValueType = typename Container::value_type;
+            ValueType x     = Generate<ValueType>::random();
+
+            for ([[maybe_unused]] auto _ : st) {
+              auto f = [&x] { return x; };
+              generate_n(c.begin(), size, f);
+              benchmark::DoNotOptimize(c);
+              benchmark::DoNotOptimize(x);
+              benchmark::ClobberMemory();
+            }
+          })
+          ->Arg(32)
+          ->Arg(1024)
+          ->Arg(8192);
+    };
+    bm.operator()<std::vector<int>>("std::generate_n(vector<int>)", std_generate_n);
+    bm.operator()<std::deque<int>>("std::generate_n(deque<int>)", std_generate_n);
+    bm.operator()<std::list<int>>("std::generate_n(list<int>)", std_generate_n);
+    bm.operator()<std::vector<int>>("rng::generate_n(vector<int>)", std::ranges::generate_n);
+    bm.operator()<std::deque<int>>("rng::generate_n(deque<int>)", std::ranges::generate_n);
+    bm.operator()<std::list<int>>("rng::generate_n(list<int>)", std::ranges::generate_n);
+  }
 
   benchmark::Initialize(&argc, argv);
   benchmark::RunSpecifiedBenchmarks();