Changeset f0c3120

Timestamp:

Jul 23, 2020, 1:37:31 PM (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:

04b73b6

Parents:

2e5fd8b6

Message:

Added unsuccesfull reverse rng attempt

Location:

doc/theses/thierry_delisle_PhD/code

Files:

• relaxed_list.hpp (modified) (4 diffs)
• snzi-packed.hpp (added)
• snzi.hpp (modified) (1 diff)

doc/theses/thierry_delisle_PhD/code/relaxed_list.hpp

@@ -30 +30 @@
 #include "links.hpp"
 #include "snzi.hpp"
+#include "snzi-packed.hpp"
 #include "snzm.hpp"
 
@@ -82 +83 @@
                 : numLists(numThreads * numQueues)
                 , lists(new intrusive_queue_t<node_t>[numLists])
-                #if VARIANT == SNZI || VARIANT == BIAS || VARIANT == BACK || VARIANT == BACKBIAS
-                        , snzi( std::log2( numLists / (numQueues) ), 2 )
+                #if VARIANT == SNZI || VARIANT == BACK
+                        , snzi( std::log2( numLists / (2 * numQueues) ), 2 )
+                #elif VARIANT == BIAS || VARIANT == BACKBIAS
+                        #ifdef SNZI_PACKED
+                                , snzi( std::ceil( std::log2(numLists) ) )
+                        #else
+                                , snzi( std::log2( numLists / (2 * numQueues) ), 2 )
+                        #endif
                 #elif VARIANT == SNZM || VARIANT == DISCOVER
                         , snzm( numLists )
@@ -421 +428 @@
                 unsigned i;
                 if(bias) {
-                        if(0 == (r & 0xF)) {
-                                i = r >> 4;
+                        if(0 == (r & 0x3F)) {
+                                i = r >> 6;
                         } else {
-                                i = tls.my_queue + ((r >> 4) % 4);
+                                i = tls.my_queue + ((r >> 6) % 4);
                                 tls.pick.push.local++;
                         }
@@ -448 +455 @@
         __attribute__((aligned(64))) std::unique_ptr<intrusive_queue_t<node_t> []> lists;
 private:
-        #if VARIANT == SNZI || VARIANT == BIAS || VARIANT == BACK || VARIANT == BACKBIAS
+        #if VARIANT == SNZI || VARIANT == BACK
                 snzi_t snzi;
+        #elif VARIANT == BIAS || VARIANT == BACKBIAS
+                #ifdef SNZI_PACKED
+                        snzip_t snzi;
+                #else
+                        snzi_t snzi;
+                #endif
         #elif VARIANT == SNZM || VARIANT == DISCOVER
                 snzm_t snzm;

doc/theses/thierry_delisle_PhD/code/snzi.hpp

@@ -157 +157 @@
 {
         int width = std::pow(base, depth);
-        std::cout << "SNZI: " << depth << "x" << width << "(" << mask - 1 << ")" << std::endl;
+        std::cout << "SNZI: " << depth << "x" << width << "(" << mask - 1 << ") " << (sizeof(snzi_t::node) * (root + 1)) << " bytes" << std::endl;
         for(int i = 0; i < root; i++) {
-                nodes[i].parent = &nodes[(i / base) + width ];
+                std::cout << i << " -> " << (i / base) + width << std::endl;
+                nodes[i].parent = &nodes[(i / base) + width];
         }
 }