Changeset 5d1ebb9 for libcfa/src/concurrency

Timestamp:

Jan 13, 2022, 9:42:08 PM (2 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

75965a6

Parents:

919a6b2

Message:

remove thread_rand, remove consolidated random generators

Location:

libcfa/src/concurrency

Files:

• kernel/fwd.hfa (modified) (2 diffs)
• thread.cfa (modified) (3 diffs)

libcfa/src/concurrency/kernel/fwd.hfa

@@ -79 +79 @@
                         return
                         #if defined(__SIZEOF_INT128__)
-                                __lehmer64( kernelTLS().rand_seed );
+                                lehmer64( kernelTLS().rand_seed );
                         #else
-                                __xorshift64( kernelTLS().rand_seed );
+                                xorshift_13_7_17( kernelTLS().rand_seed );
                         #endif
                 }
 
-                #define M  (1_l64u << 48_l64u)
-                #define A  (25214903917_l64u)
-                #define AI (18446708753438544741_l64u)
-                #define C  (11_l64u)
-                #define D  (16_l64u)
-
                 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;
+                        return LCGBI_fwd( kernelTLS().ready_rng.fwd_seed );
                 }
 
                 static inline unsigned __tls_rand_bck() {
-                        unsigned int r = kernelTLS().ready_rng.bck_seed >> D;
-                        kernelTLS().ready_rng.bck_seed = AI * (kernelTLS().ready_rng.bck_seed - C) & (M - 1);
-                        return r;
-                }
-
-                #undef M
-                #undef A
-                #undef AI
-                #undef C
-                #undef D
+                        return LCGBI_bck( kernelTLS().ready_rng.bck_seed );
+                }
 
                 static inline void __tls_rand_advance_bck(void) {
@@ -140 +125 @@
                         }
                 }
-
-                extern uint64_t thread_rand();
 
                 // Semaphore which only supports a single thread

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 Jan 12 18:46:48 2022
-// Update Count     : 36
+// Last Modified On : Thu Jan 13 20:11:55 2022
+// Update Count     : 42
 //
 
@@ -24 +24 @@
 #define __CFA_INVOKE_PRIVATE__
 #include "invoke.h"
-
-uint64_t thread_rand();
 
 extern uint32_t __global_random_seed;
@@ -174 +172 @@
 }
 
-uint64_t thread_rand() {
-        disable_interrupts();
-        uint64_t ret = __tls_rand();
-        enable_interrupts();
-        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 ) {