Merge pull request #15 from sunoru/master

Fix the incorrect parameter used by XSH RR in 128 bits.
imneme · May 25, 2019 · 4b6f580 · 4b6f580
2 parents d67eff2 + f183a02
commit 4b6f580
Show file tree

Hide file tree

Showing 4 changed files with 136 additions and 136 deletions.
diff --git a/include/pcg_variants.h b/include/pcg_variants.h
@@ -161,7 +161,7 @@ inline uint32_t pcg_output_xsh_rr_64_32(uint64_t state)
 #if PCG_HAS_128BIT_OPS
 inline uint64_t pcg_output_xsh_rr_128_64(pcg128_t state)
 {
-    return pcg_rotr_64(((state >> 29u) ^ state) >> 58u, state >> 122u);
+    return pcg_rotr_64(((state >> 35u) ^ state) >> 58u, state >> 122u);
 }
 #endif
 

diff --git a/test-low/expected/check-mcg-128-xsh-rr-64.out b/test-low/expected/check-mcg-128-xsh-rr-64.out
@@ -5,57 +5,57 @@ pcg_mcg_128_xsh_rr_64_random_r:
       -  output func: XSH-RR
 
 Round 1:
-  64bit: 0x1f3f6f71bf11d795 0x5d1834b1b382aaea 0xe0cc31ad7ae723ce
-	 0x6e4a7f95ae249aa4 0xa52f62ac3d4a7bb4 0x7b4df40ccac57d78
-  Again: 0x1f3f6f71bf11d795 0x5d1834b1b382aaea 0xe0cc31ad7ae723ce
-	 0x6e4a7f95ae249aa4 0xa52f62ac3d4a7bb4 0x7b4df40ccac57d78
-  Coins: HTTTHHHTTHHTHHTTTTHTHTTHHTHHHHHTTHTHHTHHHTHHHHHHHTTTTHTTHTHTHHTHT
-  Rolls: 5 6 1 1 5 2 4 5 3 2 4 1 5 6 6 3 5 2 2 6 1 1 2 4 3 6 4 3 1 6 6 5 5
-  Cards: 9h Qs Ac 4s 2d Th 2h 6d Ad 8d 8s Qd 8c Kd 6s 9c Kc Qh Ks 5s 6c 7d
-	 2c Ah 6h 3d Js 2s 3c 5h Qc 4c Tc Kh Td Jc 4h 3h Jd 8h 9d As 3s 7s
-	 Ts 7c 5d 9s 4d 7h 5c Jh
+  64bit: 0x1f3f7121e50db375 0x5d18374c90e01618 0x98a20fad7ae65b50
+	 0xb04a7f95ed7e29f9 0xa535567f80452bb4 0xb46ef40ccacf759f
+  Again: 0x1f3f7121e50db375 0x5d18374c90e01618 0x98a20fad7ae65b50
+	 0xb04a7f95ed7e29f9 0xa535567f80452bb4 0xb46ef40ccacf759f
+  Coins: TTTTHTHTHHTHTHTTTTTTTHHHTTTHTTTHTHHHHTHHHHHHHTHHTHTTTHHHHTHTHHTHT
+  Rolls: 5 4 3 4 2 2 5 1 1 2 6 5 1 1 1 4 5 2 4 6 6 1 5 1 1 5 4 3 5 3 1 1 3
+  Cards: Jd 8s 5c Qc 8c Td 7s 7c Kh Ks 9s Ts 4s Js Th Qh 9c 6c 5h 3c 3s 9h
+	 As Kc Tc 7d 5d 7h Jc 3h 6h Kd 2c 4d 4c Ac 8d Ad 6d 8h Ah 3d 2d 2s
+	 5s 2h Qd 4h 6s Jh 9d Qs
 
 Round 2:
-  64bit: 0xe5344f17f1ac3821 0xc872b1d7825f3ef2 0x5fedd60ac1f90511
-	 0xc0007b43d34e0bcc 0x5fc6ad65d1fcc620 0xcd0123a1e658ba6c
-  Again: 0xe5344f17f1ac3821 0xc872b1d7825f3ef2 0x5fedd60ac1f90511
-	 0xc0007b43d34e0bcc 0x5fc6ad65d1fcc620 0xcd0123a1e658ba6c
-  Coins: HHHTHTHTTHHHHTTHTHTTHTHTHTTHTTHTHTHTTTHHTTHHTTHTHHHTTHHTTHTTHHHHH
-  Rolls: 3 3 1 4 2 5 2 3 5 1 5 6 4 5 3 6 5 5 4 2 2 2 2 2 4 3 1 1 6 5 3 3 2
-  Cards: Ks Qd 9h Ac 4h 8h Js Kc As 9c Ah Jc 6s 5s Kh 5c 7c Td 8d Th 3s Jh
-	 2s 8c Tc Jd 9s 6d 7d Qh 3h 5h 9d Ts 4c Qs Ad 7s 6h 7h Qc 6c 2c 3c
-	 2d 2h 5d 4s 8s 3d 4d Kd
+  64bit: 0x96632017f1ac5d0c 0xc87255df98c3c672 0x5fedd97d156a7439
+	 0x4819e670134e0b89 0x6a1fdea5d1fcdd62 0xc12fa3a1e61cb317
+  Again: 0x96632017f1ac5d0c 0xc87255df98c3c672 0x5fedd97d156a7439
+	 0x4819e670134e0b89 0x6a1fdea5d1fcdd62 0xc12fa3a1e61cb317
+  Coins: THHTHTHTTHHHHTHTHHTHHHTHHTHTTHHHTTTTTTHTHHHTHHHTHHTTTHHTHHTHHHTHT
+  Rolls: 6 1 5 6 4 5 6 3 2 2 4 1 4 4 5 4 3 3 4 4 1 2 4 2 6 5 6 3 2 4 3 6 2
+  Cards: 6d Ah Tc 5d Th 2s 9s 8d 2c Ac 8c Jd 9h 3c Js 3s Qc 7h 6c Qs Jc 2h
+	 5c 7c 4s 8h As 4h 9c Ad 8s Kc 2d Kh 3h 4c Jh 5s 3d Qh 7s 6h Kd Qd
+	 5h 7d 4d Td 6s Ts Ks 9d
 
 Round 3:
-  64bit: 0x3711f1fb4d96e912 0xe5dbacbfcf582b9c 0xd4b07bf072fe7662
-	 0xce00067c6c1fdf2d 0x3635b202e67faeb7 0xbe50219d54eea26e
-  Again: 0x3711f1fb4d96e912 0xe5dbacbfcf582b9c 0xd4b07bf072fe7662
-	 0xce00067c6c1fdf2d 0x3635b202e67faeb7 0xbe50219d54eea26e
-  Coins: HTHTHTTTHTHHHHHHHTTHHTTHHHHHTHHHTTTHHTTHHHTHTHTTTTTHHHHTTTTTHHTTH
-  Rolls: 1 5 4 2 4 2 6 2 2 2 5 2 6 6 3 6 5 2 3 3 3 2 1 3 2 2 1 1 2 4 2 2 5
-  Cards: 8h Jh 2c Th 3d 2h Td 7d 3c Ah 5h 9s 4s Qs 7s Kd 6h 6d Ad Js 2d As
-	 7h Qd 3h 4h 8d 3s Jd Kh 6c 2s Qc Ks 9h 4d 5d Tc 5c 4c 7c 8s Ac 6s
-	 Qh 9c Kc 5s 8c Jc Ts 9d
+  64bit: 0x370bd048b32a5912 0x86f1f1084f582b18 0x8b1c06b872fe7670
+	 0x2b00067c2d1fec03 0x3635b207411488cd 0x0bb8e488d4eea22b
+  Again: 0x370bd048b32a5912 0x86f1f1084f582b18 0x8b1c06b872fe7670
+	 0x2b00067c2d1fec03 0x3635b207411488cd 0x0bb8e488d4eea22b
+  Coins: HHHTHTTTTTTHHHHTTTHHHTHHTTTTHTHHTTHHTTTHHHTHHTHHTHHTHTHTTTTTHTHTH
+  Rolls: 3 5 5 2 6 1 3 2 4 3 3 4 1 2 3 4 5 2 1 3 5 4 6 1 4 3 5 3 1 2 4 1 1
+  Cards: 9c 9d 8s 8d 5s 6c 2s Kc 7h Kd Th 9s Qd 4s Qh 6h Tc 7d 7c Ks 4d Jd
+	 3s 6s 3h 8c Td 3d Kh Ts 3c Jc 9h 5d As 8h 5h 7s Js Qc Qs Jh Ah 5c
+	 2d 4c 6d Ad 2c 4h 2h Ac
 
 Round 4:
