Merge fe71b86 into c4715e6

smarr · Aug 9, 2020 · b93da4a · b93da4a
2 parents c4715e6 + fe71b86
commit b93da4a
Show file tree

Hide file tree

Showing 8 changed files with 523 additions and 65 deletions.
diff --git a/.classpath b/.classpath
@@ -23,6 +23,6 @@
 	<classpathentry kind="src" path="/com.oracle.truffle.tools.profiler"/>
 	<classpathentry kind="src" path="/org.graalvm.polyglot.tck"/>
 	<classpathentry kind="src" path="/com.oracle.svm.core"/>
-	<classpathentry kind="lib" path="libs/affinity.jar"/>
+	<classpathentry kind="lib" path="libs/affinity.jar" sourcepath="libs/affinity-sources.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -63,13 +63,13 @@ benchmark_job:
     - ant compile
     - rebench --experiment="CI Benchmark Run Pipeline ID $CI_PIPELINE_ID" --branch="$CI_COMMIT_REF_NAME" -c codespeed.conf SOMns
 
-benchmark_csp_and_interp_job:
+benchmark_job_others:
   stage: benchmark
   tags: [benchmarks, infinity]
   allow_failure: true
   script:
     - ant compile
-    - rebench --experiment="CI Benchmark Run Pipeline ID $CI_PIPELINE_ID" --branch="$CI_COMMIT_REF_NAME" -c codespeed.conf SOMns-SavinaCSP
+    - rebench --experiment="CI Benchmark Run Pipeline ID $CI_PIPELINE_ID" --branch="$CI_COMMIT_REF_NAME" -c codespeed.conf SOMns-concurrency-models
     - rebench --experiment="CI Benchmark Run Pipeline ID $CI_PIPELINE_ID" --branch="$CI_COMMIT_REF_NAME" -c codespeed.conf SOMns-interp
 
 benchmark_nightly_job:

diff --git a/build.xml b/build.xml
@@ -238,6 +238,9 @@
         <get src="https://repo1.maven.org/maven2/net/openhft/affinity/3.2.3/affinity-3.2.3.jar"
             usetimestamp="true"
             dest="${lib.dir}/affinity.jar" />
+        <get src="https://repo1.maven.org/maven2/net/openhft/affinity/3.2.3/affinity-3.2.3-sources.jar"
+            usetimestamp="true"
+            dest="${lib.dir}/affinity-sources.jar" />
         <get src="https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"
             usetimestamp="true"
             dest="${lib.dir}/slf4j-api.jar" />

diff --git a/codespeed.conf b/codespeed.conf
@@ -56,21 +56,10 @@ benchmark_suites:
             - PageRank:
                 extra_args: "1 0 100"
                 codespeed_name: "1st.PageRank"
-            - Lee:
-                extra_args: "1 0 4"
-                codespeed_name: "1st.Lee"
-            - LeeSTM:
-                extra_args: "1 0 4"
-                codespeed_name: "1st.LeeSTM"
-            - Vacation:
-                extra_args: "1 0 8"
-                codespeed_name: "1st.Vacation"
-            - VacationSTM:
-                extra_args: "1 0 8"
-                codespeed_name: "1st.VacationSTM"
             - Splay:
                 extra_args: "1 0 1"
                 codespeed_name: "1st.Splay"
+
     macro-steady:
         gauge_adapter: RebenchLog
         command: *MACRO_CMD
@@ -117,18 +106,6 @@ benchmark_suites:
                 extra_args: "120 0 1000"
                 codespeed_name: "peak.PageRank"
                 warmup: 20
-            - Lee:
-                extra_args: "150 0 2"
-                codespeed_name: "peak.Lee"
-            - LeeSTM:
-                extra_args: "150 0 4"
-                codespeed_name: "peak.LeeSTM"
-            - Vacation:
-                extra_args: "150 0 12"
-                codespeed_name: "peak.Vacation"
-            - VacationSTM:
-                extra_args: "150 0 10"
-                codespeed_name: "peak.VacationSTM"
             - Splay:
                 extra_args: "150 0 1"
                 codespeed_name: "peak.Splay"
@@ -475,7 +452,7 @@ benchmark_suites:
                 extra_args: "130 0 1000"
                 codespeed_name: "i.Messages"
 
-    fj-steady:
+    fj-seq-steady:
         description: Sequential version of Fork/Join benchmarks for normal performance tracking
         gauge_adapter: RebenchLog
         command: &FJ_CMD " core-lib/Benchmarks/Harness.ns core-lib/Benchmarks/ForkJoin/%(benchmark)s%(input)s.ns "
@@ -499,7 +476,7 @@ benchmark_suites:
                 extra_args: "130 0 256"
                 codespeed_name: "peak.LUDecomposition"
 
-    fj-startup:
+    fj-seq-startup:
         description: Sequential version of Fork/Join benchmarks for normal performance tracking
         gauge_adapter: RebenchLog
         command: *FJ_CMD
@@ -554,10 +531,11 @@ benchmark_suites:
           # - UTS:
           #     extra_args: 1
 
-    savina-csp:
+    csp-steady:
         description: CSP port of the savina benchmarks
         gauge_adapter: RebenchLog
-        command: &CSP_CMD " core-lib/Benchmarks/Harness.ns SavinaCSP.%(benchmark)s 125 0"
+        command: &HARNESS_W_ITER " core-lib/Benchmarks/Harness.ns %(benchmark)s %(iterations)s 0"
+        iterations: 125
         max_invocation_time: 500
         warmup: 30
         benchmarks:
@@ -574,25 +552,90 @@ benchmark_suites:
                 extra_args: "200 4"
                 codespeed_name: "CSP.Philosophers"
 
-    savina-csp-interp:
+    csp-startup:
         description: CSP port of the savina benchmarks
         gauge_adapter: RebenchLog
-        command: &CSP_INTERP_CMD " core-lib/Benchmarks/Harness.ns SavinaCSP.%(benchmark)s 50 0"
+        command: *HARNESS_W_ITER
+        iterations: 1
+        invocations: 3
         max_invocation_time: 500
         warmup: 30
         benchmarks:
             - PingPong:
                 #numMessages numThreads, numThreads is unused
                 extra_args: "8000 2"
-                codespeed_name: "CSP.PingPong"
             - ForkJoinThroughput:
                 #numMessages numThreads
                 extra_args: "8000 4"
-                codespeed_name: "CSP.ForkJoinThroughput"
             - Philosophers:
                 #numrounds numThreads, uses numThreads - 1 Philosophers
                 extra_args: "700 4"
-                codespeed_name: "CSP.Philosophers"
+
+    mutex-startup:
+      description: various mutex based benchmarks
+      gauge_adapter: RebenchLog
+      command: *HARNESS_W_ITER
+      max_invocation_time: 500
+      iterations: 1
+      invocations: 3
+      warmup: 30
+      benchmarks:
+          - MutexSuite.ProducerConsumer:
+              #buffersize numThreads, split threads equally into producers and consumers
+              extra_args: "4000 4"
+          - MutexSuite.Philosophers:
+              #numrounds numThreads, uses numThreads - 1 Philosophers
+              extra_args: "50000 4"
+          - Lee:
+              extra_args: 4
+          - Vacation:
+              extra_args: 8
+
+    mutex-steady:
+        description: various mutex based benchmarks
+        gauge_adapter: RebenchLog
+        command: *HARNESS_W_ITER
+        max_invocation_time: 500
+        iterations: 150
+        warmup: 30
+        benchmarks:
+            - MutexSuite.ProducerConsumer:
+                #buffersize numThreads, split threads equally into producers and consumers
+                extra_args: "4000 4"
+            - MutexSuite.Philosophers:
+                #numrounds numThreads, uses numThreads - 1 Philosophers
+                extra_args: "50000 4"
+            - Lee:
+                extra_args: 2
+            - Vacation:
+                extra_args: 12
+
+    stm-startup:
+      description: various mutex based benchmarks
+      gauge_adapter: RebenchLog
+      command: *HARNESS_W_ITER
+      max_invocation_time: 500
+      iterations: 1
+      invocations: 3
+      warmup: 30
+      benchmarks:
+            - LeeSTM:
+                extra_args: 1
+            - VacationSTM:
+                extra_args: 1
+
+    stm-steady:
+        description: various mutex based benchmarks
+        gauge_adapter: RebenchLog
+        command: *HARNESS_W_ITER
+        max_invocation_time: 500
+        iterations: 150
+        warmup: 30
+        benchmarks:
+            - LeeSTM:
+                extra_args: 4
+            - VacationSTM:
+                extra_args: 10
 
 # VMs have a name and are specified by a path and the binary to be executed
 executors:
@@ -679,8 +722,8 @@ experiments:
             - sort-steady
             - som-startup
             - som-steady
-            - fj-startup
-            - fj-steady
+            - fj-seq-startup
+            - fj-seq-steady
         executions:
             - SOMns-graal
     SOMns-Savina:
@@ -693,15 +736,13 @@ experiments:
                 suites:
                   - savina-jit
 
-    SOMns-SavinaCSP:
-        description: Run the Savina Actor benchmarks
+    SOMns-concurrency-models:
+        suites:
+          - mutex-steady
+          - stm-steady
+          - csp-steady
         executions:
-            - SOMns-interp-tn:
-                suites:
-                  - savina-csp-interp
-            - SOMns-graal-tn:
-                suites:
-                  - savina-csp
+          - SOMns-graal-tn
 
     SOMns-interp:
         description: All benchmarks on SOMns without Graal