From a027ea6f8ed39a84a65cd0a8e09f749172cbe3af Mon Sep 17 00:00:00 2001 From: Octave Larose Date: Wed, 14 Feb 2024 15:07:52 +0100 Subject: [PATCH] reverting test config for the PR --- .gitlab-ci.yml | 61 -------------------------------------------------- rebench.conf | 54 ++++++++++++++++++++++---------------------- 2 files changed, 27 insertions(+), 88 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 59f0d487..00000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,61 +0,0 @@ -stages: - - build-test - - benchmark - - benchmark-completion - -#variables: - -before_script: - - git submodule update --init - -build-and-test-interpreters: - stage: build-test - tags: [yuria2] - script: - # Setup - - cargo clean - - cargo build --release - - # - cargo test - - # Unit Tests -# - PYTHONPATH=src python3 -m pytest -# - ./som.sh -cp Smalltalk TestSuite/TestHarness.som - - # Interpreter -# - $RPYTHON --batch src/main_rpython.py -# - ./som-bc-interp -cp Smalltalk TestSuite/TestHarness.som - - # Package and Upload - - lz4 ./target/release/som-interpreter-ast som-interpreter-ast.lz4 - - lz4 ./target/release/som-interpreter-bc som-interpreter-bc.lz4 - - - | - sftp tmp-artifacts << EOF - -mkdir incoming/${CI_PIPELINE_ID}/ - put som-interpreter-ast.lz4 incoming/${CI_PIPELINE_ID}/ - put som-interpreter-bc.lz4 incoming/${CI_PIPELINE_ID}/ - EOF - -benchmark-y2: - stage: benchmark - tags: [yuria2] - script: - - sftp tmp-artifacts:incoming/${CI_PIPELINE_ID}/som-interpreter-ast.lz4 - - sftp tmp-artifacts:incoming/${CI_PIPELINE_ID}/som-interpreter-bc.lz4 - - - mkdir -p ./target/release - - lz4 -d som-interpreter-ast.lz4 ./target/release/som-interpreter-ast - - lz4 -d som-interpreter-bc.lz4 ./target/release/som-interpreter-bc - - # Run Benchmarks - - rebench --experiment="CI ID $CI_PIPELINE_ID" --branch="$CI_COMMIT_REF_NAME" -c rebench.conf - -report-completion: - stage: benchmark-completion - tags: [yuria2] - script: - - rebench --experiment="CI ID $CI_PIPELINE_ID" --report-completion rebench.conf - - - diff --git a/rebench.conf b/rebench.conf index 5f21eb9b..ccbf1377 100644 --- a/rebench.conf +++ b/rebench.conf @@ -7,7 +7,7 @@ reporting: # Benchmark results will be reported to ReBenchDB rebenchdb: # this url needs to point to the API endpoint - db_url: https://rebench.stefan-marr.de/rebenchdb + db_url: https://rebench.polomack.eu/rebenchdb repo_url: https://github.com/Hirevo/som-rs record_all: true # make sure everything is recorded project_name: som-rs @@ -21,38 +21,38 @@ benchmark_suites: command: &MACRO_CMD "-c core-lib/Smalltalk core-lib/Examples/Benchmarks core-lib/Examples/Benchmarks/Richards core-lib/Examples/Benchmarks/DeltaBlue core-lib/Examples/Benchmarks/NBody core-lib/Examples/Benchmarks/Json core-lib/Examples/Benchmarks/GraphSearch -- BenchmarkHarness %(benchmark)s %(iterations)s " iterations: 10 benchmarks: - - Richards: {extra_args: 1, machines: [yuria2]} - - DeltaBlue: {extra_args: 50, machines: [yuria2]} - - NBody: {extra_args: 500, machines: [yuria2]} - - JsonSmall: {extra_args: 1, machines: [yuria2]} - - GraphSearch: {extra_args: 4, machines: [yuria2]} - - PageRank: {extra_args: 40, machines: [yuria2]} + - Richards: {extra_args: 1} + - DeltaBlue: {extra_args: 50} + - NBody: {extra_args: 500} + - JsonSmall: {extra_args: 1} + - GraphSearch: {extra_args: 4} + - PageRank: {extra_args: 40} micro: gauge_adapter: RebenchLog command: "-c core-lib/Smalltalk core-lib/Examples/Benchmarks core-lib/Examples/Benchmarks/LanguageFeatures -- BenchmarkHarness %(benchmark)s %(iterations)s " iterations: 10 benchmarks: - - Fannkuch: {extra_args: 6, machines: [yuria2]} - - Fibonacci: {extra_args: "3", machines: [yuria2]} - - Dispatch: {extra_args: 2, machines: [yuria2]} - - Bounce: {extra_args: "2", machines: [yuria2]} - - Loop: {extra_args: 5, machines: [yuria2]} - - Permute: {extra_args: "3", machines: [yuria2]} - - Queens: {extra_args: "2", machines: [yuria2]} - - List: {extra_args: "2", machines: [yuria2]} - - Recurse: {extra_args: "3", machines: [yuria2]} - - Storage: {extra_args: 1, machines: [yuria2]} - - Sieve: {extra_args: 4, machines: [yuria2]} - - BubbleSort: {extra_args: "3", machines: [yuria2]} - - QuickSort: {extra_args: 1, machines: [yuria2]} - - Sum: {extra_args: 2, machines: [yuria2]} - - Towers: {extra_args: "2", machines: [yuria2]} - - TreeSort: {extra_args: "1", machines: [yuria2]} - - IntegerLoop: {extra_args: 2, machines: [yuria2]} - - FieldLoop: {extra_args: 1, machines: [yuria2]} - - WhileLoop: {extra_args: 10, machines: [yuria2]} - - Mandelbrot: {extra_args: 30, machines: [yuria2]} + - Fannkuch: {extra_args: 6} + - Fibonacci: {extra_args: "3"} + - Dispatch: {extra_args: 2} + - Bounce: {extra_args: "2"} + - Loop: {extra_args: 5} + - Permute: {extra_args: "3"} + - Queens: {extra_args: "2"} + - List: {extra_args: "2"} + - Recurse: {extra_args: "3"} + - Storage: {extra_args: 1} + - Sieve: {extra_args: 4} + - BubbleSort: {extra_args: "3"} + - QuickSort: {extra_args: 1} + - Sum: {extra_args: 2} + - Towers: {extra_args: "2"} + - TreeSort: {extra_args: "1"} + - IntegerLoop: {extra_args: 2} + - FieldLoop: {extra_args: 1} + - WhileLoop: {extra_args: 10} + - Mandelbrot: {extra_args: 30} executors: som-rs-ast: