From d1d8a9f389155c223db92d060b8fbccda58e2e53 Mon Sep 17 00:00:00 2001 From: Tyge Løvset Date: Thu, 3 Nov 2022 13:28:45 +0100 Subject: Made cmap i_max_load_factor a compile time template parameter instead of runtime. Enables cmap to be NULL initialized. Currently only cvec/cdeq and csmap cannot be NULL initialized, but eventually they will. --- benchmarks/picobench/picobench_cmap.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'benchmarks/picobench/picobench_cmap.cpp') diff --git a/benchmarks/picobench/picobench_cmap.cpp b/benchmarks/picobench/picobench_cmap.cpp index 7d114d30..3ffba5b9 100644 --- a/benchmarks/picobench/picobench_cmap.cpp +++ b/benchmarks/picobench/picobench_cmap.cpp @@ -33,15 +33,18 @@ DEFMAP(map_s, ); #define i_key int32_t #define i_val int32_t #define i_tag i +#define i_max_load_factor float(MaxLoadFactor100) / 100.0f #include #define i_key uint64_t #define i_val uint64_t #define i_tag x +#define i_max_load_factor float(MaxLoadFactor100) / 100.0f #include #define i_key_str #define i_val_str +#define i_max_load_factor float(MaxLoadFactor100) / 100.0f #include PICOBENCH_SUITE("Map1"); @@ -69,7 +72,6 @@ static void ins_and_erase_i(picobench::state& s) static void ins_and_erase_cmap_i(picobench::state& s) { cmap_i map = cmap_i_init(); - cmap_i_max_load_factor(&map, (int)MaxLoadFactor100 / 100.0); csrandom(seed); picobench::scope scope(s); @@ -89,7 +91,6 @@ static void ins_and_erase_cmap_i(picobench::state& s) static void ins_and_erase_cmap_x(picobench::state& s) { cmap_x map = cmap_x_init(); - cmap_x_max_load_factor(&map, (int)MaxLoadFactor100 / 100.0); csrandom(seed); picobench::scope scope(s); @@ -136,7 +137,6 @@ static void ins_and_access_cmap_i(picobench::state& s) uint64_t mask = (1ull << s.arg()) - 1; size_t result = 0; cmap_i map = cmap_i_init(); - cmap_i_max_load_factor(&map, (int)MaxLoadFactor100 / 100.0); csrandom(seed); picobench::scope scope(s); @@ -189,7 +189,6 @@ static void ins_and_access_cmap_s(picobench::state& s) char* buf = cstr_data(&str); size_t result = 0; cmap_str map = cmap_str_init(); - cmap_str_max_load_factor(&map, (int)MaxLoadFactor100 / 100.0); csrandom(seed); picobench::scope scope(s); @@ -249,7 +248,6 @@ static void iterate_x(picobench::state& s) static void iterate_cmap_x(picobench::state& s) { cmap_x map = cmap_x_init(); - cmap_x_max_load_factor(&map, (int)MaxLoadFactor100 / 100.0); uint64_t K = (1ull << s.arg()) - 1; picobench::scope scope(s); -- cgit v1.2.3