Benchmarks: build smaller docker image (#1923)

Author: vouillon

bench.Dockerfile

@@ -33,27 +33,36 @@ RUN mkdir janestreet \
  && opam remote add js .
 
 # 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
+RUN opam install -y --deps-only js_of_ocaml-compiler \
+ && opam install opam-format stringext uucp cstruct bigstringaf \
+ && opam clean
 
 # Install js_of_ocaml / wasm_of_ocaml
 COPY --chown=opam:opam . ./
-RUN opam install -y wasm_of_ocaml-compiler
+RUN opam install -y wasm_of_ocaml-compiler \
+ && opam clean
 
 # Compile partial render table benchmark
-RUN opam install opam-format stringext uucp cstruct
-RUN opam exec -- dune exec tools/ci_setup.exe janestreet .
-RUN opam install ppxlib.0.35.0 # temporary workaround
-RUN cd janestreet/lib/bonsai_web_components && git config pull.rebase true && git pull
-RUN 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
-RUN cp -r janestreet/_build/default/lib/bonsai_web_components/partial_render_table/bench/bin/main.bc.* ./benchmarks/benchmark-partial-render-table
+#RUN opam exec -- dune exec tools/ci_setup.exe ../janestreet . \
+# && opam install ppxlib.0.35.0 # temporary workaround \
+# && opam clean
+
+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
 
 # 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
 
-WORKDIR ./benchmarks
+WORKDIR /bench-dir/js_of_ocaml/benchmarks

benchmarks/benchmark-camlboy/Makefile

@@ -4,8 +4,9 @@ export NAME=Camlboy
 
 SHELL=/bin/bash -o pipefail
 
-SCRIPT=../../CAMLBOY/_build/default/bin/web/bench_node.bc
-ROM=../../CAMLBOY/resource/games/tobu.gb
+DIR=../../../CAMLBOY
+SCRIPT=$(DIR)/_build/default/bin/web/bench_node.bc
+ROM=$(DIR)/resource/games/tobu.gb
 
 bench:
 	$(MAKE) perform COMPILER=Js_of_ocaml SUFFIX=.js KIND=js

benchmarks/benchmark-partial-render-table/Makefile

@@ -8,10 +8,8 @@ bench:
 	$(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
 
-BYTE_FILE=../../janestreet/_build/default/lib/bonsai_web_components/partial_render_table/bench/bin/main.bc-for-jsoo
-
 perform:
-	/usr/bin/time -f "%E %R" $(COMPILER) --debug times --opt 2 --pretty $(BYTE_FILE) -o out.js 2>&1 | \
+	/usr/bin/time -f "%E %R" $(COMPILER) --debug times --opt 2 --pretty main.bc-for-jsoo -o out.js 2>&1 | \
 	tee /dev/stderr | \
 	ocaml -I +str str.cma ../utils/compilation_metrics.ml $(COMPILER) "$(NAME)" | \
 	sh ../utils/aggregate.sh $(KIND)