Fix bench

dev/bench/bench.sh

@@ -138,14 +138,6 @@ number_of_processors=$(cat /proc/cpuinfo | grep '^processor *' | wc -l)
 program_name="$0"
 program_path=$(readlink -f "${program_name%/*}")
 
-# pre build needed helpers
-dune build --root "$program_path/../.." -- dev/bench/render_results.exe dev/bench/render_line_results.exe topbin/rocq.exe
-
-render_results=$(readlink -f "$program_path/../../_build/default/dev/bench/render_results.exe")
-render_line_results=$(readlink -f "$program_path/../../_build/default/dev/bench//render_line_results.exe")
-rocq_exe=$(readlink -f "$program_path/../../_build/default/topbin/rocq.exe")
-timelog2html="$rocq_exe timelog2html"
-
 coqbot_url_prefix="https://coqbot.herokuapp.com/pendulum/"
 
 # --------------------------------------------------------------------------------
@@ -349,7 +341,7 @@ git clone -q --depth 1 -b "$old_coq_opam_archive_git_branch" "$old_coq_opam_arch
 new_coq_opam_archive_dir="$working_dir/new_coq_opam_archive"
 git clone -q --depth 1 -b "$new_coq_opam_archive_git_branch" "$new_coq_opam_archive_git_uri" "$new_coq_opam_archive_dir"
 
-initial_opam_packages="num ocamlfind dune yojson"
+initial_opam_packages="num zarith ocamlfind dune yojson"
 
 # Create an opam root and install Coq
 # $1 = root_name {ex: NEW / OLD}
@@ -438,6 +430,16 @@ create_opam "NEW" "$new_ocaml_version" "$new_coq_commit" "$new_coq_version" \
             "$new_coq_opam_archive_dir" "$new_opam_override_urls" "$new_ocaml_flambda"
 new_coq_commit_long="$COQ_HASH_LONG"
 
+# pre build needed helpers (needs an opam switch)
+
+# pre build needed helpers (needs an opam switch)
+dune build --root "$program_path/../.." -- dev/bench/render_results.exe dev/bench/render_line_results.exe topbin/rocq.exe
+
+render_results=$(readlink -f "$program_path/../../_build/default/dev/bench/render_results.exe")
+render_line_results=$(readlink -f "$program_path/../../_build/default/dev/bench//render_line_results.exe")
+rocq_exe=$(readlink -f "$program_path/../../_build/default/topbin/rocq.exe")
+timelog2html="$rocq_exe timelog2html"
+
 # Create an OPAM-root to which we will install the OLD version of Coq.
 create_opam "OLD" "$old_ocaml_version" "$old_coq_commit" "$old_coq_version" \
             "$old_coq_opam_archive_dir" "$old_opam_override_urls" "$old_ocaml_flambda"
@@ -467,7 +469,7 @@ export PROFILING=1
 export COQ_PROFILE_COMPONENTS=command,parse_command,partac.perform
 
 # packages tied to the coq commit need to be pinned accordingly
-core_packages='rocq-runtime coq-core rocq-core coq-stdlib coqide-server coq'
+core_packages='rocq-runtime coq-core rocq-core rocq-stdlib coq-stdlib coqide-server rocq coq'
 
 for coq_opam_package in $core_packages $coq_opam_packages; do
 
@@ -680,6 +682,7 @@ $skipped_packages"
           if [ "$new_compressed" ]; then
             gunzip --keep "$new_data"
           fi
+          mkdir -p "$working_dir/html/$coq_opam_package/$(dirname "$vo")/"
           $timelog2html \
             "$new_base_path/${vo%%o}" \
             "${old_data%.gz}" \