Concurrent Immix

.github/configs/base.yml

@@ -6,6 +6,7 @@ suites:
     type: DaCapo
     # Need running-ng to support 23.9
     release: evaluation
+    # This is expanded in CI when we run with the config.
     path: "DACAPO_PATH/dacapo-23.9-RC3-chopin.jar"
     minheap: mmtk-openjdk-11-MarkCompact
     # Min heap values are from dacapo-evaluation-git-04132797
@@ -90,18 +91,3 @@ runtimes:
     type: OpenJDK
     release: 11
     home: "/home/runner/work/mmtk-openjdk/mmtk-openjdk/bundles/jdk"
-
-configs:
-  - "jdk11-master|ms|s|fail_on_oom|tph|preserve|mmtk_gc-SemiSpace"
-  - "jdk11-master|ms|s|fail_on_oom|tph|preserve|mmtk_gc-GenCopy"
-  - "jdk11-master|ms|s|fail_on_oom|tph|preserve|mmtk_gc-Immix"
-  - "jdk11-master|ms|s|fail_on_oom|tph|preserve|mmtk_gc-GenImmix"
-  - "jdk11-master|ms|s|fail_on_oom|tph|preserve|mmtk_gc-StickyImmix"
-  - "jdk11-master|ms|s|fail_on_oom|tph|preserve|mmtk_gc-MarkSweep"
-  - "jdk11-master|ms|s|fail_on_oom|tph|preserve|mmtk_gc-MarkCompact"
-  # TODO: We need to disable compressed oops for Compressor temporarily until it supports
-  # discontiguous spaces.
-  - "jdk11-master|ms|s|fail_on_oom|tph|preserve|no_compressed_oops|mmtk_gc-Compressor"
-
-benchmarks:
-  dacapo-23.9-RC3-chopin-ci:

.github/configs/large-heap.yml

@@ -0,0 +1,9 @@
+includes:
+  - "./base.yml"
+
+configs:
+  - "jdk11-master|ms|s|fail_on_oom|tph|preserve|mmtk_gc-ConcurrentImmix"
+
+# This will be expanded in CI when we run with the config. Keep a new line at the end.
+benchmarks:
+  dacapo-23.9-RC3-chopin-ci:

.github/configs/normal-heap.yml

@@ -0,0 +1,18 @@
+includes:
+  - "./base.yml"
+
+configs:
+  - "jdk11-master|ms|s|fail_on_oom|tph|preserve|mmtk_gc-SemiSpace"
+  - "jdk11-master|ms|s|fail_on_oom|tph|preserve|mmtk_gc-GenCopy"
+  - "jdk11-master|ms|s|fail_on_oom|tph|preserve|mmtk_gc-Immix"
+  - "jdk11-master|ms|s|fail_on_oom|tph|preserve|mmtk_gc-GenImmix"
+  - "jdk11-master|ms|s|fail_on_oom|tph|preserve|mmtk_gc-StickyImmix"
+  - "jdk11-master|ms|s|fail_on_oom|tph|preserve|mmtk_gc-MarkSweep"
+  - "jdk11-master|ms|s|fail_on_oom|tph|preserve|mmtk_gc-MarkCompact"
+  # TODO: We need to disable compressed oops for Compressor temporarily until it supports
+  # discontiguous spaces.
+  - "jdk11-master|ms|s|fail_on_oom|tph|preserve|no_compressed_oops|mmtk_gc-Compressor"
+
+# This will be expanded in CI when we run with the config. Keep a new line at the end.
+benchmarks:
+  dacapo-23.9-RC3-chopin-ci:

.github/scripts/ci-expected-results.yml

@@ -10,6 +10,7 @@ results:
         MarkSweep: pass
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass
       batik:
         SemiSpace: pass
         GenCopy: pass
@@ -19,6 +20,7 @@ results:
         MarkSweep: pass
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass
       biojava:
         SemiSpace: pass
         GenCopy: pass