-  64bit: 0x250e2a37b5defaa1 0x5b1ba8ff004f686f 0x8ecefce7624af8f0
-	 0x1b78c5d21854ab64 0x6ecc2e97287a1c98 0x00b02070350b8777
-  Again: 0x250e2a37b5defaa1 0x5b1ba8ff004f686f 0x8ecefce7624af8f0
-	 0x1b78c5d21854ab64 0x6ecc2e97287a1c98 0x00b02070350b8777
-  Coins: HHHTTTTTTTTTHTTHHTTHTHTTTTTTTHHTHTHHHHHHTHHHTTHHHHTHTHHTTTTTHTHHT
-  Rolls: 4 5 3 1 4 6 5 3 2 1 4 2 3 6 2 1 3 3 2 2 5 1 1 1 6 4 5 4 5 6 2 5 1
-  Cards: 7h Qh 2c 8c Kh Tc 4c 6s Ac 3d Ah 5c Qd 4s Qs Ts Td 2h 6c Ad 4h 7d
-	 Jc 2s 3s Ks Js 7c 8d Kd 9s 2d 3c Kc 8h As 5s Th 7s Jh 9c 4d 6h 5d
-	 Qc Jd 5h 6d 8s 9d 3h 9h
+  64bit: 0x2e54206ae3defaa1 0xb94390ff004a3a88 0x43aefce76424c057
+	 0x1b7bb31e40e62b64 0xbe1389e1d47a1c9c 0xae5b2c7035094ff8
+  Again: 0x2e54206ae3defaa1 0xb94390ff004a3a88 0x43aefce76424c057
+	 0x1b7bb31e40e62b64 0xbe1389e1d47a1c9c 0xae5b2c7035094ff8
+  Coins: HHTTTHTTTTTTHTTHHTTHTTTTTTTTHTHHHTTHHHHHTHHTTTHHHHTHTHHTTTTTHTHHT
+  Rolls: 5 3 1 3 6 5 5 3 3 1 2 4 5 2 6 6 3 6 3 4 3 1 1 6 3 6 6 5 3 5 3 5 5
+  Cards: 9d 8h Tc 5s 2h Qd 7d 4s 7h 8d 7s Th Qh 2d Ts Jh 6d As 5h Kh 4d 8c
+	 Ks Td 3s 4c Ah 2c Jc Js 7c 6s 3h 9h Ac 5c 6c 5d 8s 3c 9s 3d Kd Kc
+	 2s Jd Ad 9c 6h Qs 4h Qc
 
 Round 5:
-  64bit: 0x083816fafdb5557f 0xf69ce44f9a2257ef 0x8d9000883af9cc9b
-	 0x11930fe3618176f4 0xa2435903b9182403 0xdd53b4a94bf028f8
-  Again: 0x083816fafdb5557f 0xf69ce44f9a2257ef 0x8d9000883af9cc9b
-	 0x11930fe3618176f4 0xa2435903b9182403 0xdd53b4a94bf028f8
-  Coins: HTTTTTHHTTHTTTTHHTHTTTTTTTHTHHTTTTTTTHHTTTTHHTHHHTTHHHTTHHTHHTHTH
-  Rolls: 5 4 3 2 2 6 5 5 3 2 2 6 2 2 5 3 1 1 6 2 2 6 6 3 4 4 6 6 5 5 3 4 5
-  Cards: Qc 2s Js Qd 2d 5c 4s Ac 6c Ts Kd 6s Qs 6d Kh Jd 5h Ks 7d 9c Kc 7h
-	 Qh 3h 3c 8h 5d 9h 9s 3d 4c 6h Td Jh 4d 5s 9d 8s 7c Ah 2h 2c As 3s
-	 7s Tc 4h Th Jc Ad 8d 8c
+  64bit: 0xc83816f9b172e06d 0xf69ceb0dd016930f 0xd9095dc58339cc9b
+	 0x07c0969dddb176f4 0xa2434766df4a7413 0x93acf45acbf028bd
+  Again: 0xc83816f9b172e06d 0xf69ceb0dd016930f 0xd9095dc58339cc9b
+	 0x07c0969dddb176f4 0xa2434766df4a7413 0x93acf45acbf028bd
+  Coins: HTTHTTHHTTTTTTHHHTTTTTTTTTHTTHTHTTTHTHTTTHTHTTHHHTTHHHHHHTTHHTHTT
+  Rolls: 1 3 4 2 5 3 1 1 2 6 4 4 4 3 3 3 2 5 3 2 4 2 4 1 6 1 6 6 1 3 3 4 5
+  Cards: 2c 2s Qc 7h 8d 6h 2d 9s Jc Ah Qd 6s 2h 6c 3s 8c Js 8s 9d 8h Ad Jh
+	 7d 3h Ts 7c Kc Ac 4h Qh Kd Kh 9h 7s Ks 6d Tc 5s 3d 5h 5c 9c Qs 4s
+	 3c 4c 5d Th Jd Td As 4d
 
diff --git a/test-low/expected/check-oneseq-128-xsh-rr-64.out b/test-low/expected/check-oneseq-128-xsh-rr-64.out
@@ -5,57 +5,57 @@ pcg_oneseq_128_xsh_rr_64_random_r:
       -  output func: XSH-RR
 
 Round 1:
-  64bit: 0x4a451540e0534011 0xc7a53dbdbda8a9eb 0x818a54b8368135fd
-	 0xed0b1af32543f08b 0x5d1a56490bf31335 0xf9eb3c8e7e7fcfdd
-  Again: 0x4a451540e0534011 0xc7a53dbdbda8a9eb 0x818a54b8368135fd
-	 0xed0b1af32543f08b 0x5d1a56490bf31335 0xf9eb3c8e7e7fcfdd
-  Coins: HTHHHHTHTTHTTTHHTTHTHTTHTHTTTTHHHTHHTHHHTTHHTHTHTTTHHHTTHHTTHTTHT
-  Rolls: 1 3 1 4 6 4 5 1 1 4 1 1 4 2 3 4 4 1 6 3 4 3 5 3 4 2 5 2 3 2 1 6 5
-  Cards: 3d Kh Qd Ad Ts 4s Qh 8h 9h As Qc 2d 7s 4c Jd Kc 6s 3s 9s Jc 7c Js
-	 5c 5s Ac 2s 9c 6h 5d Td Ks 9d 8d Qs 4d 2h 8s 6d 3h 2c Tc 5h 4h Th
-	 Jh 7d Ah 3c Kd 8c 6c 7h
+  64bit: 0x61451540c6e348bf 0xc796bfdef9e9e9eb 0x818a6fbb8ae302bd
+	 0xed0bfd3d30bd7a0b 0xe3fca2790bf312ca 0x5c8abb9f257fcfdd
+  Again: 0x61451540c6e348bf 0xc796bfdef9e9e9eb 0x818a6fbb8ae302bd
+	 0xed0bfd3d30bd7a0b 0xe3fca2790bf312ca 0x5c8abb9f257fcfdd
+  Coins: HHTTHHHHTTHTHTHHTTHTTHHTTHTTTHTTHTHHTHHHHTTHHHTTHTHHHHTTTHHTTHTHH
+  Rolls: 2 3 5 1 4 2 1 1 1 4 2 4 4 4 2 6 4 5 3 5 2 2 1 2 2 1 5 2 6 2 3 6 5
+  Cards: Jh 4c Kd 2d 7d 8h Ad 6c Ah Jc 4s Tc 8s 5h Ks 6s Qc Js 5d 2h 3s Td
+	 3c As 9d 3h 7h Qs Qd 4h 2s 4d 5c 9s Jd 5s Ts 6d 7c Kc 3d 9h 2c 7s
+	 6h Ac 8d Qh 8c Kh 9c Th
 
 Round 2:
-  64bit: 0x5813e1ec80af653f 0x7827f5213a5e4485 0x736a4d77a87f5fc0
-	 0x27298ddaa64185a9 0x03d0963bc47da1a2 0x3cb63da9cdfbe495
-  Again: 0x5813e1ec80af653f 0x7827f5213a5e4485 0x736a4d77a87f5fc0
-	 0x27298ddaa64185a9 0x03d0963bc47da1a2 0x3cb63da9cdfbe495
-  Coins: THTTTTHHTTTTHHHTHTHHHHTHTHHTHHTHTHTTHHHTHTHHHHTHHHTHTHHHTHHTHTHHH
-  Rolls: 3 5 4 2 1 5 1 4 1 6 1 1 5 1 5 6 6 5 1 6 4 6 2 1 2 3 4 4 1 1 1 6 6
-  Cards: 5h 9h Qh Ad Qs 5s Tc 6h 4c 2s 3c 4s Jd Qc 3d 7c Js Td 7d Jh Th 7s
-	 6c 5d 3h Jc Qd Ts Kh 6d Kc 8c Ks 9s 8h Ac 4d 4h 9c 9d 2c Ah 8s 3s
-	 5c 7h 2d 8d As Kd 6s 2h
+  64bit: 0x4d7d269900af657a 0x7827f6d514650c89 0x159f58c7087f5fc9
+	 0x46118ddaa6be1ac7 0x68b22f8cc47da1b0 0x4fb63da9895cce6c
+  Again: 0x4d7d269900af657a 0x7827f6d514650c89 0x159f58c7087f5fc9
+	 0x46118ddaa6be1ac7 0x68b22f8cc47da1b0 0x4fb63da9895cce6c
+  Coins: HHTTTHTHTHTHHTHTHTHHTTTHTTHTHHTHTHTTTTHTHTHHTHHHHHHHTHTHHHTTHTHHH
+  Rolls: 5 5 5 4 5 1 5 5 3 4 1 3 1 6 3 4 2 1 6 6 6 5 2 5 4 1 4 1 5 4 5 2 3
+  Cards: 5s 2d Ad 7d 6c Jc Ts 7s 4s 6h 9h 3h Ks 6d Jh 8d 2c Qh As 9s Tc 9d
+	 9c Qs 7h 6s Jd 8s 5h 2s Js Th Qd Ac Kc 4h 8c 2h 5c 7c 8h 5d 3s Kd
+	 Kh Ah 3d 4d 4c Qc Td 3c
 
 Round 3:
-  64bit: 0xed6aee1bac7fcbe9 0xbb953dac254373c6 0x729b5dca14051a9c
-	 0x9d90c7a1510b785f 0xcb8f97ebd34b641c 0x98672d469210c5d9
-  Again: 0xed6aee1bac7fcbe9 0xbb953dac254373c6 0x729b5dca14051a9c
-	 0x9d90c7a1510b785f 0xcb8f97ebd34b641c 0x98672d469210c5d9
-  Coins: HHTTHTTTHHHHHHTHTHHHHTTHTHHTHTTTHHHTHHTTTHHHHHTTTHHTHHTHHHTHHHTTH
-  Rolls: 6 3 3 3 2 4 5 6 5 4 6 2 6 5 6 4 6 1 3 6 3 1 3 4 4 1 3 5 3 2 5 5 1
-  Cards: As Tc 8h 5h 3h Jd Qh 9c 7h 6c 8c Td 5s Ac 5c Ah 4h 9d Qs 8d Th Ks
-	 Ts Qc 7s 3c Qd 4d 9h Kd 3s 4c Jc 4s 8s Jh 2d 6s 7d 2s Ad Kh 5d 6d
-	 6h 3d 9s 7c Js Kc 2c 2h
+  64bit: 0xfb1ae85bac7fffe7 0x1b513dac248db912 0x0b732a69c0051a9e
+	 0x07ea687a910b781a 0xcbbc7b8e17d9441c 0x71e72d46877d4a45
+  Again: 0xfb1ae85bac7fffe7 0x1b513dac248db912 0x0b732a69c0051a9e
+	 0x07ea687a910b781a 0xcbbc7b8e17d9441c 0x71e72d46877d4a45
+  Coins: HHTTHTTTHTHTTHTTTHHHHTTHHTHTHHHHHHHTHTTTHHTHHHHTTHTTHHTTHHTHTHTTH
+  Rolls: 6 6 4 2 6 6 5 6 5 6 3 6 2 1 4 2 2 5 5 5 5 2 4 4 4 4 1 1 3 2 3 1 1
+  Cards: 5h Kc 4s 5s 5c 4d Qd 3h 9c Kh Ks Ad Tc 7c Qs Ah Js 5d 8s Kd 9s 8h
+	 As 7d 6s 2c Jc 7s Ts 2d 8c 4c Jh 9h 2h 3d Th 3s 6d Ac 6c Td Qc Jd
+	 Qh 4h 9d 3c 8d 2s 6h 7h
 
 Round 4:
-  64bit: 0x2cf96404b54922f5 0x4e69bd9ea5bdaa28 0xd21133fe0f493b5a
-	 0x768519cb1e4ee428 0xc10c4d6fa4afb629 0x59eb2d5d6443b69a
-  Again: 0x2cf96404b54922f5 0x4e69bd9ea5bdaa28 0xd21133fe0f493b5a
-	 0x768519cb1e4ee428 0xc10c4d6fa4afb629 0x59eb2d5d6443b69a
-  Coins: TTHHHTTTTHHHTTHHHHHHHTHTTHHHTTTTTTHTTTHTHHHTHTTTTHTTTTHTHHTTHHTHH
-  Rolls: 5 2 5 5 2 1 1 3 4 3 3 1 4 1 4 3 1 1 1 1 4 4 3 6 5 6 5 1 6 6 3 5 4
-  Cards: 2d Jd Th 6s 7d 7c 4s Ad Jc 5h Tc 3d 2s Kd Jh 8h Qd 4d 3s 7s Ts Qh
-	 8d Kh Js 8s 4h 9d Ac 3c 3h 6c Td 2h 7h 9c Qs Kc 6d As 9h 5s 9s 5d
-	 5c 6h 8c 4c Qc 2c Ah Ks
+  64bit: 0x071d57f2282922f5 0x8599bd9ea3e9716e 0xd21244c3c5993b5a
+	 0xf68519ccb4b68974 0x17684d6fa45e14f9 0x8ccb2d5d6f37b9da
+  Again: 0x071d57f2282922f5 0x8599bd9ea3e9716e 0xd21244c3c5993b5a
+	 0xf68519ccb4b68974 0x17684d6fa45e14f9 0x8ccb2d5d6f37b9da
+  Coins: TTHTTTTTTHHTTHTHHHHHTTTTHHTHTHTTHTTTTHTHTHTTTTTTTHHHHTTHHHTTHTHHT
+  Rolls: 5 3 4 5 4 5 5 5 4 5 5 5 2 3 6 5 5 1 5 1 2 6 5 1 3 4 3 2 4 5 3 4 1
+  Cards: Js 3c 9h 2h 8c 5d 3d Ks 4d 5h 6d 7h 7c 9d Kd 4h 7d Kc Jh 8h 4s 4c
+	 Td Qc 8d 5s 5c Jc Qs 8s Tc Ts 3h Ah Th Qh 2s 2c Qd 3s As 6h 6s Ad
+	 6c 9c Jd Kh Ac 2d 9s 7s
 
 Round 5:
-  64bit: 0x0bb10f41c8663aa8 0x073667ad5c5e7982 0xedaa469e600ff6f0
-	 0xff54e027a8f9ce74 0x37f0c5b30c9fe517 0x9e22db42d3a79a29
-  Again: 0x0bb10f41c8663aa8 0x073667ad5c5e7982 0xedaa469e600ff6f0
-	 0xff54e027a8f9ce74 0x37f0c5b30c9fe517 0x9e22db42d3a79a29
-  Coins: HHTTHTTHTHHTTTHHHHTTTTHHHHTHTHHTHHHHHHTHHHHHHTHTTHHTTTHHTTTHHTTTT
-  Rolls: 1 1 2 1 6 1 1 2 4 3 5 2 6 4 2 5 3 6 3 3 6 2 2 1 4 2 3 1 6 3 1 1 1
-  Cards: 6c 8s Tc 5h 2s 5d 7h 8d 4d 4s 9d 8c 3d Jh 3s 2d Kh 7s Qs 9s Ah Qc
-	 Kc Th 6d 7c 8h 2c 7d Ts 9c 5s Kd Jc Td 3h Qh 9h Ad Ac 6s As 6h 3c
-	 Ks 4h Js Jd 4c 5c 2h Qd
+  64bit: 0x6d8c1d1fa0663aa1 0x9b3667ad868b881b 0x21df869e600e87d0
+	 0xabcdaa4c6979ce74 0x37f3b0e855fc7b17 0x9573f94b4bff9a29
+  Again: 0x6d8c1d1fa0663aa1 0x9b3667ad868b881b 0x21df869e600e87d0
+	 0xabcdaa4c6979ce74 0x37f3b0e855fc7b17 0x9573f94b4bff9a29
+  Coins: HHTTTHTHHHTTHTHHHHTTTHTHHHHHHHTTTHTHHTTHHHHHHTTTTTHTHTHTTTTTHHTTT
+  Rolls: 5 4 4 2 2 5 2 6 1 1 5 1 5 6 2 1 2 6 5 5 1 2 4 5 4 4 3 3 4 3 3 2 5
+  Cards: Qs 9c Jd Kd 3h Qd 4c 8d Ac 2c 4h 7s Ah 3c 8s 8c 5c Jc Ks Td 5s Kh
+	 2s 6d Jh 4s Qh 6h Tc Ts 3s 7c 8h 6s 6c 7h 7d 9h As 2d 9s Js 4d 5d
+	 Qc Th 2h 3d Kc Ad 9d 5h
 
diff --git a/test-low/expected/check-setseq-128-xsh-rr-64.out b/test-low/expected/check-setseq-128-xsh-rr-64.out
@@ -5,57 +5,57 @@ pcg_setseq_128_xsh_rr_64_random_r:
       -  output func: XSH-RR
 
 Round 1:
-  64bit: 0x32bc197f2f4571fc 0x046ad09ee341b1e8 0x27dfcdce23595fc7
-	 0xb49cee1a5ea333c1 0x88bf84786ecdbce0 0x90071ae465ce622b
-  Again: 0x32bc197f2f4571fc 0x046ad09ee341b1e8 0x27dfcdce23595fc7
-	 0xb49cee1a5ea333c1 0x88bf84786ecdbce0 0x90071ae465ce622b
-  Coins: HHHHTTTTHHTHTTHHHHHTTTTTTTTHHTHHHTHHTHHTHTHTHHTTTTHTHHHHTHTTTTTHT
-  Rolls: 4 3 6 6 6 3 6 4 4 5 4 3 6 6 5 3 1 6 5 5 6 1 6 1 1 5 1 2 3 3 2 5 2
-  Cards: Qh Qd Tc 4d Ks 5s 4s 8c 2d 2h 9s Jc 3s Js 8d 4c Td Kc 5d 7d 8h As
-	 6c Jd Kh 7c 7s 3h 9h Qs 2s 2c 6d 9c Ah Qc Ts 8s 6h Th 9d Kd 3d Ad
-	 4h Ac 3c 7h 5h Jh 6s 5c
+  64bit: 0x42bc197d32f2393a 0x920f68ff6341b1cb 0x265b380ff57b5fc7
+	 0xb49cee1fecd7defd 0xf30b09986ecda74c 0x32cef26465ce0494
+  Again: 0x42bc197d32f2393a 0x920f68ff6341b1cb 0x265b380ff57b5fc7
+	 0xb49cee1fecd7defd 0xf30b09986ecda74c 0x32cef26465ce0494
+  Coins: HHHHTHTTHHHHTTHTHHHTTTTHTTHHHTHHTTHTTTHHTTHHHTTHHTTTHTTHTHTTHHTHH
+  Rolls: 4 1 6 2 5 6 4 4 2 6 2 6 1 6 6 2 5 6 2 5 6 1 5 1 2 3 1 2 1 1 2 2 4
+  Cards: 5h 5s 6d 4h 6h Ks 8h Jd As 9h 3h 2h 3c Ah Tc Th 2d Kc 8s Qd Ac Js
+	 Jh 3d Ad Qh 7c 9d 4c 4s 7s 2c Qs 8c 9s 5c 7d 4d 2s 3s Ts 6c 8d Td
+	 Kh Kd Qc 6s Jc 9c 7h 5d
 
 Round 2:
