Merge pull request #300 from shakthimaan/dev/use-5.0.0+trunk

Use 5.0.0+trunk name and version
ocaml-bench · Mar 2, 2022 · a6e33fb · a6e33fb
2 parents 79da00b + 46cca1b
commit a6e33fb
Show file tree

Hide file tree

Showing 15 changed files with 34 additions and 93 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -1,12 +1,12 @@
 kind: pipeline
-name: 5.00.0+stable+serial
+name: 5.0.0+stable+serial
 
 platform:
   os: linux
   arch: amd64
 
 steps:
-- name: 5.00.0+stable
+- name: 5.0.0+stable
   image: ocaml/opam:ubuntu-20.04-ocaml-4.12
   commands:
   - sudo apt-get update && sudo apt-get -y install wget pkg-config libgmp-dev m4 libdw-dev jq python3-pip autoconf jo
@@ -19,20 +19,20 @@ steps:
   - export ITER=1
   - export OPAM_DISABLE_SANDBOXING=true
   - TAG='"run_in_ci"' make run_config_filtered.json
-  - USE_SYS_DUNE_HACK=1 RUN_CONFIG_JSON=run_config_filtered.json make ocaml-versions/5.00.0+stable.bench
+  - USE_SYS_DUNE_HACK=1 RUN_CONFIG_JSON=run_config_filtered.json make ocaml-versions/5.0.0+stable.bench
   - ls _results
   - cat _results/*
 
 ---
 kind: pipeline
-name: 5.00.0+stable+parallel
+name: 5.0.0+stable+parallel
 
 platform:
   os: linux
   arch: amd64
 
 steps:
-- name: 5.00.0+stable+parallel
+- name: 5.0.0+stable+parallel
   image: ocaml/opam:ubuntu-20.04-ocaml-4.12
   commands:
   - sudo apt-get update && sudo apt-get -y install wget pkg-config libgmp-dev m4 libdw-dev jq python3-pip autoconf jo
@@ -47,20 +47,20 @@ steps:
   - TAG='"run_in_ci"' make multicore_parallel_run_config_filtered.json
   - TAG='"macro_bench"' make multicore_parallel_run_config_filtered_filtered.json
   - make multicore_parallel_run_config_filtered_filtered_2domains.json
-  - USE_SYS_DUNE_HACK=1 BUILD_BENCH_TARGET=multibench_parallel RUN_CONFIG_JSON=multicore_parallel_run_config_filtered_filtered_2domains.json make ocaml-versions/5.00.0+stable.bench
+  - USE_SYS_DUNE_HACK=1 BUILD_BENCH_TARGET=multibench_parallel RUN_CONFIG_JSON=multicore_parallel_run_config_filtered_filtered_2domains.json make ocaml-versions/5.0.0+stable.bench
   - ls _results
   - cat _results/*
 
 ---
 kind: pipeline
-name: 5.00.0+trunk+serial
+name: 5.0.0+trunk+serial
 
 platform:
   os: linux
   arch: amd64
 
 steps:
-- name: 5.00.0+trunk+serial
+- name: 5.0.0+trunk+serial
   image: ocaml/opam:ubuntu-20.04-ocaml-4.12
   failure: ignore
   commands:
@@ -74,20 +74,20 @@ steps:
   - export ITER=1
   - export OPAM_DISABLE_SANDBOXING=true
   - TAG='"run_in_ci"' make run_config_filtered.json
-  - USE_SYS_DUNE_HACK=1 RUN_CONFIG_JSON=run_config_filtered.json make ocaml-versions/5.00.0+trunk.bench
+  - USE_SYS_DUNE_HACK=1 RUN_CONFIG_JSON=run_config_filtered.json make ocaml-versions/5.0.0+trunk.bench
   - ls _results
   - cat _results/*
 
 ---
 kind: pipeline
-name: 5.00.0+trunk+parallel
+name: 5.0.0+trunk+parallel
 
 platform:
   os: linux
   arch: amd64
 
 steps:
-- name: 5.00.0+trunk+parallel
+- name: 5.0.0+trunk+parallel
   image: ocaml/opam:ubuntu-20.04-ocaml-4.12
   failure: ignore
   commands:
@@ -103,7 +103,7 @@ steps:
   - TAG='"run_in_ci"' make multicore_parallel_run_config_filtered.json
   - TAG='"macro_bench"' make multicore_parallel_run_config_filtered_filtered.json
   - make multicore_parallel_run_config_filtered_filtered_2domains.json
-  - USE_SYS_DUNE_HACK=1 BUILD_BENCH_TARGET=multibench_parallel RUN_CONFIG_JSON=multicore_parallel_run_config_filtered_filtered_2domains.json make ocaml-versions/5.00.0+trunk.bench
+  - USE_SYS_DUNE_HACK=1 BUILD_BENCH_TARGET=multibench_parallel RUN_CONFIG_JSON=multicore_parallel_run_config_filtered_filtered_2domains.json make ocaml-versions/5.0.0+trunk.bench
   - ls _results
   - cat _results/*
 

diff --git a/Makefile b/Makefile
@@ -140,7 +140,7 @@ ifeq (0, $(USE_SYS_DUNE_HACK))
 endif
 	opam update --switch=$(CONFIG_SWITCH_NAME)
 	@{ case "$*" in \
-		*5.00*) sed 's/(alias (name buildbench) (deps layers.exe irmin_mem_rw.exe))/; (alias (name buildbench) (deps layers.exe irmin_mem_rw.exe))/g' ./benchmarks/irmin/dune > ./benchmarks/irmin/dune ; \
+		*5.0*) sed 's/(alias (name buildbench) (deps layers.exe irmin_mem_rw.exe))/; (alias (name buildbench) (deps layers.exe irmin_mem_rw.exe))/g' ./benchmarks/irmin/dune > ./benchmarks/irmin/dune ; \
 			sed 's/(alias (name buildbench) (deps metro_geo.pdf PDFReference16.pdf_toobig))/; (alias (name buildbench) (deps metro_geo.pdf PDFReference16.pdf_toobig))/g' ./benchmarks/cpdf/dune ;; \
 	esac };
 	@{	for i in ${PACKAGES}; do \

diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ $ opam install dune.2.9.0
 
 $ git clone https://github.com/ocaml-bench/sandmark.git
 $ cd sandmark
-$ make ocaml-versions/5.00.0+trunk.bench
+$ make ocaml-versions/5.0.0+trunk.bench
 $ make ocaml-versions/4.14.0+domains.bench
 ```
 
@@ -157,9 +157,9 @@ configuration:
 ```
 would allow
 ```sh
-$ RUN_BENCH_TARGET=run_orun-2M make ocaml-versions/5.00.0+trunk.bench
+$ RUN_BENCH_TARGET=run_orun-2M make ocaml-versions/5.0.0+trunk.bench
 ```
-to run the benchmarks on 5.00.0+trunk with a 2M minor heap setting taskset
+to run the benchmarks on 5.0.0+trunk with a 2M minor heap setting taskset
 onto CPU 5.
 
 The benchmarks also have associated tags which classify the benchmarks. The
@@ -265,7 +265,7 @@ The following table marks the benchmarks that are currently not working with any
 
 | Variants | Benchmarks | Issue Tracker |
 |---|---|---|
-| 5.00.0+trunk.bench | irmin benchmarks | [sandmark#262](https://github.com/ocaml-bench/sandmark/issues/262) |
+| 5.0.0+trunk.bench | irmin benchmarks | [sandmark#262](https://github.com/ocaml-bench/sandmark/issues/262) |
 | 4.14.0+domains.bench | irmin benchmarks | [sandmark#262](https://github.com/ocaml-bench/sandmark/issues/262) |
 
 ## UI

diff --git a/...packages/domainslib/domainslib.0.4.1/opam → ...packages/domainslib/domainslib.0.4.2/opam b/...packages/domainslib/domainslib.0.4.1/opam → ...packages/domainslib/domainslib.0.4.2/opam
@@ -9,13 +9,13 @@ dev-repo: "git+https://github.com/ocaml-multicore/domainslib.git"
 bug-reports: "https://github.com/ocaml-multicore/domainslib/issues"
 tags: ["org:ocamllabs"]
 depends: [
-  "ocaml" {>= "5.00"}
+  "ocaml" {>= "5.0"}
   "dune" {>= "1.8"}
   "mirage-clock-unix" {with-test}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 run-test: ["dune" "runtest" "-p" name "-j" jobs]
 url {
-  src: "https://github.com/ocaml-multicore/domainslib/archive/0.4.1.tar.gz"
-  checksum: "md5=7514b4f9c7bcc2d5c20bb1143cf0b77a"
+  src: "https://github.com/ocaml-multicore/domainslib/archive/0.4.2.tar.gz"
+  checksum: "md5=a079b8b5b676e8d38d713f02b25b14db"
 }
diff --git a/...s/packages/ocaml-base-compiler/ocaml-base-compiler.5.00.0+trunk/files/invoke-configure.sh b/...s/packages/ocaml-base-compiler/ocaml-base-compiler.5.00.0+trunk/files/invoke-configure.sh
diff --git a/dependencies/packages/ocaml-base-compiler/ocaml-base-compiler.5.00.0+trunk/opam b/dependencies/packages/ocaml-base-compiler/ocaml-base-compiler.5.00.0+trunk/opam
diff --git a/...es/packages/ocaml/ocaml.5.00.0+trunk/opam → ...ies/packages/ocaml/ocaml.5.0.0+trunk/opam b/...es/packages/ocaml/ocaml.5.00.0+trunk/opam → ...ies/packages/ocaml/ocaml.5.0.0+trunk/opam
diff --git a/ocaml-versions/5.00.0+stable.json → ocaml-versions/5.0.0+stable.json b/ocaml-versions/5.00.0+stable.json → ocaml-versions/5.0.0+stable.json
@@ -1,5 +1,5 @@
 {
-  "url" : "https://github.com/ocaml/ocaml/archive/b73cbbea4bc40ffd26a459d594a39b99cec4273d.zip",
+  "url" : "https://github.com/ocaml/ocaml/archive/2422a5984a8cc597a44c214946677e562d8808bf.zip",
   "package_overrides": [
     "fmt.0.9.0",
     "ocamlfind.1.9.3"

diff --git a/ocaml-versions/5.00.0+trunk.json → ocaml-versions/5.0.0+trunk.json b/ocaml-versions/5.00.0+trunk.json → ocaml-versions/5.0.0+trunk.json
diff --git a/ocaml-versions/5.00.0+domains.json b/ocaml-versions/5.00.0+domains.json
diff --git a/ocaml-versions/custom_navajo.json b/ocaml-versions/custom_navajo.json
@@ -3,35 +3,35 @@
     "url": "https://github.com/ocaml/ocaml/archive/trunk.tar.gz",
     "tag": "macro_bench",
     "config_json": "run_config_filtered.json",
-    "name": "5.00+trunk+sequential",
+    "name": "5.0+trunk+sequential",
     "expiry": "2100-01-01"
   },
   {
     "url": "https://github.com/ocaml/ocaml/archive/b73cbbea4bc40ffd26a459d594a39b99cec4273d.zip",
     "tag": "macro_bench",
     "config_json": "run_config_filtered.json",
-    "name": "5.00+stable+sequential",
+    "name": "5.0+stable+sequential",
     "expiry": "2100-01-01"
   },
   {
     "url": "https://github.com/ocaml/ocaml/archive/trunk.tar.gz",
     "tag": "macro_bench",
     "config_json": "multicore_parallel_navajo_run_config_filtered.json",
-    "name": "5.00+trunk+parallel",
+    "name": "5.0+trunk+parallel",
     "expiry": "2100-01-01"
   },
   {
     "url": "https://github.com/ocaml/ocaml/archive/b73cbbea4bc40ffd26a459d594a39b99cec4273d.zip",
     "tag": "macro_bench",
     "config_json": "multicore_parallel_navajo_run_config_filtered.json",
-    "name": "5.00+stable+parallel",
+    "name": "5.0+stable+parallel",
     "expiry": "2100-01-01"
   },
   {
     "url": "https://github.com/sadiqj/ocaml/archive/refs/heads/eventring-pr.zip",
     "tag": "run_in_ci",
     "config_json": "run_config_filtered.json",
-    "name": "5.00+trunk+sadiqj+pr10964",
+    "name": "5.0+trunk+sadiqj+pr10964",
     "expiry": "2022-02-25"
   }
 ]
diff --git a/ocaml-versions/custom_turing.json b/ocaml-versions/custom_turing.json
@@ -3,35 +3,35 @@
     "url": "https://github.com/ocaml/ocaml/archive/trunk.tar.gz",
     "tag": "macro_bench",
     "config_json": "run_config_filtered.json",
-    "name": "5.00+trunk+sequential",
+    "name": "5.0+trunk+sequential",
     "expiry": "2100-01-01"
   },
   {
     "url": "https://github.com/ocaml/ocaml/archive/b73cbbea4bc40ffd26a459d594a39b99cec4273d.zip",
     "tag": "macro_bench",
     "config_json": "run_config_filtered.json",
-    "name": "5.00+stable+sequential",
+    "name": "5.0+stable+sequential",
     "expiry": "2100-01-01"
   },
   {
     "url": "https://github.com/ocaml/ocaml/archive/trunk.tar.gz",
     "tag": "macro_bench",
     "config_json": "multicore_parallel_run_config_filtered.json",
-    "name": "5.00+trunk+parallel",
+    "name": "5.0+trunk+parallel",
     "expiry": "2100-01-01"
   },
   {
     "url": "https://github.com/ocaml/ocaml/archive/b73cbbea4bc40ffd26a459d594a39b99cec4273d.zip",
     "tag": "macro_bench",
     "config_json": "multicore_parallel_run_config_filtered.json",
-    "name": "5.00+stable+parallel",
+    "name": "5.0+stable+parallel",
     "expiry": "2100-01-01"
   },
   {
     "url": "https://github.com/sadiqj/ocaml/archive/refs/heads/eventring-pr.zip",
     "tag": "run_in_ci",
     "config_json": "run_config_filtered.json",
-    "name": "5.00+trunk+sadiqj+pr10964",
+    "name": "5.0+trunk+sadiqj+pr10964",
     "expiry": "2022-02-25"
   }
 ]
diff --git a/run_all_custom.sh b/run_all_custom.sh
@@ -110,7 +110,7 @@ while [ $i -lt ${COUNT} ]; do
                              SANDMARK_REMOVE_PACKAGES="`echo ${CONFIG_REMOVE_PACKAGES}`" \
                              RUN_BENCH_TARGET=run_orunchrt \
                              BUILD_BENCH_TARGET=multibench_parallel \
-                             make ocaml-versions/5.00.0+stable.bench > "${RESULTS_DIR}/${CONFIG_NAME}.${TIMESTAMP}.${COMMIT}.log" 2>&1
+                             make ocaml-versions/5.0.0+stable.bench > "${RESULTS_DIR}/${CONFIG_NAME}.${TIMESTAMP}.${COMMIT}.log" 2>&1
         fi
 
         # Copy results

diff --git a/run_all_parallel.sh b/run_all_parallel.sh
@@ -12,4 +12,4 @@ USE_SYS_DUNE_HACK=1 \
                  RUN_BENCH_TARGET=run_orunchrt \
                  BUILD_BENCH_TARGET=multibench_parallel \
                  RUN_CONFIG_JSON=multicore_parallel_run_config_filtered.json \
-                 make ocaml-versions/5.00.0+stable.bench
+                 make ocaml-versions/5.0.0+stable.bench
diff --git a/run_all_serial.sh b/run_all_serial.sh
@@ -2,4 +2,4 @@
 
 TAG='"macro_bench"' make run_config_filtered.json
 
-USE_SYS_DUNE_HACK=1 RUN_CONFIG_JSON=run_config_filtered.json make ocaml-versions/5.00.0+stable.bench
+USE_SYS_DUNE_HACK=1 RUN_CONFIG_JSON=run_config_filtered.json make ocaml-versions/5.0.0+stable.bench
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		TAG='"macro_bench"' make run_config_filtered.json

		USE_SYS_DUNE_HACK=1 RUN_CONFIG_JSON=run_config_filtered.json make ocaml-versions/5.00.0+stable.bench
		USE_SYS_DUNE_HACK=1 RUN_CONFIG_JSON=run_config_filtered.json make ocaml-versions/5.0.0+stable.bench