@@ -28,6 +30,7 @@ results:
         MarkSweep: pass
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass
       cassandra:
         SemiSpace: pass
         GenCopy: pass
@@ -37,6 +40,7 @@ results:
         MarkSweep: ignore
         MarkCompact: ignore
         Compressor: ignore
+        ConcurrentImmix: ignore
       eclipse:
         SemiSpace: pass
         GenCopy: pass
@@ -46,6 +50,7 @@ results:
         MarkSweep: ignore
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass
       fop:
         SemiSpace: pass
         GenCopy: pass
@@ -55,6 +60,7 @@ results:
         MarkSweep: ignore
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass
       graphchi:
         SemiSpace: pass
         GenCopy: pass
@@ -64,6 +70,7 @@ results:
         MarkSweep: pass
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass
       h2:
         SemiSpace: pass
         GenCopy: pass
@@ -73,6 +80,7 @@ results:
         MarkSweep: ignore
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass
       h2o:
         SemiSpace: pass
         GenCopy: pass
@@ -82,6 +90,7 @@ results:
         MarkSweep: pass
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass
       jme:
         SemiSpace: pass
         GenCopy: pass
@@ -91,6 +100,7 @@ results:
         MarkSweep: pass
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass
       jython:
         SemiSpace: pass
         GenCopy: pass
@@ -100,6 +110,7 @@ results:
         MarkSweep: ignore
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass
       kafka:
         SemiSpace: pass
         GenCopy: pass
@@ -109,6 +120,7 @@ results:
         MarkSweep: pass
         MarkCompact: ignore
         Compressor: pass
+        ConcurrentImmix: pass
       luindex:
         SemiSpace: pass
         GenCopy: pass
@@ -118,6 +130,7 @@ results:
         MarkSweep: pass
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass
       lusearch:
         SemiSpace: pass
         GenCopy: pass
@@ -127,6 +140,7 @@ results:
         MarkSweep: pass
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass
       pmd:
         SemiSpace: pass
         GenCopy: pass
@@ -136,6 +150,7 @@ results:
         MarkSweep: pass
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass
       sunflow:
         SemiSpace: pass
         GenCopy: pass
@@ -145,6 +160,7 @@ results:
         MarkSweep: pass
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass
       tomcat:
         SemiSpace: pass
         GenCopy: pass
@@ -154,6 +170,7 @@ results:
         MarkSweep: pass
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass
       xalan:
         SemiSpace: pass
         GenCopy: pass
@@ -163,6 +180,7 @@ results:
         MarkSweep: pass
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass
       zxing:
         SemiSpace: pass
         GenCopy: pass
@@ -172,6 +190,7 @@ results:
         MarkSweep: pass
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass
 
     release:
       avrora:
@@ -183,6 +202,7 @@ results:
         MarkSweep: pass
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass
       batik:
         SemiSpace: pass
         GenCopy: pass
@@ -192,6 +212,7 @@ results:
         MarkSweep: pass
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass
       biojava:
         SemiSpace: pass
         GenCopy: pass
@@ -201,6 +222,7 @@ results:
         MarkSweep: pass
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass
       cassandra:
         SemiSpace: pass
         GenCopy: pass
@@ -210,6 +232,7 @@ results:
         MarkSweep: ignore
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass
       eclipse:
         SemiSpace: pass
         GenCopy: pass
@@ -219,6 +242,7 @@ results:
         MarkSweep: ignore
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass
       fop:
         SemiSpace: pass
         GenCopy: pass
@@ -228,6 +252,7 @@ results:
         MarkSweep: ignore
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass
       graphchi:
         SemiSpace: pass
         GenCopy: pass
@@ -237,6 +262,7 @@ results:
         MarkSweep: pass
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass
       h2:
         SemiSpace: pass
         GenCopy: pass
@@ -246,6 +272,7 @@ results:
         MarkSweep: ignore
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass
       h2o:
         SemiSpace: pass
         GenCopy: pass
