Changeset c655650

Timestamp:

Feb 12, 2022, 1:53:14 PM (2 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

470618c0

Parents:

aac37fa

Message:

update fast PRNG code

Location:

libcfa/src/concurrency

Files:

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

libcfa/src/concurrency/kernel/startup.cfa

@@ -18 +18 @@
 
 // C Includes
-#include <errno.h>              // errno
+#include <errno.h>                                                                              // errno
 #include <signal.h>
-#include <string.h>             // strerror
-#include <unistd.h>             // sysconf
+#include <string.h>                                                                             // strerror
+#include <unistd.h>                                                                             // sysconf
 
 extern "C" {
-      #include <limits.h>       // PTHREAD_STACK_MIN
-        #include <unistd.h>       // syscall
-        #include <sys/eventfd.h>  // eventfd
-      #include <sys/mman.h>     // mprotect
-      #include <sys/resource.h> // getrlimit
+        #include <limits.h>                                                                     // PTHREAD_STACK_MIN
+        #include <unistd.h>                                                                     // syscall
+        #include <sys/eventfd.h>                                                        // eventfd
+        #include <sys/mman.h>                                                           // mprotect
+        #include <sys/resource.h>                                                       // getrlimit
 }
 
 // CFA Includes
 #include "kernel_private.hfa"
-#include "startup.hfa"          // STARTUP_PRIORITY_XXX
+#include "startup.hfa"                                                                  // STARTUP_PRIORITY_XXX
 #include "limits.hfa"
 #include "math.hfa"
@@ -102 +102 @@
 extern void __wake_proc(processor *);
 extern int cfa_main_returned;                                                   // from interpose.cfa
-extern uint32_t __global_random_seed;
+uint32_t __global_random_prime = 4_294_967_291u, __global_random_mask = false;
 
 //-----------------------------------------------------------------------------
@@ -490 +490 @@
         preferred = ready_queue_new_preferred();
         last_proc = 0p;
-        random_state = __global_random_seed;
+        random_state = __global_random_mask ? __global_random_prime : __global_random_prime ^ rdtscl();
         #if defined( __CFA_WITH_VERIFY__ )
                 canary = 0x0D15EA5E0D15EA5Ep;

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 : Sat Jan 15 14:34:58 2022
-// Update Count     : 45
+// Last Modified On : Sat Feb 12 08:45:33 2022
+// Update Count     : 65
 //
 
@@ -25 +25 @@
 #include "invoke.h"
 
-extern uint32_t __global_random_seed;
+extern uint32_t __global_random_seed, __global_random_prime, __global_random_mask;
 
 //-----------------------------------------------------------------------------
@@ -45 +45 @@
         preferred = ready_queue_new_preferred();
         last_proc = 0p;
-        random_state = __global_random_seed;
+        random_state = __global_random_mask ? __global_random_prime : __global_random_prime ^ rdtscl();
         #if defined( __CFA_WITH_VERIFY__ )
                 canary = 0x0D15EA5E0D15EA5Ep;
@@ -178 +178 @@
         active_thread()->random_state = __global_random_seed = seed;
         GENERATOR( active_thread()->random_state );
+        __global_random_prime = active_thread()->random_state;
+        __global_random_mask = true;
 } // set_seed
 

libcfa/src/concurrency/thread.hfa

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Feb  9 22:10:14 2022
-// Update Count     : 14
+// Last Modified On : Fri Feb 11 16:34:07 2022
+// Update Count     : 20
 //
 
@@ -131 +131 @@
 
 //----------
+// prng
 static inline {
         uint32_t prng( thread$ & th ) __attribute__(( warn_unused_result )) { return LCG( th.random_state ); } // [0,UINT_MAX]
         uint32_t prng( thread$ & th, uint32_t u ) __attribute__(( warn_unused_result )) { return prng( th ) % u; } // [0,u)
         uint32_t prng( thread$ & th, uint32_t l, uint32_t u ) __attribute__(( warn_unused_result )) { return prng( th, u - l + 1 ) + l; } // [l,u]
-} // prng
+        forall( T & | is_thread(T) ) {
+                uint32_t prng( T & th ) __attribute__(( warn_unused_result )) { return prng( (thread &)th ); } // [0,UINT_MAX]
+                uint32_t prng( T & th, uint32_t u ) __attribute__(( warn_unused_result )) { return prng( th ) % u; } // [0,u)
+                uint32_t prng( T & th, uint32_t l, uint32_t u ) __attribute__(( warn_unused_result )) { return prng( th, u - l + 1 ) + l; } // [l,u]
+        } // distribution
+} // distribution
 
 // Local Variables: //