Fix benchmarking

Signed-off-by: Stefan Marr <git@stefan-marr.de>
smarr · Jul 5, 2024 · ec1020f · ec1020f
1 parent 48f4dca
commit ec1020f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 18 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -32,11 +32,14 @@ build_and_test:
     - rm -rf cmake-build && mkdir cmake-build
     - 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"

diff --git a/rebench.conf b/rebench.conf
@@ -55,25 +55,25 @@ benchmark_suites:
             - Mandelbrot:   {extra_args: 30, machines: [yuria2]}
 
 executors:
-    som-gcc-generational-inttag:            {path: ., executable: SOM++}
-    som-gcc-generational-intbox:            {path: ., executable: SOM++}
-    som-gcc-generational-intbox-intcache:   {path: ., executable: SOM++}
-    som-gcc-mark_sweep-inttag:              {path: ., executable: SOM++}
-    som-gcc-mark_sweep-intbox:              {path: ., executable: SOM++}
-    som-gcc-mark_sweep-intbox-intcache:     {path: ., executable: SOM++}
-    som-gcc-copying-inttag:                 {path: ., executable: SOM++}
-    som-gcc-copying-intbox:                 {path: ., executable: SOM++}
-    som-gcc-copying-intbox-intcache:        {path: ., executable: SOM++}
+    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-clang-generational-inttag:          {path: ., executable: SOM++}
-    som-clang-generational-intbox:          {path: ., executable: SOM++}
-    som-clang-generational-intbox-intcache: {path: ., executable: SOM++}
-    som-clang-mark_sweep-inttag:            {path: ., executable: SOM++}
-    som-clang-mark_sweep-intbox:            {path: ., executable: SOM++}
-    som-clang-mark_sweep-intbox-intcache:   {path: ., executable: SOM++}
-    som-clang-copying-inttag:               {path: ., executable: SOM++}
-    som-clang-copying-intbox:               {path: ., executable: SOM++}
-    som-clang-copying-intbox-intcache:      {path: ., executable: SOM++}
+    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++}
 
 # define the benchmarks to be executed for a re-executable benchmark run
 experiments: