diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8feb987e..7db22b49 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,13 +33,6 @@ build_and_test: - if [ "$COMPILER" = "gcc" ]; then export CC=gcc-13; export CXX=g++-13; fi - if [ "$COMPILER" = "clang" ]; then export CC=clang-17; export CXX=clang++-17; fi - - cd cmake-build - - cmake .. $INTEGERS -DGC_TYPE=$GC - - make - - ./SOM++ -cp ../Smalltalk ../TestSuite/TestHarness.som - - ./unittests -cp ../Smalltalk:../TestSuite/BasicInterpreterTests ../Examples/Hello.som - - cd .. - # compose a name for this configuration - |+ export NAME="som-$COMPILER-$GC" @@ -52,6 +45,16 @@ build_and_test: NAME="$NAME-intcache" fi NAME=`echo "$NAME" | tr '[:upper:]' '[:lower:]'` + + - cd cmake-build + - cmake .. $INTEGERS -DGC_TYPE=$GC + - make + - ./SOM++ -cp ../Smalltalk ../TestSuite/TestHarness.som + - ./unittests -cp ../Smalltalk:../TestSuite/BasicInterpreterTests ../Examples/Hello.som + - mv SOM++ ../$NAME + - cd .. + + # run the benchmarks - rebench --experiment="CI ID $CI_PIPELINE_ID" --branch="$CI_COMMIT_REF_NAME" -c rebench.conf all "e:${NAME}" "m:$MACHINE" ### # complete_benchmarking: diff --git a/rebench.conf b/rebench.conf index 6124f5b7..4a086908 100644 --- a/rebench.conf +++ b/rebench.conf @@ -18,7 +18,7 @@ runs: benchmark_suites: macro: gauge_adapter: RebenchLog - command: &MACRO_CMD "-cp ../Smalltalk:../Examples/Benchmarks/Richards:../Examples/Benchmarks/DeltaBlue:../Examples/Benchmarks/NBody:../Examples/Benchmarks/Json:../Examples/Benchmarks/GraphSearch ../Examples/Benchmarks/BenchmarkHarness.som %(benchmark)s %(iterations)s 0 " + command: &MACRO_CMD "-cp Smalltalk:Examples/Benchmarks/Richards:Examples/Benchmarks/DeltaBlue:Examples/Benchmarks/NBody:Examples/Benchmarks/Json:Examples/Benchmarks/GraphSearch Examples/Benchmarks/BenchmarkHarness.som %(benchmark)s %(iterations)s 0 " iterations: 10 benchmarks: - Richards: {extra_args: 1, machines: [yuria ]} @@ -30,7 +30,7 @@ benchmark_suites: micro: gauge_adapter: RebenchLog - command: "-cp ../Smalltalk:../Examples/Benchmarks/LanguageFeatures ../Examples/Benchmarks/BenchmarkHarness.som %(benchmark)s %(iterations)s 0 " + command: "-cp Smalltalk:Examples/Benchmarks/LanguageFeatures Examples/Benchmarks/BenchmarkHarness.som %(benchmark)s %(iterations)s 0 " iterations: 10 benchmarks: - Fannkuch: {extra_args: 6, machines: [yuria ]} @@ -55,25 +55,25 @@ benchmark_suites: - Mandelbrot: {extra_args: 30, machines: [yuria2]} executors: - som-gcc-generational-inttag: {path: cmake-build, executable: SOM++} - som-gcc-generational-intbox: {path: cmake-build, executable: SOM++} - som-gcc-generational-intbox-intcache: {path: cmake-build, executable: SOM++} - som-gcc-mark_sweep-inttag: {path: cmake-build, executable: SOM++} - som-gcc-mark_sweep-intbox: {path: cmake-build, executable: SOM++} - som-gcc-mark_sweep-intbox-intcache: {path: cmake-build, executable: SOM++} - som-gcc-copying-inttag: {path: cmake-build, executable: SOM++} - som-gcc-copying-intbox: {path: cmake-build, executable: SOM++} - som-gcc-copying-intbox-intcache: {path: cmake-build, executable: SOM++} + som-gcc-generational-inttag: {executable: som-gcc-generational-inttag } + som-gcc-generational-intbox: {executable: som-gcc-generational-intbox } + som-gcc-generational-intbox-intcache: {executable: som-gcc-generational-intbox-intcache } + som-gcc-mark_sweep-inttag: {executable: som-gcc-mark_sweep-inttag } + som-gcc-mark_sweep-intbox: {executable: som-gcc-mark_sweep-intbox } + som-gcc-mark_sweep-intbox-intcache: {executable: som-gcc-mark_sweep-intbox-intcache } + som-gcc-copying-inttag: {executable: som-gcc-copying-inttag } + som-gcc-copying-intbox: {executable: som-gcc-copying-intbox } + som-gcc-copying-intbox-intcache: {executable: som-gcc-copying-intbox-intcache } - som-clang-generational-inttag: {path: cmake-build, executable: SOM++} - som-clang-generational-intbox: {path: cmake-build, executable: SOM++} - som-clang-generational-intbox-intcache: {path: cmake-build, executable: SOM++} - som-clang-mark_sweep-inttag: {path: cmake-build, executable: SOM++} - som-clang-mark_sweep-intbox: {path: cmake-build, executable: SOM++} - som-clang-mark_sweep-intbox-intcache: {path: cmake-build, executable: SOM++} - som-clang-copying-inttag: {path: cmake-build, executable: SOM++} - som-clang-copying-intbox: {path: cmake-build, executable: SOM++} - som-clang-copying-intbox-intcache: {path: cmake-build, executable: SOM++} + som-clang-generational-inttag: {executable: som-clang-generational-inttag } + som-clang-generational-intbox: {executable: som-clang-generational-intbox } + som-clang-generational-intbox-intcache: {executable: som-clang-generational-intbox-intcache} + som-clang-mark_sweep-inttag: {executable: som-clang-mark_sweep-inttag } + som-clang-mark_sweep-intbox: {executable: som-clang-mark_sweep-intbox } + som-clang-mark_sweep-intbox-intcache: {executable: som-clang-mark_sweep-intbox-intcache } + som-clang-copying-inttag: {executable: som-clang-copying-inttag } + som-clang-copying-intbox: {executable: som-clang-copying-intbox } + som-clang-copying-intbox-intcache: {executable: som-clang-copying-intbox-intcache } # define the benchmarks to be executed for a re-executable benchmark run experiments: