Merge predicated version of the algorithms

Author: ldionne

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

@@ -20,9 +20,21 @@
 #include "../../GenerateInput.h"
 
 int main(int argc, char** argv) {
-  auto std_remove = [](auto first, auto last, auto const& value) { return std::remove(first, last, value); };
+  auto std_remove    = [](auto first, auto last, auto const& value) { return std::remove(first, last, value); };
+  auto std_remove_if = [](auto first, auto last, auto const& value) {
+    return std::remove_if(first, last, [&](auto element) {
+      benchmark::DoNotOptimize(element);
+      return element == value;
+    });
+  };
+  auto ranges_remove_if = [](auto first, auto last, auto const& value) {
+    return std::ranges::remove_if(first, last, [&](auto element) {
+      benchmark::DoNotOptimize(element);
+      return element == value;
+    });
+  };
 
-  // Benchmark {std,ranges}::remove on a sequence of the form xxxxxxxxxxyyyyyyyyyy
+  // Benchmark {std,ranges}::{remove,remove_if} on a sequence of the form xxxxxxxxxxyyyyyyyyyy
   // where we remove the prefix of x's from the sequence.
   //
   // We perform this benchmark in a batch because we need to restore the
@@ -64,12 +76,21 @@ int main(int argc, char** argv) {
           ->Arg(1024)
           ->Arg(8192);
     };
+    // {std,ranges}::remove
     bm.operator()<std::vector<int>>("std::remove(vector<int>) (prefix)", std_remove);
     bm.operator()<std::deque<int>>("std::remove(deque<int>) (prefix)", std_remove);
     bm.operator()<std::list<int>>("std::remove(list<int>) (prefix)", std_remove);
     bm.operator()<std::vector<int>>("rng::remove(vector<int>) (prefix)", std::ranges::remove);
     bm.operator()<std::deque<int>>("rng::remove(deque<int>) (prefix)", std::ranges::remove);
     bm.operator()<std::list<int>>("rng::remove(list<int>) (prefix)", std::ranges::remove);
+
+    // {std,ranges}::remove_if
+    bm.operator()<std::vector<int>>("std::remove_if(vector<int>) (prefix)", std_remove_if);
+    bm.operator()<std::deque<int>>("std::remove_if(deque<int>) (prefix)", std_remove_if);
+    bm.operator()<std::list<int>>("std::remove_if(list<int>) (prefix)", std_remove_if);
+    bm.operator()<std::vector<int>>("rng::remove_if(vector<int>) (prefix)", ranges_remove_if);
+    bm.operator()<std::deque<int>>("rng::remove_if(deque<int>) (prefix)", ranges_remove_if);
+    bm.operator()<std::list<int>>("rng::remove_if(list<int>) (prefix)", ranges_remove_if);
   }
 
   // Benchmark {std,ranges}::remove on a sequence of the form xyxyxyxyxyxyxyxyxyxy
@@ -117,12 +138,21 @@ int main(int argc, char** argv) {
           ->Arg(1024)
           ->Arg(8192);
     };
+    // {std,ranges}::remove
     bm.operator()<std::vector<int>>("std::remove(vector<int>) (sprinkled)", std_remove);
     bm.operator()<std::deque<int>>("std::remove(deque<int>) (sprinkled)", std_remove);
     bm.operator()<std::list<int>>("std::remove(list<int>) (sprinkled)", std_remove);
     bm.operator()<std::vector<int>>("rng::remove(vector<int>) (sprinkled)", std::ranges::remove);
     bm.operator()<std::deque<int>>("rng::remove(deque<int>) (sprinkled)", std::ranges::remove);
     bm.operator()<std::list<int>>("rng::remove(list<int>) (sprinkled)", std::ranges::remove);
+
+    // {std,ranges}::remove_if
+    bm.operator()<std::vector<int>>("std::remove_if(vector<int>) (sprinkled)", std_remove_if);
+    bm.operator()<std::deque<int>>("std::remove_if(deque<int>) (sprinkled)", std_remove_if);
+    bm.operator()<std::list<int>>("std::remove_if(list<int>) (sprinkled)", std_remove_if);
+    bm.operator()<std::vector<int>>("rng::remove_if(vector<int>) (sprinkled)", ranges_remove_if);
+    bm.operator()<std::deque<int>>("rng::remove_if(deque<int>) (sprinkled)", ranges_remove_if);
+    bm.operator()<std::list<int>>("rng::remove_if(list<int>) (sprinkled)", ranges_remove_if);
   }
 
   benchmark::Initialize(&argc, argv);

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

