Benchmarks: move version-specific set-up from docker file to makefiles (#1927)

* Benchmarks: move version-specific set-up from docker file to makefiles

* Partial render table: Compile as much as possible during docker build

* Output timing information

Author: vouillon

.dockerignore

@@ -4,3 +4,4 @@ _build
 compiler/tests-*
 manual
 examples
+benchmarks/build

bench.Dockerfile

@@ -34,35 +34,20 @@ RUN mkdir janestreet \
 
 # Install dependencies
 WORKDIR /bench-dir/js_of_ocaml
-COPY --chown=opam:opam ./*.opam ./
-RUN opam pin -yn --with-version=dev .
-RUN opam install -y --deps-only js_of_ocaml-compiler \
- && opam install opam-format stringext uucp cstruct bigstringaf \
+COPY --chown=opam:opam js_of_ocaml-compiler.opam .
+RUN opam install -y --deps-only ./js_of_ocaml-compiler.opam \
+ && opam install opam-format stringext uucp cstruct \
  && opam clean
 
-# Install js_of_ocaml / wasm_of_ocaml
-COPY --chown=opam:opam . ./
-RUN opam install -y wasm_of_ocaml-compiler \
- && opam clean
-
-# Compile partial render table benchmark
-#RUN opam exec -- dune exec tools/ci_setup.exe ../janestreet . \
-# && opam install ppxlib.0.35.0 # temporary workaround \
-# && opam clean
-
+# Prepare partial render table benchmark
+COPY --chown=opam:opam dune-project ./
+COPY --chown=opam:opam tools ./tools
 RUN opam exec -- dune exec tools/ci_setup.exe ../janestreet . \
- && opam install ppxlib.0.35.0 \
- && eval $(opam env) \
- && dune build --root ../janestreet --profile release lib/bonsai_web_components/partial_render_table/bench/bin/main.bc.wasm.js lib/bonsai_web_components/partial_render_table/bench/bin/main.bc.js \
- && cp -r ../janestreet/_build/default/lib/bonsai_web_components/partial_render_table/bench/bin/main.bc* ./benchmarks/benchmark-partial-render-table/ \
- && rm -rf ../janestreet
+ && opam exec -- dune build --root ../janestreet --profile release lib/bonsai_web_components/partial_render_table/bench/bin/main.bc-for-jsoo \
+ && opam remove js_of_ocaml-compiler ojs \
+ && opam clean
 
-# CAMLBOY
-WORKDIR /bench-dir
-RUN opam install brr \
- && opam clean \
- && git clone --depth 1 https://github.com/ocaml-wasm/CAMLBOY -b node \
- && cd CAMLBOY \
- && opam exec -- dune build --root . --profile release ./bin/web
+# Copy sources
+COPY --chown=opam:opam . ./
 
 WORKDIR /bench-dir/js_of_ocaml/benchmarks

benchmarks/Makefile

@@ -14,19 +14,25 @@ all: _perf graphsnopr graphspr graphseff _noperf
 # see https://github.com/ocurrent/current-bench
 .PHONY: bench microbenchmarks
 bench:
+	@date -u +"%FT%TZ - Installing dependencies"
+	opam pin -yn --with-version=dev ..
+	opam install -y wasm_of_ocaml-compiler js_of_ocaml-ppx gen_js_api brr
 	$(MAKE) microbenchmarks
 	$(MAKE) -C benchmark-fiat-crypto bench
 	$(MAKE) -C benchmark-ocamlc bench
 	$(MAKE) -C benchmark-partial-render-table bench
 	$(MAKE) -C benchmark-camlboy bench
 
 microbenchmarks:
+	@date -u +"%FT%TZ - Microbenchmarks: starting"
 	make _noprecomp
+	@date -u +"%FT%TZ - Microbenchmarks: compiler"
 	$(RUN) ./report-wasm-cb.config ./report-jsoo-cb.config
 	$(REPORT) -format current-bench -config report-wasm-cb.config \
 	  -ylabel "Wasm_of_ocaml" | sh utils/aggregate.sh wasm
 	$(REPORT) -format current-bench -config report-jsoo-cb.config \
 	  -ylabel "Js_of_ocaml" | sh utils/aggregate.sh js
+	@date -u +"%FT%TZ - Microbenchmarks: done"
 
 graphsnopr: _noprecomp $(GRAPHSNOPR)
 

benchmarks/benchmark-camlboy/Makefile

@@ -4,13 +4,18 @@ export NAME=Camlboy
 
 SHELL=/bin/bash -o pipefail
 
-DIR=../../../CAMLBOY
+DIR=CAMLBOY
 SCRIPT=$(DIR)/_build/default/bin/web/bench_node.bc
 ROM=$(DIR)/resource/games/tobu.gb
 
 bench:
+	@date -u +"%FT%TZ - $(NAME): starting"
+	git clone --depth 1 https://github.com/ocaml-wasm/CAMLBOY -b node
+	cd $(DIR) && opam exec -- dune build --root . --profile release ./bin/web
+	@date -u +"%FT%TZ - $(NAME): compiled"
 	$(MAKE) perform COMPILER=Js_of_ocaml SUFFIX=.js KIND=js
 	$(MAKE) perform COMPILER=Wasm_of_ocaml SUFFIX=.wasm.js KIND=wasm
+	@date -u +"%FT%TZ - $(NAME): done"
 
 perform:
 	node $(SCRIPT)$(SUFFIX) $(ROM) | \

benchmarks/benchmark-fiat-crypto/Makefile

@@ -5,8 +5,10 @@ export NAME=Fiat-Crypto
 SHELL=/bin/bash -o pipefail
 
 bench:
+	@date -u +"%FT%TZ - $(NAME): starting"
 	$(MAKE) perform COMPILER=js_of_ocaml EXTRA_ARGS="--enable effects" KIND=js
 	$(MAKE) perform COMPILER=wasm_of_ocaml EXTRA_ARGS="" KIND=wasm
+	@date -u +"%FT%TZ - $(NAME): done"
 
 perform: bedrock2_fiat_crypto.byte
 	/usr/bin/time -f "%E %R" $(COMPILER) --debug times --source-map $(EXTRA_ARGS) $< 2>&1 | \

benchmarks/benchmark-ocamlc/Makefile

@@ -5,9 +5,11 @@ export NAME=Ocamlc
 SHELL=/bin/bash -o pipefail
 
 bench:
+	@date -u +"%FT%TZ - $(NAME): starting"
 	cp -r ../sources/ml .
 	$(MAKE) perform COMPILER=js_of_ocaml SCRIPT=ocamlc.js KIND=js
 	$(MAKE) perform COMPILER=wasm_of_ocaml SCRIPT=ocamlc.wasm.js KIND=wasm
+	@date -u +"%FT%TZ - $(NAME): done"
 
 ARGS=ml/*.ml ml/*.ml ml/*.ml ml/*.ml ml/*.ml ml/*.ml ml/*.ml ml/*.ml
 
@@ -18,4 +20,3 @@ perform:
 	/usr/bin/time -f '{"compiler": "$(COMPILER)", "time":"%E"}' node $(SCRIPT) -c $(ARGS) 2>&1 | \
 	sh ../utils/format_metrics.sh exec | \
 	sh ../utils/aggregate.sh $(KIND)
-

benchmarks/benchmark-partial-render-table/Makefile

@@ -5,8 +5,13 @@ export NAME=Partial Render Table
 SHELL=/bin/bash -o pipefail
 
 bench:
+	@date -u +"%FT%TZ - $(NAME): starting"
+	dune build --root ../../../janestreet --profile release lib/bonsai_web_components/partial_render_table/bench/bin/main.bc.wasm.js lib/bonsai_web_components/partial_render_table/bench/bin/main.bc.js
+	cp -r ../../../janestreet/_build/default/lib/bonsai_web_components/partial_render_table/bench/bin/main.bc* .
+	@date -u +"%FT%TZ - $(NAME): compiled"
 	$(MAKE) perform COMPILER=js_of_ocaml SCRIPT=main.bc.js KIND=js
 	$(MAKE) perform COMPILER=wasm_of_ocaml SCRIPT=main.bc.wasm.js KIND=wasm
+	@date -u +"%FT%TZ - $(NAME): done"
 
 perform:
 	/usr/bin/time -f "%E %R" $(COMPILER) --debug times --opt 2 --pretty main.bc-for-jsoo -o out.js 2>&1 | \

benchmarks/report.ml

@@ -326,7 +326,8 @@ let current_bench_output
   let json =
     `Assoc [ "name", `String suite_name; "results", `List (summary :: results) ]
   in
-  Yojson.Basic.to_channel ch json
+  Yojson.Basic.to_channel ch json;
+  output_char ch '\n'
 
 let output ~format conf =
   let output_function, close =