From a1239bda96b2d969eb072c4fd032024c2fc57832 Mon Sep 17 00:00:00 2001 From: sendaoYan Date: Sun, 5 May 2024 19:13:24 +0800 Subject: [PATCH 1/3] [Misc] Disable ArrayBaseOffsets.java#no-coh-no-ccp when test with -XX:+UseCompactObjectHeaders Summary: Disable runtime/FieldLayout/ArrayBaseOffsets.java#no-coh-no-ccp and runtime/FieldLayout/ArrayBaseOffsets.java#no-coh-with-ccp when test with -XX:+UseCompactObjectHeaders Testing: CI pipeline Reviewers: maoliang.ml, lvfei.lv Issue: https://github.com/dragonwell-project/dragonwell11/issues/812 --- test/hotspot/jtreg/runtime/FieldLayout/ArrayBaseOffsets.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/hotspot/jtreg/runtime/FieldLayout/ArrayBaseOffsets.java b/test/hotspot/jtreg/runtime/FieldLayout/ArrayBaseOffsets.java index fbb2a55cb0d..e3854f97c14 100644 --- a/test/hotspot/jtreg/runtime/FieldLayout/ArrayBaseOffsets.java +++ b/test/hotspot/jtreg/runtime/FieldLayout/ArrayBaseOffsets.java @@ -42,6 +42,7 @@ * @library /test/lib * @requires vm.bits == "64" * @requires vm.opt.UseCompressedClassPointers != false + * @requires vm.opt.UseCompactObjectHeaders != true * @modules java.base/jdk.internal.misc * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseCompactObjectHeaders -XX:+UseCompressedClassPointers ArrayBaseOffsets */ @@ -49,6 +50,7 @@ * @test id=no-coh-no-ccp * @library /test/lib * @requires vm.bits == "64" + * @requires vm.opt.UseCompactObjectHeaders != true * @modules java.base/jdk.internal.misc * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseCompactObjectHeaders -XX:-UseCompressedClassPointers ArrayBaseOffsets */ From 5560226e6162a3639b5a3c4e5b500ab0240835cc Mon Sep 17 00:00:00 2001 From: "lvfei.lv" Date: Thu, 9 May 2024 12:20:05 +0800 Subject: [PATCH 2/3] [Misc] Update version Summary: Update dragonwell version Testing: CICD Reviewers: kuaiwei, yuleil Issue: https://github.com/dragonwell-project/dragonwell11/issues/225 --- make.sh | 2 +- version.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/make.sh b/make.sh index f693dd46c82..f432b52bd06 100755 --- a/make.sh +++ b/make.sh @@ -6,7 +6,7 @@ if [ $# != 1 ]; then fi # incr by every Dragonwell release -DRAGONWELL_VERSION=19 +DRAGONWELL_VERSION=20 LC_ALL=C BUILD_MODE=$1 arch=$(uname -m) diff --git a/version.txt b/version.txt index eb54771babf..a8d2dfe76cb 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -11.0.22.19.7-ga +11.0.23.20.9-ga \ No newline at end of file From 02f37bfb346efd4c16cb905c1f22226cf05ffd6a Mon Sep 17 00:00:00 2001 From: lxw Date: Tue, 14 May 2024 17:11:41 +0800 Subject: [PATCH 3/3] [GC] Disable ArrayBaseOffsets.java on risc64 Summary: alignment of array elements hasn't changed on risc64, thus skip its test Testing: test/hotspot/jtreg/runtime/FieldLayout/ArrayBaseOffsets.java Reviewers: mmyxym, sendaoYan Issue: https://github.com/dragonwell-project/dragonwell11/issues/814 --- test/hotspot/jtreg/runtime/FieldLayout/ArrayBaseOffsets.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/hotspot/jtreg/runtime/FieldLayout/ArrayBaseOffsets.java b/test/hotspot/jtreg/runtime/FieldLayout/ArrayBaseOffsets.java index e3854f97c14..97e01d963cb 100644 --- a/test/hotspot/jtreg/runtime/FieldLayout/ArrayBaseOffsets.java +++ b/test/hotspot/jtreg/runtime/FieldLayout/ArrayBaseOffsets.java @@ -26,6 +26,7 @@ * @library /test/lib * @requires vm.bits == "64" * @requires vm.opt.UseCompressedClassPointers != false + * @requires os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64" * @modules java.base/jdk.internal.misc * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseCompactObjectHeaders -XX:+UseCompressedOops ArrayBaseOffsets */ @@ -34,6 +35,7 @@ * @library /test/lib * @requires vm.bits == "64" * @requires vm.opt.UseCompressedClassPointers != false + * @requires os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64" * @modules java.base/jdk.internal.misc * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseCompactObjectHeaders -XX:-UseCompressedOops ArrayBaseOffsets */ @@ -43,6 +45,7 @@ * @requires vm.bits == "64" * @requires vm.opt.UseCompressedClassPointers != false * @requires vm.opt.UseCompactObjectHeaders != true + * @requires os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64" * @modules java.base/jdk.internal.misc * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseCompactObjectHeaders -XX:+UseCompressedClassPointers ArrayBaseOffsets */ @@ -51,6 +54,7 @@ * @library /test/lib * @requires vm.bits == "64" * @requires vm.opt.UseCompactObjectHeaders != true + * @requires os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64" * @modules java.base/jdk.internal.misc * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseCompactObjectHeaders -XX:-UseCompressedClassPointers ArrayBaseOffsets */