Skip to content

Commit 1413977

Browse files
OracleLabsAutomationzapster
OracleLabsAutomation
authored and
zapster
committed
[GR-59526] Update labsjdk to 24+22-jvmci-b01
PullRequest: graal/19194
2 parents fe8d1f5 + 994143a commit 1413977

File tree

49 files changed

+252
-1783
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+252
-1783
lines changed

‎common.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {
11-
"galahad-jdk": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+21-2436", "platformspecific": true, "extrabundles": ["static-libs"]},
11+
"galahad-jdk": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+22-2651", "platformspecific": true, "extrabundles": ["static-libs"]},
1212

1313
"oraclejdk17": {"name": "jpg-jdk", "version": "17.0.7", "build_id": "jdk-17.0.7+8", "platformspecific": true, "extrabundles": ["static-libs"]},
1414
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.7+4-jvmci-23.1-b02", "platformspecific": true },
@@ -45,13 +45,13 @@
4545

4646
"oraclejdk23": {"name": "jpg-jdk", "version": "23", "build_id": "jdk-23+37", "platformspecific": true, "extrabundles": ["static-libs"]},
4747

48-
"oraclejdk-latest": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+21", "platformspecific": true, "extrabundles": ["static-libs"]},
49-
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-24+21-jvmci-b01", "platformspecific": true },
50-
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-24+21-jvmci-b01-debug", "platformspecific": true },
51-
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-24+21-jvmci-b01-sulong", "platformspecific": true },
52-
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-24+21-jvmci-b01", "platformspecific": true },
53-
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-24+21-jvmci-b01-debug", "platformspecific": true },
54-
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-24+21-jvmci-b01-sulong", "platformspecific": true }
48+
"oraclejdk-latest": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+22", "platformspecific": true, "extrabundles": ["static-libs"]},
49+
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-24+22-jvmci-b01", "platformspecific": true },
50+
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-24+22-jvmci-b01-debug", "platformspecific": true },
51+
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-24+22-jvmci-b01-sulong", "platformspecific": true },
52+
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-24+22-jvmci-b01", "platformspecific": true },
53+
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-24+22-jvmci-b01-debug", "platformspecific": true },
54+
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-24+22-jvmci-b01-sulong", "platformspecific": true }
5555
},
5656

5757
"eclipse": {

‎compiler/ci/ci_common/gate.jsonnet‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@
8585

8686
test:: s.base(no_warning_as_error=true),
8787
test_zgc:: s.base(no_warning_as_error=true, extra_vm_args="-XX:+UseZGC"),
88-
test_singlegen_zgc:: s.base(no_warning_as_error=true, extra_vm_args="-XX:+UseZGC -XX:-ZGenerational"),
8988
test_serialgc:: s.base(no_warning_as_error=true, extra_vm_args="-XX:+UseSerialGC"),
9089

9190

@@ -136,18 +135,6 @@
136135
components+: ["truffle"],
137136
},
138137

