dune'd

Author: pqwy

.gitignore

@@ -2,11 +2,15 @@ _build
 *.install
 *.native
 *.byte
+.merlin
 
 *~
 \.\#*
 \#*#
 
 gmon.out
+.gdb_history
 *.prof
+perf.data*
+*.json
 rondom

.merlin

@@ -1,13 +1,14 @@
-#require "cstruct, zarith, sexplib"
-#directory "_build/src"
-#load "nocrypto.cma"
-
-(* #require "oUnit" *)
-(* #directory "_build/tests" *)
-(* #load "testlib.cma" *)
+#directory "_build/default/src"
+#directory "_build/default/src/.nocrypto.objs/byte"
+#directory "_build/default/unix"
+#directory "_build/default/unix/.nocrypto_entropy_unix.objs/byte"
+#directory "_build/default/lwt"
+#directory "_build/default/lwt/.nocrypto_entropy_lwt.objs/byte"
 
-#directory "_build/unix"
+#require "cstruct, ocplib-endian, zarith"
+#load "nocrypto.cma"
 #load "nocrypto_entropy_unix.cmo"
+#load "nocrypto_entropy_lwt.cmo"
 
 open Nocrypto
 let _ = Nocrypto_entropy_unix.initialize ()

.ocamlinit

@@ -7,7 +7,6 @@ env:
     - UPDATE_GCC_BINUTILS=1
     - TESTS=true
   matrix:
-    - OCAML_VERSION=4.02
     - OCAML_VERSION=4.03
     - OCAML_VERSION=4.04
     - OCAML_VERSION=4.05
@@ -17,5 +16,6 @@ env:
     - OCAML_VERSION=4.06 DEPOPTS="lwt cstruct-lwt"
     - OCAML_VERSION=4.04 DEPOPTS="mirage-xen"
     - OCAML_VERSION=4.06 DEPOPTS="mirage-solo5 mirage-entropy"
+    - OCAML_VERSION=4.07
 notifications:
   email: false

.travis.yml

@@ -20,13 +20,8 @@ delegating to AES-NI.
 ## Build
 
 ```bash
-./pkg/pkg.ml build
-  --with-unix BOOL
-  --with-lwt BOOL
-  --xen BOOL
-  --freestanding BOOL
-
-./pkg/pkg.ml test
+dune build
+dune runtest
 ```
 
 ## FAQ
@@ -59,11 +54,12 @@ Program terminated with signal SIGILL, Illegal instruction.
 autodetection yet. You compiled the library with acceleration, but you are using
 it on a machine that does not support it.
 
-`pkg/pkg.ml build --accelerate false` force-disables non-portable code.
+The environment variable `NOCRYPTO_ACCELERATE` can be used to override
+detection:
 
-`pkg/pkg.ml build --accelerate true` force-enables non-portable code.
+- `NOCRYPTO_ACCELERATE=false dune build` force-disables non-portable code.
+- `NOCRYPTO_ACCELERATE=true dune build` force-enables non-portable code.
+- Otherwise, it matches the capabilities of the build machine.
 
-The flag can also be set via the `NOCRYPTO_ACCELERATE` environment variable.
-When unset, it maches the capabilities of the build machine.
 
 [![Build Status](https://travis-ci.org/mirleft/ocaml-nocrypto.svg?branch=master)](https://travis-ci.org/mirleft/ocaml-nocrypto)

README.md

@@ -0,0 +1,4 @@
+(executables
+  (names speed)
+  (modules speed)
+  (libraries nocrypto))

_tags

@@ -50,7 +50,7 @@ let throughput title f =
   sizes |> List.iter @@ fun size ->
     Gc.full_major () ;
     let (iters, time, bw) = burn f size in
-    Printf.printf "    % 5d:  %04.f MB/s  (%d iters in %.03f s)\n%!"
+    Printf.printf "    % 5d:  %04f MB/s  (%d iters in %.03f s)\n%!"
       size (bw /. mb) iters time
 
 let bm name f = (name, fun () -> f name)

bench/dune

@@ -0,0 +1,12 @@
+let evar  = "NOCRYPTO_ACCELERATE"
+let needs = [`SSSE3; `AES; `PCLMULQDQ]
+let flags = ["-DACCELERATE"; "-mssse3"; "-maes"; "-mpclmul"]
+
+let _ =
+  let auto = match Cpuid.supports needs with Ok true -> flags | _ -> [] in
+  let fs = match Sys.getenv evar with
+    "true" -> flags
+  | "false" -> []
+  | _ -> auto
+  | exception Not_found -> auto in
+  Format.(printf "(@[%a@])%!" (fun ppf -> List.iter (fprintf ppf "%s@ ")) fs)