Changes in / [a3effcc:a6cafa8]

Files:

• libcfa/src/concurrency/kernel/startup.cfa (modified) (4 diffs)
• libcfa/src/concurrency/ready_queue.cfa (modified) (7 diffs)
• tests/concurrent/.expect/cluster.txt (deleted)
• tests/concurrent/cluster.cfa (deleted)

libcfa/src/concurrency/kernel/startup.cfa

@@ -579 +579 @@
 
         // Lock the RWlock so no-one pushes/pops while we are changing the queue
-        disable_interrupts();
         uint_fast32_t last_size = ready_mutate_lock();
 
@@ -587 +586 @@
         // Unlock the RWlock
         ready_mutate_unlock( last_size );
-        enable_interrupts_noPoll(); // Don't poll, could be in main cluster
-
 
         this.io.cnt  = num_io;
@@ -604 +601 @@
 
         // Lock the RWlock so no-one pushes/pops while we are changing the queue
-        disable_interrupts();
         uint_fast32_t last_size = ready_mutate_lock();
 
@@ -612 +608 @@
         // Unlock the RWlock
         ready_mutate_unlock( last_size );
-        enable_interrupts_noPoll(); // Don't poll, could be in main cluster
 
         #if !defined(__CFA_NO_STATISTICS__)

libcfa/src/concurrency/ready_queue.cfa

@@ -215 +215 @@
 }
 
-static inline [unsigned, bool] idx_from_r(unsigned r, unsigned preferred) {
-        unsigned i;
-        bool local;
-        #if defined(BIAS)
-                unsigned rlow  = r % BIAS;
-                unsigned rhigh = r / BIAS;
-                if((0 != rlow) && preferred >= 0) {
-                        // (BIAS - 1) out of BIAS chances
-                        // Use perferred queues
-                        i = preferred + (rhigh % 4);
-                        local = true;
-                }
-                else {
-                        // 1 out of BIAS chances
-                        // Use all queues
-                        i = rhigh;
-                        local = false;
-                }
-        #else
-                i = r;
-                local = false;
-        #endif
-        return [i, local];
-}
-
 //-----------------------------------------------------------------------
 __attribute__((hot)) bool push(struct cluster * cltr, struct $thread * thrd) with (cltr->ready_queue) {
@@ -247 +222 @@
         thrd->link.ts = rdtscl();
 
-        __attribute__((unused)) bool local;
-        __attribute__((unused)) int preferred;
-        #if defined(BIAS)
-                preferred =
+        #if defined(BIAS) && !defined(__CFA_NO_STATISTICS__)
+                bool local = false;
+                int preferred =
                         //*
                         kernelTLS.this_processor ? kernelTLS.this_processor->id * 4 : -1;
@@ -256 +230 @@
                         thrd->link.preferred * 4;
                         //*/
+
+
         #endif
 
@@ -262 +238 @@
         do {
                 // Pick the index of a lane
-                unsigned r = __tls_rand();
-                [i, local] = idx_from_r(r, preferred);
-
-                #if !defined(__CFA_NO_STATISTICS__)
-                        if(local) {
-                                __tls_stats()->ready.pick.push.local++;
-                        }
+                #if defined(BIAS)
+                        unsigned r = __tls_rand();
+                        unsigned rlow  = r % BIAS;
+                        unsigned rhigh = r / BIAS;
+                        if((0 != rlow) && preferred >= 0) {
+                                // (BIAS - 1) out of BIAS chances
+                                // Use perferred queues
+                                i = preferred + (rhigh % 4);
+
+                                #if !defined(__CFA_NO_STATISTICS__)
+                                        local = true;
+                                        __tls_stats()->ready.pick.push.local++;
+                                #endif
+                        }
+                        else {
+                                // 1 out of BIAS chances
+                                // Use all queues
+                                i = rhigh;
+                                local = false;
+                        }
+                #else
+                        i = __tls_rand();
                 #endif
 
@@ -320 +311 @@
         /* paranoid */ verify( lanes.count > 0 );
         unsigned count = __atomic_load_n( &lanes.count, __ATOMIC_RELAXED );
-        int preferred;
         #if defined(BIAS)
                 // Don't bother trying locally too much
                 int local_tries = 8;
-                preferred = kernelTLS.this_processor->id * 4;
-        #endif
-
+        #endif
 
         // As long as the list is not empty, try finding a lane that isn't empty and pop from it
@@ -335 +323 @@
         #endif
                 // Pick two lists at random
-                unsigned ri = __tls_rand();
-                unsigned rj = __tls_rand();
-
-                unsigned i, j;
-                __attribute__((unused)) bool locali, localj;
-                [i, locali] = idx_from_r(ri, preferred);
-                [j, localj] = idx_from_r(rj, preferred);
-
-                #if !defined(__CFA_NO_STATISTICS__)
-                        if(locali) {
-                                __tls_stats()->ready.pick.pop.local++;
-                        }
-                        if(localj) {
-                                __tls_stats()->ready.pick.pop.local++;
-                        }
+                unsigned i,j;
+                #if defined(BIAS)
+                        #if !defined(__CFA_NO_STATISTICS__)
+                                bool local = false;
+                        #endif
+                        uint64_t r = __tls_rand();
+                        unsigned rlow  = r % BIAS;
+                        uint64_t rhigh = r / BIAS;
+                        if(local_tries && 0 != rlow) {
+                                // (BIAS - 1) out of BIAS chances
+                                // Use perferred queues
+                                unsigned pid = kernelTLS.this_processor->id * 4;
+                                i = pid + (rhigh % 4);
+                                j = pid + ((rhigh >> 32ull) % 4);
+
+                                // count the tries
+                                local_tries--;
+
+                                #if !defined(__CFA_NO_STATISTICS__)
+                                        local = true;
+                                        __tls_stats()->ready.pick.pop.local++;
+                                #endif
+                        }
+                        else {
+                                // 1 out of BIAS chances
+                                // Use all queues
+                                i = rhigh;
+                                j = rhigh >> 32ull;
+                        }
+                #else
+                        i = __tls_rand();
+                        j = __tls_rand();
                 #endif
 
@@ -359 +364 @@
                 if(thrd) {
                         #if defined(BIAS) && !defined(__CFA_NO_STATISTICS__)
-                                if( locali || localj ) __tls_stats()->ready.pick.pop.lsuccess++;
+                                if( local ) __tls_stats()->ready.pick.pop.lsuccess++;
                         #endif
                         return thrd;