From 1e7bf68d8933cb01bf5139675b0ace04bf904903 Mon Sep 17 00:00:00 2001 From: Shakthi Kannan Date: Mon, 28 Feb 2022 17:14:24 +0530 Subject: [PATCH 1/2] Use 5.0.0+trunk name and version --- .drone.yml | 24 +++++++++---------- Makefile | 2 +- README.md | 8 +++---- .../files/invoke-configure.sh | 16 ------------- .../ocaml-base-compiler.5.00.0+trunk/opam | 19 --------------- .../opam | 0 .../{5.00.0+stable.json => 5.0.0+stable.json} | 2 +- .../{5.00.0+trunk.json => 5.0.0+trunk.json} | 0 ocaml-versions/5.00.0+domains.json | 24 ------------------- ocaml-versions/custom_navajo.json | 10 ++++---- ocaml-versions/custom_turing.json | 10 ++++---- run_all_custom.sh | 4 ++-- run_all_parallel.sh | 2 +- run_all_serial.sh | 2 +- 14 files changed, 32 insertions(+), 91 deletions(-) delete mode 100644 dependencies/packages/ocaml-base-compiler/ocaml-base-compiler.5.00.0+trunk/files/invoke-configure.sh delete mode 100644 dependencies/packages/ocaml-base-compiler/ocaml-base-compiler.5.00.0+trunk/opam rename dependencies/packages/ocaml/{ocaml.5.00.0+trunk => ocaml.5.0.0+trunk}/opam (100%) rename ocaml-versions/{5.00.0+stable.json => 5.0.0+stable.json} (81%) rename ocaml-versions/{5.00.0+trunk.json => 5.0.0+trunk.json} (100%) delete mode 100644 ocaml-versions/5.00.0+domains.json diff --git a/.drone.yml b/.drone.yml index 5d77bb3933..0cfc1ddd86 100644 --- 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 index 06c53155da..d69868c1d1 100644 --- 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 index b1de97ba83..21c83446e3 100644 --- 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/dependencies/packages/ocaml-base-compiler/ocaml-base-compiler.5.00.0+trunk/files/invoke-configure.sh b/dependencies/packages/ocaml-base-compiler/ocaml-base-compiler.5.00.0+trunk/files/invoke-configure.sh deleted file mode 100644 index 30095bb280..0000000000 --- a/dependencies/packages/ocaml-base-compiler/ocaml-base-compiler.5.00.0+trunk/files/invoke-configure.sh +++ /dev/null @@ -1,16 +0,0 @@ -prefix="$1" -os="$2" -if [ -e configure.ac ]; then - exec ./configure ${OCAMLCONFIGOPTION} --prefix "$prefix" --with-default-string=unsafe -else - unsafe_string='' - if grep -q 'default_safe_string=true' configure; then - unsafe_string='-no-force-safe-string -default-unsafe-string' - fi - case "$os" in - macos|freebsd|openbsd) - exec ./configure ${OCAMLCONFIGOPTION} -prefix "$prefix" $unsafe_string -cc cc -aspp "cc -c";; - *) - exec ./configure ${OCAMLCONFIGOPTION} -prefix "$prefix" $unsafe_string;; - esac -fi 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 deleted file mode 100644 index 8399752b6e..0000000000 --- a/dependencies/packages/ocaml-base-compiler/ocaml-base-compiler.5.00.0+trunk/opam +++ /dev/null @@ -1,19 +0,0 @@ -opam-version: "2.0" -synopsis: "OCaml compiler" -maintainer: "platform@lists.ocaml.org" -depends: [ - "ocaml" {= _:version & post} - "base-unix" {post} - "base-bigarray" {post} - "base-threads" {post} -] -conflict-class: "ocaml-core-compiler" -flags: compiler -build: [ - ["sh" "invoke-configure.sh" prefix os] - [make "-j" jobs "world"] - [make "-j" jobs "world.opt"] -] -install: [make "install"] -url { src: "https://github.com/ocaml/ocaml/archive/trunk.tar.gz" } -setenv: [ [ ORUN_CONFIG_ocaml_url = "https://github.com/ocaml/ocaml/archive/trunk.tar.gz" ] ] diff --git a/dependencies/packages/ocaml/ocaml.5.00.0+trunk/opam b/dependencies/packages/ocaml/ocaml.5.0.0+trunk/opam similarity index 100% rename from dependencies/packages/ocaml/ocaml.5.00.0+trunk/opam rename to dependencies/packages/ocaml/ocaml.5.0.0+trunk/opam diff --git a/ocaml-versions/5.00.0+stable.json b/ocaml-versions/5.0.0+stable.json similarity index 81% rename from ocaml-versions/5.00.0+stable.json rename to ocaml-versions/5.0.0+stable.json index 294ff6d064..feb5f095a2 100644 --- a/ocaml-versions/5.00.0+stable.json +++ b/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 b/ocaml-versions/5.0.0+trunk.json similarity index 100% rename from ocaml-versions/5.00.0+trunk.json rename to 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 deleted file mode 100644 index fd4ab627b1..0000000000 --- a/ocaml-versions/5.00.0+domains.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "url" : "https://github.com/ocaml-multicore/ocaml-multicore/archive/refs/heads/5.00.zip", - "package_overrides": [ - "fmt.0.9.0" - ], - "package_remove": [ - "coq", - "coq-core", - "coq-stdlib", - "fraplib", - "index", - "integers", - "irmin", - "irmin-layers", - "irmin-pack", - "js_of_ocaml-compiler", - "ppx_derivers", - "ppx_deriving", - "ppx_deriving_yojson", - "ppx_irmin", - "ppx_repr", - "stdio" - ] -} diff --git a/ocaml-versions/custom_navajo.json b/ocaml-versions/custom_navajo.json index b35b0fb735..80b442155a 100644 --- 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 index 89b997fddb..8d677431df 100644 --- 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 index 6be330c461..d9474bc7ee 100644 --- a/run_all_custom.sh +++ b/run_all_custom.sh @@ -94,7 +94,7 @@ while [ $i -lt ${COUNT} ]; do OCAML_CONFIG_OPTION="`echo ${CONFIG_OPTIONS}`" \ OCAML_RUN_PARAM="`echo ${CONFIG_RUN_PARAMS}`" \ SANDMARK_CUSTOM_NAME="`echo ${CONFIG_NAME}`" \ - 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 else USE_SYS_DUNE_HACK=1 SANDMARK_URL="`echo ${CONFIG_URL}`" \ RUN_CONFIG_JSON="`echo ${CONFIG_RUN_JSON}`" \ @@ -104,7 +104,7 @@ while [ $i -lt ${COUNT} ]; do SANDMARK_CUSTOM_NAME="`echo ${CONFIG_NAME}`" \ 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 index 03914796f2..d8d558b21e 100644 --- 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 index e5fc0ac9bc..add843933b 100644 --- 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 From 1d9692946aa23b19a66de35321b59c1595c301f6 Mon Sep 17 00:00:00 2001 From: Shakthi Kannan Date: Wed, 2 Mar 2022 18:39:06 +0530 Subject: [PATCH 2/2] Use domainslib.0.4.2 --- .../domainslib/{domainslib.0.4.1 => domainslib.0.4.2}/opam | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename dependencies/packages/domainslib/{domainslib.0.4.1 => domainslib.0.4.2}/opam (89%) diff --git a/dependencies/packages/domainslib/domainslib.0.4.1/opam b/dependencies/packages/domainslib/domainslib.0.4.2/opam similarity index 89% rename from dependencies/packages/domainslib/domainslib.0.4.1/opam rename to dependencies/packages/domainslib/domainslib.0.4.2/opam index a9431f8531..f98173e790 100644 --- a/dependencies/packages/domainslib/domainslib.0.4.1/opam +++ b/dependencies/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" }