From 1812ba2914869354a77059351a8bdf027476cba9 Mon Sep 17 00:00:00 2001 From: Vojtech Horky Date: Fri, 2 Jul 2021 11:36:23 +0200 Subject: [PATCH 01/10] CI: enable OpenJDK 12 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index be22d5cb..daed90cc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,7 +49,7 @@ jobs: - openjdk9 - openjdk10 - openjdk11 - #- openjdk12 + - openjdk12 - openj9-openjdk8 - openj9-openjdk11 #- openj9-openjdk16 From aa6aed798ded311d33f80194a3e220530269bc62 Mon Sep 17 00:00:00 2001 From: Vojtech Horky Date: Fri, 2 Jul 2021 11:36:43 +0200 Subject: [PATCH 02/10] CI: enable OpenJDK 13 --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index daed90cc..92b94f91 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,6 +50,7 @@ jobs: - openjdk10 - openjdk11 - openjdk12 + - openjdk13 - openj9-openjdk8 - openj9-openjdk11 #- openj9-openjdk16 From cce499007fcfc75de94a1bd5d41412fc8c3d356c Mon Sep 17 00:00:00 2001 From: Vojtech Horky Date: Fri, 2 Jul 2021 12:01:18 +0200 Subject: [PATCH 03/10] CI: enable OpenJDK 14 --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 92b94f91..c84d06f6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,6 +51,7 @@ jobs: - openjdk11 - openjdk12 - openjdk13 + - openjdk14 - openj9-openjdk8 - openj9-openjdk11 #- openj9-openjdk16 From 42934e3d239fff1c4866432cfe47f02aa4e35d89 Mon Sep 17 00:00:00 2001 From: Vojtech Horky Date: Tue, 20 Jul 2021 14:21:03 +0200 Subject: [PATCH 04/10] CI: enable OpenJDK 15 --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c84d06f6..1bd3ae95 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,6 +52,7 @@ jobs: - openjdk12 - openjdk13 - openjdk14 + - openjdk15 - openj9-openjdk8 - openj9-openjdk11 #- openj9-openjdk16 From 55f9afbd7fcc4e52f5381d5e0a301a9643705f37 Mon Sep 17 00:00:00 2001 From: Vojtech Horky Date: Tue, 20 Jul 2021 15:02:08 +0200 Subject: [PATCH 05/10] CI: build on 13 and 15 in Windows --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1bd3ae95..3f20e1ca 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -153,7 +153,7 @@ jobs: windows: strategy: matrix: - java: [ '8', '11' ] #, '13', '15' ] + java: [ '8', '11' , '13', '15' ] runs-on: windows-latest continue-on-error: true steps: From f0356aed4a5024d336ff93213404c2874c0948e6 Mon Sep 17 00:00:00 2001 From: Vojtech Horky Date: Tue, 20 Jul 2021 15:43:01 +0200 Subject: [PATCH 06/10] CI: build on 13 and 15 in Mac --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3f20e1ca..413e979e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -104,7 +104,7 @@ jobs: macos: strategy: matrix: - java: [ '8', '11' ] #, '13', '15' ] + java: [ '8', '11', '13', '15' ] runs-on: macos-latest continue-on-error: true steps: From 3caac4a91e1c1db3bd1070f3587ef1fbb4418fc7 Mon Sep 17 00:00:00 2001 From: Vojtech Horky Date: Wed, 21 Jul 2021 16:54:19 +0200 Subject: [PATCH 07/10] CI: enable OpenJDK 16 --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 413e979e..978c7b4e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,6 +53,7 @@ jobs: - openjdk13 - openjdk14 - openjdk15 + - openjdk16 - openj9-openjdk8 - openj9-openjdk11 #- openj9-openjdk16 From 0e7f89fd3fbe3be1942306cd4e44c403e2bff070 Mon Sep 17 00:00:00 2001 From: Vojtech Horky Date: Thu, 22 Jul 2021 09:45:14 +0200 Subject: [PATCH 08/10] CI: add workaround for Java 16 --- tools/ci/bench-jmh.sh | 1 + tools/ci/common.sh | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/tools/ci/bench-jmh.sh b/tools/ci/bench-jmh.sh index 136fc595..9d376a0b 100755 --- a/tools/ci/bench-jmh.sh +++ b/tools/ci/bench-jmh.sh @@ -6,6 +6,7 @@ source "$(dirname "$0")/common.sh" java -jar "$RENAISSANCE_JMH_JAR" \ -jvmArgs -Xms2500M -jvmArgs -Xmx2500m \ + $( for arg in $( get_jvm_workaround_args ); do echo "-jvmArgs" "$arg"; done ) \ -jvmArgs -Dorg.renaissance.jmh.configuration=test \ -jvmArgs -Dorg.renaissance.jmh.fakeIncompatible=true \ -wi 0 -i 1 -f 1 -foe true diff --git a/tools/ci/common.sh b/tools/ci/common.sh index 6093c66f..fa753932 100644 --- a/tools/ci/common.sh +++ b/tools/ci/common.sh @@ -21,6 +21,12 @@ RENAISSANCE_GIT_VERSION=$(git describe --tags --always --dirty=-SNAPSHOT || echo # Strip leading 'v' from the git-produced version RENAISSANCE_VERSION=${RENAISSANCE_GIT_VERSION#v} +# Try to guess JVM version +RENAISSANCE_JVM_MAJOR_VERSION="$( java -XshowSettings:properties -version 2>&1 \ + | sed -n -e 's#^[ \t]*java.version[ ]*=[ ]\(.*\)#\1#p' \ + | sed -e 's#1\.8#8#' -e 's#\([^.]*\).*#\1#' \ + || echo 8 )" + # The base bundle RENAISSANCE_DIR="target" RENAISSANCE_JAR_NAME="renaissance-gpl-${RENAISSANCE_VERSION}.jar" @@ -43,6 +49,15 @@ cp_reflink() { cp $REFLINK "$@" } +get_jvm_workaround_args() { + if [ "$RENAISSANCE_JVM_MAJOR_VERSION" = "16" ]; then + echo "--add-opens=java.base/java.lang.invoke=ALL-UNNAMED" + echo "--add-opens=java.base/java.util=ALL-UNNAMED" + echo "--add-opens=java.base/java.nio=ALL-UNNAMED" + echo "--add-opens=java.base/sun.nio.ch=ALL-UNNAMED" + fi +} + # Make sure we are in the top-level directory so that we can use # relative paths when referring to files within the project. From 1e1c63e2b5ba0a122e69a5aa280461d129829e14 Mon Sep 17 00:00:00 2001 From: Vojtech Horky Date: Thu, 22 Jul 2021 12:10:35 +0200 Subject: [PATCH 09/10] CI: run on OpenJ9 on JDK16 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 978c7b4e..8e936689 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,7 +56,7 @@ jobs: - openjdk16 - openj9-openjdk8 - openj9-openjdk11 - #- openj9-openjdk16 + - openj9-openjdk16 runs-on: ubuntu-latest container: "renaissancebench/buildenv:${{ matrix.image }}" continue-on-error: true From 84d7091bc6532bb5399471852a5d06c86223e03e Mon Sep 17 00:00:00 2001 From: Vojtech Horky Date: Thu, 22 Jul 2021 19:35:07 +0200 Subject: [PATCH 10/10] CI: parse java -version only --- tools/ci/common.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/ci/common.sh b/tools/ci/common.sh index fa753932..99a5f53a 100644 --- a/tools/ci/common.sh +++ b/tools/ci/common.sh @@ -21,10 +21,9 @@ RENAISSANCE_GIT_VERSION=$(git describe --tags --always --dirty=-SNAPSHOT || echo # Strip leading 'v' from the git-produced version RENAISSANCE_VERSION=${RENAISSANCE_GIT_VERSION#v} -# Try to guess JVM version -RENAISSANCE_JVM_MAJOR_VERSION="$( java -XshowSettings:properties -version 2>&1 \ - | sed -n -e 's#^[ \t]*java.version[ ]*=[ ]\(.*\)#\1#p' \ - | sed -e 's#1\.8#8#' -e 's#\([^.]*\).*#\1#' \ +# Try to guess JVM version (and replace 1.8 with 8) +RENAISSANCE_JVM_MAJOR_VERSION="$( java -version 2>&1 \ + | sed -n -e '/version[[:blank:]]\+"/ { s/.*version[[:blank:]]\+"\([^"]*\)".*/\1/; s/1[.]8/8/; s/^\([^.]*\)[.].*/\1/; p }' \ || echo 8 )" # The base bundle