Changes in / [a5873bd:5f259f3]

Location:

doc/theses/thierry_delisle_PhD/code

Files:

• process.sh (deleted)
• relaxed_list.hpp (modified) (10 diffs)
• runperf.sh (deleted)

doc/theses/thierry_delisle_PhD/code/relaxed_list.hpp

@@ -73 +73 @@
                         "SNZI",
                         "BITMASK",
-                        "SNZI + DISCOVERED MASK",
+                        "DISCOVER",
                         "SNZI + MASK"
                 };
@@ -82 +82 @@
                 : lists(new intrusive_queue_t[numLists])
                 , numLists(numLists)
-                #if VARIANT == SNZI
+                #if VARIANT == SNZI || VARIANT == DISCOVER
                         , snzi( std::log2( numLists / 8 ), 2 )
-                #elif VARIANT == SNZM || VARIANT == DISCOVER
+                #elif VARIANT == SNZM
                         , snzm( numLists )
                 #endif
@@ -128 +128 @@
                                         assert(qword == 0);
                                         bts(tls.mask, bit);
-                                        snzm.arrive(i);
+                                        snzi.arrive(i);
                                 #elif VARIANT == SNZI
                                         snzi.arrive(i);
@@ -166 +166 @@
                 #if VARIANT == DISCOVER
                         assert(numLists <= 64);
-                        while(snzm.query()) {
+                        while(snzi.query()) {
                                 tls.pick.pop.mask_attempt++;
                                 unsigned i, j;
@@ -180 +180 @@
                                                 tls.pick.pop.mask_reset++;
                                                 mask = (1U << numLists) - 1;
-                                                tls.mask.store(mask, std::memory_order_relaxed);
                                         }
 
@@ -203 +202 @@
                         }
                 #elif VARIANT == SNZM
-                        //*
                         while(snzm.query()) {
                                 tls.pick.pop.mask_attempt++;
@@ -248 +246 @@
                                 if(auto node = try_pop(i, j)) return node;
                         }
-                        /*/
-                        while(snzm.query()) {
-                                // Pick two lists at random
-                                int i = tls.rng.next() % numLists;
-                                int j = tls.rng.next() % numLists;
-
-                                if(auto node = try_pop(i, j)) return node;
-                        }
-                        //*/
                 #elif VARIANT == BITMASK
                         int nnempty;
@@ -351 +340 @@
                                 assert(qword == 0);
                                 __attribute__((unused)) bool ret = btr(tls.mask, bit);
-                                snzm.depart(w);
+                                snzi.depart(w);
                         #elif VARIANT == SNZI
                                 snzi.depart(w);
@@ -522 +511 @@
         const unsigned numLists;
 private:
-        #if VARIANT == SNZI
+        #if VARIANT == SNZI || VARIANT == DISCOVER
                 snzi_t snzi;
-        #elif VARIANT == SNZM || VARIANT == DISCOVER
+        #elif VARIANT == SNZM
                 snzm_t snzm;
         #else
@@ -613 +602 @@
                 double pop_sur  = (100.0 * double(global.pick.pop .success) / global.pick.pop .attempt);
                 double mpop_sur = (100.0 * double(global.pick.pop .success) / global.pick.pop .mask_attempt);
-                double rpop_sur = (100.0 * double(global.pick.pop .success) / global.pick.pop .mask_reset);
-
-                double push_len = double(global.pick.push.attempt     ) / global.pick.push.success;
-                double pop_len  = double(global.pick.pop .attempt     ) / global.pick.pop .success;
-                double mpop_len = double(global.pick.pop .mask_attempt) / global.pick.pop .success;
-                double rpop_len = double(global.pick.pop .mask_reset  ) / global.pick.pop .success;
-
-                os << "Push   Pick   : " << push_sur << " %, len " << push_len << " (" << global.pick.push.attempt      << " / " << global.pick.push.success << ")\n";
-                os << "Pop    Pick   : " << pop_sur  << " %, len " << pop_len  << " (" << global.pick.pop .attempt      << " / " << global.pick.pop .success << ")\n";
-                os << "TryPop Pick   : " << mpop_sur << " %, len " << mpop_len << " (" << global.pick.pop .mask_attempt << " / " << global.pick.pop .success << ")\n";
-                os << "Pop M Reset   : " << rpop_sur << " %, len " << rpop_len << " (" << global.pick.pop .mask_reset   << " / " << global.pick.pop .success << ")\n";
+                double rpop_sur = (100.0 * double(global.pick.pop .mask_reset) / global.pick.pop .mask_attempt);
+
+                os << "Push   Pick % : " << push_sur << "(" << global.pick.push.success << " / " << global.pick.push.attempt << ")\n";
+                os << "Pop    Pick % : " << pop_sur  << "(" << global.pick.pop .success << " / " << global.pick.pop .attempt << ")\n";
+                os << "TryPop Pick % : " << mpop_sur << "(" << global.pick.pop .success << " / " << global.pick.pop .mask_attempt << ")\n";
+                os << "Pop M Reset % : " << rpop_sur << "(" << global.pick.pop .mask_reset << " / " << global.pick.pop .mask_attempt << ")\n";
 
                 double avgQ_push = double(global.qstat.push.value) / global.qstat.push.count;