-  64bit: 0xd466514bd434aa55 0x5caf1c745646e475 0xd75d7f68efb53e0a
-	 0xda4271429d4360e0 0xe7e519746192971c 0xf2207d9343bfa0c5
-  Again: 0xd466514bd434aa55 0x5caf1c745646e475 0xd75d7f68efb53e0a
-	 0xda4271429d4360e0 0xe7e519746192971c 0xf2207d9343bfa0c5
-  Coins: HTTHHTHHTHHHHHTHTHTHHTTHTTHHTHHHHTHHTHTTTHHHTTTTHHTTHTHHTTHHHTTTT
-  Rolls: 3 6 3 5 5 3 3 2 3 3 2 3 4 1 4 3 1 5 2 6 4 4 2 1 1 4 3 5 6 2 6 2 2
-  Cards: 2s 4s 2d Js Jd 6d 4d Ac 5s 7d 4h Jc Td 9h Ks Th 3c 3d 3s Jh 7c 2h
-	 5d 9s 6c Kd Qs Kh 9d 9c 6h Qh 8s Ah Qc 7h 5h 8c 7s 8d Ad 6s 2c As
-	 3h Qd Kc Tc 8h 4c Ts 5c
+  64bit: 0xd466569a4d8ad4ad 0x2750e343c646e477 0xd75d0aef0fb6c68a
+	 0xcc011a58e60360e0 0xe7e51a8c8246e056 0xf226a0a46ccea8c5
+  Again: 0xd466569a4d8ad4ad 0x2750e343c646e477 0xd75d0aef0fb6c68a
+	 0xcc011a58e60360e0 0xe7e51a8c8246e056 0xf226a0a46ccea8c5
+  Coins: HTTHHTTTHTHTTHHHTHTHHTTHTTTHHTTHHTHTHHTTTHHHTTTHHTTHHTHHTHHHHTTHT
+  Rolls: 3 1 1 5 1 2 5 5 1 1 2 1 6 1 4 5 6 5 3 2 2 6 2 3 5 2 4 5 4 4 2 2 1
+  Cards: 9d Th 8c Qc Ah 9s Kh 4h 4c 7h 6s Jd 8h 8d 3s Kd Qd 2d 5h 2s 9c Kc
+	 Ac 4d 5d 6d 4s As 7c 3d Ts 3h 8s 9h Jh Qh 2c 5c 6h Td 7s Qs Ks Ad
+	 Tc 5s Jc 6c 3c Js 7d 2h
 
 Round 3:
-  64bit: 0x68958314a357691b 0x835bb1399777cb82 0x624637222f8756ec
-	 0x22801cd396ae136a 0x737d473106480a6b 0x688ad0b11796f5ca
-  Again: 0x68958314a357691b 0x835bb1399777cb82 0x624637222f8756ec
-	 0x22801cd396ae136a 0x737d473106480a6b 0x688ad0b11796f5ca
-  Coins: HTHTHHHTHHTHTHTHTTTTTTTHHHHTHHHTTTHHTTHTTHHHTTHHHHHHTHHHHTTHTHTTH
-  Rolls: 4 6 4 2 3 5 4 4 4 2 4 4 2 4 1 4 2 2 3 1 2 1 5 6 3 5 1 4 3 1 1 5 1
-  Cards: 2d 9h Ah Qc 4s Th 6c Ad 7d Ac 4c Kh 6d 3h 2c 5d 8s Kc Jh 8d Kd 3c
-	 5s 5h Tc Qd Js 9c Jd 2h Ts 7h Qs 6s 7c 3s Qh 5c 4d 6h 9d 7s 8c Ks
-	 2s 9s 3d Jc Td As 4h 8h
+  64bit: 0x4c958314d629c1df 0x0a0b67f99777c5f7 0x0b8c68bfef8756a8
+	 0x5e801cd341fef66a 0x663b473106b1db05 0xf842d0b116472a54
+  Again: 0x4c958314d629c1df 0x0a0b67f99777c5f7 0x0b8c68bfef8756a8
+	 0x5e801cd341fef66a 0x663b473106b1db05 0xf842d0b116472a54
+  Coins: HHHTTHHTHTTHTHHHTTTTTTHHHHHHHHTHTTHHTHTHHHTTHHTHTTTHHTTHHHHTTHTTH
+  Rolls: 6 2 2 5 6 5 4 1 6 5 2 2 4 4 1 5 1 6 4 5 4 3 3 4 6 1 3 4 3 3 1 3 5
+  Cards: 7c 8c 3d Td Qs 6s 8s Kd As 6d 9c 9h 7s Kh Jc 4d 5c 5d Jh 2h 7d Ad
+	 Qc Ac 5h 5s Th Jd Js Qd 3h Qh 8d 9d 4s Tc 2d 2s 9s 8h 3c 4c 3s Kc
+	 Ah Ts Ks 7h 6h 2c 6c 4h
 
 Round 4:
