From 2f5bab07e5f151f26ef07478a4f251feaeeb0d26 Mon Sep 17 00:00:00 2001 From: Douglas Rumbaugh Date: Wed, 13 Dec 2023 12:40:16 -0500 Subject: Query throughput benchmark --- benchmarks/insert_query_tput.cpp | 79 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 benchmarks/insert_query_tput.cpp (limited to 'benchmarks/insert_query_tput.cpp') diff --git a/benchmarks/insert_query_tput.cpp b/benchmarks/insert_query_tput.cpp new file mode 100644 index 0000000..fe85e68 --- /dev/null +++ b/benchmarks/insert_query_tput.cpp @@ -0,0 +1,79 @@ +/* + * + */ + +#define ENABLE_TIMER + +#include + +#include "framework/DynamicExtension.h" +#include "shard/ISAMTree.h" +#include "query/rangequery.h" +#include "framework/interface/Record.h" + +#include "psu-util/timer.h" + + +typedef de::Record Rec; +typedef de::ISAMTree ISAM; +typedef de::rq::Query Q; +typedef de::DynamicExtension Ext; + +std::atomic inserts_done = false; + +void insert_thread(Ext *extension, size_t n, size_t k) { + TIMER_INIT(); + for (int64_t i=0; iinsert(r); + } + TIMER_STOP(); + auto insert_lat = TIMER_RESULT(); + + fprintf(stdout, "I\t%ld\t%ld\t%ld\n", extension->get_record_count(), insert_lat, k); + } + + inserts_done.store(true); +} + +void query_thread(Ext *extension, double selectivity, size_t k) { + TIMER_INIT(); + + while (!inserts_done.load()) { + size_t reccnt = extension->get_record_count(); + size_t range = reccnt * selectivity; + + auto q = new de::rq::Parms(); + + TIMER_START(); + for (int64_t i=0; ilower_bound = start; + q->upper_bound = start + range; + auto res = extension->query(q); + auto r = res.get(); + } + TIMER_STOP(); + auto query_lat = TIMER_RESULT(); + fprintf(stdout, "Q\t%ld\t%ld\t%ld\n", reccnt, query_lat, k); + } +} + +int main(int argc, char **argv) { + + /* the closeout routine takes _forever_ ... so we'll just leak the memory */ + auto extension = new Ext(10000, 2, 1, 0, 2); + size_t n = 10000000; + size_t per_trial = 1000; + double selectivity = .001; + + std::thread i_thrd(insert_thread, extension, n, per_trial); + std::thread q_thrd(query_thread, extension, selectivity, 1); + + q_thrd.join(); + i_thrd.join(); + fflush(stderr); +} + -- cgit v1.2.3 From 0a9e79416df03a9e0a3d2cf171cf90028a644d6d Mon Sep 17 00:00:00 2001 From: "Douglas B. Rumbaugh" Date: Mon, 15 Jan 2024 17:21:11 -0500 Subject: Benchmarking programs --- benchmarks/insert_query_tput.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'benchmarks/insert_query_tput.cpp') diff --git a/benchmarks/insert_query_tput.cpp b/benchmarks/insert_query_tput.cpp index fe85e68..09179b0 100644 --- a/benchmarks/insert_query_tput.cpp +++ b/benchmarks/insert_query_tput.cpp @@ -27,7 +27,9 @@ void insert_thread(Ext *extension, size_t n, size_t k) { TIMER_START(); for (int64_t j=0; jinsert(r); + while (!extension->insert(r)) { + _mm_pause(); + } } TIMER_STOP(); auto insert_lat = TIMER_RESULT(); @@ -58,13 +60,14 @@ void query_thread(Ext *extension, double selectivity, size_t k) { TIMER_STOP(); auto query_lat = TIMER_RESULT(); fprintf(stdout, "Q\t%ld\t%ld\t%ld\n", reccnt, query_lat, k); + delete q; } } int main(int argc, char **argv) { /* the closeout routine takes _forever_ ... so we'll just leak the memory */ - auto extension = new Ext(10000, 2, 1, 0, 2); + auto extension = new Ext(1000, 10000, 2); size_t n = 10000000; size_t per_trial = 1000; double selectivity = .001; -- cgit v1.2.3 From 97ddc19c2f57d54df2fe791ddedcbaf62fd1922e Mon Sep 17 00:00:00 2001 From: Douglas Rumbaugh Date: Mon, 22 Jan 2024 10:42:40 -0500 Subject: Moved some benchmarks over to range count --- benchmarks/insert_query_tput.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'benchmarks/insert_query_tput.cpp') diff --git a/benchmarks/insert_query_tput.cpp b/benchmarks/insert_query_tput.cpp index 09179b0..3b63395 100644 --- a/benchmarks/insert_query_tput.cpp +++ b/benchmarks/insert_query_tput.cpp @@ -8,7 +8,7 @@ #include "framework/DynamicExtension.h" #include "shard/ISAMTree.h" -#include "query/rangequery.h" +#include "query/rangecount.h" #include "framework/interface/Record.h" #include "psu-util/timer.h" @@ -16,7 +16,7 @@ typedef de::Record Rec; typedef de::ISAMTree ISAM; -typedef de::rq::Query Q; +typedef de::rc::Query Q; typedef de::DynamicExtension Ext; std::atomic inserts_done = false; @@ -47,7 +47,7 @@ void query_thread(Ext *extension, double selectivity, size_t k) { size_t reccnt = extension->get_record_count(); size_t range = reccnt * selectivity; - auto q = new de::rq::Parms(); + auto q = new de::rc::Parms(); TIMER_START(); for (int64_t i=0; i Date: Mon, 22 Jan 2024 10:53:56 -0500 Subject: Benchmarking: updated insert_query_tput to use better rng --- benchmarks/insert_query_tput.cpp | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'benchmarks/insert_query_tput.cpp') diff --git a/benchmarks/insert_query_tput.cpp b/benchmarks/insert_query_tput.cpp index 3b63395..865e82c 100644 --- a/benchmarks/insert_query_tput.cpp +++ b/benchmarks/insert_query_tput.cpp @@ -11,6 +11,8 @@ #include "query/rangecount.h" #include "framework/interface/Record.h" +#include + #include "psu-util/timer.h" @@ -40,18 +42,23 @@ void insert_thread(Ext *extension, size_t n, size_t k) { inserts_done.store(true); } -void query_thread(Ext *extension, double selectivity, size_t k) { +void query_thread(Ext *extension, double selectivity, size_t k, gsl_rng *rng) { TIMER_INIT(); while (!inserts_done.load()) { size_t reccnt = extension->get_record_count(); + if (reccnt == 0) { + continue; // don't start querying until there is data + } + size_t range = reccnt * selectivity; auto q = new de::rc::Parms(); TIMER_START(); for (int64_t i=0; ilower_bound = start; q->upper_bound = start + range; auto res = extension->query(q); @@ -72,11 +79,15 @@ int main(int argc, char **argv) { size_t per_trial = 1000; double selectivity = .001; + gsl_rng * rng = gsl_rng_alloc(gsl_rng_mt19937); + std::thread i_thrd(insert_thread, extension, n, per_trial); - std::thread q_thrd(query_thread, extension, selectivity, 1); + std::thread q_thrd(query_thread, extension, selectivity, 1, rng); q_thrd.join(); i_thrd.join(); + + gsl_rng_free(rng); fflush(stderr); } -- cgit v1.2.3 From b1f966353695a0e06948df5332acccb84bbbcda0 Mon Sep 17 00:00:00 2001 From: Douglas Rumbaugh Date: Wed, 31 Jan 2024 14:26:34 -0500 Subject: Query/Insert intermix benchmarks --- benchmarks/insert_query_tput.cpp | 87 ++++++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 38 deletions(-) (limited to 'benchmarks/insert_query_tput.cpp') diff --git a/benchmarks/insert_query_tput.cpp b/benchmarks/insert_query_tput.cpp index 865e82c..8844d04 100644 --- a/benchmarks/insert_query_tput.cpp +++ b/benchmarks/insert_query_tput.cpp @@ -23,71 +23,82 @@ typedef de::DynamicExtension Ext; std::atomic inserts_done = false; -void insert_thread(Ext *extension, size_t n, size_t k) { + +void query_thread(Ext *extension, double selectivity, size_t k, gsl_rng *rng) { TIMER_INIT(); - for (int64_t i=0; iinsert(r)) { - _mm_pause(); - } - } - TIMER_STOP(); - auto insert_lat = TIMER_RESULT(); - fprintf(stdout, "I\t%ld\t%ld\t%ld\n", extension->get_record_count(), insert_lat, k); - } + size_t reccnt = extension->get_record_count(); - inserts_done.store(true); -} + size_t range = reccnt * selectivity; -void query_thread(Ext *extension, double selectivity, size_t k, gsl_rng *rng) { - TIMER_INIT(); + auto q = new de::rc::Parms(); - while (!inserts_done.load()) { - size_t reccnt = extension->get_record_count(); - if (reccnt == 0) { - continue; // don't start querying until there is data - } + TIMER_START(); + for (int64_t i=0; ilower_bound = start; + q->upper_bound = start + range; + auto res = extension->query(q); + auto r = res.get(); + } + TIMER_STOP(); + auto query_lat = TIMER_RESULT(); + fprintf(stdout, "Q\t%ld\t%ld\t%ld\n", reccnt, query_lat, k); + delete q; +} + +void insert_thread(Ext *extension, size_t n, size_t k, gsl_rng *rng) { + TIMER_INIT(); - auto q = new de::rc::Parms(); + size_t reccnt = 0; + Rec r; + while (reccnt < n) { + auto old_reccnt = reccnt; TIMER_START(); - for (int64_t i=0; ilower_bound = start; - q->upper_bound = start + range; - auto res = extension->query(q); - auto r = res.get(); + if (extension->insert(r)) { + reccnt++; + } } TIMER_STOP(); - auto query_lat = TIMER_RESULT(); - fprintf(stdout, "Q\t%ld\t%ld\t%ld\n", reccnt, query_lat, k); - delete q; + auto insert_lat = TIMER_RESULT(); + + fprintf(stdout, "I\t%ld\t%ld\t%ld\n", reccnt, insert_lat, reccnt - old_reccnt); + + if (reccnt % 100000 == 0 && reccnt != n) { + auto a = std::thread(query_thread, extension, .01, 20, rng); + a.detach(); + } } } int main(int argc, char **argv) { /* the closeout routine takes _forever_ ... so we'll just leak the memory */ - auto extension = new Ext(1000, 10000, 2); + auto extension = new Ext(1000, 12000, 8); size_t n = 10000000; size_t per_trial = 1000; double selectivity = .001; - gsl_rng * rng = gsl_rng_alloc(gsl_rng_mt19937); + TIMER_INIT(); - std::thread i_thrd(insert_thread, extension, n, per_trial); - std::thread q_thrd(query_thread, extension, selectivity, 1, rng); + gsl_rng * rng = gsl_rng_alloc(gsl_rng_mt19937); - q_thrd.join(); + TIMER_START(); + std::thread i_thrd(insert_thread, extension, n, per_trial, rng); i_thrd.join(); + TIMER_STOP(); + + auto total_latency = TIMER_RESULT(); + fprintf(stdout, "T\t%ld\n", total_latency); gsl_rng_free(rng); + delete extension; fflush(stderr); } -- cgit v1.2.3 From 27d36dd9a68e4cf454be2ca7877ece0a34c3e929 Mon Sep 17 00:00:00 2001 From: Douglas Rumbaugh Date: Wed, 31 Jan 2024 15:48:21 -0500 Subject: Insert throughput benchmark --- benchmarks/insert_query_tput.cpp | 96 +++++++++++++++++++++------------------- 1 file changed, 51 insertions(+), 45 deletions(-) (limited to 'benchmarks/insert_query_tput.cpp') diff --git a/benchmarks/insert_query_tput.cpp b/benchmarks/insert_query_tput.cpp index 8844d04..ed5bfe9 100644 --- a/benchmarks/insert_query_tput.cpp +++ b/benchmarks/insert_query_tput.cpp @@ -23,79 +23,85 @@ typedef de::DynamicExtension Ext; std::atomic inserts_done = false; +void query_thread(Ext *extension, size_t n) { + gsl_rng *rng = gsl_rng_alloc(gsl_rng_mt19937); + size_t range = n*.0001; -void query_thread(Ext *extension, double selectivity, size_t k, gsl_rng *rng) { - TIMER_INIT(); - - size_t reccnt = extension->get_record_count(); - - size_t range = reccnt * selectivity; - - auto q = new de::rc::Parms(); - - TIMER_START(); - for (int64_t i=0; i *q = new de::rc::Parms(); + while (!inserts_done.load()) { + size_t start = gsl_rng_uniform_int(rng, n - range); q->lower_bound = start; q->upper_bound = start + range; auto res = extension->query(q); auto r = res.get(); + usleep(100); } - TIMER_STOP(); - auto query_lat = TIMER_RESULT(); - fprintf(stdout, "Q\t%ld\t%ld\t%ld\n", reccnt, query_lat, k); + + gsl_rng_free(rng); delete q; } -void insert_thread(Ext *extension, size_t n, size_t k, gsl_rng *rng) { - TIMER_INIT(); - +void insert_thread(Ext *extension, size_t n, gsl_rng *rng) { size_t reccnt = 0; Rec r; - while (reccnt < n) { - auto old_reccnt = reccnt; - - TIMER_START(); - for (size_t i=0; iinsert(r)) { - reccnt++; - } - } - TIMER_STOP(); - auto insert_lat = TIMER_RESULT(); - - fprintf(stdout, "I\t%ld\t%ld\t%ld\n", reccnt, insert_lat, reccnt - old_reccnt); + for (size_t i=0; iinsert(r)) { + usleep(1); } } + + inserts_done.store(true); } int main(int argc, char **argv) { - /* the closeout routine takes _forever_ ... so we'll just leak the memory */ + if (argc < 3) { + fprintf(stderr, "insert_query_tput reccnt query_threads\n"); + exit(EXIT_FAILURE); + } + + size_t n = atol(argv[1]); + size_t qthread_cnt = atol(argv[2]); + auto extension = new Ext(1000, 12000, 8); - size_t n = 10000000; - size_t per_trial = 1000; - double selectivity = .001; + gsl_rng * rng = gsl_rng_alloc(gsl_rng_mt19937); + + /* warmup structure w/ 10% of records */ + size_t warmup = .1 * n; + Rec r; + for (size_t i=0; iinsert(r)) { + usleep(1); + } + } + + extension->await_next_epoch(); TIMER_INIT(); - gsl_rng * rng = gsl_rng_alloc(gsl_rng_mt19937); + std::vector qthreads(qthread_cnt); TIMER_START(); - std::thread i_thrd(insert_thread, extension, n, per_trial, rng); + std::thread i_thrd(insert_thread, extension, n - warmup, rng); + for (size_t i=0; i Date: Wed, 31 Jan 2024 16:13:38 -0500 Subject: insert query tput updates --- benchmarks/insert_query_tput.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'benchmarks/insert_query_tput.cpp') diff --git a/benchmarks/insert_query_tput.cpp b/benchmarks/insert_query_tput.cpp index ed5bfe9..8274d2a 100644 --- a/benchmarks/insert_query_tput.cpp +++ b/benchmarks/insert_query_tput.cpp @@ -27,6 +27,8 @@ void query_thread(Ext *extension, size_t n) { gsl_rng *rng = gsl_rng_alloc(gsl_rng_mt19937); size_t range = n*.0001; + size_t total = 0; + de::rc::Parms *q = new de::rc::Parms(); while (!inserts_done.load()) { size_t start = gsl_rng_uniform_int(rng, n - range); @@ -34,9 +36,12 @@ void query_thread(Ext *extension, size_t n) { q->upper_bound = start + range; auto res = extension->query(q); auto r = res.get(); - usleep(100); + total += r[0].key; + usleep(1); } + fprintf(stderr, "%ld\n", total); + gsl_rng_free(rng); delete q; } @@ -66,7 +71,7 @@ int main(int argc, char **argv) { size_t n = atol(argv[1]); size_t qthread_cnt = atol(argv[2]); - auto extension = new Ext(1000, 12000, 8); + auto extension = new Ext(1000, 12000, 8, 0, 64); gsl_rng * rng = gsl_rng_alloc(gsl_rng_mt19937); /* warmup structure w/ 10% of records */ -- cgit v1.2.3 From 1e226fc415d7674de0ecde51199d89e9042c6a22 Mon Sep 17 00:00:00 2001 From: Douglas Rumbaugh Date: Wed, 31 Jan 2024 16:57:41 -0500 Subject: Updated insert query throughput to use IRS queries --- benchmarks/insert_query_tput.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'benchmarks/insert_query_tput.cpp') diff --git a/benchmarks/insert_query_tput.cpp b/benchmarks/insert_query_tput.cpp index 8274d2a..05715b1 100644 --- a/benchmarks/insert_query_tput.cpp +++ b/benchmarks/insert_query_tput.cpp @@ -8,7 +8,7 @@ #include "framework/DynamicExtension.h" #include "shard/ISAMTree.h" -#include "query/rangecount.h" +#include "query/irs.h" #include "framework/interface/Record.h" #include @@ -18,7 +18,7 @@ typedef de::Record Rec; typedef de::ISAMTree ISAM; -typedef de::rc::Query Q; +typedef de::irs::Query Q; typedef de::DynamicExtension Ext; std::atomic inserts_done = false; @@ -27,17 +27,19 @@ void query_thread(Ext *extension, size_t n) { gsl_rng *rng = gsl_rng_alloc(gsl_rng_mt19937); size_t range = n*.0001; - size_t total = 0; + int64_t total = 0; - de::rc::Parms *q = new de::rc::Parms(); + de::irs::Parms *q = new de::irs::Parms(); while (!inserts_done.load()) { size_t start = gsl_rng_uniform_int(rng, n - range); q->lower_bound = start; q->upper_bound = start + range; + q->sample_size = 100; + q->rng = rng; auto res = extension->query(q); auto r = res.get(); - total += r[0].key; - usleep(1); + total += r.size(); + usleep(1); } fprintf(stderr, "%ld\n", total); -- cgit v1.2.3 From 080e73dd1f90163cea987ba3d3d56e3c1b7ddea7 Mon Sep 17 00:00:00 2001 From: Douglas Rumbaugh Date: Wed, 31 Jan 2024 20:57:40 -0500 Subject: Updated throughput bench to use SOSD --- benchmarks/insert_query_tput.cpp | 46 ++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 21 deletions(-) (limited to 'benchmarks/insert_query_tput.cpp') diff --git a/benchmarks/insert_query_tput.cpp b/benchmarks/insert_query_tput.cpp index 05715b1..40a5f8d 100644 --- a/benchmarks/insert_query_tput.cpp +++ b/benchmarks/insert_query_tput.cpp @@ -10,6 +10,7 @@ #include "shard/ISAMTree.h" #include "query/irs.h" #include "framework/interface/Record.h" +#include "include/data-proc.h" #include @@ -20,23 +21,22 @@ typedef de::Record Rec; typedef de::ISAMTree ISAM; typedef de::irs::Query Q; typedef de::DynamicExtension Ext; +typedef de::irs::Parms QP; std::atomic inserts_done = false; -void query_thread(Ext *extension, size_t n) { +void query_thread(Ext *extension, std::vector *queries) { gsl_rng *rng = gsl_rng_alloc(gsl_rng_mt19937); - size_t range = n*.0001; + size_t total = 0; - int64_t total = 0; - - de::irs::Parms *q = new de::irs::Parms(); while (!inserts_done.load()) { - size_t start = gsl_rng_uniform_int(rng, n - range); - q->lower_bound = start; - q->upper_bound = start + range; - q->sample_size = 100; - q->rng = rng; - auto res = extension->query(q); + auto q_idx = gsl_rng_uniform_int(rng, queries->size()); + + auto q = (*queries)[q_idx]; + q.rng = rng; + q.sample_size = 1000; + + auto res = extension->query(&q); auto r = res.get(); total += r.size(); usleep(1); @@ -45,15 +45,14 @@ void query_thread(Ext *extension, size_t n) { fprintf(stderr, "%ld\n", total); gsl_rng_free(rng); - delete q; } -void insert_thread(Ext *extension, size_t n, gsl_rng *rng) { +void insert_thread(Ext *extension, size_t start, std::vector *records) { size_t reccnt = 0; Rec r; - for (size_t i=0; isize(); i++) { + r.key = (*records)[i]; + r.value = i; while (!extension->insert(r)) { usleep(1); @@ -65,22 +64,27 @@ void insert_thread(Ext *extension, size_t n, gsl_rng *rng) { int main(int argc, char **argv) { - if (argc < 3) { - fprintf(stderr, "insert_query_tput reccnt query_threads\n"); + if (argc < 5) { + fprintf(stderr, "insert_query_tput reccnt query_threads datafile queryfile\n"); exit(EXIT_FAILURE); } size_t n = atol(argv[1]); size_t qthread_cnt = atol(argv[2]); + std::string d_fname = std::string(argv[3]); + std::string q_fname = std::string(argv[4]); auto extension = new Ext(1000, 12000, 8, 0, 64); gsl_rng * rng = gsl_rng_alloc(gsl_rng_mt19937); + + auto data = read_sosd_file(d_fname, n); + auto queries = read_range_queries(q_fname, .001); /* warmup structure w/ 10% of records */ size_t warmup = .1 * n; Rec r; for (size_t i=0; iinsert(r)) { @@ -95,9 +99,9 @@ int main(int argc, char **argv) { std::vector qthreads(qthread_cnt); TIMER_START(); - std::thread i_thrd(insert_thread, extension, n - warmup, rng); + std::thread i_thrd(insert_thread, extension, warmup, &data); for (size_t i=0; i Date: Wed, 7 Feb 2024 13:42:34 -0500 Subject: Fully realized shard concept interface --- benchmarks/insert_query_tput.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'benchmarks/insert_query_tput.cpp') diff --git a/benchmarks/insert_query_tput.cpp b/benchmarks/insert_query_tput.cpp index 40a5f8d..ce05264 100644 --- a/benchmarks/insert_query_tput.cpp +++ b/benchmarks/insert_query_tput.cpp @@ -19,7 +19,7 @@ typedef de::Record Rec; typedef de::ISAMTree ISAM; -typedef de::irs::Query Q; +typedef de::irs::Query Q; typedef de::DynamicExtension Ext; typedef de::irs::Parms QP; -- cgit v1.2.3