LesBoloss-es · Kerl13 · Apr 26, 2020 · Apr 26, 2020 · Apr 26, 2020 · Apr 27, 2020
diff --git a/c/.gitignore b/c/.gitignore
diff --git a/c/Makefile b/c/Makefile
diff --git a/c/ocamlrandom.c b/c/ocamlrandom.c
diff --git a/c/ocamlrandom.h b/c/ocamlrandom.h
diff --git a/c/splitmix64.h b/c/splitmix64.h
diff --git a/c/testocamlrandom.c b/c/testocamlrandom.c
diff --git a/c/testsplitmix.c b/c/testsplitmix.c
diff --git a/c/testxoshiro.c b/c/testxoshiro.c
diff --git a/compare.sh b/compare.sh
diff --git a/ocaml/dune-project → dune-project b/ocaml/dune-project → dune-project
diff --git a/ocaml/Makefile b/ocaml/Makefile
diff --git a/ocaml/bench.ml b/ocaml/bench.ml
diff --git a/ocaml/dune b/ocaml/dune
diff --git a/ocaml/tests/dune b/ocaml/tests/dune
diff --git a/ocaml/tests/ocamlrandom.ml b/ocaml/tests/ocamlrandom.ml
diff --git a/ocaml/tests/splitmix.ml b/ocaml/tests/splitmix.ml
diff --git a/ocaml/tests/xoshiro.ml b/ocaml/tests/xoshiro.ml
diff --git a/ocaml/xoshiro/dune b/ocaml/xoshiro/dune
diff --git a/ocaml/xoshiro/x256pp_c/x256pp.c b/ocaml/xoshiro/x256pp_c/x256pp.c
diff --git a/ocaml/xoshiro/x256pp_c/x256pp.h b/ocaml/xoshiro/x256pp_c/x256pp.h
diff --git a/ocaml/.gitignore → prng/src/.gitignore b/ocaml/.gitignore → prng/src/.gitignore
diff --git a/ocaml/make-random/bench.ml → prng/src/make-random/bench.ml b/ocaml/make-random/bench.ml → prng/src/make-random/bench.ml
diff --git a/ocaml/make-random/dune → prng/src/make-random/dune b/ocaml/make-random/dune → prng/src/make-random/dune
diff --git a/ocaml/make-random/makeRandom.ml → prng/src/make-random/makeRandom.ml b/ocaml/make-random/makeRandom.ml → prng/src/make-random/makeRandom.ml
diff --git a/ocaml/make-random/test.ml → prng/src/make-random/test.ml b/ocaml/make-random/test.ml → prng/src/make-random/test.ml
diff --git a/ocaml/splitmix/dune → prng/src/splitmix/dune b/ocaml/splitmix/dune → prng/src/splitmix/dune
diff --git a/ocaml/splitmix/sm64.ml → prng/src/splitmix/sm64.ml b/ocaml/splitmix/sm64.ml → prng/src/splitmix/sm64.ml
diff --git a/prng/src/splitmix/tests/dune b/prng/src/splitmix/tests/dune
@@ -0,0 +1,13 @@
+(executable
+ (name sm64_ocaml)
+ (libraries splitmix testutils))
+
+(rule
+ (target sm64_c.exe)
+ (deps reference.h (:codedeps sm64_c.c reference.c ../../testutils/libtestutils.a))
+ (action
+  (run cc -Wall -Wextra -Wpedantic -o %{target} %{codedeps})))
+
+(rule (with-stdout-to sm64_ocaml.output (run ./sm64_ocaml.exe --nb=1000)))
+(rule (with-stdout-to sm64_c.output     (run ./sm64_c.exe     --nb=1000)))
+(rule (alias runtest) (action (diff sm64_ocaml.output sm64_c.output)))
diff --git a/c/splitmix64.c → prng/src/splitmix/tests/reference.c b/c/splitmix64.c → prng/src/splitmix/tests/reference.c
@@ -9,13 +9,13 @@ See <http://creativecommons.org/publicdomain/zero/1.0/>. */
 #include <stdint.h>
 
 /* This is a fixed-increment version of Java 8's SplittableRandom generator
-   See http://dx.doi.org/10.1145/2714064.2660195 and
+   See http://dx.doi.org/10.1145/2714064.2660195 and 
    http://docs.oracle.com/javase/8/docs/api/java/util/SplittableRandom.html
 
    It is a very fast generator passing BigCrush, and it can be useful if
    for some reason you absolutely want 64 bits of state. */
 
-static uint64_t x = 0xdead42beef37ca7a; /* The state can be seeded with any value. */
+static uint64_t x; /* The state can be seeded with any value. */
 
 uint64_t next() {
 	uint64_t z = (x += 0x9e3779b97f4a7c15);
@@ -24,3 +24,10 @@ uint64_t next() {
 	return z ^ (z >> 31);
 }
 
+// --------------------------------
+// Above this line: verbatim copy of http://prng.di.unimi.it/splitmix64.c
+// Below: added by us for testing purpose
+
+void seed(uint64_t s) {
+  x = s;
+}
diff --git a/prng/src/splitmix/tests/reference.h b/prng/src/splitmix/tests/reference.h
@@ -0,0 +1,9 @@
+#ifndef SPLITMIX64_H
+#define SPLITMIX64_H 1
+
+#include <stdint.h>
+
+uint64_t next();
+void seed(uint64_t);
+
+#endif
diff --git a/prng/src/splitmix/tests/sm64_c.c b/prng/src/splitmix/tests/sm64_c.c
@@ -0,0 +1,6 @@
+#include "reference.h" // seed, next
+#include "../../testutils/testutils.h" // testutils_run
+
+int main(int argc, char* argv[]) {
+  return testutils_run(argc, argv, seed, next);
+}
diff --git a/prng/src/splitmix/tests/sm64_ocaml.ml b/prng/src/splitmix/tests/sm64_ocaml.ml
@@ -0,0 +1,7 @@
+open Splitmix
+
+let () =
+  let state = ref 0L in
+  Testutils.run
+    ~seed_f:(fun s -> state := s)
+    ~next:(fun () -> Sm64.next state)
diff --git a/prng/src/testutils/dune b/prng/src/testutils/dune
@@ -0,0 +1,8 @@
+(foreign_library
+ (archive_name testutils)
+ (language c)
+ (flags -Wall -Wextra -Wpedantic)
+ (names testutils))
+
+(library
+ (name testutils))