Merge tag 'v0.18.0' into jdk-21+24-mmtk-merge

Author: caizixian

.github/configs/base.yml

@@ -0,0 +1,86 @@
+includes:
+  - "$RUNNING_NG_PACKAGE_DATA/base/runbms.yml"
+
+suites:
+  dacapochopin-04132797-ci:
+    type: DaCapo
+    release: evaluation
+    path: "DACAPO_PATH/dacapo-evaluation-git-04132797.jar"
+    minheap: mmtk-openjdk-11-MarkCompact
+    minheap_values:
+      mmtk-openjdk-11-MarkCompact:
+        avrora: 8
+        batik: 426
+        biojava: 197
+        cassandra: 117
+        eclipse: 439
+        fop: 24
+        graphchi: 195
+        h2: 1122
+        h2o: 136
+        jme: 236
+        jython: 48
+        kafka: 243
+        luindex: 25
+        lusearch: 36
+        pmd: 291
+        spring: 110
+        sunflow: 37
+        tradebeans: .inf
+        tradesoap: .inf
+        tomcat: 55
+        xalan: 19
+        zxing: 427
+      nominal-heap-sizes:
+        avrora: 7
+        batik: 192
+        biojava: 97
+        cassandra: 74
+        eclipse: 346
+        fop: 17
+        graphchi: 179
+        h2: 506
+        h2o: 102
+        jme: 29
+        jython: 29
+        kafka: 207
+        luindex: 44
+        lusearch: 19
+        pmd: 114
+        spring: 47
+        sunflow: 25
+        tradebeans: 101
+        tradesoap: 89
+        tomcat: 17
+        xalan: 9
+        zxing: 66
+    timing_iteration: 1
+    timeout: 7200
+
+overrides:
+  invocations: 1
+  remote_host: null
+
+modifiers:
+  mmtk_gc:
+    type: "EnvVar"
+    var: "MMTK_PLAN"
+    val: "{0}"
+
+runtimes:
+  jdk11-master:
+    type: OpenJDK
+    release: 11
+    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"
+
+benchmarks:
+  dacapochopin-04132797-ci:

.github/scripts/build-normal.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -xe
+
+. $(dirname "$0")/new-common.sh
+
+# Use fastdebug if DEBUG_LEVEL is unset
+DEBUG_LEVEL=${DEBUG_LEVEL:="fastdebug"}
+
+# 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 product-bundles
+
+if [[ $DEBUG_LEVEL == "fastdebug" ]]; then
+    pushd build/linux-x86_64-normal-server-fastdebug/bundles
+    F=`ls *_bin-debug.tar.gz`
+    mv $F ${F/_bin-debug/_bin}
+    popd
+fi

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

@@ -27,6 +27,12 @@ export MMTK_PLAN=GenImmix
 build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms500M -Xmx500M -jar $DACAPO_PATH/dacapo-2006-10-MR2.jar fop
 build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms500M -Xmx500M -jar $DACAPO_PATH/dacapo-2006-10-MR2.jar luindex
 
+# --- StickyImmix ---
+export MMTK_PLAN=StickyImmix
+
+build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms500M -Xmx500M -jar $DACAPO_PATH/dacapo-2006-10-MR2.jar fop
+build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms500M -Xmx500M -jar $DACAPO_PATH/dacapo-2006-10-MR2.jar luindex
+
 # -- GenCopy --
 export MMTK_PLAN=GenCopy
 

.github/scripts/ci-test-global-alloc-bit.sh

@@ -32,6 +32,12 @@ build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHea
 build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms500M -Xmx500M -jar $DACAPO_PATH/dacapo-2006-10-MR2.jar fop
 build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms500M -Xmx500M -jar $DACAPO_PATH/dacapo-2006-10-MR2.jar luindex
 
+# --- StickyImmix ---
+export MMTK_PLAN=StickyImmix
+
+build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms500M -Xmx500M -jar $DACAPO_PATH/dacapo-2006-10-MR2.jar antlr
+build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms500M -Xmx500M -jar $DACAPO_PATH/dacapo-2006-10-MR2.jar fop
+build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms500M -Xmx500M -jar $DACAPO_PATH/dacapo-2006-10-MR2.jar luindex
 
 # --- GenCopy ---
 export MMTK_PLAN=GenCopy

.github/scripts/ci-test-only-normal.sh

@@ -68,6 +68,22 @@ build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHea
 # Test heap resizing
 build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms20M -Xmx100M -jar $DACAPO_PATH/dacapo-2006-10-MR2.jar fop
 
