From 834b25aaab1fb14b313a62deba0f52c39c532d99 Mon Sep 17 00:00:00 2001
From: Stefan Marr <git@stefan-marr.de>
Date: Sun, 11 Apr 2021 11:26:58 +0100
Subject: [PATCH] Adding benchmarks and SomSomTests to GitLab CI

Signed-off-by: Stefan Marr <git@stefan-marr.de>
---
 .gitlab-ci.yml |  1 +
 rebench.conf   | 24 +++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 767415a..c64a1d7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,6 +13,7 @@ som:
   script:
     - ant test
     - ./som.sh -cp ./Smalltalk ./TestSuite/TestHarness.som
+    - ./som.sh -cp core-lib/Smalltalk:core-lib/TestSuite:core-lib/SomSom/src/compiler:core-lib/SomSom/src/vm:core-lib/SomSom/src/vmobjects:core-lib/SomSom/src/interpreter:core-lib/SomSom/src/primitives core-lib/SomSom/tests/SomSomTests.som
     - ant checkstyle
     
     - rebench --experiment="CI ID $CI_PIPELINE_ID" --branch="$CI_COMMIT_REF_NAME" -c rebench.conf all
diff --git a/rebench.conf b/rebench.conf
index 14aa7fd..f42ac1f 100644
--- a/rebench.conf
+++ b/rebench.conf
@@ -13,7 +13,7 @@ reporting:
         project_name: SOM
 
 runs:
-    max_invocation_time: 60
+    max_invocation_time: 120
 
 benchmark_suites:
     macro:
@@ -53,9 +53,25 @@ benchmark_suites:
             - FieldLoop:    {extra_args: 1}
             - WhileLoop:    {extra_args: 10}
             - Mandelbrot:   {extra_args: 30}
+    
+    micro-somsom:
+        gauge_adapter: RebenchLog
+        command: "-cp Smalltalk:Examples/Benchmarks/LanguageFeatures Examples/Benchmarks/BenchmarkHarness.som %(benchmark)s %(iterations)s 0 "
+        iterations: 1
+        benchmarks:
+            - Loop:         {extra_args: 1}
+            - Queens:       {extra_args: 1}
+            - List:         {extra_args: 1}
+            - Recurse:      {extra_args: 1}
+            - Mandelbrot:   {extra_args: 3}
 
 executors:
     som:  {path: ., executable: som.sh}
+    somsom:
+        path: .
+        executable: som.sh
+        args: "-cp core-lib/Smalltalk:core-lib/TestSuite:core-lib/SomSom/src/compiler:core-lib/SomSom/src/vm:core-lib/SomSom/src/vmobjects:core-lib/SomSom/src/interpreter:core-lib/SomSom/src/primitives core-lib/SomSom/src/vm/Main.som"
+    
         
 # define the benchmarks to be executed for a re-executable benchmark run
 experiments:
@@ -66,3 +82,9 @@ experiments:
             - macro
         executions:
             - som
+    SomSom:
+        description: Running a few SomSom benchmarks on SOM (Java)
+        suites:
+            - micro-somsom
+        executions:
+            - somsom