@@ -255,6 +282,7 @@ results:
         MarkSweep: ignore
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass
       jme:
         SemiSpace: pass
         GenCopy: pass
@@ -264,6 +292,7 @@ results:
         MarkSweep: pass
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass
       jython:
         SemiSpace: pass
         GenCopy: pass
@@ -273,6 +302,7 @@ results:
         MarkSweep: ignore
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass
       kafka:
         SemiSpace: pass
         GenCopy: pass
@@ -282,6 +312,7 @@ results:
         MarkSweep: pass
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass
       luindex:
         SemiSpace: pass
         GenCopy: pass
@@ -291,6 +322,7 @@ results:
         MarkSweep: pass
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass
       lusearch:
         SemiSpace: pass
         GenCopy: pass
@@ -300,6 +332,7 @@ results:
         MarkSweep: pass
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass
       pmd:
         SemiSpace: pass
         GenCopy: pass
@@ -309,6 +342,7 @@ results:
         MarkSweep: pass
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass
       sunflow:
         SemiSpace: pass
         GenCopy: pass
@@ -318,6 +352,7 @@ results:
         MarkSweep: pass
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass
       tomcat:
         SemiSpace: pass
         GenCopy: pass
@@ -327,6 +362,7 @@ results:
         MarkSweep: pass
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass
       xalan:
         SemiSpace: ignore
         GenCopy: ignore
@@ -336,6 +372,7 @@ results:
         MarkSweep: pass
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass
       zxing:
         SemiSpace: pass
         GenCopy: pass
@@ -345,3 +382,4 @@ results:
         MarkSweep: pass
         MarkCompact: pass
         Compressor: pass
+        ConcurrentImmix: pass

.github/scripts/ci-matrix-result-check.py

@@ -3,19 +3,19 @@
 import os
 import re
 
-if len(sys.argv) < 5:
+if len(sys.argv) < 6:
     raise ValueError("Invalid arguments")
 
-script_dir = os.path.dirname(os.path.abspath(__file__));
-config_path = os.path.join(script_dir, "..", "configs", "base.yml")
+script_dir = os.path.dirname(os.path.abspath(__file__))
 expected_results_path = os.path.join(script_dir, "ci-expected-results.yml")
 
 arch = sys.argv[1]
 build = sys.argv[2]
 benchmark = sys.argv[3]
 log_dir = sys.argv[4]
+config_file = sys.argv[5]
 
-def read_in_plans():
+def read_in_plans(config_path):
     # Load the YAML file
     with open(config_path, "r") as f:
         data = yaml.safe_load(f)
@@ -119,7 +119,7 @@ def print_log(directory, search_string):
                         print(f"----------------------------------------------")
 
 # dict['a'] = 'SemiSpace', etc
-plan_dict = read_in_plans()
+plan_dict = read_in_plans(config_file)
 
 actual = read_in_actual_results(sys.stdin.readline(), plan_dict)
 expected = read_in_expected_results(build, benchmark)

.github/scripts/ci-test-minimal.sh

@@ -26,6 +26,7 @@ MMTK_PLAN=MarkCompact runbms_dacapo2006_with_heap_multiplier fop 4
 # TODO: Need to temporarily disable compressed oops for the Compressor until it supports
 # discontiguous spaces.
 MMTK_PLAN=Compressor runbms_dacapo2006_with_heap_multiplier fop 4 -XX:-UseCompressedOops -XX:-UseCompressedClassPointers
+MMTK_PLAN=ConcurrentImmix runbms_dacapo2006_with_heap_multiplier fop 4 -XX:-UseCompressedOops -XX:-UseCompressedClassPointers
 MMTK_PLAN=MarkSweep runbms_dacapo2006_with_heap_multiplier fop 8
 MMTK_PLAN=NoGC runbms_dacapo2006_with_heap_size fop 1000 1000
 # Test heap resizing