diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2f98a4e2..2598c8b7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -97,7 +97,7 @@ build_and_test: if [ "$MACHINE" = "zullie1" ]; then M='' else - M="m:$MACHINE" + M="t:$MACHINE" fi rebench --experiment="CI ID $CI_PIPELINE_ID" --branch="$CI_COMMIT_REF_NAME" -c rebench.conf all "e:${NAME}" $M diff --git a/rebench.conf b/rebench.conf index 69761403..dae85bde 100644 --- a/rebench.conf +++ b/rebench.conf @@ -22,41 +22,41 @@ benchmark_suites: command: "-H16MB -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 " iterations: 10 benchmarks: - - Richards: {iterations: 5, extra_args: 1, machines: [yuria3]} - - DeltaBlue: {extra_args: 500, machines: [yuria2]} - - NBody: {extra_args: 5000, machines: [yuria3]} - - JsonSmall: {extra_args: 10, machines: [yuria ]} - - GraphSearch: {extra_args: 7, machines: [yuria2]} - - PageRank: {extra_args: 150, machines: [yuria3]} + - Richards: {iterations: 5, extra_args: 1, tags: [yuria3]} + - DeltaBlue: {extra_args: 500, tags: [yuria2]} + - NBody: {extra_args: 5000, tags: [yuria3]} + - JsonSmall: {extra_args: 10, tags: [yuria ]} + - GraphSearch: {extra_args: 7, tags: [yuria2]} + - PageRank: {extra_args: 150, tags: [yuria3]} micro: gauge_adapter: RebenchLog command: "-cp Smalltalk:Examples/Benchmarks/LanguageFeatures:Examples/Benchmarks/TestSuite Examples/Benchmarks/BenchmarkHarness.som %(benchmark)s %(iterations)s " iterations: 10 benchmarks: - - Fannkuch: {extra_args: 7, machines: [yuria ]} - - Fibonacci: {extra_args: 3, machines: [yuria2]} - - Dispatch: {extra_args: 20, machines: [yuria3]} - - Bounce: {extra_args: 10, machines: [yuria ]} - - Loop: {extra_args: 50, machines: [yuria2]} - - Permute: {extra_args: 3, machines: [yuria3]} - - Queens: {extra_args: 10, machines: [yuria ]} - - List: {extra_args: 2, machines: [yuria2]} - - Recurse: {extra_args: 3, machines: [yuria3]} - - Storage: {extra_args: 8, machines: [yuria ]} - - Sieve: {extra_args: 4, machines: [yuria2]} - - BubbleSort: {extra_args: 30, machines: [yuria3]} - - QuickSort: {extra_args: 12, machines: [yuria ]} - - Sum: {extra_args: 20, machines: [yuria2]} - - Towers: {extra_args: 2, machines: [yuria3]} - - TreeSort: {extra_args: 10, machines: [yuria ]} - - IntegerLoop: {extra_args: 10, machines: [yuria2]} - - FieldLoop: {extra_args: 5, machines: [yuria3]} - - WhileLoop: {extra_args: 100, machines: [yuria ]} - - Mandelbrot: {extra_args: 100, machines: [yuria2]} + - Fannkuch: {extra_args: 7, tags: [yuria ]} + - Fibonacci: {extra_args: 3, tags: [yuria2]} + - Dispatch: {extra_args: 20, tags: [yuria3]} + - Bounce: {extra_args: 10, tags: [yuria ]} + - Loop: {extra_args: 50, tags: [yuria2]} + - Permute: {extra_args: 3, tags: [yuria3]} + - Queens: {extra_args: 10, tags: [yuria ]} + - List: {extra_args: 2, tags: [yuria2]} + - Recurse: {extra_args: 3, tags: [yuria3]} + - Storage: {extra_args: 8, tags: [yuria ]} + - Sieve: {extra_args: 4, tags: [yuria2]} + - BubbleSort: {extra_args: 30, tags: [yuria3]} + - QuickSort: {extra_args: 12, tags: [yuria ]} + - Sum: {extra_args: 20, tags: [yuria2]} + - Towers: {extra_args: 2, tags: [yuria3]} + - TreeSort: {extra_args: 10, tags: [yuria ]} + - IntegerLoop: {extra_args: 10, tags: [yuria2]} + - FieldLoop: {extra_args: 5, tags: [yuria3]} + - WhileLoop: {extra_args: 100, tags: [yuria ]} + - Mandelbrot: {extra_args: 100, tags: [yuria2]} - # - Test: {invocations: 5, iterations: 1, machines: [yuria2]} - - TestGC: {invocations: 5, iterations: 1, extra_args: 100, machines: [yuria2]} + # - Test: {invocations: 5, iterations: 1, tags: [yuria2]} + - TestGC: {invocations: 5, iterations: 1, extra_args: 100, tags: [yuria2]} awfy: gauge_adapter: RebenchLog @@ -64,8 +64,8 @@ benchmark_suites: iterations: 1 invocations: 5 benchmarks: - - CD: {extra_args: 10, machines: [yuria2]} - # - Havlak: {extra_args: 1, machines: [yuria3]} + - CD: {extra_args: 10, tags: [yuria2]} + # - Havlak: {extra_args: 1, tags: [yuria3]} micro-somsom: gauge_adapter: RebenchLog @@ -73,11 +73,11 @@ benchmark_suites: iterations: 1 invocations: 5 benchmarks: - - Loop: {extra_args: 40, machines: [yuria3]} - - Queens: {extra_args: 10, machines: [yuria2]} - - List: {extra_args: 10, machines: [yuria2]} - - Recurse: {extra_args: 10, machines: [yuria3]} - - Mandelbrot: {extra_args: 50, machines: [yuria3]} + - Loop: {extra_args: 40, tags: [yuria3]} + - Queens: {extra_args: 10, tags: [yuria2]} + - List: {extra_args: 10, tags: [yuria2]} + - Recurse: {extra_args: 10, tags: [yuria3]} + - Mandelbrot: {extra_args: 50, tags: [yuria3]} som-parse: gauge_adapter: RebenchLog @@ -85,8 +85,8 @@ benchmark_suites: iterations: 1! invocations: 5 benchmarks: - - SomParse: {extra_args: 1, machines: [yuria2]} - - SomInit: {extra_args: 10000, machines: [yuria2]} + - SomParse: {extra_args: 1, tags: [yuria2]} + - SomInit: {extra_args: 10000, tags: [yuria2]} interpreter: description: Basic interpreter benchmarks for comparing performance of most basic concepts. @@ -94,22 +94,22 @@ benchmark_suites: invocations: 5 command: "-cp Smalltalk:Examples/Benchmarks/Interpreter Examples/Benchmarks/BenchmarkHarness.som %(benchmark)s %(iterations)s " benchmarks: - - ArgRead: {extra_args: 5, machines: [yuria2]} - - ArrayReadConst: {extra_args: 5, machines: [yuria2]} - - ArrayWriteConstConst: {extra_args: 5, machines: [yuria2]} - - BlockSend0ConstReturn: {extra_args: 2, machines: [yuria2]} - - Const: {extra_args: 5, machines: [yuria2]} - - FieldConstWrite: {extra_args: 5, machines: [yuria2]} - - FieldRead: {extra_args: 5, machines: [yuria2]} - - FieldReadIncWrite: {extra_args: 2, machines: [yuria2]} - - FieldReadWrite: {extra_args: 5, machines: [yuria3]} - - GlobalRead: {extra_args: 5, machines: [yuria3]} - - LocalConstWrite: {extra_args: 5, machines: [yuria3]} - - LocalRead: {extra_args: 5, machines: [yuria3]} - - LocalReadIncWrite: {extra_args: 5, machines: [yuria3]} - - LocalReadWrite: {extra_args: 5, machines: [yuria3]} - - SelfSend0: {extra_args: 2, machines: [yuria3]} - - SelfSend0BlockConstNonLocalReturn: {extra_args: 1, machines: [yuria3]} + - ArgRead: {extra_args: 5, tags: [yuria2]} + - ArrayReadConst: {extra_args: 5, tags: [yuria2]} + - ArrayWriteConstConst: {extra_args: 5, tags: [yuria2]} + - BlockSend0ConstReturn: {extra_args: 2, tags: [yuria2]} + - Const: {extra_args: 5, tags: [yuria2]} + - FieldConstWrite: {extra_args: 5, tags: [yuria2]} + - FieldRead: {extra_args: 5, tags: [yuria2]} + - FieldReadIncWrite: {extra_args: 2, tags: [yuria2]} + - FieldReadWrite: {extra_args: 5, tags: [yuria3]} + - GlobalRead: {extra_args: 5, tags: [yuria3]} + - LocalConstWrite: {extra_args: 5, tags: [yuria3]} + - LocalRead: {extra_args: 5, tags: [yuria3]} + - LocalReadIncWrite: {extra_args: 5, tags: [yuria3]} + - LocalReadWrite: {extra_args: 5, tags: [yuria3]} + - SelfSend0: {extra_args: 2, tags: [yuria3]} + - SelfSend0BlockConstNonLocalReturn: {extra_args: 1, tags: [yuria3]} executors: som-gcc-generational-inttag: {path: ., executable: som-gcc-generational-inttag }