Changeset 12c1eef for libcfa/src/concurrency/kernel/fwd.hfa

Timestamp:

Jan 19, 2022, 2:36:56 PM (4 years ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

97c215f

Parents:

5235d49 (diff), 6a33e40 (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

File:

• libcfa/src/concurrency/kernel/fwd.hfa (modified) (3 diffs)

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 );
+                                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) {
@@ -112 +97 @@
                 }
         }
-
-
 
         extern void disable_interrupts();
@@ -142 +125 @@
                         }
                 }
-
-                extern uint64_t thread_rand();
 
                 // Semaphore which only supports a single thread