Changes in libcfa/src/bits/random.hfa [90fb672:d9585291]
- File:
-
- 1 edited
-
libcfa/src/bits/random.hfa (modified) (18 diffs)
Legend:
- Unmodified
- Added
- Removed
-
libcfa/src/bits/random.hfa
r90fb672 rd9585291 10 10 // Created On : Fri Jan 14 07:18:11 2022 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Mon Mar 20 21:45:24 202313 // Update Count : 1 8612 // Last Modified On : Thu Dec 22 20:54:22 2022 13 // Update Count : 178 14 14 // 15 15 … … 28 28 #define XOSHIRO256PP 29 29 //#define KISS_64 30 // #define SPLITMIX_6431 30 32 31 // 32-bit generators 33 32 //#define XORSHIFT_6_21_7 34 33 #define XOSHIRO128PP 35 // #define SPLITMIX_3236 34 #else // 32-bit architecture 37 35 // 64-bit generators 38 36 //#define XORSHIFT_13_7_17 39 37 #define XOSHIRO256PP 40 // #define SPLITMIX_6441 38 42 39 // 32-bit generators 43 40 //#define XORSHIFT_6_21_7 44 41 #define XOSHIRO128PP 45 // #define SPLITMIX_3246 42 #endif // __x86_64__ 47 43 48 44 // Define C/CFA PRNG name and random-state. 45 46 // SKULLDUGGERY: typedefs name struct and typedef with the same name to deal with CFA typedef numbering problem. 49 47 50 48 #ifdef XOSHIRO256PP 51 49 #define PRNG_NAME_64 xoshiro256pp 52 50 #define PRNG_STATE_64_T GLUE(PRNG_NAME_64,_t) 53 typedef struct { uint64_t s0, s1, s2, s3; } PRNG_STATE_64_T;51 typedef struct PRNG_STATE_64_T { uint64_t s0, s1, s2, s3; } PRNG_STATE_64_T; 54 52 #endif // XOSHIRO256PP 55 53 … … 57 55 #define PRNG_NAME_32 xoshiro128pp 58 56 #define PRNG_STATE_32_T GLUE(PRNG_NAME_32,_t) 59 typedef struct { uint32_t s0, s1, s2, s3; } PRNG_STATE_32_T;57 typedef struct PRNG_STATE_32_T { uint32_t s0, s1, s2, s3; } PRNG_STATE_32_T; 60 58 #endif // XOSHIRO128PP 61 59 … … 85 83 #endif // XORSHIFT_12_25_27 86 84 87 #ifdef SPLITMIX_6488 #define PRNG_NAME_64 splitmix6489 #define PRNG_STATE_64_T uint64_t90 #endif // SPLITMIX3291 92 #ifdef SPLITMIX_3293 #define PRNG_NAME_32 splitmix3294 #define PRNG_STATE_32_T uint32_t95 #endif // SPLITMIX3296 97 85 #ifdef KISS_64 98 86 #define PRNG_NAME_64 kiss_64 99 87 #define PRNG_STATE_64_T GLUE(PRNG_NAME_64,_t) 100 typedef struct { uint64_t z, w, jsr, jcong; } PRNG_STATE_64_T;88 typedef struct PRNG_STATE_64_T { uint64_t z, w, jsr, jcong; } PRNG_STATE_64_T; 101 89 #endif // KISS_^64 102 90 … … 104 92 #define PRNG_NAME_32 xorwow 105 93 #define PRNG_STATE_32_T GLUE(PRNG_NAME_32,_t) 106 typedef struct { uint32_t a, b, c, d, counter; } PRNG_STATE_32_T;94 typedef struct PRNG_STATE_32_T { uint32_t a, b, c, d, counter; } PRNG_STATE_32_T; 107 95 #endif // XOSHIRO128PP 108 96 … … 131 119 #ifdef __cforall // don't include in C code (invoke.h) 132 120 133 // https://rosettacode.org/wiki/Pseudo-random_numbers/Splitmix64134 //135 // Splitmix64 is not recommended for demanding random number requirements, but is often used to calculate initial states136 // for other more complex pseudo-random number generators (see https://prng.di.unimi.it).137 // Also https://rosettacode.org/wiki/Pseudo-random_numbers/Splitmix64.138 static inline uint64_t splitmix64( uint64_t & state ) {139 state += 0x9e3779b97f4a7c15;140 uint64_t z = state;141 z = (z ^ (z >> 30)) * 0xbf58476d1ce4e5b9;142 z = (z ^ (z >> 27)) * 0x94d049bb133111eb;143 return z ^ (z >> 31);144 } // splitmix64145 146 static inline void splitmix64_set_seed( uint64_t & state , uint64_t seed ) {147 state = seed;148 splitmix64( state ); // prime149 } // splitmix64_set_seed150 151 // https://github.com/bryc/code/blob/master/jshash/PRNGs.md#splitmix32152 //153 // Splitmix32 is not recommended for demanding random number requirements, but is often used to calculate initial states154 // for other more complex pseudo-random number generators (see https://prng.di.unimi.it).155 156 static inline uint32_t splitmix32( uint32_t & state ) {157 state += 0x9e3779b9;158 uint64_t z = state;159 z = (z ^ (z >> 15)) * 0x85ebca6b;160 z = (z ^ (z >> 13)) * 0xc2b2ae35;161 return z ^ (z >> 16);162 } // splitmix32163 164 static inline void splitmix32_set_seed( uint32_t & state, uint64_t seed ) {165 state = seed;166 splitmix32( state ); // prime167 } // splitmix32_set_seed168 169 #ifdef __SIZEOF_INT128__170 //--------------------------------------------------171 static inline uint64_t lehmer64( __uint128_t & state ) {172 __uint128_t ret = state;173 state *= 0x_da94_2042_e4dd_58b5;174 return ret >> 64;175 } // lehmer64176 177 static inline void lehmer64_set_seed( __uint128_t & state, uint64_t seed ) {178 // The seed needs to be coprime with the 2^64 modulus to get the largest period, so no factors of 2 in the seed.179 state = splitmix64( seed ); // prime180 } // lehmer64_set_seed181 182 //--------------------------------------------------183 static inline uint64_t wyhash64( uint64_t & state ) {184 uint64_t ret = state;185 state += 0x_60be_e2be_e120_fc15;186 __uint128_t tmp;187 tmp = (__uint128_t) ret * 0x_a3b1_9535_4a39_b70d;188 uint64_t m1 = (tmp >> 64) ^ tmp;189 tmp = (__uint128_t)m1 * 0x_1b03_7387_12fa_d5c9;190 uint64_t m2 = (tmp >> 64) ^ tmp;191 return m2;192 } // wyhash64193 194 static inline void wyhash64_set_seed( uint64_t & state, uint64_t seed ) {195 state = splitmix64( seed ); // prime196 } // wyhash64_set_seed197 #endif // __SIZEOF_INT128__198 199 121 // https://prng.di.unimi.it/xoshiro256starstar.c 200 122 // … … 208 130 209 131 #ifndef XOSHIRO256PP 210 typedef struct { uint64_t s0, s1, s2, s3; } xoshiro256pp_t;132 typedef struct xoshiro256pp_t { uint64_t s0, s1, s2, s3; } xoshiro256pp_t; 211 133 #endif // ! XOSHIRO256PP 212 134 … … 229 151 230 152 static inline void xoshiro256pp_set_seed( xoshiro256pp_t & state, uint64_t seed ) { 231 // To attain repeatable seeding, compute seeds separately because the order of argument evaluation is undefined. 232 uint64_t seed1 = splitmix64( seed ); // prime 233 uint64_t seed2 = splitmix64( seed ); 234 uint64_t seed3 = splitmix64( seed ); 235 uint64_t seed4 = splitmix64( seed ); 236 state = (xoshiro256pp_t){ seed1, seed2, seed3, seed4 }; 153 state = (xoshiro256pp_t){ seed, seed, seed, seed }; 154 xoshiro256pp( state ); 237 155 } // xoshiro256pp_set_seed 238 156 … … 247 165 248 166 #ifndef XOSHIRO128PP 249 typedef struct { uint32_t s0, s1, s2, s3; } xoshiro128pp_t;167 typedef struct xoshiro128pp_t { uint32_t s0, s1, s2, s3; } xoshiro128pp_t; 250 168 #endif // ! XOSHIRO128PP 251 169 … … 268 186 269 187 static inline void xoshiro128pp_set_seed( xoshiro128pp_t & state, uint32_t seed ) { 270 // To attain repeatable seeding, compute seeds separately because the order of argument evaluation is undefined. 271 uint32_t seed1 = splitmix32( seed ); // prime 272 uint32_t seed2 = splitmix32( seed ); 273 uint32_t seed3 = splitmix32( seed ); 274 uint32_t seed4 = splitmix32( seed ); 275 state = (xoshiro128pp_t){ seed1, seed2, seed3, seed4 }; 188 state = (xoshiro128pp_t){ seed, seed, seed, seed }; 189 xoshiro128pp( state ); // prime 276 190 } // xoshiro128pp_set_seed 191 192 #ifdef __SIZEOF_INT128__ 193 //-------------------------------------------------- 194 static inline uint64_t lehmer64( __uint128_t & state ) { 195 __uint128_t ret = state; 196 state *= 0x_da94_2042_e4dd_58b5; 197 return ret >> 64; 198 } // lehmer64 199 200 static inline void lehmer64_set_seed( __uint128_t & state, uint64_t seed ) { 201 // The seed needs to be coprime with the 2^64 modulus to get the largest period, so no factors of 2 in the seed. 202 state = seed; 203 lehmer64( state ); // prime 204 } // lehmer64_set_seed 205 206 //-------------------------------------------------- 207 static inline uint64_t wyhash64( uint64_t & state ) { 208 uint64_t ret = state; 209 state += 0x_60be_e2be_e120_fc15; 210 __uint128_t tmp; 211 tmp = (__uint128_t) ret * 0x_a3b1_9535_4a39_b70d; 212 uint64_t m1 = (tmp >> 64) ^ tmp; 213 tmp = (__uint128_t)m1 * 0x_1b03_7387_12fa_d5c9; 214 uint64_t m2 = (tmp >> 64) ^ tmp; 215 return m2; 216 } // wyhash64 217 218 static inline void wyhash64_set_seed( uint64_t & state, uint64_t seed ) { 219 state = seed; 220 wyhash64( state ); // prime 221 } // wyhash64_set_seed 222 #endif // __SIZEOF_INT128__ 277 223 278 224 //-------------------------------------------------- … … 286 232 287 233 static inline void xorshift_13_7_17_set_seed( uint64_t & state, uint64_t seed ) { 288 state = splitmix64( seed ); // prime 234 state = seed; 235 xorshift_13_7_17( state ); // prime 289 236 } // xorshift_13_7_17_set_seed 290 237 … … 303 250 304 251 static inline void xorshift_6_21_7_set_seed( uint32_t & state, uint32_t seed ) { 305 state = splitmix32( seed ); // prime 252 state = seed; 253 xorshift_6_21_7( state ); // prime 306 254 } // xorshift_6_21_7_set_seed 307 255 … … 317 265 318 266 static inline void xorshift_12_25_27_set_seed( uint64_t & state, uint64_t seed ) { 319 state = splitmix64( seed ); // prime 267 state = seed; 268 xorshift_12_25_27( state ); // prime 320 269 } // xorshift_12_25_27_set_seed 321 270 … … 323 272 // The state must be seeded with a nonzero value. 324 273 #ifndef KISS_64 325 typedef struct { uint64_t z, w, jsr, jcong; } kiss_64_t;274 typedef struct kiss_64_t { uint64_t z, w, jsr, jcong; } kiss_64_t; 326 275 #endif // ! KISS_64 327 276 … … 338 287 339 288 static inline void kiss_64_set_seed( kiss_64_t & rs, uint64_t seed ) with(rs) { 340 z = 1; w = 1; jsr = 4; jcong = splitmix64( seed ); // prime 289 z = 1; w = 1; jsr = 4; jcong = seed; 290 kiss_64( rs ); // prime 341 291 } // kiss_64_set_seed 342 292 … … 344 294 // The state array must be initialized to non-zero in the first four words. 345 295 #ifndef XORWOW 346 typedef struct { uint32_t a, b, c, d, counter; } xorwow_t;296 typedef struct xorwow_t { uint32_t a, b, c, d, counter; } xorwow_t; 347 297 #endif // ! XORWOW 348 298 … … 366 316 367 317 static inline void xorwow_set_seed( xorwow_t & rs, uint32_t seed ) { 368 // To attain repeatable seeding, compute seeds separately because the order of argument evaluation is undefined. 369 uint32_t seed1 = splitmix32( seed ); // prime 370 uint32_t seed2 = splitmix32( seed ); 371 uint32_t seed3 = splitmix32( seed ); 372 uint32_t seed4 = splitmix32( seed ); 373 rs = (xorwow_t){ seed1, seed2, seed3, seed4, 0 }; 318 rs = (xorwow_t){ seed, seed, seed, seed, 0 }; 319 xorwow( rs ); // prime 374 320 } // xorwow_set_seed 375 321 … … 377 323 // Used in __tls_rand_fwd 378 324 #define M (1_l64u << 48_l64u) 379 #define A (25 _214_903_917_l64u)380 #define AI (18 _446_708_753_438_544_741_l64u)325 #define A (25214903917_l64u) 326 #define AI (18446708753438544741_l64u) 381 327 #define C (11_l64u) 382 328 #define D (16_l64u)
Note:
See TracChangeset
for help on using the changeset viewer.
