From 1eddea1da0125ddad2f8804fadafd1494c1bb11a Mon Sep 17 00:00:00 2001 From: Tyge Løvset Date: Mon, 18 Apr 2022 23:00:13 +0200 Subject: Renamed stc64_random() => crandom(), stc64_srandom(seed) => csrandom(seed). Kept old names for backward comp. --- benchmarks/plotbench/cdeq_benchmark.cpp | 28 ++++++++++++++-------------- benchmarks/plotbench/clist_benchmark.cpp | 24 ++++++++++++------------ benchmarks/plotbench/cmap_benchmark.cpp | 32 ++++++++++++++++---------------- benchmarks/plotbench/csmap_benchmark.cpp | 32 ++++++++++++++++---------------- benchmarks/plotbench/cvec_benchmark.cpp | 20 ++++++++++---------- 5 files changed, 68 insertions(+), 68 deletions(-) (limited to 'benchmarks/plotbench') diff --git a/benchmarks/plotbench/cdeq_benchmark.cpp b/benchmarks/plotbench/cdeq_benchmark.cpp index f57da6b2..b6eebb26 100644 --- a/benchmarks/plotbench/cdeq_benchmark.cpp +++ b/benchmarks/plotbench/cdeq_benchmark.cpp @@ -27,10 +27,10 @@ Sample test_std_deque() { { s.test[INSERT].t1 = clock(); container con; - stc64_srandom(seed); - c_forrange (N/3) con.push_front(stc64_random() & mask1); - c_forrange (N/3) {con.push_back(stc64_random() & mask1); con.pop_front();} - c_forrange (N/3) con.push_back(stc64_random() & mask1); + csrandom(seed); + c_forrange (N/3) con.push_front(crandom() & mask1); + c_forrange (N/3) {con.push_back(crandom() & mask1); con.pop_front();} + c_forrange (N/3) con.push_back(crandom() & mask1); s.test[INSERT].t2 = clock(); s.test[INSERT].sum = con.size(); s.test[ERASE].t1 = clock(); @@ -39,13 +39,13 @@ Sample test_std_deque() { s.test[ERASE].sum = con.size(); }{ container con; - stc64_srandom(seed); - c_forrange (N) con.push_back(stc64_random() & mask2); + csrandom(seed); + c_forrange (N) con.push_back(crandom() & mask2); s.test[FIND].t1 = clock(); size_t sum = 0; // Iteration - not inherent find - skipping //container::iterator it; - //c_forrange (S) if ((it = std::find(con.begin(), con.end(), stc64_random() & mask2)) != con.end()) sum += *it; + //c_forrange (S) if ((it = std::find(con.begin(), con.end(), crandom() & mask2)) != con.end()) sum += *it; s.test[FIND].t2 = clock(); s.test[FIND].sum = sum; s.test[ITER].t1 = clock(); @@ -71,10 +71,10 @@ Sample test_stc_deque() { s.test[INSERT].t1 = clock(); container con = cdeq_x_init(); //cdeq_x_reserve(&con, N); - stc64_srandom(seed); - c_forrange (N/3) cdeq_x_push_front(&con, stc64_random() & mask1); - c_forrange (N/3) {cdeq_x_push_back(&con, stc64_random() & mask1); cdeq_x_pop_front(&con);} - c_forrange (N/3) cdeq_x_push_back(&con, stc64_random() & mask1); + csrandom(seed); + c_forrange (N/3) cdeq_x_push_front(&con, crandom() & mask1); + c_forrange (N/3) {cdeq_x_push_back(&con, crandom() & mask1); cdeq_x_pop_front(&con);} + c_forrange (N/3) cdeq_x_push_back(&con, crandom() & mask1); s.test[INSERT].t2 = clock(); s.test[INSERT].sum = cdeq_x_size(con); s.test[ERASE].t1 = clock(); @@ -83,13 +83,13 @@ Sample test_stc_deque() { s.test[ERASE].sum = cdeq_x_size(con); cdeq_x_drop(&con); }{ - stc64_srandom(seed); + csrandom(seed); container con = cdeq_x_init(); - c_forrange (N) cdeq_x_push_back(&con, stc64_random() & mask2); + c_forrange (N) cdeq_x_push_back(&con, crandom() & mask2); s.test[FIND].t1 = clock(); size_t sum = 0; //cdeq_x_iter it, end = cdeq_x_end(&con); - //c_forrange (S) if ((it = cdeq_x_find(&con, stc64_random() & mask2)).ref != end.ref) sum += *it.ref; + //c_forrange (S) if ((it = cdeq_x_find(&con, crandom() & mask2)).ref != end.ref) sum += *it.ref; s.test[FIND].t2 = clock(); s.test[FIND].sum = sum; s.test[ITER].t1 = clock(); diff --git a/benchmarks/plotbench/clist_benchmark.cpp b/benchmarks/plotbench/clist_benchmark.cpp index eaa18201..c82c9506 100644 --- a/benchmarks/plotbench/clist_benchmark.cpp +++ b/benchmarks/plotbench/clist_benchmark.cpp @@ -27,9 +27,9 @@ Sample test_std_forward_list() { { s.test[INSERT].t1 = clock(); container con; - stc64_srandom(seed); - c_forrange (N/2) con.push_front(stc64_random() & mask1); - c_forrange (N/2) con.push_front(stc64_random() & mask1); + csrandom(seed); + c_forrange (N/2) con.push_front(crandom() & mask1); + c_forrange (N/2) con.push_front(crandom() & mask1); s.test[INSERT].t2 = clock(); s.test[INSERT].sum = 0; s.test[ERASE].t1 = clock(); @@ -38,13 +38,13 @@ Sample test_std_forward_list() { s.test[ERASE].sum = 0; }{ container con; - stc64_srandom(seed); - c_forrange (N) con.push_front(stc64_random() & mask2); + csrandom(seed); + c_forrange (N) con.push_front(crandom() & mask2); s.test[FIND].t1 = clock(); size_t sum = 0; container::iterator it; // Iteration - not inherent find - skipping - //c_forrange (S) if ((it = std::find(con.begin(), con.end(), stc64_random() & mask2)) != con.end()) sum += *it; + //c_forrange (S) if ((it = std::find(con.begin(), con.end(), crandom() & mask2)) != con.end()) sum += *it; s.test[FIND].t2 = clock(); s.test[FIND].sum = sum; s.test[ITER].t1 = clock(); @@ -69,9 +69,9 @@ Sample test_stc_forward_list() { { s.test[INSERT].t1 = clock(); container con = clist_x_init(); - stc64_srandom(seed); - c_forrange (N/2) clist_x_push_front(&con, stc64_random() & mask1); - c_forrange (N/2) clist_x_push_back(&con, stc64_random() & mask1); + csrandom(seed); + c_forrange (N/2) clist_x_push_front(&con, crandom() & mask1); + c_forrange (N/2) clist_x_push_back(&con, crandom() & mask1); s.test[INSERT].t2 = clock(); s.test[INSERT].sum = 0; s.test[ERASE].t1 = clock(); @@ -80,13 +80,13 @@ Sample test_stc_forward_list() { s.test[ERASE].sum = 0; clist_x_drop(&con); }{ - stc64_srandom(seed); + csrandom(seed); container con = clist_x_init(); - c_forrange (N) clist_x_push_front(&con, stc64_random() & mask2); + c_forrange (N) clist_x_push_front(&con, crandom() & mask2); s.test[FIND].t1 = clock(); size_t sum = 0; //clist_x_iter it, end = clist_x_end(&con); - //c_forrange (S) if ((it = clist_x_find(&con, stc64_random() & mask2)).ref != end.ref) sum += *it.ref; + //c_forrange (S) if ((it = clist_x_find(&con, crandom() & mask2)).ref != end.ref) sum += *it.ref; s.test[FIND].t2 = clock(); s.test[FIND].sum = sum; s.test[ITER].t1 = clock(); diff --git a/benchmarks/plotbench/cmap_benchmark.cpp b/benchmarks/plotbench/cmap_benchmark.cpp index d8d1c6ab..0554ae9c 100644 --- a/benchmarks/plotbench/cmap_benchmark.cpp +++ b/benchmarks/plotbench/cmap_benchmark.cpp @@ -26,28 +26,28 @@ Sample test_std_unordered_map() { typedef std::unordered_map container; Sample s = {"std,unordered_map"}; { - stc64_srandom(seed); + csrandom(seed); s.test[INSERT].t1 = clock(); container con; - c_forrange (i, N/2) con.emplace(stc64_random() & mask1, i); + c_forrange (i, N/2) con.emplace(crandom() & mask1, i); c_forrange (i, N/2) con.emplace(i, i); s.test[INSERT].t2 = clock(); s.test[INSERT].sum = con.size(); - stc64_srandom(seed); + csrandom(seed); s.test[ERASE].t1 = clock(); - c_forrange (N) con.erase(stc64_random() & mask1); + c_forrange (N) con.erase(crandom() & mask1); s.test[ERASE].t2 = clock(); s.test[ERASE].sum = con.size(); }{ container con; - stc64_srandom(seed); - c_forrange (i, N/2) con.emplace(stc64_random() & mask1, i); + csrandom(seed); + c_forrange (i, N/2) con.emplace(crandom() & mask1, i); c_forrange (i, N/2) con.emplace(i, i); - stc64_srandom(seed); + csrandom(seed); s.test[FIND].t1 = clock(); size_t sum = 0; container::iterator it; - c_forrange (N) if ((it = con.find(stc64_random() & mask1)) != con.end()) sum += it->second; + c_forrange (N) if ((it = con.find(crandom() & mask1)) != con.end()) sum += it->second; s.test[FIND].t2 = clock(); s.test[FIND].sum = sum; s.test[ITER].t1 = clock(); @@ -70,30 +70,30 @@ Sample test_stc_unordered_map() { typedef cmap_x container; Sample s = {"STC,unordered_map"}; { - stc64_srandom(seed); + csrandom(seed); s.test[INSERT].t1 = clock(); container con = cmap_x_init(); - c_forrange (i, N/2) cmap_x_insert(&con, stc64_random() & mask1, i); + c_forrange (i, N/2) cmap_x_insert(&con, crandom() & mask1, i); c_forrange (i, N/2) cmap_x_insert(&con, i, i); s.test[INSERT].t2 = clock(); s.test[INSERT].sum = cmap_x_size(con); - stc64_srandom(seed); + csrandom(seed); s.test[ERASE].t1 = clock(); - c_forrange (N) cmap_x_erase(&con, stc64_random() & mask1); + c_forrange (N) cmap_x_erase(&con, crandom() & mask1); s.test[ERASE].t2 = clock(); s.test[ERASE].sum = cmap_x_size(con); cmap_x_drop(&con); }{ container con = cmap_x_init(); - stc64_srandom(seed); - c_forrange (i, N/2) cmap_x_insert(&con, stc64_random() & mask1, i); + csrandom(seed); + c_forrange (i, N/2) cmap_x_insert(&con, crandom() & mask1, i); c_forrange (i, N/2) cmap_x_insert(&con, i, i); - stc64_srandom(seed); + csrandom(seed); s.test[FIND].t1 = clock(); size_t sum = 0; const cmap_x_value* val; c_forrange (N) - if ((val = cmap_x_get(&con, stc64_random() & mask1))) + if ((val = cmap_x_get(&con, crandom() & mask1))) sum += val->second; s.test[FIND].t2 = clock(); s.test[FIND].sum = sum; diff --git a/benchmarks/plotbench/csmap_benchmark.cpp b/benchmarks/plotbench/csmap_benchmark.cpp index e7603b58..baf4c879 100644 --- a/benchmarks/plotbench/csmap_benchmark.cpp +++ b/benchmarks/plotbench/csmap_benchmark.cpp @@ -25,28 +25,28 @@ Sample test_std_map() { typedef std::map container; Sample s = {"std,map"}; { - stc64_srandom(seed); + csrandom(seed); s.test[INSERT].t1 = clock(); container con; - c_forrange (i, N/2) con.emplace(stc64_random() & mask1, i); + c_forrange (i, N/2) con.emplace(crandom() & mask1, i); c_forrange (i, N/2) con.emplace(i, i); s.test[INSERT].t2 = clock(); s.test[INSERT].sum = con.size(); - stc64_srandom(seed); + csrandom(seed); s.test[ERASE].t1 = clock(); - c_forrange (N) con.erase(stc64_random() & mask1); + c_forrange (N) con.erase(crandom() & mask1); s.test[ERASE].t2 = clock(); s.test[ERASE].sum = con.size(); }{ container con; - stc64_srandom(seed); - c_forrange (i, N/2) con.emplace(stc64_random() & mask1, i); + csrandom(seed); + c_forrange (i, N/2) con.emplace(crandom() & mask1, i); c_forrange (i, N/2) con.emplace(i, i); - stc64_srandom(seed); + csrandom(seed); s.test[FIND].t1 = clock(); size_t sum = 0; container::iterator it; - c_forrange (N) if ((it = con.find(stc64_random() & mask1)) != con.end()) sum += it->second; + c_forrange (N) if ((it = con.find(crandom() & mask1)) != con.end()) sum += it->second; s.test[FIND].t2 = clock(); s.test[FIND].sum = sum; s.test[ITER].t1 = clock(); @@ -70,30 +70,30 @@ Sample test_stc_map() { typedef csmap_x container; Sample s = {"STC,map"}; { - stc64_srandom(seed); + csrandom(seed); s.test[INSERT].t1 = clock(); container con = csmap_x_init(); - c_forrange (i, N/2) csmap_x_insert(&con, stc64_random() & mask1, i); + c_forrange (i, N/2) csmap_x_insert(&con, crandom() & mask1, i); c_forrange (i, N/2) csmap_x_insert(&con, i, i); s.test[INSERT].t2 = clock(); s.test[INSERT].sum = csmap_x_size(con); - stc64_srandom(seed); + csrandom(seed); s.test[ERASE].t1 = clock(); - c_forrange (N) csmap_x_erase(&con, stc64_random() & mask1); + c_forrange (N) csmap_x_erase(&con, crandom() & mask1); s.test[ERASE].t2 = clock(); s.test[ERASE].sum = csmap_x_size(con); csmap_x_drop(&con); }{ container con = csmap_x_init(); - stc64_srandom(seed); - c_forrange (i, N/2) csmap_x_insert(&con, stc64_random() & mask1, i); + csrandom(seed); + c_forrange (i, N/2) csmap_x_insert(&con, crandom() & mask1, i); c_forrange (i, N/2) csmap_x_insert(&con, i, i); - stc64_srandom(seed); + csrandom(seed); s.test[FIND].t1 = clock(); size_t sum = 0; const csmap_x_value* val; c_forrange (N) - if ((val = csmap_x_get(&con, stc64_random() & mask1))) + if ((val = csmap_x_get(&con, crandom() & mask1))) sum += val->second; s.test[FIND].t2 = clock(); s.test[FIND].sum = sum; diff --git a/benchmarks/plotbench/cvec_benchmark.cpp b/benchmarks/plotbench/cvec_benchmark.cpp index 21e7a229..357cfcf0 100644 --- a/benchmarks/plotbench/cvec_benchmark.cpp +++ b/benchmarks/plotbench/cvec_benchmark.cpp @@ -27,8 +27,8 @@ Sample test_std_vector() { { s.test[INSERT].t1 = clock(); container con; - stc64_srandom(seed); - c_forrange (N) con.push_back(stc64_random() & mask1); + csrandom(seed); + c_forrange (N) con.push_back(crandom() & mask1); s.test[INSERT].t2 = clock(); s.test[INSERT].sum = con.size(); s.test[ERASE].t1 = clock(); @@ -37,13 +37,13 @@ Sample test_std_vector() { s.test[ERASE].sum = con.size(); }{ container con; - stc64_srandom(seed); - c_forrange (N) con.push_back(stc64_random() & mask2); + csrandom(seed); + c_forrange (N) con.push_back(crandom() & mask2); s.test[FIND].t1 = clock(); size_t sum = 0; container::iterator it; // Iteration - not inherent find - skipping - //c_forrange (S) if ((it = std::find(con.begin(), con.end(), stc64_random() & mask2)) != con.end()) sum += *it; + //c_forrange (S) if ((it = std::find(con.begin(), con.end(), crandom() & mask2)) != con.end()) sum += *it; s.test[FIND].t2 = clock(); s.test[FIND].sum = sum; s.test[ITER].t1 = clock(); @@ -69,8 +69,8 @@ Sample test_stc_vector() { { s.test[INSERT].t1 = clock(); container con = cvec_x_init(); - stc64_srandom(seed); - c_forrange (N) cvec_x_push_back(&con, stc64_random() & mask1); + csrandom(seed); + c_forrange (N) cvec_x_push_back(&con, crandom() & mask1); s.test[INSERT].t2 = clock(); s.test[INSERT].sum = cvec_x_size(con); s.test[ERASE].t1 = clock(); @@ -79,13 +79,13 @@ Sample test_stc_vector() { s.test[ERASE].sum = cvec_x_size(con); cvec_x_drop(&con); }{ - stc64_srandom(seed); + csrandom(seed); container con = cvec_x_init(); - c_forrange (N) cvec_x_push_back(&con, stc64_random() & mask2); + c_forrange (N) cvec_x_push_back(&con, crandom() & mask2); s.test[FIND].t1 = clock(); size_t sum = 0; //cvec_x_iter it, end = cvec_x_end(&con); - //c_forrange (S) if ((it = cvec_x_find(&con, stc64_random() & mask2)).ref != end.ref) sum += *it.ref; + //c_forrange (S) if ((it = cvec_x_find(&con, crandom() & mask2)).ref != end.ref) sum += *it.ref; s.test[FIND].t2 = clock(); s.test[FIND].sum = sum; s.test[ITER].t1 = clock(); -- cgit v1.2.3