Changeset 8e1b1bb

Timestamp:

May 26, 2020, 11:43:13 AM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

0092853

Parents:

3bf812b

Message:

Now using a single macro for algorithmic variants

Location:

doc/theses/thierry_delisle_PhD/code

Files:

• relaxed_list.cpp (modified) (1 diff)
• relaxed_list.hpp (modified) (17 diffs)

doc/theses/thierry_delisle_PhD/code/relaxed_list.cpp

@@ -918 +918 @@
 
         std::cout << "Running " << nthreads << " threads (" << (nthreads * nqueues) << " queues) for " << duration << " seconds" << std::endl;
+        std::cout << "Relaxed list variant: " << relaxed_list<Node>::name() << std::endl;
         switch(benchmark) {
                 case Churn:

doc/theses/thierry_delisle_PhD/code/relaxed_list.hpp

@@ -1 +1 @@
 #pragma once
+
+enum VARIANTS {
+        VANILLA,
+        SNZI,
+        BITMASK,
+        DISCOVER
+};
+
+#ifndef VARIANT
+#define VARIANT VANILLA
+#endif
 
 #ifndef NO_STATS
@@ -13 +24 @@
 #include "utils.hpp"
 #include "snzi.hpp"
+
+#define MACRO_XSTR(s) MACRO_STR(s)
+#define MACRO_STR(s) #s
 
 using namespace std;
@@ -54 +68 @@
 
 public:
+        static const char * name() {
+                return MACRO_XSTR(VARIANT);
+        }
+
         relaxed_list(unsigned numLists)
                 : lists(new intrusive_queue_t[numLists])
                 , numLists(numLists)
-                #if defined(SIMPLE_SNZI) || defined(DISCOVER_BITMASK)
+                #if VARIANT == SNZI || VARIANT == DISCOVER
                         , snzi( std::log2( numLists / 8 ) )
                 #endif
@@ -90 +108 @@
                         if( !lists[i].lock.try_lock() ) continue;
 
-                        #if !defined(SIMPLE_SNZI) && !defined(DISCOVER_BITMASK)
+                        #if VARIANT != SNZI && VARIANT != DISCOVER
                                 __attribute__((unused)) int num = numNonEmpty;
                         #endif
@@ -96 +114 @@
                         // Actually push it
                         if(lists[i].push(node)) {
-                                #if defined(DISCOVER_BITMASK)
+                                #if VARIANT == DISCOVER
                                         size_t qword = i >> 6ull;
                                         size_t bit   = i & 63ull;
@@ -102 +120 @@
                                         bts(tls.mask, bit);
                                         snzi.arrive(i);
-                                #elif defined(SIMPLE_SNZI)
+                                #elif VARIANT == SNZI
                                         snzi.arrive(i);
-                                #elif !defined(NO_BITMASK)
+                                #elif VARIANT == BITMASK
                                         numNonEmpty++;
                                         size_t qword = i >> 6ull;
@@ -116 +134 @@
                                 #endif
                         }
-                        #if !defined(SIMPLE_SNZI) && !defined(DISCOVER_BITMASK)
+                        #if VARIANT != SNZI && VARIANT != DISCOVER
                                 assert(numNonEmpty <= (int)numLists);
                         #endif
@@ -125 +143 @@
                         #ifndef NO_STATS
                                 tls.pick.push.success++;
-                                #if !defined(SIMPLE_SNZI) && !defined(DISCOVER_BITMASK)
+                                #if VARIANT != SNZI && VARIANT != DISCOVER
                                         tls.empty.push.value += num;
                                         tls.empty.push.count += 1;
@@ -135 +153 @@
 
         __attribute__((noinline, hot)) node_t * pop() {
-                #if defined(DISCOVER_BITMASK)
+                #if VARIANT == DISCOVER
                         assert(numLists <= 64);
                         while(snzi.query()) {
@@ -164 +182 @@
                                 if(auto node = try_pop(i, j)) return node;
                         }
-                #elif defined(SIMPLE_SNZI)
+                #elif VARIANT == SNZI
                         while(snzi.query()) {
                                 // Pick two lists at random
@@ -172 +190 @@
                                 if(auto node = try_pop(i, j)) return node;
                         }
-                #elif !defined(NO_BITMASK)
+                #elif VARIANT == BITMASK
                         int nnempty;
                         while(0 != (nnempty = numNonEmpty)) {
@@ -226 +244 @@
                 #endif
 
-                #if defined(DISCOVER_BITMASK)
+                #if VARIANT == DISCOVER
                         if(lists[i].ts() > 0) bts(tls.mask, i); else btr(tls.mask, i);
                         if(lists[j].ts() > 0) bts(tls.mask, j); else btr(tls.mask, j);
@@ -244 +262 @@
                 if( !list.lock.try_lock() ) return nullptr;
 
-                #if !defined(SIMPLE_SNZI) && !defined(DISCOVER_BITMASK)
+                #if VARIANT != SNZI && VARIANT != DISCOVER
                         __attribute__((unused)) int num = numNonEmpty;
                 #endif
@@ -261 +279 @@
 
                 if(emptied) {
-                        #if defined(DISCOVER_BITMASK)
+                        #if VARIANT == DISCOVER
                                 size_t qword = w >> 6ull;
                                 size_t bit   = w & 63ull;
@@ -267 +285 @@
                                 __attribute__((unused)) bool ret = btr(tls.mask, bit);
                                 snzi.depart(w);
-                        #elif defined(SIMPLE_SNZI)
+                        #elif VARIANT == SNZI
                                 snzi.depart(w);
-                        #elif !defined(NO_BITMASK)
+                        #elif VARIANT == BITMASK
                                 numNonEmpty--;
                                 size_t qword = w >> 6ull;
@@ -284 +302 @@
                 // Unlock and return
                 list.lock.unlock();
-                #if !defined(SIMPLE_SNZI) && !defined(DISCOVER_BITMASK)
+                #if VARIANT != SNZI && VARIANT != DISCOVER
                         assert(numNonEmpty >= 0);
                 #endif
                 #ifndef NO_STATS
                         tls.pick.pop.success++;
-                        #if !defined(SIMPLE_SNZI) && !defined(DISCOVER_BITMASK)
+                        #if VARIANT != SNZI && VARIANT != DISCOVER
                                 tls.empty.pop.value += num;
                                 tls.empty.pop.count += 1;
@@ -435 +453 @@
         const unsigned numLists;
 private:
-        #if defined(SIMPLE_SNZI) || defined(DISCOVER_BITMASK)
+        #if VARIANT == SNZI || VARIANT == DISCOVER
                 snzi_t snzi;
         #else
                 std::atomic_int numNonEmpty  = { 0 };  // number of non-empty lists
+        #endif
+        #if VARIANT == BITMASK
                 std::atomic_size_t list_mask[7] = { {0}, {0}, {0}, {0}, {0}, {0}, {0} }; // which queues are empty
         #endif