139-
truffle_xcomp_singlegen_zgc:: s.base("build,unittest",
140-
extra_vm_args="-Dpolyglot.engine.AllowExperimentalOptions=true " +
141-
"-Dpolyglot.engine.CompileImmediately=true " +
142-
"-Dpolyglot.engine.BackgroundCompilation=false " +
143-
"-Dtck.inlineVerifierInstrument=false " +
144-
"-XX:+UseZGC -XX:-ZGenerational",
145-
extra_unittest_args="--verbose truffle") + {
146-
environment+: {"TRACE_COMPILATION": "true"},
147-
logs+: ["*/*_compilation.log"],
148-
components+: ["truffle"],
149-
},
150-
151138
truffle_xcomp_serialgc:: s.base("build,unittest",
152139
extra_vm_args="-Dpolyglot.engine.AllowExperimentalOptions=true " +
153140
"-Dpolyglot.engine.CompileImmediately=true " +
@@ -162,21 +149,18 @@
162149

163150
ctw:: s.base("build,ctw", no_warning_as_error=true),
164151
ctw_zgc:: s.base("build,ctw", no_warning_as_error=true, extra_vm_args="-XX:+UseZGC"),
165-
ctw_singlegen_zgc:: s.base("build,ctw", no_warning_as_error=true, extra_vm_args="-XX:+UseZGC -XX:-ZGenerational"),
166152

167153
ctw_economy:: s.base("build,ctweconomy", extra_vm_args="-Djdk.graal.CompilerConfiguration=economy"),
168154
ctw_phaseplan_fuzzing:: s.base("build,ctwphaseplanfuzzing"),
169155

170156
# Runs some benchmarks as tests
171157
benchmarktest:: s.base("build,benchmarktest") + jmh_benchmark_test,
172158
benchmarktest_zgc:: s.base("build,benchmarktest", extra_vm_args="-XX:+UseZGC") + jmh_benchmark_test,
173-
benchmarktest_singlegen_zgc:: s.base("build,benchmarktest", extra_vm_args="-XX:+UseZGC -XX:-ZGenerational") + jmh_benchmark_test,
174159

175160
bootstrap:: s.base("build,bootstrap", no_warning_as_error=true),
176161
bootstrap_lite:: s.base("build,bootstraplite", no_warning_as_error=true),
177162
bootstrap_full:: s.base("build,bootstrapfullverify", no_warning_as_error=true),
178163
bootstrap_full_zgc:: s.base("build,bootstrapfullverify", no_warning_as_error=true, extra_vm_args="-XX:+UseZGC"),
179-
bootstrap_full_singlegen_zgc:: s.base("build,bootstrapfullverify", no_warning_as_error=true, extra_vm_args="-XX:+UseZGC -XX:-ZGenerational"),
180164
bootstrap_economy:: s.base("build,bootstrapeconomy", no_warning_as_error=true, extra_vm_args="-Djdk.graal.CompilerConfiguration=economy"),
181165

182166
style:: c.deps.eclipse + c.deps.jdt + s.base("style,fullbuild,javadoc") + galahad.exclude,
@@ -471,11 +455,6 @@
471455
"ctw_zgc",
472456
"benchmarktest_zgc",
473457
"bootstrap_full_zgc",
474-
"test_singlegen_zgc",
475-
"truffle_xcomp_singlegen_zgc",
476-
"ctw_singlegen_zgc",
477-
"benchmarktest_singlegen_zgc",
478-
"bootstrap_full_singlegen_zgc",
479458
]
480459
],
481460

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/DeferredBarrierAdditionTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public void checkGC() {
8080

8181
@Test
8282
public void testGroupAllocation() throws Exception {
83-
testHelper("testCrossReferences", config.gc == HotSpotGraalRuntime.HotSpotGC.X ? 0 : 1, getInitialOptions());
83+
testHelper("testCrossReferences", 1, getInitialOptions());
8484
}
8585

8686
@SuppressWarnings("try")

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/WriteBarrierAdditionTest.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import static jdk.graal.compiler.core.common.GraalOptions.PartialEscapeAnalysis;
3232
import static jdk.graal.compiler.core.common.GraalOptions.PartialUnroll;
3333
import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.referentOffset;
34-
import static org.junit.Assume.assumeTrue;
3534

3635
import java.lang.ref.Reference;
3736
import java.lang.ref.WeakReference;
@@ -364,7 +363,6 @@ protected Result testWithoutPEA(String name, Object... args) {
364363

365364
@Before
366365
public void before() {
367-
assumeTrue("ZGC has no write barriers", !(config.gc == HotSpotGC.X));
368366
expectedBarriers = -1;
369367
}
370368

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/GraalHotSpotVMConfig.java‎

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import jdk.graal.compiler.debug.Assertions;
3636
import jdk.graal.compiler.debug.GraalError;
3737
import jdk.graal.compiler.options.OptionValues;
38-
import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
3938
import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod;
4039
import jdk.vm.ci.hotspot.HotSpotVMConfigStore;
4140
import jdk.vm.ci.meta.MetaAccessProvider;
@@ -98,18 +97,6 @@ public boolean useG1GC() {
9897
return gc == HotSpotGraalRuntime.HotSpotGC.G1;
9998
}
10099

101-
/*
102-
* There's no direct way to test for the presence of the boolean flag ZGenerational since there
103-
* aren't any notPresent values which are distinct from the possible values. Instead use true
104-
* and false as the notPresent value and check if it returns different answers.
105-
*/
106-
public final boolean isZGenerationalDefault = JavaVersionUtil.JAVA_SPEC > 21 &&
107-
(!access.getFlag("ZGenerational", Boolean.class, false).equals(access.getFlag("ZGenerational", Boolean.class, true)));
108-
109-
public boolean useXGC() {
110-
return gc == HotSpotGraalRuntime.HotSpotGC.X;
111-
}
112-
113100
public final HotSpotGraalRuntime.HotSpotGC gc = getSelectedGC();
114101

115102
private HotSpotGraalRuntime.HotSpotGC getSelectedGC() throws GraalError {
@@ -623,44 +610,6 @@ private long getZGCAddressField(String name) {
623610
public final long zBarrierSetRuntimeLoadBarrierOnOopArray = getZGCAddressField("ZBarrierSetRuntime::load_barrier_on_oop_array");
624611
public final int zPointerLoadShift = getConstant("ZPointerLoadShift", Integer.class, -1, osArch.equals("aarch64") && zgcSupport);
625612

626-
private long getXGCAddressField(String name) {
627-
if (JavaVersionUtil.JAVA_SPEC == 21 || isZGenerationalDefault) {
628-
/*
629-
* Graal does not support single gen ZGC in JDK 21 and it's no longer supported in 24
630-
* once the ZGenerational global flag has been removed.
631-
*/
632-
return 0;
633-
}
634-
String realName = name;
635-
long address = 0;
636-
if (zgcSupport) {
637-
/*
638-
* Generational ZGC support exports the required functions as address using the new
639-
* XBarrierSetRuntime names.
640-
*/
641-
address = getAddress(name);
642-
} else {
643-
/*
644-
* Use the old names which are exported as fields in CompilerToVM::Data. This logic can
645-
* be deleted once the transition is complete.
646-
*/
647-
realName = name.replace("XBarrierSetRuntime::", "CompilerToVM::Data::ZBarrierSetRuntime_");
648-
address = getFieldValue(realName, Long.class, "address");
649-
}
650-
GraalError.guarantee(gc != HotSpotGraalRuntime.HotSpotGC.X || address != 0, "Unexpected null value for %s", realName);
651-
return address;
652-
}
653-
654-
/*
655-
* Single generation ZGC support
656-
*/
657-
public final int threadAddressBadMaskOffset = getFieldValue("CompilerToVM::Data::thread_address_bad_mask_offset", Integer.class, "int");
658-
public final long xBarrierSetRuntimeLoadBarrierOnOopFieldPreloaded = getXGCAddressField("XBarrierSetRuntime::load_barrier_on_oop_field_preloaded");
659-
public final long xBarrierSetRuntimeLoadBarrierOnWeakOopFieldPreloaded = getXGCAddressField("XBarrierSetRuntime::load_barrier_on_weak_oop_field_preloaded");
660-
public final long xBarrierSetRuntimeWeakLoadBarrierOnWeakOopFieldPreloaded = getXGCAddressField("XBarrierSetRuntime::weak_load_barrier_on_weak_oop_field_preloaded");
661-
public final long xBarrierSetRuntimeWeakLoadBarrierOnPhantomOopFieldPreloaded = getXGCAddressField("XBarrierSetRuntime::weak_load_barrier_on_phantom_oop_field_preloaded");
662-
public final long xBarrierSetRuntimeLoadBarrierOnOopArray = getXGCAddressField("XBarrierSetRuntime::load_barrier_on_oop_array");
663-
664613
// aarch64 specific nmethod entry barrier support
665614
// @formatter:off
666615
public final int BarrierSetAssembler_nmethod_patching_type = getFieldValue("CompilerToVM::Data::BarrierSetAssembler_nmethod_patching_type", Integer.class, "int", -1, osArch.equals("aarch64"));

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotBackendFactory.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,9 +252,7 @@ private BarrierSet createBarrierSet(GraalHotSpotVMConfig config, MetaAccessProvi
252252
boolean useDeferredInitBarriers = config.useDeferredInitBarriers;
253253
ResolvedJavaType objectArrayType = metaAccess.lookupJavaType(Object[].class);
254254
ResolvedJavaField referentField = HotSpotReplacementsUtil.referentField(metaAccess);
255-
if (config.gc == HotSpotGraalRuntime.HotSpotGC.X) {
256-
return new HotSpotXBarrierSet(referentField);
257-
} else if (config.gc == HotSpotGraalRuntime.HotSpotGC.Z) {
255+
if (config.gc == HotSpotGraalRuntime.HotSpotGC.Z) {
258256
return new HotSpotZBarrierSet(objectArrayType, referentField);
259257
} else if (config.gc == HotSpotGraalRuntime.HotSpotGC.Epsilon) {
260258
return new NoBarrierSet();

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotGraalRuntime.java‎

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
package jdk.graal.compiler.hotspot;
2626

2727
import static jdk.graal.compiler.core.common.GraalOptions.HotSpotPrintInlining;
28-
import static jdk.graal.compiler.serviceprovider.JavaVersionUtil.JAVA_SPEC;
2928
import static jdk.vm.ci.common.InitTimer.timer;
3029
import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime;
3130

@@ -67,6 +66,7 @@
6766
import jdk.graal.compiler.replacements.SnippetCounter.Group;
6867
import jdk.graal.compiler.runtime.RuntimeProvider;
6968
import jdk.graal.compiler.serviceprovider.GraalServices;
69+
import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
7070
import jdk.graal.compiler.serviceprovider.VMSupport;
7171
import jdk.vm.ci.code.Architecture;
7272
import jdk.vm.ci.code.stack.StackIntrospection;
@@ -206,9 +206,7 @@ public enum HotSpotGC {
206206
Serial("UseSerialGC"),
207207
Parallel("UseParallelGC"),
208208
G1("UseG1GC"),
209-
// non-generational ZGC
210-
X(JAVA_SPEC >= 24, true, flagIsSet("UseZGC").and(isZGenerational().negate())),
211-
Z(JAVA_SPEC >= 24, true, flagIsSet("UseZGC").and(isZGenerational())),
209+
Z(JavaVersionUtil.JAVA_SPEC > 21, true, flagIsSet("UseZGC")),
212210
Epsilon(true, true, flagIsSet("UseEpsilonGC")),
213211

214212
// Unsupported GCs
@@ -218,10 +216,6 @@ public enum HotSpotGC {
218216
this(true, true, flagIsSet(flag));
219217
}
220218

221-
HotSpotGC(Predicate<GraalHotSpotVMConfig> predicate) {
222-
this(true, true, predicate);
223-
}
224-
225219
HotSpotGC(boolean supported, boolean expectNamePresent, Predicate<GraalHotSpotVMConfig> predicate) {
226220
this.supported = supported;
227221
this.expectNamePresent = expectNamePresent;
@@ -233,19 +227,6 @@ private static Predicate<GraalHotSpotVMConfig> flagIsSet(String flag) {
233227
return config -> config.getFlag(flag, Boolean.class, notPresent, true);
234228
}
235229

236-
private static Predicate<GraalHotSpotVMConfig> isZGenerational() {
237-
return config -> {
238-
if (JAVA_SPEC == 21) {
239-
return false;
240-
}
241-
if (config.isZGenerationalDefault) {
242-
return true;
243-
} else {
244-
return config.getFlag("ZGenerational", Boolean.class);
245-
}
246-
};
247-
}
248-
249230
/**
250231
* Specifies if this GC is supported by Graal.
251232
*/
@@ -273,17 +254,7 @@ public boolean isSelected(GraalHotSpotVMConfig config) {
273254
*/
274255
static HotSpotGC forName(int name, GraalHotSpotVMConfig config) {
275256
for (HotSpotGC gc : HotSpotGC.values()) {
276-
if (gc == X || gc == Z) {
277-
// CollectedHeap::X is not defined in HotSpot. Query CollectedHeap::Z instead
278-
// and the ZGenerational flag.
279-
if (config.getConstant("CollectedHeap::Z", Integer.class, -1, gc.expectNamePresent) == name) {
280-
if (isZGenerational().test(config)) {
281-
return Z;
282-
} else {
283-
return X;
284-
}
285-
}
286-
} else if (config.getConstant("CollectedHeap::" + gc.name(), Integer.class, -1, gc.expectNamePresent) == name) {
257+
if (config.getConstant("CollectedHeap::" + gc.name(), Integer.class, -1, gc.expectNamePresent) == name) {
287258
return gc;
288259
}
289260
}

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotXBarrierSet.java‎

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/JVMCIVersionCheck.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ public final class JVMCIVersionCheck {
5555
private static final Map<String, Map<String, Version>> JVMCI_MIN_VERSIONS = Map.of(
5656
"21", Map.of(DEFAULT_VENDOR_ENTRY, createLegacyVersion(23, 1, 33)),
5757
"24", Map.of(
58-
"Oracle Corporation", createLabsJDKVersion("24+21", 1),
59-
DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("24+21", 1)));
58+
"Oracle Corporation", createLabsJDKVersion("24+22", 1),
59+
DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("24+22", 1)));
6060
private static final int NA = 0;
6161
/**
6262
* Minimum Java release supported by Graal.

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotLIRGenerator.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363
import jdk.graal.compiler.hotspot.HotSpotLIRGenerator;
6464
import jdk.graal.compiler.hotspot.HotSpotLockStack;
6565
import jdk.graal.compiler.hotspot.aarch64.g1.AArch64HotSpotG1BarrierSetLIRTool;
66-
import jdk.graal.compiler.hotspot.aarch64.x.AArch64HotSpotXBarrierSetLIRGenerator;
6766
import jdk.graal.compiler.hotspot.aarch64.z.AArch64HotSpotZBarrierSetLIRGenerator;
6867
import jdk.graal.compiler.hotspot.debug.BenchmarkCounters;
6968
import jdk.graal.compiler.hotspot.meta.HotSpotProviders;
@@ -116,9 +115,6 @@ public class AArch64HotSpotLIRGenerator extends AArch64LIRGenerator implements H
116115
private HotSpotDebugInfoBuilder debugInfoBuilder;
117116

118117
protected static BarrierSetLIRGeneratorTool getBarrierSet(GraalHotSpotVMConfig config, HotSpotProviders providers) {
119-
if (config.gc == HotSpotGraalRuntime.HotSpotGC.X) {
120-
return new AArch64HotSpotXBarrierSetLIRGenerator(config, providers);
121-
}
122118
if (config.gc == HotSpotGraalRuntime.HotSpotGC.G1) {
123119
return new AArch64G1BarrierSetLIRGenerator(new AArch64HotSpotG1BarrierSetLIRTool(config, providers));
124120
}

0 commit comments

Comments
 (0)