-  64bit: 0x70b154906436b7b1 0x59b96c6b3bfb4547 0x09c3ed5f4b106d80
-	 0x95042b4582f5120e 0x54a6e1cbd6439a12 0x4f27f1908dc23136
-  Again: 0x70b154906436b7b1 0x59b96c6b3bfb4547 0x09c3ed5f4b106d80
-	 0x95042b4582f5120e 0x54a6e1cbd6439a12 0x4f27f1908dc23136
-  Coins: HHTHTTHTHHHTTTHTHTTHTTTTTHTHHTHHTTHTHTHTHHTHTTHTTTTHHHHHHTHTTHHHT
-  Rolls: 3 1 6 5 5 2 3 1 3 5 5 5 6 3 4 6 2 3 1 2 6 5 1 5 3 5 6 5 6 1 4 1 3
-  Cards: 4c 9s Jd Ad 2d 4d 6s 5c Qd 3d 5h 4s 2s Js 3s Td 9d 7s 7h 6h Ah 9h
-	 Jc Kd 4h Kh 7c 6c Ks Ac 3c 8d Tc 7d 9c As 2h 5s 6d 8h 3h 8s Kc 2c
-	 5d Ts 8c Qh Th Qs Jh Qc
+  64bit: 0x7be93fed956eb7b1 0xd3896c6b3da90b93 0xb824835f4b10ac71
+	 0x91442b459684cd4a 0x95f2423d32439a16 0x8f27f193f919439b
+  Again: 0x7be93fed956eb7b1 0xd3896c6b3da90b93 0xb824835f4b10ac71
+	 0x91442b459684cd4a 0x95f2423d32439a16 0x8f27f193f919439b
+  Coins: TTTHHTHTHHHTTTHHHHHTTHHTTTTHHTHHTTTHHTHTHTHTTTTHTHHTHHTHHTHTTHHHH
+  Rolls: 2 2 2 1 1 6 3 3 3 3 6 4 4 5 2 6 2 1 5 1 2 1 5 2 3 3 2 5 5 1 6 3 3
+  Cards: 9d Ac Ad 5d Qd 2h 8c 3d 7c Kh Qh 2s 6h As Ah 3c Qc 7d 6c Tc 9s Th
+	 3s Qs 5c Js 5s 8s 8h 4s 9h 8d Ts Jh 7h 4d Td 5h 7s 6d Ks 4c Kd 3h
+	 Jc 2c Jd Kc 6s 4h 2d 9c
 
 Round 5:
-  64bit: 0xa9c0cd13ca953685 0x9636f7a4f384be70 0x74527281ad5f4faf
-	 0x6553b2e166ca45d9 0x585499403842c2f1 0x230b9fbdb5e5e09a
-  Again: 0xa9c0cd13ca953685 0x9636f7a4f384be70 0x74527281ad5f4faf
-	 0x6553b2e166ca45d9 0x585499403842c2f1 0x230b9fbdb5e5e09a
-  Coins: HHTTHTHTTHHTHTTTTTTTTHTHTHTTHHHHTTTTTTTTHTTTTHTHHTTTTHHTTHHHHTTTT
-  Rolls: 5 6 3 3 2 4 2 4 6 3 6 4 3 2 4 6 4 5 4 4 2 2 5 6 1 3 3 4 3 3 2 2 4
-  Cards: 4c As 2h 9s 3h 2s 8s Ad 3d 9d Ts 3s Js 5h Jd 5s Tc 5d Qh Ks Th 7d
-	 6s 6d 3c 2c Jh Qd 8h 9h 4s Jc 9c Kd Td 5c 7s 4h 6c 2d 7c Qs 8c Kc
-	 Ac 4d 6h 8d Kh 7h Qc Ah
+  64bit: 0x84303513ca944bf9 0xa516f7a4f5abdda3 0x2c807281adaf15f2
+	 0x7fd8cab166ca461d 0xf8549943f5ec9bc6 0x610b9fbdbe946e80
+  Again: 0x84303513ca944bf9 0xa516f7a4f5abdda3 0x2c807281adaf15f2
+	 0x7fd8cab166ca461d 0xf8549943f5ec9bc6 0x610b9fbdbe946e80
+  Coins: HTTTHTHTTTTHHTHHTTHTTTTHTTTHHHTHHTTTTTTTTTTTHHTTTHHTTTTHTHHHTTTHT
+  Rolls: 1 4 1 1 6 2 2 4 6 1 4 6 3 2 3 2 4 5 4 4 4 4 1 3 1 3 3 4 5 5 5 3 5
+  Cards: 2c 2h 8d Js 4s 3c 5h Ad 3d Qh Th 9c 4c 4d Td As 7c 2s Jd Ks 6h 8h
+	 Tc 6d 6s 9d 5d 5s 8s 4h 5c 7s Qd 7d 9s Ts Qc Ac Kc Jh 2d Ah 8c Kd
+	 6c Qs 3s 9h 7h Jc Kh 3h