+# --- StickyImmix ---
+export MMTK_PLAN=StickyImmix
+
+# Test - the benchmarks that are commented out do not work yet
+# Note: the command line options are necessary for now to ensure the benchmarks work. We may later change the options if we do not have these many constraints.
+build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms75M -Xmx75M -jar $DACAPO_PATH/dacapo-2006-10-MR2.jar antlr
+build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms75M -Xmx75M -jar $DACAPO_PATH/dacapo-2006-10-MR2.jar fop
+build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms75M -Xmx75M -jar $DACAPO_PATH/dacapo-2006-10-MR2.jar luindex
+build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms75M -Xmx75M -jar $DACAPO_PATH/dacapo-2006-10-MR2.jar lusearch
+build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms75M -Xmx75M -jar $DACAPO_PATH/dacapo-2006-10-MR2.jar pmd
+build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms75M -Xmx75M -jar $DACAPO_PATH/dacapo-2006-10-MR2.jar xalan
+
+# These benchmarks take 40s+ for slowdebug build, we may consider removing them from the CI
+build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms200M -Xmx200M -jar $DACAPO_PATH/dacapo-2006-10-MR2.jar hsqldb
+build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms200M -Xmx200M -jar $DACAPO_PATH/dacapo-2006-10-MR2.jar eclipse
+
 # --- GenCopy ---
 export MMTK_PLAN=GenCopy
 

.github/scripts/new-common.sh

@@ -0,0 +1,4 @@
+BINDING_PATH=$(realpath $(dirname "$0"))/../..
+OPENJDK_PATH=$BINDING_PATH/../openjdk
+DACAPO_PATH=$BINDING_PATH/../dacapo
+RUSTUP_TOOLCHAIN=`cat $BINDING_PATH/mmtk/rust-toolchain`

.github/scripts/pgo-build.sh

@@ -7,7 +7,7 @@ RUSTFLAGS="-Cprofile-generate=/tmp/$USER/pgo-data" make CONF=linux-x86_64-normal
 rm -rf /tmp/$USER/pgo-data/*
 
 # Profile using fop
-MMTK_PLAN=GenImmix MMTK_STRESS_FACTOR=4194304 MMTK_PRECISE_STRESS=false ./build/linux-x86_64-normal-server-release/images/jdk/bin/java -XX:MetaspaceSize=500M -XX:+DisableExplicitGC -XX:-TieredCompilation -Xcomp -XX:+UseThirdPartyHeap -Xms60M -Xmx60M -jar /usr/share/benchmarks/dacapo/dacapo-evaluation-git-6e411f33.jar -n 5 fop
+MMTK_PLAN=GenImmix MMTK_STRESS_FACTOR=16777216 MMTK_PRECISE_STRESS=false ./build/linux-x86_64-normal-server-release/images/jdk/bin/java -XX:MetaspaceSize=500M -XX:+DisableExplicitGC -XX:-TieredCompilation -Xcomp -XX:+UseThirdPartyHeap -Xms60M -Xmx60M -jar /usr/share/benchmarks/dacapo/dacapo-evaluation-git-6e411f33.jar -n 5 fop
 
 # Merge profiling data
 /opt/rust/toolchains/1.66.1-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/bin/llvm-profdata merge -o /tmp/$USER/pgo-data/merged.profdata /tmp/$USER/pgo-data

.github/scripts/setup.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -xe
+
+. $(dirname "$0")/new-common.sh
+
+# Install nightly rust
+rustup toolchain install $RUSTUP_TOOLCHAIN
+rustup target add i686-unknown-linux-gnu --toolchain $RUSTUP_TOOLCHAIN
+rustup component add clippy --toolchain $RUSTUP_TOOLCHAIN
+rustup component add rustfmt --toolchain $RUSTUP_TOOLCHAIN
+rustup override set $RUSTUP_TOOLCHAIN
+
+# Install running
+pip3 install running-ng
+
+# Install dependencies
+sudo apt-get update -y
+sudo apt-get install dos2unix
+sudo apt-get install build-essential libx11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev libcups2-dev libasound2-dev libxrandr-dev

.github/scripts/style-check.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -xe
+
+. $(dirname "$0")/new-common.sh
+
+export RUSTFLAGS="-D warnings"
+
+pushd $BINDING_PATH/mmtk
+cargo clippy || exit $?
+cargo clippy --release || exit $?
+
+cargo fmt -- --check || exit $?
+popd
+
+find $BINDING_PATH/openjdk \
+    $BINDING_PATH/mmtk \
+    -name '*.hpp' \
+    -o -name '*.cpp' \
+    -o -name '*.rs' \
+    -o -name '*.toml' \
+    -o -name '*.gmk' \
+    -exec $(dirname "$0")/ci-check-lineends.sh '{}' \;
+