From 808f8e659a812ecd2cbef1570a175ca28fe44124 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Thu, 1 Dec 2022 01:30:54 +0200 Subject: [PATCH] Remove tsl maps from benchmarks --- benchmark/string.cpp | 74 --------------------------------------- benchmark/string_view.cpp | 74 --------------------------------------- benchmark/uint32.cpp | 40 --------------------- benchmark/uint64.cpp | 40 --------------------- 4 files changed, 228 deletions(-) diff --git a/benchmark/string.cpp b/benchmark/string.cpp index 0611ead5..8352e1c9 100644 --- a/benchmark/string.cpp +++ b/benchmark/string.cpp @@ -12,12 +12,6 @@ # include "absl/container/node_hash_map.h" # include "absl/container/flat_hash_map.h" #endif -#ifdef HAVE_TSL_HOPSCOTCH -# include "tsl/hopscotch_map.h" -#endif -#ifdef HAVE_TSL_ROBIN -# include "tsl/robin_map.h" -#endif #ifdef HAVE_ANKERL_UNORDERED_DENSE # include "ankerl/unordered_dense.h" #endif @@ -290,26 +284,6 @@ template using absl_flat_hash_map = #endif -#ifdef HAVE_TSL_HOPSCOTCH - -template using tsl_hopscotch_map = - tsl::hopscotch_map, std::equal_to, ::allocator< std::pair >>; - -template using tsl_hopscotch_pg_map = - tsl::hopscotch_pg_map, std::equal_to, ::allocator< std::pair >>; - -#endif - -#ifdef HAVE_TSL_ROBIN - -template using tsl_robin_map = - tsl::robin_map, std::equal_to, ::allocator< std::pair >>; - -template using tsl_robin_pg_map = - tsl::robin_pg_map, std::equal_to, ::allocator< std::pair >>; - -#endif - #ifdef HAVE_ANKERL_UNORDERED_DENSE template using ankerl_unordered_dense_map = @@ -383,26 +357,6 @@ template using absl_flat_hash_map_fnv1a = #endif -#ifdef HAVE_TSL_HOPSCOTCH - -template using tsl_hopscotch_map_fnv1a = - tsl::hopscotch_map, ::allocator< std::pair >>; - -template using tsl_hopscotch_pg_map_fnv1a = - tsl::hopscotch_pg_map, ::allocator< std::pair >>; - -#endif - -#ifdef HAVE_TSL_ROBIN - -template using tsl_robin_map_fnv1a = - tsl::robin_map, ::allocator< std::pair >>; - -template using tsl_robin_pg_map_fnv1a = - tsl::robin_pg_map, ::allocator< std::pair >>; - -#endif - #ifdef HAVE_ANKERL_UNORDERED_DENSE template using ankerl_unordered_dense_map_fnv1a = @@ -431,20 +385,6 @@ int main() test( "absl::node_hash_map" ); test( "absl::flat_hash_map" ); -#endif - -#ifdef HAVE_TSL_HOPSCOTCH - - test( "tsl::hopscotch_map" ); - test( "tsl::hopscotch_pg_map" ); - -#endif - -#ifdef HAVE_TSL_ROBIN - - test( "tsl::robin_map" ); - test( "tsl::robin_pg_map" ); - #endif test( "std::unordered_map, FNV-1a" ); @@ -462,20 +402,6 @@ int main() test( "absl::node_hash_map, FNV-1a" ); test( "absl::flat_hash_map, FNV-1a" ); -#endif - -#ifdef HAVE_TSL_HOPSCOTCH - - test( "tsl::hopscotch_map, FNV-1a" ); - test( "tsl::hopscotch_pg_map, FNV-1a" ); - -#endif - -#ifdef HAVE_TSL_ROBIN - - test( "tsl::robin_map, FNV-1a" ); - test( "tsl::robin_pg_map, FNV-1a" ); - #endif std::cout << "---\n\n"; diff --git a/benchmark/string_view.cpp b/benchmark/string_view.cpp index a7774ffe..68a629ae 100644 --- a/benchmark/string_view.cpp +++ b/benchmark/string_view.cpp @@ -12,12 +12,6 @@ # include "absl/container/node_hash_map.h" # include "absl/container/flat_hash_map.h" #endif -#ifdef HAVE_TSL_HOPSCOTCH -# include "tsl/hopscotch_map.h" -#endif -#ifdef HAVE_TSL_ROBIN -# include "tsl/robin_map.h" -#endif #ifdef HAVE_ANKERL_UNORDERED_DENSE # include "ankerl/unordered_dense.h" #endif @@ -291,26 +285,6 @@ template using absl_flat_hash_map = #endif -#ifdef HAVE_TSL_HOPSCOTCH - -template using tsl_hopscotch_map = - tsl::hopscotch_map, std::equal_to, ::allocator< std::pair >>; - -template using tsl_hopscotch_pg_map = - tsl::hopscotch_pg_map, std::equal_to, ::allocator< std::pair >>; - -#endif - -#ifdef HAVE_TSL_ROBIN - -template using tsl_robin_map = - tsl::robin_map, std::equal_to, ::allocator< std::pair >>; - -template using tsl_robin_pg_map = - tsl::robin_pg_map, std::equal_to, ::allocator< std::pair >>; - -#endif - #ifdef HAVE_ANKERL_UNORDERED_DENSE template using ankerl_unordered_dense_map = @@ -384,26 +358,6 @@ template using absl_flat_hash_map_fnv1a = #endif -#ifdef HAVE_TSL_HOPSCOTCH - -template using tsl_hopscotch_map_fnv1a = - tsl::hopscotch_map, ::allocator< std::pair >>; - -template using tsl_hopscotch_pg_map_fnv1a = - tsl::hopscotch_pg_map, ::allocator< std::pair >>; - -#endif - -#ifdef HAVE_TSL_ROBIN - -template using tsl_robin_map_fnv1a = - tsl::robin_map, ::allocator< std::pair >>; - -template using tsl_robin_pg_map_fnv1a = - tsl::robin_pg_map, ::allocator< std::pair >>; - -#endif - #ifdef HAVE_ANKERL_UNORDERED_DENSE template using ankerl_unordered_dense_map_fnv1a = @@ -432,20 +386,6 @@ int main() test( "absl::node_hash_map" ); test( "absl::flat_hash_map" ); -#endif - -#ifdef HAVE_TSL_HOPSCOTCH - - test( "tsl::hopscotch_map" ); - test( "tsl::hopscotch_pg_map" ); - -#endif - -#ifdef HAVE_TSL_ROBIN - - test( "tsl::robin_map" ); - test( "tsl::robin_pg_map" ); - #endif test( "std::unordered_map, FNV-1a" ); @@ -463,20 +403,6 @@ int main() test( "absl::node_hash_map, FNV-1a" ); test( "absl::flat_hash_map, FNV-1a" ); -#endif - -#ifdef HAVE_TSL_HOPSCOTCH - - test( "tsl::hopscotch_map, FNV-1a" ); - test( "tsl::hopscotch_pg_map, FNV-1a" ); - -#endif - -#ifdef HAVE_TSL_ROBIN - - test( "tsl::robin_map, FNV-1a" ); - test( "tsl::robin_pg_map, FNV-1a" ); - #endif std::cout << "---\n\n"; diff --git a/benchmark/uint32.cpp b/benchmark/uint32.cpp index 8034b0c4..127fb9f3 100644 --- a/benchmark/uint32.cpp +++ b/benchmark/uint32.cpp @@ -13,12 +13,6 @@ # include "absl/container/node_hash_map.h" # include "absl/container/flat_hash_map.h" #endif -#ifdef HAVE_TSL_HOPSCOTCH -# include "tsl/hopscotch_map.h" -#endif -#ifdef HAVE_TSL_ROBIN -# include "tsl/robin_map.h" -#endif #ifdef HAVE_ANKERL_UNORDERED_DENSE # include "ankerl/unordered_dense.h" #endif @@ -307,26 +301,6 @@ template using absl_flat_hash_map = #endif -#ifdef HAVE_TSL_HOPSCOTCH - -template using tsl_hopscotch_map = - tsl::hopscotch_map, std::equal_to, ::allocator< std::pair >>; - -template using tsl_hopscotch_pg_map = - tsl::hopscotch_pg_map, std::equal_to, ::allocator< std::pair >>; - -#endif - -#ifdef HAVE_TSL_ROBIN - -template using tsl_robin_map = - tsl::robin_map, std::equal_to, ::allocator< std::pair >>; - -template using tsl_robin_pg_map = - tsl::robin_pg_map, std::equal_to, ::allocator< std::pair >>; - -#endif - #ifdef HAVE_ANKERL_UNORDERED_DENSE template using ankerl_unordered_dense_map = @@ -353,20 +327,6 @@ int main() test( "absl::node_hash_map" ); test( "absl::flat_hash_map" ); -#endif - -#ifdef HAVE_TSL_HOPSCOTCH - - test( "tsl::hopscotch_map" ); - test( "tsl::hopscotch_pg_map" ); - -#endif - -#ifdef HAVE_TSL_ROBIN - - test( "tsl::robin_map" ); - test( "tsl::robin_pg_map" ); - #endif std::cout << "---\n\n"; diff --git a/benchmark/uint64.cpp b/benchmark/uint64.cpp index cb98c2ec..963a6e77 100644 --- a/benchmark/uint64.cpp +++ b/benchmark/uint64.cpp @@ -13,12 +13,6 @@ # include "absl/container/node_hash_map.h" # include "absl/container/flat_hash_map.h" #endif -#ifdef HAVE_TSL_HOPSCOTCH -# include "tsl/hopscotch_map.h" -#endif -#ifdef HAVE_TSL_ROBIN -# include "tsl/robin_map.h" -#endif #ifdef HAVE_ANKERL_UNORDERED_DENSE # include "ankerl/unordered_dense.h" #endif @@ -307,26 +301,6 @@ template using absl_flat_hash_map = #endif -#ifdef HAVE_TSL_HOPSCOTCH - -template using tsl_hopscotch_map = - tsl::hopscotch_map, std::equal_to, ::allocator< std::pair >>; - -template using tsl_hopscotch_pg_map = - tsl::hopscotch_pg_map, std::equal_to, ::allocator< std::pair >>; - -#endif - -#ifdef HAVE_TSL_ROBIN - -template using tsl_robin_map = - tsl::robin_map, std::equal_to, ::allocator< std::pair >>; - -template using tsl_robin_pg_map = - tsl::robin_pg_map, std::equal_to, ::allocator< std::pair >>; - -#endif - #ifdef HAVE_ANKERL_UNORDERED_DENSE template using ankerl_unordered_dense_map = @@ -353,20 +327,6 @@ int main() test( "absl::node_hash_map" ); test( "absl::flat_hash_map" ); -#endif - -#ifdef HAVE_TSL_HOPSCOTCH - - test( "tsl::hopscotch_map" ); - test( "tsl::hopscotch_pg_map" ); - -#endif - -#ifdef HAVE_TSL_ROBIN - - test( "tsl::robin_map" ); - test( "tsl::robin_pg_map" ); - #endif std::cout << "---\n\n";