From 60c30fcfd2c4a085aa87127bfe9cae51b352d13e Mon Sep 17 00:00:00 2001
From: Douglas Rumbaugh <dbr4@psu.edu>
Date: Tue, 20 Feb 2024 16:10:32 -0500
Subject: Updated watermark benchmark to shuffle data

---
 benchmarks/watermark_testing.cpp | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'benchmarks/watermark_testing.cpp')

diff --git a/benchmarks/watermark_testing.cpp b/benchmarks/watermark_testing.cpp
index caba8ff..5fa0c0d 100644
--- a/benchmarks/watermark_testing.cpp
+++ b/benchmarks/watermark_testing.cpp
@@ -5,15 +5,17 @@
 #define ENABLE_TIMER
 
 #include "framework/DynamicExtension.h"
-#include "shard/ISAMTree.h"
+#include "shard/TrieSpline.h"
 #include "query/rangequery.h"
 #include "framework/interface/Record.h"
 
 #include "psu-util/timer.h"
 
+#include <algorithm>
 
-typedef de::Record<int64_t, int64_t> Rec;
-typedef de::ISAMTree<Rec> ISAM;
+typedef uint64_t K;
+typedef de::Record<K, K> Rec;
+typedef de::TrieSpline<Rec> ISAM;
 typedef de::rq::Query<Rec, ISAM> Q;
 typedef de::DynamicExtension<Rec, ISAM, Q> Ext;
 
@@ -23,7 +25,14 @@ int main(int argc, char **argv) {
     std::vector hwms = {5000l, 10000l, 20000l, 50000l};
     std::vector lwms = {.1, .2, .3, .4, .5, .6, .7, .8, .9};
 
-    size_t n = 1000000;
+    size_t n = 1000000000;
+
+    std::vector<K> keys(n);
+    for (K i=0; i<n; i++) {
+        keys[i] = i;
+    }
+
+    std::random_shuffle(keys.begin(), keys.end());
 
     TIMER_INIT();
 
@@ -33,8 +42,8 @@ int main(int argc, char **argv) {
 
             auto extension = new Ext(lwm, hwm, 8);
             TIMER_START();
-            for (int64_t i=0; i<n; i++) {
-                Rec r = {i, i};
+            for (size_t i=0; i<n; i++) {
+                Rec r = {keys[i], keys[i]};
                 while (!extension->insert(r)) {
                     _mm_pause();
                 }
-- 
cgit v1.2.3


From b1b5ab106122e6917f6b34452be95e617506f05d Mon Sep 17 00:00:00 2001
From: "Douglas B. Rumbaugh" <dbr4@psu.edu>
Date: Mon, 25 Mar 2024 12:54:17 -0400
Subject: Updates for build on OpenBSD

Necessary updates to get the codebase building under OpenBSD 7.5 with
clang. This is a minimal set of changes to get building to work, which
includes disabling several things that aren't directly compatable. More
work will be necessary to get full functionality. In particular, Triespline,
PGM, and the reference M-tree do not currently build on OpenBSD with clang
due to GNU dependencies or other gcc specific features.
---
 benchmarks/watermark_testing.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'benchmarks/watermark_testing.cpp')

diff --git a/benchmarks/watermark_testing.cpp b/benchmarks/watermark_testing.cpp
index 5fa0c0d..c56fc63 100644
--- a/benchmarks/watermark_testing.cpp
+++ b/benchmarks/watermark_testing.cpp
@@ -12,6 +12,7 @@
 #include "psu-util/timer.h"
 
 #include <algorithm>
+#include <random>
 
 typedef uint64_t K;
 typedef de::Record<K, K> Rec;
@@ -32,7 +33,10 @@ int main(int argc, char **argv) {
         keys[i] = i;
     }
 
-    std::random_shuffle(keys.begin(), keys.end());
+    std::random_device rd;
+    std::mt19937 g(rd());
+
+    std::shuffle(keys.begin(), keys.end(), g);
 
     TIMER_INIT();
 
-- 
cgit v1.2.3