From 5ec897e052c240e015f68df3536c8106456ad52c Mon Sep 17 00:00:00 2001 From: codeamic Date: Thu, 31 Mar 2022 07:30:52 +0100 Subject: [PATCH] updates --- README.md | 2 +- ocaml-versions/custom.json | 8 ++++---- ocaml-versions/custom_navajo.json | 4 ++-- ocaml-versions/custom_turing.json | 4 ++-- run_all_custom.sh | 2 +- run_all_serial.sh | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index ed9c0cf926..33c4224d08 100644 --- a/README.md +++ b/README.md @@ -180,7 +180,7 @@ RAM housed at IITM. The `sequential.json` file may be filtered based on the tag. For example, ```bash -$ TAG='"macro_bench"' make run_config_filtered.json +$ TAG='"macro_bench"' make sequential_filtered.json ``` filters the `sequential.json` file to only contain the benchmarks tagged as diff --git a/ocaml-versions/custom.json b/ocaml-versions/custom.json index bc65c42bac..131274c43c 100644 --- a/ocaml-versions/custom.json +++ b/ocaml-versions/custom.json @@ -2,14 +2,14 @@ { "url": "https://github.com/ocaml/ocaml/archive/trunk.tar.gz", "tag": "macro_bench", - "config_json": "run_config_filtered.json", + "config_json": "sequential_filtered.json", "name": "5.0.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", + "config_json": "sequential_filtered.json", "name": "5.0.0+stable+sequential", "expiry": "2100-01-01" }, @@ -30,8 +30,8 @@ { "url": "https://github.com/sadiqj/ocaml/archive/refs/heads/eventring-pr.zip", "tag": "run_in_ci", - "config_json": "run_config_filtered.json", + "config_json": "sequential_filtered.json", "name": "5.0.0+trunk+sadiqj+pr10964", "expiry": "2022-02-25" } -] +] \ No newline at end of file diff --git a/ocaml-versions/custom_navajo.json b/ocaml-versions/custom_navajo.json index 591749cdb2..5b1c5fdf21 100644 --- a/ocaml-versions/custom_navajo.json +++ b/ocaml-versions/custom_navajo.json @@ -2,7 +2,7 @@ { "url": "https://github.com/ocaml/ocaml/archive/trunk.tar.gz", "tag": "macro_bench", - "config_json": "run_config_filtered.json", + "config_json": "sequential_filtered.json", "name": "5.0.0+trunk+sequential", "expiry": "2100-01-01" }, @@ -16,7 +16,7 @@ { "url": "https://github.com/gadmm/ocaml/archive/refs/heads/multicore_async_actions.zip", "tag": "macro_bench", - "config_json": "run_config_filtered.json", + "config_json": "sequential_filtered.json", "name": "5.0.0+trunk+sequential+gadmm+pr11057", "expiry": "2022-03-20" }, diff --git a/ocaml-versions/custom_turing.json b/ocaml-versions/custom_turing.json index 861e3925fc..d4484b784e 100644 --- a/ocaml-versions/custom_turing.json +++ b/ocaml-versions/custom_turing.json @@ -2,7 +2,7 @@ { "url": "https://github.com/ocaml/ocaml/archive/trunk.tar.gz", "tag": "macro_bench", - "config_json": "run_config_filtered.json", + "config_json": "sequential_filtered.json", "name": "5.0.0+trunk+sequential", "expiry": "2100-01-01" }, @@ -16,7 +16,7 @@ { "url": "https://github.com/gadmm/ocaml/archive/refs/heads/multicore_async_actions.zip", "tag": "macro_bench", - "config_json": "run_config_filtered.json", + "config_json": "sequential_filtered.json", "name": "5.0.0+trunk+sequential+gadmm+pr11057", "expiry": "2022-03-20" }, diff --git a/run_all_custom.sh b/run_all_custom.sh index 8ea202edeb..314db03ff3 100644 --- a/run_all_custom.sh +++ b/run_all_custom.sh @@ -68,7 +68,7 @@ while [ $i -lt ${COUNT} ]; do CONFIG_TAG=`jq -r '.['$i'].tag // "macro_bench"' "${CUSTOM_FILE}"` if [ $j -eq 0 ]; then - CONFIG_RUN_JSON="run_config_filtered.json" + CONFIG_RUN_JSON="sequential_filtered.json" CONFIG_NAME="${CONFIG_NAME}+sequential" else CONFIG_NAME="${CONFIG_NAME}+parallel" diff --git a/run_all_serial.sh b/run_all_serial.sh index add843933b..8a4c8bf3a8 100644 --- a/run_all_serial.sh +++ b/run_all_serial.sh @@ -1,5 +1,5 @@ #!/bin/bash -TAG='"macro_bench"' make run_config_filtered.json +TAG='"macro_bench"' make sequential_filtered.json -USE_SYS_DUNE_HACK=1 RUN_CONFIG_JSON=run_config_filtered.json make ocaml-versions/5.0.0+stable.bench +USE_SYS_DUNE_HACK=1 RUN_CONFIG_JSON=sequential_filtered.json make ocaml-versions/5.0.0+stable.bench