Benchmarks: combined view of bot JavaSCript and Wasm

Author: vouillon

benchmarks/Makefile

@@ -23,9 +23,9 @@ microbenchmarks:
 	make _noprecomp
 	$(RUN) ./report-wasm-cb.config ./report-jsoo-cb.config
 	$(REPORT) -format current-bench -config report-wasm-cb.config \
-	  -ylabel "Wasm_of_ocaml"
+	  -ylabel "Wasm_of_ocaml" | sh utils/aggregate.sh wasm
 	$(REPORT) -format current-bench -config report-jsoo-cb.config \
-	  -ylabel "Js_of_ocaml"
+	  -ylabel "Js_of_ocaml" | sh utils/aggregate.sh js
 
 graphsnopr: _noprecomp $(GRAPHSNOPR)
 

benchmarks/benchmark-camlboy/Makefile

@@ -8,10 +8,11 @@ SCRIPT=../../CAMLBOY/_build/default/bin/web/bench_node.bc
 ROM=../../CAMLBOY/resource/games/tobu.gb
 
 bench:
-	$(MAKE) perform COMPILER=Js_of_ocaml SUFFIX=.js
-	$(MAKE) perform COMPILER=Wasm_of_ocaml SUFFIX=.wasm.js
+	$(MAKE) perform COMPILER=Js_of_ocaml SUFFIX=.js KIND=js
+	$(MAKE) perform COMPILER=Wasm_of_ocaml SUFFIX=.wasm.js KIND=wasm
 
 perform:
 	node $(SCRIPT)$(SUFFIX) $(ROM) | \
 	tee /dev/stderr | \
-	ocaml -I +str str.cma output_results.ml $(COMPILER)
+	ocaml output_results.ml $(COMPILER) | \
+        sh ../utils/aggregate.sh $(KIND)

benchmarks/benchmark-fiat-crypto/Makefile

@@ -3,11 +3,14 @@
 export NAME=Fiat-Crypto
 
 bench:
-	$(MAKE) perform COMPILER=js_of_ocaml EXTRA_ARGS="--enable effects"
-	$(MAKE) perform COMPILER=wasm_of_ocaml EXTRA_ARGS=""
+	$(MAKE) perform COMPILER=js_of_ocaml EXTRA_ARGS="--enable effects" KIND=js
+	$(MAKE) perform COMPILER=wasm_of_ocaml EXTRA_ARGS="" KIND=wasm
 
 perform: bedrock2_fiat_crypto.byte
-	time -f "%E %R" $(COMPILER) --debug times --source-map $(EXTRA_ARGS) $< 2>&1 | ocaml -I +str str.cma ../utils/compilation_metrics.ml $(COMPILER) $(NAME)
+	time -f "%E %R" $(COMPILER) --debug times --source-map $(EXTRA_ARGS) $< 2>&1 | \
+	ocaml -I +str str.cma ../utils/compilation_metrics.ml $(COMPILER) $(NAME) | \
+	sh ../utils/aggregate.sh $(KIND)
+
 
 bedrock2_fiat_crypto.byte: bedrock2_fiat_crypto.ml
 	ocamlfind ocamlc -w -20 -g -linkpkg -package js_of_ocaml -g $< -o $@

benchmarks/benchmark-ocamlc/Makefile

@@ -4,11 +4,11 @@ export NAME=Ocamlc
 
 bench:
 	cp -r ../sources/ml .
-	$(MAKE) perform COMPILER=js_of_ocaml SCRIPT=ocamlc.js
-	$(MAKE) perform COMPILER=wasm_of_ocaml SCRIPT=ocamlc.wasm.js
+	$(MAKE) perform COMPILER=js_of_ocaml SCRIPT=ocamlc.js KIND=js
+	$(MAKE) perform COMPILER=wasm_of_ocaml SCRIPT=ocamlc.wasm.js KIND=wasm
 
 ARGS=ml/*.ml ml/*.ml ml/*.ml ml/*.ml ml/*.ml ml/*.ml ml/*.ml ml/*.ml
 
 perform:
-	time -f "%E %R" $(COMPILER) --debug times --opt 2 --pretty `which ocamlc.byte` -o $(SCRIPT) 2>&1 | ocaml -I +str str.cma ../utils/compilation_metrics.ml $(COMPILER) $(NAME)
-	time -f '{"compiler": "$(COMPILER)", "time":"%E"}' node $(SCRIPT) -c $(ARGS) 2>&1 | sh ../utils/format_metrics.sh exec
+	time -f "%E %R" $(COMPILER) --debug times --opt 2 --pretty `which ocamlc.byte` -o $(SCRIPT) 2>&1 | ocaml -I +str str.cma ../utils/compilation_metrics.ml $(COMPILER) $(NAME) | sh ../utils/aggregate.sh $(KIND)
+	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,12 +5,14 @@ export NAME=Partial Render Table
 SHELL=/bin/bash -o pipefail
 
 bench:
-	$(MAKE) perform COMPILER=Js_of_ocaml SCRIPT=main.bc.js
-	$(MAKE) perform COMPILER=Wasm_of_ocaml SCRIPT=main.bc.wasm.js
+	$(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
 
 perform:
 	time -f "%E %R" $(COMPILER) --debug times --opt 2 --pretty `which ocamlc.byte` -o $(SCRIPT) 2>&1 | \
-	ocaml -I +str str.cma ../utils/compilation_metrics.ml $(COMPILER) $(NAME)
+	ocaml -I +str str.cma ../utils/compilation_metrics.ml $(COMPILER) $(NAME) | \
+	sh ../utils/aggregate.sh $(KIND)
 	node $(SCRIPT) | \
 	tee /dev/stderr | \
-	ocaml -I +str str.cma summarize_results.ml $(COMPILER)
+	ocaml -I +str str.cma summarize_results.ml $(COMPILER) | \
+	sh ../utils/aggregate.sh $(KIND)

benchmarks/utils/aggregate.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+TEMP=$(mktemp)
+
+tee $TEMP | jq '.name |= "Js vs Wasm" | .results[].metrics[].name |= .+"/'$1'"'
+cat $TEMP
+rm $TEMP