commit 679bda82585987b739868a5fefdd64c662f4379f
parent 888e39e601f7fb25abcaa7d5c835cc3caca28dda
Author: Michael Savage <mikejsavage@gmail.com>
Date: Sun, 29 Apr 2018 12:06:18 +0300
Use PCG instead of MT/WELL512
Diffstat:
10 files changed, 22 insertions(+), 273 deletions(-)
diff --git a/make.lua b/make.lua
@@ -1,6 +1,6 @@
require( "scripts.gen_makefile" )
-local common_objs = { "memory_arena", "log", "ggformat", "patterns", "strlcpy", "strlcat", "strtonum", "profiler", "stats", "rng/well512", "breakbools" }
+local common_objs = { "memory_arena", "log", "ggformat", "patterns", "strlcpy", "strlcat", "strtonum", "profiler", "stats", "rng/pcg", "breakbools" }
local game_objs = { "work_queue", "renderer", "shaders", "gl", "glad", "immediate", "text_renderer", "liberation", "obj", "blue_noise", "rng/csprng", "ggentropy", common_objs }
local game_libs = { "glfw", "stb_image", "stb_truetype", "monocypher", "tinyobjloader" }
diff --git a/pp.cc b/pp.cc
@@ -9,7 +9,7 @@
#include "decompress_bc.h"
#include "autogdb.h"
-#include "rng/well512.h"
+#include "rng/pcg.h"
#include "libs/lz4/lz4.h"
#include "libs/lz4/lz4hc.h"
@@ -199,7 +199,7 @@ static u8 * write_compressed_texture( MemoryArena * arena, const DynamicString &
const size_t MAX_TREES = 262144 / 4;
-static bool ok_tree_position( RNGWell512 * rng, const array2d< u16 > heightmap, const array2d< v3 > normalmap, v2 pos, v3 * tree ) {
+static bool ok_tree_position( PCG * rng, const array2d< u16 > heightmap, const array2d< v3 > normalmap, v2 pos, v3 * tree ) {
u16 height = bilerp01( heightmap, pos.x, pos.y );
double p = 1;
if( height <= 5 * 256 ) return false;
@@ -242,8 +242,7 @@ static size_t place_trees( MemoryArena * arena, const array2d< u16 > heightmap,
array< v2 > points = memarena_push_array( arena, v2, trees.n );
hammersley( MAX_TREES, points );
- RNGWell512 rng;
- rng_well512_init( &rng );
+ PCG rng = new_pcg();
size_t placed = 0;
for( v2 point : points ) {
diff --git a/rng/fixed.cc b/rng/fixed.cc
@@ -8,23 +8,21 @@
* the speed and badness make it viable for particle systems and not much else
*/
-#include "../intrinsics.h"
-#include "fixed.h"
+#include "intrinsics.h"
+#include "rng/fixed.h"
static u32 nums[] = {
-#include "fixed_lookup.h"
+#include "rng/fixed_lookup.h"
};
-void rng_fixed_init( RNGFixed * rng ) {
- rng->index = 0;
+FixedRNG new_fixed_rng( u16 index ) {
+ FixedRNG rng;
+ rng.index = index;
+ return rng;
}
-u32 rng_fixed_next( RNGFixed * rng ) {
+u32 rng_next( FixedRNG * rng ) {
u32 ret = nums[ rng->index ];
rng->index = ( rng->index + 1 ) % ARRAY_COUNT( nums );
return ret;
}
-
-u32 rng_next( RNGFixed * rng ) {
- return rng_fixed_next( rng );
-}
diff --git a/rng/fixed.h b/rng/fixed.h
@@ -1,13 +1,12 @@
#pragma once
-#include "../intrinsics.h"
-#include "rng_utils.h"
+#include "intrinsics.h"
+#include "rng/rng_utils.h"
-struct RNGFixed {
+struct FixedRNG {
u16 index;
};
-void rng_fixed_init( RNGFixed * rng );
-u32 rng_fixed_next( RNGFixed * rng );
+FixedRNG new_fixed_rng( u16 index = 0 );
u32 rng_next( RNGFixed * rng );
diff --git a/rng/mersenne_twister.cc b/rng/mersenne_twister.cc
@@ -1,184 +0,0 @@
-/*
- A C-program for MT19937, with initialization improved 2002/1/26.
- Coded by Takuji Nishimura and Makoto Matsumoto.
-
- Before using, initialize the state by using init_genrand(seed)
- or init_by_array(init_key, key_length).
-
- Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- 3. The names of its contributors may not be used to endorse or promote
- products derived from this software without specific prior written
- permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- Any feedback is very welcome.
- http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html
- email: m-mat @ math.sci.hiroshima-u.ac.jp (remove space)
-*/
-
-#include <stdio.h>
-
-/* Period parameters */
-#define N 624
-#define M 397
-#define MATRIX_A 0x9908b0dfUL /* constant vector a */
-#define UPPER_MASK 0x80000000UL /* most significant w-r bits */
-#define LOWER_MASK 0x7fffffffUL /* least significant r bits */
-
-static unsigned long mt[N]; /* the array for the state vector */
-static int mti=N+1; /* mti==N+1 means mt[N] is not initialized */
-
-/* initializes mt[N] with a seed */
-void init_genrand(unsigned long s)
-{
- mt[0]= s & 0xffffffffUL;
- for (mti=1; mti<N; mti++) {
- mt[mti] =
- (1812433253UL * (mt[mti-1] ^ (mt[mti-1] >> 30)) + mti);
- /* See Knuth TAOCP Vol2. 3rd Ed. P.106 for multiplier. */
- /* In the previous versions, MSBs of the seed affect */
- /* only MSBs of the array mt[]. */
- /* 2002/01/09 modified by Makoto Matsumoto */
- mt[mti] &= 0xffffffffUL;
- /* for >32 bit machines */
- }
-}
-
-/* initialize by an array with array-length */
-/* init_key is the array for initializing keys */
-/* key_length is its length */
-/* slight change for C++, 2004/2/26 */
-void init_by_array(unsigned long init_key[], int key_length)
-{
- int i, j, k;
- init_genrand(19650218UL);
- i=1; j=0;
- k = (N>key_length ? N : key_length);
- for (; k; k--) {
- mt[i] = (mt[i] ^ ((mt[i-1] ^ (mt[i-1] >> 30)) * 1664525UL))
- + init_key[j] + j; /* non linear */
- mt[i] &= 0xffffffffUL; /* for WORDSIZE > 32 machines */
- i++; j++;
- if (i>=N) { mt[0] = mt[N-1]; i=1; }
- if (j>=key_length) j=0;
- }
- for (k=N-1; k; k--) {
- mt[i] = (mt[i] ^ ((mt[i-1] ^ (mt[i-1] >> 30)) * 1566083941UL))
- - i; /* non linear */
- mt[i] &= 0xffffffffUL; /* for WORDSIZE > 32 machines */
- i++;
- if (i>=N) { mt[0] = mt[N-1]; i=1; }
- }
-
- mt[0] = 0x80000000UL; /* MSB is 1; assuring non-zero initial array */
-}
-
-/* generates a random number on [0,0xffffffff]-interval */
-unsigned long genrand_int32(void)
-{
- unsigned long y;
- static unsigned long mag01[2]={0x0UL, MATRIX_A};
- /* mag01[x] = x * MATRIX_A for x=0,1 */
-
- if (mti >= N) { /* generate N words at one time */
- int kk;
-
- if (mti == N+1) /* if init_genrand() has not been called, */
- init_genrand(5489UL); /* a default initial seed is used */
-
- for (kk=0;kk<N-M;kk++) {
- y = (mt[kk]&UPPER_MASK)|(mt[kk+1]&LOWER_MASK);
- mt[kk] = mt[kk+M] ^ (y >> 1) ^ mag01[y & 0x1UL];
- }
- for (;kk<N-1;kk++) {
- y = (mt[kk]&UPPER_MASK)|(mt[kk+1]&LOWER_MASK);
- mt[kk] = mt[kk+(M-N)] ^ (y >> 1) ^ mag01[y & 0x1UL];
- }
- y = (mt[N-1]&UPPER_MASK)|(mt[0]&LOWER_MASK);
- mt[N-1] = mt[M-1] ^ (y >> 1) ^ mag01[y & 0x1UL];
-
- mti = 0;
- }
-
- y = mt[mti++];
-
- /* Tempering */
- y ^= (y >> 11);
- y ^= (y << 7) & 0x9d2c5680UL;
- y ^= (y << 15) & 0xefc60000UL;
- y ^= (y >> 18);
-
- return y;
-}
-
-/* generates a random number on [0,0x7fffffff]-interval */
-long genrand_int31(void)
-{
- return (long)(genrand_int32()>>1);
-}
-
-/* generates a random number on [0,1]-real-interval */
-double genrand_real1(void)
-{
- return genrand_int32()*(1.0/4294967295.0);
- /* divided by 2^32-1 */
-}
-
-/* generates a random number on [0,1)-real-interval */
-double genrand_real2(void)
-{
- return genrand_int32()*(1.0/4294967296.0);
- /* divided by 2^32 */
-}
-
-/* generates a random number on (0,1)-real-interval */
-double genrand_real3(void)
-{
- return (((double)genrand_int32()) + 0.5)*(1.0/4294967296.0);
- /* divided by 2^32 */
-}
-
-/* generates a random number on [0,1) with 53-bit resolution*/
-double genrand_res53(void)
-{
- unsigned long a=genrand_int32()>>5, b=genrand_int32()>>6;
- return(a*67108864.0+b)*(1.0/9007199254740992.0);
-}
-/* These real versions are due to Isaku Wada, 2002/01/09 added */
-
-int main(void)
-{
- int i;
- unsigned long init[4]={0x123, 0x234, 0x345, 0x456}, length=4;
- init_by_array(init, length);
- for( i = 0; i < 10000000; i++ ) {
- int x = genrand_int32();
- printf( "%d\n", x );
- }
- return 0;
-}
diff --git a/rng/well512.cc b/rng/well512.cc
@@ -1,48 +0,0 @@
-/*
- * WELL512 PRNG written by Chris Lomont
- * www.lomont.org/Math/Papers/2008/Lomont_PRNG_2008.pdf
- */
-
-#include "../intrinsics.h"
-#include "well512.h"
-
-void rng_well512_init( RNGWell512 * rng ) {
- // generated with
- // for i in (seq 1 16); od -A n -t u -N 4 /dev/urandom; end
- rng->state[ 0 ] = 3485465937;
- rng->state[ 1 ] = 619988921;
- rng->state[ 2 ] = 1151619954;
- rng->state[ 3 ] = 1259802506;
- rng->state[ 4 ] = 2391016736;
- rng->state[ 5 ] = 1833603341;
- rng->state[ 6 ] = 3529478173;
- rng->state[ 7 ] = 2843655677;
- rng->state[ 8 ] = 1227810011;
- rng->state[ 9 ] = 3849695542;
- rng->state[ 10 ] = 3734095823;
- rng->state[ 11 ] = 582871035;
- rng->state[ 12 ] = 3217102166;
- rng->state[ 13 ] = 1925191046;
- rng->state[ 14 ] = 1602871528;
- rng->state[ 15 ] = 1661469209;
- rng->index = 0;
-}
-
-u32 rng_well512_next( RNGWell512 * rng ) {
- u32 a, b, c, d;
- a = rng->state[rng->index];
- c = rng->state[(rng->index+13)&15];
- b = a^c^(a<<16)^(c<<15);
- c = rng->state[(rng->index+9)&15];
- c ^= (c>>11);
- a = rng->state[rng->index] = b^c;
- d = a^((a<<5)&0xDA442D24UL);
- rng->index = (rng->index + 15)&15;
- a = rng->state[rng->index];
- rng->state[rng->index] = a^b^d^(a<<2)^(b<<18)^(c<<28);
- return rng->state[rng->index];
-}
-
-u32 rng_next( RNGWell512 * rng ) {
- return rng_well512_next( rng );
-}
diff --git a/rng/well512.h b/rng/well512.h
@@ -1,14 +0,0 @@
-#pragma once
-
-#include "intrinsics.h"
-#include "rng/rng_utils.h"
-
-struct RNGWell512 {
- u32 state[ 16 ];
- u32 index;
-};
-
-void rng_well512_init( RNGWell512 * rng );
-u32 rng_well512_next( RNGWell512 * rng );
-
-u32 rng_next( RNGWell512 * rng );
diff --git a/server/main.cc b/server/main.cc
@@ -9,7 +9,7 @@
#include "hashtable.h"
#include "linear_algebra.h"
#include "int_conversions.h"
-#include "rng/well512.h"
+#include "rng/pcg.h"
#include "platform_io.h"
#include "platform_network.h"
#include "platform_time.h"
@@ -33,8 +33,7 @@ static HashTable< PlayerState *, MAX_PLAYERS * 2 > sids_to_states;
int main() {
UDPSocket sock = net_new_udp( NET_NONBLOCKING, PORT );
- RNGWell512 rng;
- rng_well512_init( &rng );
+ PCG rng = new_pcg();
for( ;; ) {
printf( "frame\n" );
diff --git a/stats.cc b/stats.cc
@@ -5,11 +5,11 @@
#include "intrinsics.h"
#include "stats.h"
#include "ggformat.h"
-#include "rng/well512.h"
+#include "rng/pcg.h"
void stats_init( Stats * stats ) {
*stats = { };
- rng_well512_init( &stats->rng );
+ stats->rng = new_pcg();
}
double stats_mean( const Stats * stats ) {
diff --git a/stats.h b/stats.h
@@ -2,7 +2,7 @@
#include "intrinsics.h"
#include "ggformat.h"
-#include "rng/well512.h"
+#include "rng/pcg.h"
const u32 STATS_NUM_QUART_SAMPLES = 1024;
@@ -14,7 +14,7 @@ struct Stats {
double max;
u64 num_records;
- RNGWell512 rng;
+ PCG rng;
// mutable because we sort samples to pull out percentiles in format
mutable double samples[ STATS_NUM_QUART_SAMPLES ];
