summaryrefslogtreecommitdiffhomepage
path: root/benchmarks
diff options
context:
space:
mode:
authorTyge Løvset <[email protected]>2022-04-23 14:00:47 +0200
committerTyge Løvset <[email protected]>2022-04-23 14:00:47 +0200
commit2b74b8a880d48232892ca84ac29efacd66905cd4 (patch)
tree306c25535d7983afb640739d6ad0b0e8c00a8e18 /benchmarks
parentdd5551dec268da39ad1c5c66de014e4621d24748 (diff)
downloadSTC-modified-2b74b8a880d48232892ca84ac29efacd66905cd4.tar.gz
STC-modified-2b74b8a880d48232892ca84ac29efacd66905cd4.zip
Integrated (and removed) c_hash32 and c_hash64 into c_default_hash, which is improved. Added i_key_ssv and i_val_ssv (cstr with csview as raw-type).
Diffstat (limited to 'benchmarks')
-rw-r--r--benchmarks/build_all.sh1
-rw-r--r--benchmarks/misc/sso_bench.c2
-rw-r--r--benchmarks/misc/sso_bench2.cpp1
-rw-r--r--benchmarks/picobench/picobench_cmap.cpp2
-rw-r--r--benchmarks/plotbench/cmap_benchmark.cpp1
-rw-r--r--benchmarks/shootout_hashmaps.cpp1
6 files changed, 1 insertions, 7 deletions
diff --git a/benchmarks/build_all.sh b/benchmarks/build_all.sh
index fda58f69..348a79dd 100644
--- a/benchmarks/build_all.sh
+++ b/benchmarks/build_all.sh
@@ -1,6 +1,5 @@
#!/bin/bash
cc='g++ -std=c++17'
-#cc='g++ -std=c++17 -DSTC_USE_SSO'
#cc='clang'
#cc='clang -c -DSTC_HEADER'
#cc='cl -nologo'
diff --git a/benchmarks/misc/sso_bench.c b/benchmarks/misc/sso_bench.c
index 450884f3..f2714be1 100644
--- a/benchmarks/misc/sso_bench.c
+++ b/benchmarks/misc/sso_bench.c
@@ -1,5 +1,5 @@
// https://gobyexample.com/maps
-#include <stc/alt/cstr.h>
+#include <stc/cstr.h>
#define i_type Map
#define i_key_str
#define i_val int
diff --git a/benchmarks/misc/sso_bench2.cpp b/benchmarks/misc/sso_bench2.cpp
index 87b701b5..1355a727 100644
--- a/benchmarks/misc/sso_bench2.cpp
+++ b/benchmarks/misc/sso_bench2.cpp
@@ -2,7 +2,6 @@
#include <iostream>
#include <vector>
#include <chrono>
-#define STC_USE_SSO 1
#define i_type svec
#define i_val_str
#include <stc/cstack.h>
diff --git a/benchmarks/picobench/picobench_cmap.cpp b/benchmarks/picobench/picobench_cmap.cpp
index 02daad51..d72ea12f 100644
--- a/benchmarks/picobench/picobench_cmap.cpp
+++ b/benchmarks/picobench/picobench_cmap.cpp
@@ -37,13 +37,11 @@ DEFMAP(map_s, <std::string, std::string>);
#define i_key int32_t
#define i_val int32_t
-#define i_hash c_hash32
#define i_tag i
#include <stc/cmap.h>
#define i_key uint64_t
#define i_val uint64_t
-#define i_hash c_hash64
#define i_tag x
#include <stc/cmap.h>
diff --git a/benchmarks/plotbench/cmap_benchmark.cpp b/benchmarks/plotbench/cmap_benchmark.cpp
index 0554ae9c..a22aee86 100644
--- a/benchmarks/plotbench/cmap_benchmark.cpp
+++ b/benchmarks/plotbench/cmap_benchmark.cpp
@@ -17,7 +17,6 @@ static float secs(Range s) { return (float)(s.t2 - s.t1) / CLOCKS_PER_SEC; }
#define i_key uint64_t
#define i_val uint64_t
-#define i_hash c_hash64
#define i_tag x
#include <stc/cmap.h>
diff --git a/benchmarks/shootout_hashmaps.cpp b/benchmarks/shootout_hashmaps.cpp
index 57bd3383..4ed961e7 100644
--- a/benchmarks/shootout_hashmaps.cpp
+++ b/benchmarks/shootout_hashmaps.cpp
@@ -26,7 +26,6 @@ KHASH_MAP_INIT_INT64(ii, int64_t)
// cmap and khash template expansion
#define i_key int64_t
#define i_val int64_t
-#define i_hash c_hash64
#define i_tag ii
#include <stc/cmap.h>