diff --git a/.gitignore b/.gitignore index 14820b3b..d59ac5c0 100644 --- a/.gitignore +++ b/.gitignore @@ -12,9 +12,5 @@ /.nova /.idea -# Rebench stuff -payload.json -rebench.data - # Folder to put files not intended to be pushed (like temporary files) /ignored diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 8d0b66c2..00000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,56 +0,0 @@ -stages: - - build-test - - benchmark - - benchmark-completion - -#variables: - -before_script: - - git submodule update --init - -build-and-test-interpreters: - stage: build-test - tags: [yuria] - script: - # Setup - - cargo clean - - cargo build --release - - # 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-y1: - stage: benchmark - tags: [yuria] - 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: [yuria] - script: - - rebench --experiment="CI ID $CI_PIPELINE_ID" --report-completion rebench.conf diff --git a/rebench.conf b/rebench.conf index 51e30d7a..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 diff --git a/run_benchmarks.sh b/run_benchmarks.sh deleted file mode 100755 index bd80e131..00000000 --- a/run_benchmarks.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -BENCHMARKS=("Bounce" "Mandelbrot" "List" "Permute" "Queens" "QuickSort" "Sieve" "Fannkuch" "Json" "DeltaBlue") - -for bench in "${BENCHMARKS[@]}" -do - cargo run --bin som-interpreter-bc -- -c core-lib/Smalltalk core-lib/Examples/Benchmarks core-lib/Examples/Benchmarks/Json core-lib/Examples/Benchmarks/DeltaBlue -- core-lib/Examples/Benchmarks/BenchmarkHarness.som $bench 1 0 7 - echo -ne "\n" -done -