From 8643fe194dec05b4e3f3ea31e162ac0b2b00e162 Mon Sep 17 00:00:00 2001
From: Douglas Rumbaugh <dbr4@psu.edu>
Date: Tue, 14 May 2024 16:27:42 -0400
Subject: Added btree thread scaling benchmark

---
 benchmarks/btree_insert_query_tput.cpp         | 120 -------------------------
 benchmarks/vldb/btree_thread_scaling_bench.cpp | 120 +++++++++++++++++++++++++
 2 files changed, 120 insertions(+), 120 deletions(-)
 delete mode 100644 benchmarks/btree_insert_query_tput.cpp
 create mode 100644 benchmarks/vldb/btree_thread_scaling_bench.cpp

(limited to 'benchmarks')

diff --git a/benchmarks/btree_insert_query_tput.cpp b/benchmarks/btree_insert_query_tput.cpp
deleted file mode 100644
index f838f80..0000000
--- a/benchmarks/btree_insert_query_tput.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- *
- */
-
-#define ENABLE_TIMER
-
-#include <thread>
-
-#include "query/irs.h"
-#include "include/data-proc.h"
-#include "psu-ds/BTree.h"
-#include <mutex>
-
-#include <gsl/gsl_rng.h>
-
-#include "psu-util/timer.h"
-
-
-typedef de::Record<int64_t, int64_t> Rec;
-typedef de::irs::Parms<Rec> QP;
-
-std::atomic<bool> inserts_done = false;
-
-std::mutex g_btree_lock;
-
-void query_thread(BenchBTree *tree, std::vector<QP> *queries) {
-    gsl_rng *rng = gsl_rng_alloc(gsl_rng_mt19937);
-    size_t total = 0;
-
-    while (!inserts_done.load()) {
-        auto q_idx = gsl_rng_uniform_int(rng, queries->size());
-
-        auto q = (*queries)[q_idx];
-
-        std::vector<int64_t> result;
-        g_btree_lock.lock();
-        tree->range_sample(q.lower_bound, q.upper_bound, 1000, result, rng);
-        g_btree_lock.unlock();
-
-        total += result.size();
-        usleep(1);
-    }
-
-    fprintf(stderr, "%ld\n", total);
-
-    gsl_rng_free(rng);
-}
-
-void insert_thread(BenchBTree *tree, size_t start, std::vector<int64_t> *records) {
-    size_t reccnt = 0;
-    for (size_t i=start; i<records->size(); i++) {
-        btree_record r;
-        r.key = (*records)[i];
-        r.value = i;
-
-        g_btree_lock.lock();
-        tree->insert(r);
-        g_btree_lock.unlock();
-
-        if (i % 100000 == 0) {
-            fprintf(stderr, "Inserted %ld records\n", i);
-        }
-    }
-
-    inserts_done.store(true);
-}
-
-int main(int argc, char **argv) {
-
-    if (argc < 5) {
-        fprintf(stderr, "btree_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 tree = new BenchBTree();
-    gsl_rng * rng = gsl_rng_alloc(gsl_rng_mt19937);
-    
-    auto data = read_sosd_file(d_fname, n);
-    auto queries = read_range_queries<QP>(q_fname, .001);
-
-    /* warmup structure w/ 10% of records */
-    size_t warmup = .1 * n;
-    for (size_t i=0; i<warmup; i++) {
-        btree_record r;
-        r.key = data[i];
-        r.value = i;
-
-        tree->insert(r);
-    }
-
-    TIMER_INIT();
-
-    std::vector<std::thread> qthreads(qthread_cnt);
-
-    TIMER_START();
-    std::thread i_thrd(insert_thread, tree, warmup, &data);
-    for (size_t i=0; i<qthread_cnt; i++) {
-        qthreads[i] = std::thread(query_thread, tree, &queries);
-    }
-    i_thrd.join();
-    TIMER_STOP();
-
-    for (size_t i=0; i<qthread_cnt; i++) {
-        qthreads[i].join();
-    }
-
-    auto total_latency = TIMER_RESULT();
-    size_t throughput = (size_t) ((double) (n - warmup) / (double) total_latency * 1e9);
-    fprintf(stdout, "T\t%ld\t%ld\n", total_latency, throughput);
-
-    gsl_rng_free(rng);
-    delete tree;
-    fflush(stderr);
-}
-
diff --git a/benchmarks/vldb/btree_thread_scaling_bench.cpp b/benchmarks/vldb/btree_thread_scaling_bench.cpp
new file mode 100644
index 0000000..557e966
--- /dev/null
+++ b/benchmarks/vldb/btree_thread_scaling_bench.cpp
@@ -0,0 +1,120 @@
+/*
+ *
+ */
+
+#define ENABLE_TIMER
+
+#include <thread>
+
+#include "query/irs.h"
+#include "benchmark_types.h"
+#include "file_util.h"
+#include <mutex>
+
+#include <gsl/gsl_rng.h>
+
+#include "psu-util/timer.h"
+
+
+typedef btree_record<int64_t, int64_t> Rec;
+typedef de::irs::Parms<Rec> QP;
+
+std::atomic<bool> inserts_done = false;
+
+std::mutex g_btree_lock;
+
+void query_thread(BenchBTree *tree, std::vector<QP> *queries) {
+    gsl_rng *rng = gsl_rng_alloc(gsl_rng_mt19937);
+    size_t total = 0;
+
+    while (!inserts_done.load()) {
+        auto q_idx = gsl_rng_uniform_int(rng, queries->size());
+
+        auto q = (*queries)[q_idx];
+
+        std::vector<int64_t> result;
+        g_btree_lock.lock();
+        tree->range_sample(q.lower_bound, q.upper_bound, 1000, result, rng);
+        g_btree_lock.unlock();
+
+        total += result.size();
+        usleep(1);
+    }
+
+    fprintf(stderr, "%ld\n", total);
+
+    gsl_rng_free(rng);
+}
+
+void insert_thread(BenchBTree *tree, size_t start, std::vector<Rec> *records) {
+    size_t reccnt = 0;
+    for (size_t i=start; i<records->size(); i++) {
+        btree_record<int64_t, int64_t> r;
+        r.key = (*records)[i].key;
+        r.value = i;
+
+        g_btree_lock.lock();
+        tree->insert(r);
+        g_btree_lock.unlock();
+
+        if (i % 100000 == 0) {
+            fprintf(stderr, "Inserted %ld records\n", i);
+        }
+    }
+
+    inserts_done.store(true);
+}
+
+int main(int argc, char **argv) {
+
+    if (argc < 5) {
+        fprintf(stderr, "btree_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 tree = new BenchBTree();
+    gsl_rng * rng = gsl_rng_alloc(gsl_rng_mt19937);
+    
+    auto data = read_sosd_file<Rec>(d_fname, n);
+    auto queries = read_range_queries<QP>(q_fname, .001);
+
+    /* warmup structure w/ 10% of records */
+    size_t warmup = .1 * n;
+    for (size_t i=0; i<warmup; i++) {
+        btree_record<int64_t, int64_t> r;
+        r.key = data[i].key;
+        r.value = data[i].value;
+
+        tree->insert(r);
+    }
+
+    TIMER_INIT();
+
+    std::vector<std::thread> qthreads(qthread_cnt);
+
+    TIMER_START();
+    std::thread i_thrd(insert_thread, tree, warmup, &data);
+    for (size_t i=0; i<qthread_cnt; i++) {
+        qthreads[i] = std::thread(query_thread, tree, &queries);
+    }
+    i_thrd.join();
+    TIMER_STOP();
+
+    for (size_t i=0; i<qthread_cnt; i++) {
+        qthreads[i].join();
+    }
+
+    auto total_latency = TIMER_RESULT();
+    size_t throughput = (size_t) ((double) (n - warmup) / (double) total_latency * 1e9);
+    fprintf(stdout, "T\t%ld\t%ld\n", total_latency, throughput);
+
+    gsl_rng_free(rng);
+    delete tree;
+    fflush(stderr);
+}
+
-- 
cgit v1.2.3