Add multi-version rezero16

Doesn't seem to affect codegen in these cases.

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.18)
 project(
   conflict-set
-  VERSION 0.0.9
+  VERSION 0.0.10
   DESCRIPTION
     "A data structure for optimistic concurrency control on ranges of bitwise-lexicographically-ordered keys."
   HOMEPAGE_URL "https://git.weaselab.dev/weaselab/conflict-set"
@@ -19,12 +19,6 @@ include(CheckCXXSourceCompiles)
 
 set(DEFAULT_BUILD_TYPE "Release")
 
-if(EMSCRIPTEN OR CMAKE_SYSTEM_NAME STREQUAL WASI)
-  set(WASM ON)
-else()
-  set(WASM OFF)
-endif()
-
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
   message(
     STATUS
@@ -37,8 +31,14 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
                                                "MinSizeRel" "RelWithDebInfo")
 endif()
 
-add_compile_options(-fdata-sections -ffunction-sections -Wswitch-enum
+add_compile_options(
-                    -Werror=switch-enum -fPIC)
+  -fdata-sections
+  -ffunction-sections
+  -Wswitch-enum
+  -Werror=switch-enum
+  -fPIC
+  -g
+  -fno-omit-frame-pointer)
 
 set(full_relro_flags "-pie;LINKER:-z,relro,-z,now,-z,noexecstack")
 cmake_push_check_state()
@@ -81,15 +81,6 @@ if(EMSCRIPTEN)
 endif()
 
 if(NOT USE_SIMD_FALLBACK)
-  cmake_push_check_state()
-  list(APPEND CMAKE_REQUIRED_FLAGS -msimd128)
-  check_include_file_cxx("wasm_simd128.h" HAS_WASM_SIMD)
-  if(HAS_WASM_SIMD)
-    add_compile_options(-msimd128)
-    add_compile_definitions(HAS_WASM_SIMD)
-  endif()
-  cmake_pop_check_state()
-
   cmake_push_check_state()
   list(APPEND CMAKE_REQUIRED_FLAGS -mavx)
   check_include_file_cxx("immintrin.h" HAS_AVX)
@@ -162,28 +153,22 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR AND BUILD_TESTING)
 
   file(GLOB CORPUS_TESTS ${CMAKE_CURRENT_SOURCE_DIR}/corpus/*)
 
-  # extra testing that relies on shared libraries, which aren't available with
-  # wasm
-  if(NOT WASM)
   # Shared library version of FoundationDB's skip list implementation
   add_library(skip_list SHARED SkipList.cpp)
-    target_compile_options(skip_list PRIVATE -fno-exceptions
+  target_compile_options(skip_list PRIVATE -fno-exceptions -fvisibility=hidden)
-                                             -fvisibility=hidden)
   target_include_directories(skip_list
                              PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
   set_target_properties(
     skip_list PROPERTIES LIBRARY_OUTPUT_DIRECTORY
                          "${CMAKE_CURRENT_BINARY_DIR}/skip_list")
   set_target_properties(skip_list PROPERTIES OUTPUT_NAME ${PROJECT_NAME})
-    set_target_properties(
+  set_target_properties(skip_list PROPERTIES VERSION ${PROJECT_VERSION}
-      skip_list PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION
+                                             SOVERSION ${PROJECT_VERSION_MAJOR})
-                                                      ${PROJECT_VERSION_MAJOR})
 
   # Shared library version of a std::unordered_map-based conflict set (point
   # queries only)
   add_library(hash_table SHARED HashTable.cpp)
-    target_compile_options(hash_table PRIVATE -fno-exceptions
+  target_compile_options(hash_table PRIVATE -fno-exceptions -fvisibility=hidden)
-                                              -fvisibility=hidden)
   target_include_directories(hash_table
                              PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
   set_target_properties(
@@ -202,7 +187,6 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR AND BUILD_TESTING)
     get_filename_component(hash ${TEST} NAME)
     add_test(NAME skip_list_${hash} COMMAND driver_skip_list ${TEST})
   endforeach()
-  endif()
 
   # ad hoc testing
   add_executable(conflict_set_main ConflictSet.cpp)
@@ -320,7 +304,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR AND BUILD_TESTING)
   add_test(NAME conflict_set_cxx_api_test COMMAND conflict_set_cxx_api_test)
 
   # symbol visibility tests
-  if(NOT WASM AND NOT CMAKE_BUILD_TYPE STREQUAL Debug)
+  if(NOT CMAKE_BUILD_TYPE STREQUAL Debug)
     if(APPLE)
       set(symbol_exports ${CMAKE_CURRENT_SOURCE_DIR}/apple-symbol-exports.txt)
       set(symbol_imports ${CMAKE_CURRENT_SOURCE_DIR}/apple-symbol-imports.txt)

Internal.h

@@ -580,11 +580,14 @@ namespace {
 
 template <class ConflictSetImpl, bool kEnableAssertions = true>
 struct TestDriver {
-  Arbitrary arbitrary;
+  Arbitrary *arbitrary;
-  explicit TestDriver(const uint8_t *data, size_t size)
+  explicit TestDriver(Arbitrary &a) : arbitrary(&a) {
-      : arbitrary({data, size}) {}
+#if DEBUG_VERBOSE && !defined(NDEBUG)
+    fprintf(stderr, "%p Initial version: {%" PRId64 "}\n", this, writeVersion);
+#endif
+  }
 
-  int64_t oldestVersion = arbitrary.next();
+  int64_t oldestVersion = arbitrary->next();
   int64_t writeVersion = oldestVersion;
   ConflictSetImpl cs{oldestVersion};
   ReferenceImpl refImpl{oldestVersion};
@@ -593,33 +596,34 @@ struct TestDriver {
 
   bool ok = true;
 
-  const int prefixLen = arbitrary.bounded(512);
+  const int prefixLen = arbitrary->bounded(512);
-  const int prefixByte = arbitrary.randT<uint8_t>();
+  const int prefixByte = arbitrary->randT<uint8_t>();
 
   // Call until it returns true, for "done". Check internal invariants etc
   // between calls to next.
   bool next() {
     assert(cs.getBytes() >= 0);
-    if (!arbitrary.hasEntropy()) {
+    if (!arbitrary->hasEntropy()) {
       return true;
     }
     Arena arena;
     {
-      int numPointWrites = arbitrary.bounded(100);
+      int numPointWrites = arbitrary->bounded(100);
-      int numRangeWrites = arbitrary.bounded(100);
+      int numRangeWrites = arbitrary->bounded(100);
-      int64_t v = (writeVersion += arbitrary.bounded(10) ? arbitrary.bounded(10)
+      int64_t v =
-                                                         : arbitrary.next());
+          (writeVersion +=
+           arbitrary->bounded(10) ? arbitrary->bounded(10) : arbitrary->next());
       auto *writes =
           new (arena) ConflictSet::WriteRange[numPointWrites + numRangeWrites];
       auto keys = set<std::string_view>(arena);
       while (int(keys.size()) < numPointWrites + numRangeWrites * 2) {
-        if (!arbitrary.hasEntropy()) {
+        if (!arbitrary->hasEntropy()) {
           return true;
         }
-        int keyLen = prefixLen + arbitrary.bounded(kMaxKeySuffixLen);
+        int keyLen = prefixLen + arbitrary->bounded(kMaxKeySuffixLen);
         auto *begin = new (arena) uint8_t[keyLen];
         memset(begin, prefixByte, prefixLen);
-        arbitrary.randomBytes(begin + prefixLen, keyLen - prefixLen);
+        arbitrary->randomBytes(begin + prefixLen, keyLen - prefixLen);
         keys.insert(std::string_view((const char *)begin, keyLen));
       }
 
@@ -629,7 +633,7 @@ struct TestDriver {
                rangesRemaining = numRangeWrites;
            pointsRemaining > 0 || rangesRemaining > 0; ++i) {
         bool pointRead = pointsRemaining > 0 && rangesRemaining > 0
-                             ? bool(arbitrary.bounded(2))
+                             ? bool(arbitrary->bounded(2))
                              : pointsRemaining > 0;
         if (pointRead) {
           assert(pointsRemaining > 0);
@@ -648,33 +652,20 @@ struct TestDriver {
           ++iter;
           --rangesRemaining;
         }
-#if DEBUG_VERBOSE && !defined(NDEBUG)
-        if (writes[i].end.len == 0) {
-          fprintf(stderr, "Write: {%s}\n", printable(writes[i].begin).c_str());
-        } else {
-          fprintf(stderr, "Write: [%s, %s)\n",
-                  printable(writes[i].begin).c_str(),
-                  printable(writes[i].end).c_str());
-        }
-#endif
       }
       assert(iter == keys.end());
       assert(i == numPointWrites + numRangeWrites);
 
-#if DEBUG_VERBOSE && !defined(NDEBUG)
-      fprintf(stderr, "Write @ %" PRId64 "\n", v);
-#endif
-
       // Test non-canonical writes
       if (numPointWrites > 0) {
-        int overlaps = arbitrary.bounded(numPointWrites);
+        int overlaps = arbitrary->bounded(numPointWrites);
         for (int i = 0; i < numPointWrites + numRangeWrites && overlaps > 0;
              ++i) {
           if (writes[i].end.len == 0) {
-            int keyLen = prefixLen + arbitrary.bounded(kMaxKeySuffixLen);
+            int keyLen = prefixLen + arbitrary->bounded(kMaxKeySuffixLen);
             auto *begin = new (arena) uint8_t[keyLen];
             memset(begin, prefixByte, prefixLen);
-            arbitrary.randomBytes(begin + prefixLen, keyLen - prefixLen);
+            arbitrary->randomBytes(begin + prefixLen, keyLen - prefixLen);
             writes[i].end.len = keyLen;
             writes[i].end.p = begin;
             auto c =
@@ -692,10 +683,10 @@ struct TestDriver {
           }
         }
       }
-      if (arbitrary.bounded(2)) {
+      if (arbitrary->bounded(2)) {
         // Shuffle writes
         for (int i = numPointWrites + numRangeWrites - 1; i > 0; --i) {
-          int j = arbitrary.bounded(i + 1);
+          int j = arbitrary->bounded(i + 1);
           if (i != j) {
             using std::swap;
             swap(writes[i], writes[j]);
@@ -704,7 +695,7 @@ struct TestDriver {
       }
 
       oldestVersion +=
-          arbitrary.bounded(10) ? arbitrary.bounded(10) : arbitrary.next();
+          arbitrary->bounded(10) ? arbitrary->bounded(10) : arbitrary->next();
       oldestVersion = std::min(oldestVersion, writeVersion);
 
 #ifdef THREAD_TEST
@@ -721,6 +712,20 @@ struct TestDriver {
       ready.wait();
 #endif
 
+#if DEBUG_VERBOSE && !defined(NDEBUG)
+      for (int i = 0; i < numPointWrites + numRangeWrites; ++i) {
+        if (writes[i].end.len == 0) {
+          fprintf(stderr, "%p Write: {%s}\n", this,
+                  printable(writes[i].begin).c_str());
+        } else {
+          fprintf(stderr, "%p Write: [%s, %s)\n", this,
+                  printable(writes[i].begin).c_str(),
+                  printable(writes[i].end).c_str());
+        }
+      }
+      fprintf(stderr, "%p Write @ %" PRId64 "\n", this, v);
+#endif
+
       CALLGRIND_START_INSTRUMENTATION;
       cs.addWrites(writes, numPointWrites + numRangeWrites, v);
       CALLGRIND_STOP_INSTRUMENTATION;
@@ -729,6 +734,10 @@ struct TestDriver {
         refImpl.addWrites(writes, numPointWrites + numRangeWrites, v);
       }
 
+#if DEBUG_VERBOSE && !defined(NDEBUG)
+      fprintf(stderr, "%p Set oldest version: %" PRId64 "\n", this,
+              oldestVersion);
+#endif
       cs.setOldestVersion(oldestVersion);
       if constexpr (kEnableAssertions) {
         refImpl.setOldestVersion(oldestVersion);
@@ -739,24 +748,24 @@ struct TestDriver {
 #endif
     }
     {
-      int numPointReads = arbitrary.bounded(100);
+      int numPointReads = arbitrary->bounded(100);
-      int numRangeReads = arbitrary.bounded(100);
+      int numRangeReads = arbitrary->bounded(100);
 
-      int64_t v = std::max<int64_t>(writeVersion - (arbitrary.bounded(10)
+      int64_t v = std::max<int64_t>(writeVersion - (arbitrary->bounded(10)
-                                                        ? arbitrary.bounded(10)
+                                                        ? arbitrary->bounded(10)
-                                                        : arbitrary.next()),
+                                                        : arbitrary->next()),
                                     0);
       auto *reads =
           new (arena) ConflictSet::ReadRange[numPointReads + numRangeReads];
       auto keys = set<std::string_view>(arena);
       while (int(keys.size()) < numPointReads + numRangeReads * 2) {
-        if (!arbitrary.hasEntropy()) {
+        if (!arbitrary->hasEntropy()) {
           return true;
         }
-        int keyLen = prefixLen + arbitrary.bounded(kMaxKeySuffixLen);
+        int keyLen = prefixLen + arbitrary->bounded(kMaxKeySuffixLen);
         auto *begin = new (arena) uint8_t[keyLen];
         memset(begin, prefixByte, prefixLen);
-        arbitrary.randomBytes(begin + prefixLen, keyLen - prefixLen);
+        arbitrary->randomBytes(begin + prefixLen, keyLen - prefixLen);
         keys.insert(std::string_view((const char *)begin, keyLen));
       }
 
@@ -765,7 +774,7 @@ struct TestDriver {
       for (int pointsRemaining = numPointReads, rangesRemaining = numRangeReads;
            pointsRemaining > 0 || rangesRemaining > 0; ++i) {
         bool pointRead = pointsRemaining > 0 && rangesRemaining > 0
-                             ? bool(arbitrary.bounded(2))
+                             ? bool(arbitrary->bounded(2))
                              : pointsRemaining > 0;
         if (pointRead) {
           assert(pointsRemaining > 0);
@@ -787,10 +796,10 @@ struct TestDriver {
         reads[i].readVersion = v;
 #if DEBUG_VERBOSE && !defined(NDEBUG)
         if (reads[i].end.len == 0) {
-          fprintf(stderr, "Read: {%s} @ %" PRId64 "\n",
+          fprintf(stderr, "%p Read: {%s} @ %" PRId64 "\n", this,
                   printable(reads[i].begin).c_str(), reads[i].readVersion);
         } else {
-          fprintf(stderr, "Read: [%s, %s) @ %" PRId64 "\n",
+          fprintf(stderr, "%p Read: [%s, %s) @ %" PRId64 "\n", this,
                   printable(reads[i].begin).c_str(),
                   printable(reads[i].end).c_str(), reads[i].readVersion);
         }
@@ -839,22 +848,25 @@ struct TestDriver {
         refImpl.check(reads, results2, numPointReads + numRangeReads);
       }
 
-      auto compareResults = [reads](ConflictSet::Result *results1,
+      auto compareResults = [reads, this](ConflictSet::Result *results1,
-                                    ConflictSet::Result *results2, int count) {
+                                          ConflictSet::Result *results2,
+                                          int count) {
         for (int i = 0; i < count; ++i) {
           if (results1[i] != results2[i]) {
             if (reads[i].end.len == 0) {
-              fprintf(stderr,
-                      "Expected %s, got %s for read of {%s} at version %" PRId64
-                      "\n",
-                      resultToStr(results2[i]), resultToStr(results1[i]),
-                      printable(reads[i].begin).c_str(), reads[i].readVersion);
-            } else {
               fprintf(
                   stderr,
-                  "Expected %s, got %s for read of [%s, %s) at version %" PRId64
+                  "%p Expected %s, got %s for read of {%s} at version %" PRId64
                   "\n",
-                  resultToStr(results2[i]), resultToStr(results1[i]),
+                  (void *)this, resultToStr(results2[i]),
+                  resultToStr(results1[i]), printable(reads[i].begin).c_str(),
+                  reads[i].readVersion);
+            } else {
+              fprintf(stderr,
+                      "%p Expected %s, got %s for read of [%s, %s) at version "
+                      "%" PRId64 "\n",
+                      (void *)this, resultToStr(results2[i]),
+                      resultToStr(results1[i]),
                       printable(reads[i].begin).c_str(),
                       printable(reads[i].end).c_str(), reads[i].readVersion);
             }

Jenkinsfile

@@ -123,8 +123,8 @@ pipeline {
                 '''
                 recordCoverage qualityGates: [[criticality: 'NOTE', metric: 'MODULE']], tools: [[parser: 'COBERTURA', pattern: 'build/coverage.xml']]
                 sh '''
-                # Suppress again, because we haven't dealt with function multi-versioning for x86 yet
+                gcovr -f ConflictSet.cpp
-                # gcovr -f ConflictSet.cpp --fail-under-line 100 > /dev/null
+                gcovr -f ConflictSet.cpp --fail-under-line 100 > /dev/null
                 '''
             }
         }

README.md

@@ -1,86 +1,38 @@
 A data structure for optimistic concurrency control on ranges of bitwise-lexicographically-ordered keys.
 
-Intended to replace FoundationDB's skip list.
+Intended as an alternative to FoundationDB's skip list.
 
-Hardware for all benchmarks is a mac m1 2020.
+Hardware for all benchmarks is an AMD Ryzen 9 7900 with (2x32GB) 5600MT/s CL28-34-34-89 1.35V RAM
 
-# FoundationDB's benchmark
+# Microbenchmark
 
 ## Skip list
 
-```
+|               ns/op |                op/s |    err% |          ins/op |          cyc/op |    IPC |         bra/op |   miss% |     total | benchmark
-New conflict set: 1.957 sec
+|--------------------:|--------------------:|--------:|----------------:|----------------:|-------:|---------------:|--------:|----------:|:----------
-                  0.639 Mtransactions/sec
+|              172.03 |        5,812,791.77 |    0.4% |        3,130.62 |          879.00 |  3.562 |         509.23 |    0.0% |      0.01 | `point reads`
-                  2.555 Mkeys/sec
+|              167.44 |        5,972,130.71 |    0.2% |        3,065.14 |          862.27 |  3.555 |         494.30 |    0.0% |      0.01 | `prefix reads`
-Detect only:      1.845 sec
+|              238.77 |        4,188,130.84 |    0.9% |        3,589.93 |        1,259.30 |  2.851 |         637.12 |    0.0% |      0.01 | `range reads`
-                  0.678 Mtransactions/sec
+|              424.01 |        2,358,426.70 |    0.2% |        5,620.05 |        2,242.35 |  2.506 |         854.80 |    1.7% |      0.01 | `point writes`
-                  2.710 Mkeys/sec
+|              418.45 |        2,389,780.56 |    0.4% |        5,525.07 |        2,211.05 |  2.499 |         831.71 |    1.7% |      0.01 | `prefix writes`
-Skiplist only:    1.263 sec
+|              254.87 |        3,923,568.88 |    2.6% |        3,187.01 |        1,366.50 |  2.332 |         529.11 |    2.7% |      0.02 | `range writes`
-                  0.990 Mtransactions/sec
+|              675.96 |        1,479,374.50 |    3.3% |        7,735.41 |        3,468.60 |  2.230 |       1,386.02 |    1.8% |      0.01 | `monotonic increasing point writes`
-                  3.960 Mkeys/sec
+|          137,986.20 |            7,247.10 |    0.6% |      789,752.33 |      699,462.00 |  1.129 |     144,824.14 |    0.0% |      0.01 | `worst case for radix tree`
-Performance counters:
+|               21.63 |       46,231,564.03 |    1.0% |          448.00 |          107.14 |  4.181 |          84.00 |    0.0% |      0.01 | `create and destroy`
-               Build: 0.0546
-                 Add: 0.0563
-              Detect: 1.84
-              D.Sort: 0.412
-           D.Combine: 0.0141
-         D.CheckRead: 0.671
-   D.CheckIntraBatch: 0.0068
-        D.MergeWrite: 0.592
-      D.RemoveBefore: 0.146
-```
 
 ## Radix tree (this implementation)
 
-```
+|               ns/op |                op/s |    err% |          ins/op |          cyc/op |    IPC |         bra/op |   miss% |     total | benchmark
-New conflict set: 1.366 sec
+|--------------------:|--------------------:|--------:|----------------:|----------------:|-------:|---------------:|--------:|----------:|:----------
-                  0.915 Mtransactions/sec
+|               17.03 |       58,732,967.93 |    0.6% |          276.28 |           87.96 |  3.141 |          52.15 |    0.4% |      0.01 | `point reads`
-                  3.660 Mkeys/sec
+|               19.52 |       51,239,158.04 |    0.3% |          367.16 |          101.50 |  3.617 |          61.92 |    0.3% |      0.01 | `prefix reads`
-Detect only:      1.248 sec
+|               47.74 |       20,947,676.63 |    0.5% |          998.16 |          247.43 |  4.034 |         161.64 |    0.2% |      0.01 | `range reads`
-                  1.002 Mtransactions/sec
+|               23.14 |       43,207,824.89 |    0.4% |          408.18 |          121.64 |  3.356 |          70.20 |    0.3% |      0.01 | `point writes`
-                  4.007 Mkeys/sec
+|               38.02 |       26,302,115.66 |    0.1% |          709.72 |          199.70 |  3.554 |         134.26 |    0.3% |      0.01 | `prefix writes`
-Skiplist only:    0.573 sec
+|               44.28 |       22,583,559.17 |    0.9% |          825.19 |          233.10 |  3.540 |         141.48 |    0.2% |      0.01 | `range writes`
-                  2.182 Mtransactions/sec
+|               85.50 |       11,695,990.63 |    0.5% |        1,488.16 |          455.68 |  3.266 |         289.22 |    0.1% |      0.01 | `monotonic increasing point writes`
-                  8.730 Mkeys/sec
+|          338,388.50 |            2,955.18 |    3.3% |    4,097,087.00 |    1,809,996.00 |  2.264 |     759,645.00 |    0.0% |      0.01 | `worst case for radix tree`
-Performance counters:
+|               84.84 |       11,787,313.59 |    1.4% |        1,716.02 |          440.50 |  3.896 |         271.00 |    0.0% |      0.01 | `create and destroy`
-               Build: 0.0594
-                 Add: 0.0572
-              Detect: 1.25
-              D.Sort: 0.418
-           D.Combine: 0.0149
-         D.CheckRead: 0.232
-   D.CheckIntraBatch: 0.0067
-        D.MergeWrite: 0.341
-      D.RemoveBefore: 0.232
-```
-
-# Our benchmark
-
-## Skip list
-
-|               ns/op |                op/s |    err% |     total | benchmark
-|--------------------:|--------------------:|--------:|----------:|:----------
-|              245.99 |        4,065,232.81 |    0.3% |      0.01 | `point reads`
-|              265.93 |        3,760,430.49 |    0.2% |      0.01 | `prefix reads`
-|              485.30 |        2,060,569.50 |    0.2% |      0.01 | `range reads`
-|              449.60 |        2,224,195.17 |    0.4% |      0.01 | `point writes`
-|              441.76 |        2,263,688.18 |    1.1% |      0.01 | `prefix writes`
-|              245.42 |        4,074,647.54 |    2.4% |      0.02 | `range writes`
-|              572.80 |        1,745,810.06 |    1.3% |      0.01 | `monotonic increasing point writes`
-|          154,819.33 |            6,459.14 |    0.9% |      0.01 | `worst case for radix tree`
-
-## Radix tree (this implementation)
-
-|               ns/op |                op/s |    err% |     total | benchmark
-|--------------------:|--------------------:|--------:|----------:|:----------
-|               19.17 |       52,163,930.66 |    0.1% |      0.01 | `point reads`
-|               23.68 |       42,224,388.21 |    0.7% |      0.01 | `prefix reads`
-|               63.30 |       15,797,506.06 |    0.9% |      0.01 | `range reads`
-|               29.66 |       33,720,994.74 |    0.3% |      0.01 | `point writes`
-|               43.50 |       22,987,781.25 |    1.0% |      0.01 | `prefix writes`
-|               50.00 |       20,000,000.00 |    0.8% |      0.01 | `range writes`
-|              103.25 |        9,684,786.47 |    2.9% |      0.01 | `monotonic increasing point writes`
-|        1,181,500.00 |              846.38 |    2.3% |      0.01 | `worst case for radix tree`
 
 # "Real data" test
 
@@ -89,13 +41,13 @@ Point queries only, best of three runs. Gc ratio is the ratio of time spent doin
 ## skip list
 
 ```
-Check: 11.3385 seconds, 329.718 MB/s, Add: 5.35612 seconds, 131.072 MB/s, Gc ratio: 45.7173%
+Check: 4.47891 seconds, 364.05 MB/s, Add: 4.55599 seconds, 123.058 MB/s, Gc ratio: 37.1145%
 ```
 
 ## radix tree
 
 ```
-Check: 2.48583 seconds, 1503.93 MB/s, Add: 2.12768 seconds, 329.954 MB/s, Gc ratio: 41.7943%
+Check: 1.05813 seconds, 1540.97 MB/s, Add: 1.32071 seconds, 424.508 MB/s, Gc ratio: 42.2067%
 ```
 
 ## hash table
@@ -103,5 +55,5 @@ Check: 2.48583 seconds, 1503.93 MB/s, Add: 2.12768 seconds, 329.954 MB/s, Gc rat
 (The hash table implementation doesn't work on range queries, and its purpose is to provide an idea of how fast point queries can be)
 
 ```
-Check: 1.83386 seconds, 2038.6 MB/s, Add: 0.601411 seconds, 1167.32 MB/s, Gc ratio: 48.9776%
+Check: 0.804094 seconds, 2027.81 MB/s, Add: 0.652952 seconds, 858.645 MB/s, Gc ratio: 35.3885%
 ```

SkipList.cpp

@@ -778,10 +778,6 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
     for (int s = stripes - 1; s >= 0; s--) {
       for (int i = 0; i * 2 < ss; ++i) {
         const auto &w = combinedWriteConflictRanges[s * stripeSize / 2 + i];
-#if DEBUG_VERBOSE
-        printf("Write begin: %s\n", printable(w.begin).c_str());
-        fflush(stdout);
-#endif
         values[i * 2] = w.first;
         values[i * 2 + 1] = w.second;
         keyUpdates += 3;

TestDriver.cpp

@@ -13,18 +13,50 @@ int main(int argc, char **argv) {
     std::stringstream buffer;
     buffer << t.rdbuf();
     auto str = buffer.str();
-    TestDriver<ConflictSet, !PERF_TEST> driver{(const uint8_t *)str.data(),
+    Arbitrary arbitrary({(const uint8_t *)str.data(), str.size()});
-                                               str.size()};
+    TestDriver<ConflictSet, !PERF_TEST> driver1{arbitrary};
-    while (!driver.next())
+    TestDriver<ConflictSet, !PERF_TEST> driver2{arbitrary};
-      ;
+    bool done1 = false;
-    if (!driver.ok) {
+    bool done2 = false;
+    for (;;) {
+      if (!done1) {
+        done1 = driver1.next();
+        if (!driver1.ok) {
           abort();
         }
+      }
+      if (!done2) {
+        done2 = driver2.next();
+        if (!driver2.ok) {
+          abort();
+        }
+      }
+      if (done1 && done2) {
+        break;
+      }
+    }
 
+    {
       ConflictSet::MetricsV1 *metrics;
       int metricsCount;
-    driver.cs.getMetricsV1(&metrics, &metricsCount);
+      driver1.cs.getMetricsV1(&metrics, &metricsCount);
-    printf("#################### METRICS FOR %s ####################\n",
+      printf("#################### METRICS for ConflictSet 1 for %s "
+             "####################\n",
+             argv[i]);
+      for (int i = 0; i < metricsCount; ++i) {
+        printf("# HELP %s %s\n", metrics[i].name, metrics[i].help);
+        printf("# TYPE %s %s\n", metrics[i].name,
+               metrics[i].type == metrics[i].Counter ? "counter" : "gauge");
+        printf("%s %g\n", metrics[i].name, metrics[i].getValue());
+      }
+      puts("");
+    }
+    {
+      ConflictSet::MetricsV1 *metrics;
+      int metricsCount;
+      driver2.cs.getMetricsV1(&metrics, &metricsCount);
+      printf("#################### METRICS for ConflictSet 2 for %s "
+             "####################\n",
              argv[i]);
       for (int i = 0; i < metricsCount; ++i) {
         printf("# HELP %s %s\n", metrics[i].name, metrics[i].help);
@@ -35,3 +67,4 @@ int main(int argc, char **argv) {
       puts("");
     }
   }
+}

aarch64-symbol-imports.txt

@@ -1,4 +1,4 @@
-__aarch64_cas8_relax
+__aarch64_ldadd8_relax
 __getauxval@GLIBC_2.17
 __stack_chk_fail@GLIBC_2.17
 __stack_chk_guard@GLIBC_2.17

corpus/0f5c5f28c31e44ee0ec085fec09adf0981065771

@@ -0,0 +1,5 @@
+
+��
+
+
+2

corpus/12bdd00fd4038756cbcf8ecdad1b0cd862603cd8

@@ -0,0 +1 @@
+