Changeset 42daeb4 for libcfa/src/concurrency

Timestamp:

Jan 13, 2022, 10:53:25 AM (4 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

3eaa689

Parents:

3bb12921 (diff), 00f5fde (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

libcfa/src/concurrency

Files:

• invoke.h (modified) (2 diffs)
• io.cfa (modified) (1 diff)
• kernel.cfa (modified) (2 diffs)
• kernel/fwd.hfa (modified) (3 diffs)
• kernel/startup.cfa (modified) (2 diffs)
• ready_queue.cfa (modified) (1 diff)
• thread.cfa (modified) (4 diffs)

libcfa/src/concurrency/invoke.h

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jan  6 16:37:40 2022
-// Update Count     : 47
+// Last Modified On : Sun Jan  9 19:06:45 2022
+// Update Count     : 48
 //
 
@@ -211 +211 @@
                 struct processor * last_proc;
 
+                uint32_t random_state;                                                  // fast random numbers
+
                 #if defined( __CFA_WITH_VERIFY__ )
                         void * canary;

libcfa/src/concurrency/io.cfa

@@ -548 +548 @@
                         /* paranoid */ verify( proc == __cfaabi_tls.this_processor );
                         /* paranoid */ verify( ! __preemption_enabled() );
+
+                        return true;
                 }
         #endif

libcfa/src/concurrency/kernel.cfa

@@ -554 +554 @@
         /* paranoid */ verify( 0x0D15EA5E0D15EA5Ep == thrd->canary );
 
-        const bool local = thrd->state != Start;
         if (thrd->preempted == __NO_PREEMPTION) thrd->state = Ready;
 
@@ -737 +736 @@
 
         // Check if there is a sleeping processor
-        int fd = __atomic_load_n(&this->procs.fd, __ATOMIC_SEQ_CST);
+        // int fd = __atomic_load_n(&this->procs.fd, __ATOMIC_SEQ_CST);
+        int fd = 0;
+        if( __atomic_load_n(&this->procs.fd, __ATOMIC_SEQ_CST) != 0 ) {
+                fd = __atomic_exchange_n(&this->procs.fd, 0, __ATOMIC_RELAXED);
+        }
 
         // If no one is sleeping, we are done

libcfa/src/concurrency/kernel/fwd.hfa

@@ -77 +77 @@
 
                 static inline uint64_t __tls_rand() {
+                        return
                         #if defined(__SIZEOF_INT128__)
-                                return __lehmer64( kernelTLS().rand_seed );
+                                __lehmer64( kernelTLS().rand_seed );
                         #else
-                                return __xorshift64( kernelTLS().rand_seed );
+                                __xorshift64( kernelTLS().rand_seed );
                         #endif
                 }
@@ -91 +92 @@
 
                 static inline unsigned __tls_rand_fwd() {
-
                         kernelTLS().ready_rng.fwd_seed = (A * kernelTLS().ready_rng.fwd_seed + C) & (M - 1);
                         return kernelTLS().ready_rng.fwd_seed >> D;
@@ -112 +112 @@
                 }
         }
-
-
 
         extern void disable_interrupts();

libcfa/src/concurrency/kernel/startup.cfa

@@ -101 +101 @@
 extern void __wake_proc(processor *);
 extern int cfa_main_returned;                                                   // from interpose.cfa
+extern uint32_t __global_random_seed;
 
 //-----------------------------------------------------------------------------
@@ -489 +490 @@
         preferred = ready_queue_new_preferred();
         last_proc = 0p;
+        random_state = __global_random_seed;
         #if defined( __CFA_WITH_VERIFY__ )
                 canary = 0x0D15EA5E0D15EA5Ep;

libcfa/src/concurrency/ready_queue.cfa

@@ -681 +681 @@
         // Actually pop the list
         struct thread$ * thrd;
-        unsigned long long tsc_before = ts(lane);
+        #if defined(USE_WORK_STEALING) || defined(USE_CPU_WORK_STEALING)
+                unsigned long long tsc_before = ts(lane);
+        #endif
         unsigned long long tsv;
         [thrd, tsv] = pop(lane);

libcfa/src/concurrency/thread.cfa

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Dec  4 09:17:49 2019
-// Update Count     : 9
+// Last Modified On : Wed Jan 12 18:46:48 2022
+// Update Count     : 36
 //
 
@@ -27 +27 @@
 uint64_t thread_rand();
 
+extern uint32_t __global_random_seed;
+
 //-----------------------------------------------------------------------------
 // Thread ctors and dtors
-void ?{}(thread$ & this, const char * const name, cluster & cl, void * storage, size_t storageSize ) with( this ) {
+void ?{}( thread$ & this, const char * const name, cluster & cl, void * storage, size_t storageSize ) with( this ) {
         context{ 0p, 0p };
         self_cor{ name, storage, storageSize };
@@ -45 +47 @@
         preferred = ready_queue_new_preferred();
         last_proc = 0p;
+        random_state = __global_random_seed;
         #if defined( __CFA_WITH_VERIFY__ )
                 canary = 0x0D15EA5E0D15EA5Ep;
@@ -177 +180 @@
         return ret;
 }
+ 
+#define GENERATOR LCG
+
+static inline uint32_t MarsagliaXor( uint32_t & state ) {
+        uint32_t ret = state;
+        state ^= state << 6;
+        state ^= state >> 21;
+        state ^= state << 7;
+        return ret;
+} // MarsagliaXor
+
+static inline uint32_t LCG( uint32_t & state ) {                // linear congruential generator
+        uint32_t ret = state;
+        state = 36969 * (state & 65535) + (state >> 16);        // 36969 is NOT prime! No not change it!
+        return ret;
+} // LCG
+
+void set_seed( uint32_t seed ) {
+        active_thread()->random_state = __global_random_seed = seed;
+        GENERATOR( active_thread()->random_state );
+} // set_seed
+uint32_t prng( void ) { return GENERATOR( active_thread()->random_state ); } // [0,UINT_MAX]
 
 // Local Variables: //