Changeset 9b33337 for libcfa/src/concurrency

Timestamp:

Jan 10, 2022, 7:11:34 PM (2 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

07a1e7a

Parents:

5b7a3662 (diff), a10f6b4 (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)
• kernel/fwd.hfa (modified) (3 diffs)
• 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/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/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 : Mon Jan 10 17:05:35 2022
+// Update Count     : 28
 //
 
@@ -27 +27 @@
 uint64_t thread_rand();
 
+extern uint32_t __thread_seed;                                                  // global thread 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 };
@@ -39 +41 @@
         self_mon.owner = &this;
         self_mon.recursion = 1;
+        random_state = __thread_seed;
         self_mon_p = &self_mon;
         curr_cluster = &cl;
@@ -178 +181 @@
 }
 
+#define GENERATOR LCG
+
+inline uint32_t MarsagliaXor( uint32_t & state ) {
+        state ^= state << 6;
+        state ^= state >> 21;
+        state ^= state << 7;
+        return state;
+} // MarsagliaXor
+
+inline uint32_t LCG( uint32_t & state ) {                               // linear congruential generator
+        return state = 36969 * (state & 65535) + (state >> 16); // 36969 is NOT prime!
+} // LCG
+
+void set_seed( uint32_t seed ) { active_thread()->random_state = seed; __thread_seed = seed; }
+uint32_t prng( void ) { return GENERATOR( active_thread()->random_state ); } // [0,UINT_MAX]
+
 // Local Variables: //
 // mode: c //