Merge branch 'master' into jdk-21+35-mmtk

Author: wks

.github/configs/base.yml

@@ -2,11 +2,13 @@ includes:
   - "$RUNNING_NG_PACKAGE_DATA/base/runbms.yml"
 
 suites:
-  dacapochopin-04132797-ci:
+  dacapo-23.9-RC3-chopin-ci:
     type: DaCapo
+    # Need running-ng to support 23.9
     release: evaluation
-    path: "DACAPO_PATH/dacapo-evaluation-git-04132797.jar"
+    path: "DACAPO_PATH/dacapo-23.9-RC3-chopin.jar"
     minheap: mmtk-openjdk-11-MarkCompact
+    # Min heap values are from dacapo-evaluation-git-04132797
     minheap_values:
       mmtk-openjdk-11-MarkCompact:
         avrora: 8
@@ -66,6 +68,19 @@ modifiers:
     type: "EnvVar"
     var: "MMTK_PLAN"
     val: "{0}"
+  fail_on_oom:
+    type: JVMArg
+    val: "-XX:+CrashOnOutOfMemoryError"
+  preserve:
+    type: ProgramArg
+    val: "-preserve"
+
+plugins:
+  keep_stdout_stderr:
+    type: CopyFile
+    patterns:
+      - "scratch/stdout.log"
+      - "scratch/stderr.log"
 
 runtimes:
   jdk11-master:
@@ -74,13 +89,13 @@ runtimes:
     home: "/home/runner/work/mmtk-openjdk/mmtk-openjdk/bundles/jdk"
 
 configs:
-  - "jdk11-master|ms|s|mmtk_gc-SemiSpace|tph"
-  - "jdk11-master|ms|s|mmtk_gc-GenCopy|tph"
-  - "jdk11-master|ms|s|mmtk_gc-Immix|tph"
-  - "jdk11-master|ms|s|mmtk_gc-GenImmix|tph"
-  - "jdk11-master|ms|s|mmtk_gc-StickyImmix|tph"
-  - "jdk11-master|ms|s|mmtk_gc-MarkSweep|tph"
-  - "jdk11-master|ms|s|mmtk_gc-MarkCompact|tph"
+  - "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"
 
 benchmarks:
-  dacapochopin-04132797-ci:
+  dacapo-23.9-RC3-chopin-ci:

.github/scripts/build-normal.sh

@@ -2,12 +2,15 @@ set -xe
 
 . $(dirname "$0")/common.sh
 
-unset JAVA_TOOL_OPTIONS
-unset MMTK_PLAN
+ensure_env OPENJDK_PATH
 
-# To OpenJDK folder
-cd $OPENJDK_PATH
+# Use fastdebug if DEBUG_LEVEL is unset
+DEBUG_LEVEL=${DEBUG_LEVEL:="fastdebug"}
+
+# Build target. Could be empty, or product-bundles.
+build_target=$1
 
-# Build
+# Build product bundle
+cd $OPENJDK_PATH
 sh configure --disable-warnings-as-errors --with-debug-level=$DEBUG_LEVEL
-make CONF=linux-x86_64-normal-server-$DEBUG_LEVEL THIRD_PARTY_HEAP=$BINDING_PATH/openjdk
+make CONF=linux-x86_64-normal-server-$DEBUG_LEVEL THIRD_PARTY_HEAP=$BINDING_PATH/openjdk $OPENJDK_BUILD_TARGET

.github/scripts/ci-build.sh

@@ -6,6 +6,9 @@ set -ex
 OPENJDK_URL=`cargo read-manifest --manifest-path=$BINDING_PATH/mmtk/Cargo.toml | python3 -c 'import json,sys; print(json.load(sys.stdin)["metadata"]["openjdk"]["openjdk_repo"])'`
 OPENJDK_VERSION=`cargo read-manifest --manifest-path=$BINDING_PATH/mmtk/Cargo.toml | python3 -c 'import json,sys; print(json.load(sys.stdin)["metadata"]["openjdk"]["openjdk_version"])'`
 
+# Use default openjdk path if it is not set (this is only need when MMTk core calls the script)
+OPENJDK_PATH=${OPENJDK_PATH:="$BINDING_PATH/repos/openjdk"}
+
 rm -rf $OPENJDK_PATH
 git clone $OPENJDK_URL $OPENJDK_PATH
 git -C $OPENJDK_PATH checkout $OPENJDK_VERSION