From 3dd16320d38f6312e7f5d7164b6bb7a4e14790fa Mon Sep 17 00:00:00 2001 From: Douglas Rumbaugh Date: Fri, 9 Feb 2024 15:35:32 -0500 Subject: Benchmark updates --- benchmarks/irs_bench.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'benchmarks/irs_bench.cpp') diff --git a/benchmarks/irs_bench.cpp b/benchmarks/irs_bench.cpp index ddb4220..49b1630 100644 --- a/benchmarks/irs_bench.cpp +++ b/benchmarks/irs_bench.cpp @@ -17,7 +17,7 @@ #include "psu-util/timer.h" -typedef de::Record Rec; +typedef de::Record Rec; typedef de::ISAMTree ISAM; typedef de::irs::Query Q; typedef de::DynamicExtension Ext; @@ -73,7 +73,7 @@ void insert_records(Ext *extension, size_t start, int main(int argc, char **argv) { if (argc < 4) { - fprintf(stderr, "insert_query_tput reccnt datafile queryfile\n"); + fprintf(stderr, "irs_bench reccnt datafile queryfile\n"); exit(EXIT_FAILURE); } -- cgit v1.2.3 From 69f36c9b4f5df19f09156689b333afe29a017eed Mon Sep 17 00:00:00 2001 From: Douglas Rumbaugh Date: Fri, 23 Feb 2024 15:40:49 -0500 Subject: Benchmark updates --- benchmarks/irs_bench.cpp | 73 +++++++++++------------------------------------- 1 file changed, 17 insertions(+), 56 deletions(-) (limited to 'benchmarks/irs_bench.cpp') diff --git a/benchmarks/irs_bench.cpp b/benchmarks/irs_bench.cpp index 49b1630..9895295 100644 --- a/benchmarks/irs_bench.cpp +++ b/benchmarks/irs_bench.cpp @@ -4,76 +4,32 @@ #define ENABLE_TIMER -#include - #include "framework/DynamicExtension.h" #include "shard/ISAMTree.h" #include "query/irs.h" #include "framework/interface/Record.h" -#include "include/data-proc.h" +#include "include/file_util.h" #include #include "psu-util/timer.h" +#include "include/standard_benchmarks.h" typedef de::Record Rec; -typedef de::ISAMTree ISAM; -typedef de::irs::Query Q; -typedef de::DynamicExtension Ext; +typedef de::ISAMTree Shard; +typedef de::irs::Query Q; +typedef de::DynamicExtension Ext; typedef de::irs::Parms QP; -void run_queries(Ext *extension, std::vector &queries, gsl_rng *rng) { - size_t total; - for (size_t i=0; irng = rng; - q->sample_size = 1000; - - auto res = extension->query(q); - auto r = res.get(); - total += r.size(); - } - - fprintf(stderr, "%ld\n", total); -} - -size_t g_deleted_records = 0; -double delete_proportion = 0.05; - -void insert_records(Ext *extension, size_t start, - size_t stop, - std::vector &records, - std::vector &to_delete, - size_t &delete_idx, - bool delete_records, - gsl_rng *rng) { - size_t reccnt = 0; - Rec r; - for (size_t i=start; iinsert(r)) { - usleep(1); - } - - if (delete_records && gsl_rng_uniform(rng) <= delete_proportion && to_delete[delete_idx] <= i) { - r.key = records[to_delete[delete_idx]]; - r.value = (int64_t) (to_delete[delete_idx]); - while (!extension->erase(r)) { - usleep(1); - } - delete_idx++; - g_deleted_records++; - } - } +void usage(char *progname) { + fprintf(stderr, "%s reccnt datafile queryfile", progname); } int main(int argc, char **argv) { if (argc < 4) { - fprintf(stderr, "irs_bench reccnt datafile queryfile\n"); + usage(argv[0]); exit(EXIT_FAILURE); } @@ -84,7 +40,7 @@ int main(int argc, char **argv) { auto extension = new Ext(12000, 12001, 8, 0, 64); gsl_rng * rng = gsl_rng_alloc(gsl_rng_mt19937); - auto data = read_sosd_file(d_fname, n); + auto data = read_sosd_file(d_fname, n); std::vector to_delete(n * delete_proportion); size_t j=0; for (size_t i=0; i(q_fname, .001); + for (auto q : queries) { + q.sample_size = 1000; + q.rng = rng; + } /* warmup structure w/ 10% of records */ size_t warmup = .3 * n; size_t delete_idx = 0; - insert_records(extension, 0, warmup, data, to_delete, delete_idx, false, rng); + insert_records(extension, 0, warmup, data, to_delete, delete_idx, false, rng); extension->await_next_epoch(); TIMER_INIT(); TIMER_START(); - insert_records(extension, warmup, data.size(), data, to_delete, delete_idx, true, rng); + insert_records(extension, warmup, data.size(), data, to_delete, delete_idx, true, rng); TIMER_STOP(); auto insert_latency = TIMER_RESULT(); size_t insert_throughput = (size_t) ((double) (n - warmup) / (double) insert_latency * 1e9); TIMER_START(); - run_queries(extension, queries, rng); + run_queries(extension, queries, rng); TIMER_STOP(); auto query_latency = TIMER_RESULT() / queries.size(); -- cgit v1.2.3 From 7c2f43ff039795576bc0014c367b893fbbaceca4 Mon Sep 17 00:00:00 2001 From: Douglas Rumbaugh Date: Fri, 19 Apr 2024 14:39:33 -0400 Subject: Benchmark updates --- benchmarks/irs_bench.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'benchmarks/irs_bench.cpp') diff --git a/benchmarks/irs_bench.cpp b/benchmarks/irs_bench.cpp index 9895295..84cd8b2 100644 --- a/benchmarks/irs_bench.cpp +++ b/benchmarks/irs_bench.cpp @@ -72,12 +72,23 @@ int main(int argc, char **argv) { size_t insert_throughput = (size_t) ((double) (n - warmup) / (double) insert_latency * 1e9); TIMER_START(); - run_queries(extension, queries, rng); + run_queries(extension, queries); TIMER_STOP(); auto query_latency = TIMER_RESULT() / queries.size(); - fprintf(stdout, "T\t%ld\t%ld\t%ld\n", insert_throughput, query_latency, g_deleted_records); + auto shard = extension->create_static_structure(); + + TIMER_START(); + run_static_queries(shard, queries); + TIMER_STOP(); + + auto static_latency = TIMER_RESULT() / queries.size(); + + auto ext_size = extension->get_memory_usage() + extension->get_aux_memory_usage(); + auto static_size = shard->get_memory_usage();// + shard->get_aux_memory_usage(); + + fprintf(stdout, "%ld\t%ld\t%ld\t%ld\t%ld\n", insert_throughput, query_latency, ext_size, static_latency, static_size); gsl_rng_free(rng); delete extension; -- cgit v1.2.3 From ae189be91ec135629c7ad62888cd98183494c075 Mon Sep 17 00:00:00 2001 From: Douglas Rumbaugh Date: Fri, 19 Apr 2024 15:43:57 -0400 Subject: Adjusted benchmark parameters --- benchmarks/irs_bench.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'benchmarks/irs_bench.cpp') diff --git a/benchmarks/irs_bench.cpp b/benchmarks/irs_bench.cpp index 84cd8b2..976adf9 100644 --- a/benchmarks/irs_bench.cpp +++ b/benchmarks/irs_bench.cpp @@ -19,7 +19,7 @@ typedef de::Record Rec; typedef de::ISAMTree Shard; typedef de::irs::Query Q; -typedef de::DynamicExtension Ext; +typedef de::DynamicExtension Ext; typedef de::irs::Parms QP; void usage(char *progname) { -- cgit v1.2.3 From 8479f3ce863dfb6d3b20ff4678fa6fe92ee86b52 Mon Sep 17 00:00:00 2001 From: Douglas Rumbaugh Date: Fri, 19 Apr 2024 16:50:18 -0400 Subject: Fixed some benchmarking bugs --- benchmarks/irs_bench.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'benchmarks/irs_bench.cpp') diff --git a/benchmarks/irs_bench.cpp b/benchmarks/irs_bench.cpp index 976adf9..36d88f6 100644 --- a/benchmarks/irs_bench.cpp +++ b/benchmarks/irs_bench.cpp @@ -50,7 +50,7 @@ int main(int argc, char **argv) { } /* read in the range queries and add sample size and rng for sampling */ auto queries = read_range_queries(q_fname, .001); - for (auto q : queries) { + for (auto &q : queries) { q.sample_size = 1000; q.rng = rng; } -- cgit v1.2.3 From 4a1dde3148e0e84b47c884bc0bb69c60678b4558 Mon Sep 17 00:00:00 2001 From: Douglas Rumbaugh Date: Mon, 22 Apr 2024 15:09:07 -0400 Subject: Benchmark update+reorganization The Alex benchmark isn't updated yet. --- benchmarks/irs_bench.cpp | 97 ------------------------------------------------ 1 file changed, 97 deletions(-) delete mode 100644 benchmarks/irs_bench.cpp (limited to 'benchmarks/irs_bench.cpp') diff --git a/benchmarks/irs_bench.cpp b/benchmarks/irs_bench.cpp deleted file mode 100644 index 36d88f6..0000000 --- a/benchmarks/irs_bench.cpp +++ /dev/null @@ -1,97 +0,0 @@ -/* - * - */ - -#define ENABLE_TIMER - -#include "framework/DynamicExtension.h" -#include "shard/ISAMTree.h" -#include "query/irs.h" -#include "framework/interface/Record.h" -#include "include/file_util.h" - -#include - -#include "psu-util/timer.h" -#include "include/standard_benchmarks.h" - - -typedef de::Record Rec; -typedef de::ISAMTree Shard; -typedef de::irs::Query Q; -typedef de::DynamicExtension Ext; -typedef de::irs::Parms QP; - -void usage(char *progname) { - fprintf(stderr, "%s reccnt datafile queryfile", progname); -} - -int main(int argc, char **argv) { - - if (argc < 4) { - usage(argv[0]); - exit(EXIT_FAILURE); - } - - size_t n = atol(argv[1]); - std::string d_fname = std::string(argv[2]); - std::string q_fname = std::string(argv[3]); - - auto extension = new Ext(12000, 12001, 8, 0, 64); - gsl_rng * rng = gsl_rng_alloc(gsl_rng_mt19937); - - auto data = read_sosd_file(d_fname, n); - std::vector to_delete(n * delete_proportion); - size_t j=0; - for (size_t i=0; i(q_fname, .001); - for (auto &q : queries) { - q.sample_size = 1000; - q.rng = rng; - } - - /* warmup structure w/ 10% of records */ - size_t warmup = .3 * n; - size_t delete_idx = 0; - insert_records(extension, 0, warmup, data, to_delete, delete_idx, false, rng); - - extension->await_next_epoch(); - - TIMER_INIT(); - - TIMER_START(); - insert_records(extension, warmup, data.size(), data, to_delete, delete_idx, true, rng); - TIMER_STOP(); - - auto insert_latency = TIMER_RESULT(); - size_t insert_throughput = (size_t) ((double) (n - warmup) / (double) insert_latency * 1e9); - - TIMER_START(); - run_queries(extension, queries); - TIMER_STOP(); - - auto query_latency = TIMER_RESULT() / queries.size(); - - auto shard = extension->create_static_structure(); - - TIMER_START(); - run_static_queries(shard, queries); - TIMER_STOP(); - - auto static_latency = TIMER_RESULT() / queries.size(); - - auto ext_size = extension->get_memory_usage() + extension->get_aux_memory_usage(); - auto static_size = shard->get_memory_usage();// + shard->get_aux_memory_usage(); - - fprintf(stdout, "%ld\t%ld\t%ld\t%ld\t%ld\n", insert_throughput, query_latency, ext_size, static_latency, static_size); - - gsl_rng_free(rng); - delete extension; - fflush(stderr); -} - -- cgit v1.2.3