Remove some std::string instantiation benchmarks to reduce total time

Author: arbiny

libcxx/test/benchmarks/containers/associative/associative_container_benchmarks.h

@@ -57,7 +57,6 @@ void associative_container_benchmarks(std::string container) {
   auto get_key = [](Value const& v) { return adapt_operations<Container>::key_from_value(v); };
 
   auto bench = [&](std::string operation, auto f) {
-    // Note: Add zero to the range for empty containers.
     benchmark::RegisterBenchmark(container + "::" + operation, f)->Arg(0)->Arg(32)->Arg(1024)->Arg(8192);
   };
 
@@ -173,7 +172,6 @@ void associative_container_benchmarks(std::string container) {
   // Insertion
   /////////////////////////
   bench("insert(value) (already present)", [=](auto& st) {
-    // Make sure non-empty container for |to_insert| to be present and no segfault.
     const std::size_t size = st.range(0) ? st.range(0) : 1;
     std::vector<Value> in  = make_value_types(generate_unique_keys(size));
     Value to_insert        = in[in.size() / 2]; // pick any existing value

libcxx/test/benchmarks/containers/associative/unordered_map.bench.cpp

@@ -28,8 +28,6 @@ struct support::adapt_operations<std::unordered_map<K, V>> {
 
 int main(int argc, char** argv) {
   support::associative_container_benchmarks<std::unordered_map<int, int>>("std::unordered_map<int, int>");
-  support::associative_container_benchmarks<std::unordered_map<std::string, int>>(
-      "std::unordered_map<std::string, int>");
 
   benchmark::Initialize(&argc, argv);
   benchmark::RunSpecifiedBenchmarks();

libcxx/test/benchmarks/containers/associative/unordered_multimap.bench.cpp

@@ -27,8 +27,6 @@ struct support::adapt_operations<std::unordered_multimap<K, V>> {
 
 int main(int argc, char** argv) {
   support::associative_container_benchmarks<std::unordered_multimap<int, int>>("std::unordered_multimap<int, int>");
-  support::associative_container_benchmarks<std::unordered_multimap<std::string, int>>(
-      "std::unordered_multimap<std::string, int>");
 
   benchmark::Initialize(&argc, argv);
   benchmark::RunSpecifiedBenchmarks();

libcxx/test/benchmarks/containers/associative/unordered_multiset.bench.cpp

@@ -8,7 +8,6 @@
 
 // UNSUPPORTED: c++03, c++11, c++14, c++17
 
-#include <string>
 #include <unordered_set>
 
 #include "associative_container_benchmarks.h"
@@ -27,8 +26,6 @@ struct support::adapt_operations<std::unordered_multiset<K>> {
 
 int main(int argc, char** argv) {
   support::associative_container_benchmarks<std::unordered_multiset<int>>("std::unordered_multiset<int>");
-  support::associative_container_benchmarks<std::unordered_multiset<std::string>>(
-      "std::unordered_multiset<std::string>");
 
   benchmark::Initialize(&argc, argv);
   benchmark::RunSpecifiedBenchmarks();