Changeset a1b9bc3 for doc/theses/thierry_delisle_PhD/code/readyQ_proto/dynamic_entropy.hpp

Timestamp:

Apr 12, 2021, 5:22:02 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

7f5683e

Parents:

fe63ae6

Message:

Many small changes to prototype code

File:

• doc/theses/thierry_delisle_PhD/code/readyQ_proto/dynamic_entropy.hpp (modified) (7 diffs)

doc/theses/thierry_delisle_PhD/code/readyQ_proto/dynamic_entropy.hpp

@@ -33 +33 @@
                 do {
                         // Pick the index of a lane
-                        i = idx_from_r(tls.rng1.next(), tls.my_queue);
+                        i = idx_from_r(tls.rng1.next(), tls.my_queue).first;
                         // i = ret.first; //local = ret.second;
                         tls.stats.push.attempt++;
@@ -48 +48 @@
                         // Pick two lists at random
                         unsigned i, j;
-                        // bool locali, localj;
-                        i = idx_from_r(tls.rng2.prev(), tls.my_queue);
-                        j = idx_from_r(tls.rng2.prev(), tls.my_queue);
-
-                        // i = reti.first; //local = reti.second;
-                        // j = retj.first; //local = retj.second;
+                        bool locali, localj;
+                        auto reti = idx_from_r(tls.rng2.prev(), tls.my_queue);
+                        auto retj = idx_from_r(tls.rng2.prev(), tls.my_queue);
+
+                        i = reti.first; locali = reti.second;
+                        j = retj.first; localj = retj.second;
                         tls.stats.pop.attempt++;
 
@@ -108 +108 @@
         }
 
-        inline unsigned idx_from_r(unsigned r, unsigned preferred) {
+        inline std::pair<unsigned, bool> idx_from_r(unsigned r, unsigned preferred) {
                 unsigned i;
-                // bool local;
+                bool local;
                 unsigned rlow  = r % 4;
                 unsigned rhigh = r / 4;
@@ -117 +117 @@
                         // Use perferred queues
                         i = preferred + (rhigh % 4);
-                        // local = true;
+                        local = true;
                 }
                 else {
@@ -123 +123 @@
                         // Use all queues
                         i = rhigh;
-                        // local = false;
-                }
-                return i % numLists;
+                        local = false;
+                }
+                return {i % numLists, local};
         }
 private:
@@ -141 +141 @@
                 Random     rng1 = { unsigned(std::hash<std::thread::id>{}(std::this_thread::get_id()) ^ rdtscl()) };
                 Random     rng2 = { unsigned(std::hash<std::thread::id>{}(std::this_thread::get_id()) ^ rdtscl()) };
+                Random     rng3 = { unsigned(std::hash<std::thread::id>{}(std::this_thread::get_id()) ^ rdtscl()) };
                 unsigned   my_queue = calc_preferred();
                 struct {
@@ -185 +186 @@
         }
 
-        static void stats_print(std::ostream & os) {
+        static void stats_print(std::ostream & os, double) {
                         const auto & global = global_stats;