@@ -23,8 +23,20 @@ int main(int argc, char** argv) {
   auto std_remove_copy = [](auto first, auto last, auto out, auto const& value) {
     return std::remove_copy(first, last, out, value);
   };
+  auto std_remove_copy_if = [](auto first, auto last, auto out, auto const& value) {
+    return std::remove_copy_if(first, last, out, [&](auto element) {
+      benchmark::DoNotOptimize(element);
+      return element == value;
+    });
+  };
+  auto ranges_remove_copy_if = [](auto first, auto last, auto out, auto const& value) {
+    return std::ranges::remove_copy_if(first, last, out, [&](auto element) {
+      benchmark::DoNotOptimize(element);
+      return element == value;
+    });
+  };
 
-  // Benchmark {std,ranges}::remove_copy on a sequence of the form xxxxxxxxxxyyyyyyyyyy
+  // Benchmark {std,ranges}::{remove_copy,remove_copy_if} on a sequence of the form xxxxxxxxxxyyyyyyyyyy
   // where we remove the prefix of x's from the sequence.
   {
     auto bm = []<class Container>(std::string name, auto remove_copy) {
@@ -53,15 +65,24 @@ int main(int argc, char** argv) {
           ->Arg(1024)
           ->Arg(8192);
     };
+    // {std,ranges}::remove_copy
     bm.operator()<std::vector<int>>("std::remove_copy(vector<int>) (prefix)", std_remove_copy);
     bm.operator()<std::deque<int>>("std::remove_copy(deque<int>) (prefix)", std_remove_copy);
     bm.operator()<std::list<int>>("std::remove_copy(list<int>) (prefix)", std_remove_copy);
     bm.operator()<std::vector<int>>("rng::remove_copy(vector<int>) (prefix)", std::ranges::remove_copy);
     bm.operator()<std::deque<int>>("rng::remove_copy(deque<int>) (prefix)", std::ranges::remove_copy);
     bm.operator()<std::list<int>>("rng::remove_copy(list<int>) (prefix)", std::ranges::remove_copy);
+
+    // {std,ranges}::remove_copy_if
+    bm.operator()<std::vector<int>>("std::remove_copy_if(vector<int>) (prefix)", std_remove_copy_if);
+    bm.operator()<std::deque<int>>("std::remove_copy_if(deque<int>) (prefix)", std_remove_copy_if);
+    bm.operator()<std::list<int>>("std::remove_copy_if(list<int>) (prefix)", std_remove_copy_if);
+    bm.operator()<std::vector<int>>("rng::remove_copy_if(vector<int>) (prefix)", ranges_remove_copy_if);
+    bm.operator()<std::deque<int>>("rng::remove_copy_if(deque<int>) (prefix)", ranges_remove_copy_if);
+    bm.operator()<std::list<int>>("rng::remove_copy_if(list<int>) (prefix)", ranges_remove_copy_if);
   }
 
-  // Benchmark {std,ranges}::remove_copy on a sequence of the form xyxyxyxyxyxyxyxyxyxy
+  // Benchmark {std,ranges}::{remove_copy,remove_copy_if} on a sequence of the form xyxyxyxyxyxyxyxyxyxy
   // where we remove the x's from the sequence.
   {
     auto bm = []<class Container>(std::string name, auto remove_copy) {
@@ -91,12 +112,21 @@ int main(int argc, char** argv) {
           ->Arg(1024)
           ->Arg(8192);
     };
+    // {std,ranges}::remove_copy
     bm.operator()<std::vector<int>>("std::remove_copy(vector<int>) (sprinkled)", std_remove_copy);
     bm.operator()<std::deque<int>>("std::remove_copy(deque<int>) (sprinkled)", std_remove_copy);
     bm.operator()<std::list<int>>("std::remove_copy(list<int>) (sprinkled)", std_remove_copy);
     bm.operator()<std::vector<int>>("rng::remove_copy(vector<int>) (sprinkled)", std::ranges::remove_copy);
     bm.operator()<std::deque<int>>("rng::remove_copy(deque<int>) (sprinkled)", std::ranges::remove_copy);
     bm.operator()<std::list<int>>("rng::remove_copy(list<int>) (sprinkled)", std::ranges::remove_copy);
+
+    // {std,ranges}::remove_copy_if
+    bm.operator()<std::vector<int>>("std::remove_copy_if(vector<int>) (sprinkled)", std_remove_copy_if);
+    bm.operator()<std::deque<int>>("std::remove_copy_if(deque<int>) (sprinkled)", std_remove_copy_if);
+    bm.operator()<std::list<int>>("std::remove_copy_if(list<int>) (sprinkled)", std_remove_copy_if);
+    bm.operator()<std::vector<int>>("rng::remove_copy_if(vector<int>) (sprinkled)", ranges_remove_copy_if);
+    bm.operator()<std::deque<int>>("rng::remove_copy_if(deque<int>) (sprinkled)", ranges_remove_copy_if);
+    bm.operator()<std::list<int>>("rng::remove_copy_if(list<int>) (sprinkled)", ranges_remove_copy_if);
   }
 
   benchmark::Initialize(&argc, argv);