[GR-59836] Update labsjdk to 24+24-jvmci-b01

common.json

@@ -8,7 +8,7 @@
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {
-    "galahad-jdk":        {"name": "jpg-jdk",   "version": "24",      "build_id": "jdk-24+23-2783", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "galahad-jdk":        {"name": "jpg-jdk",   "version": "24",      "build_id": "jdk-24+24-2950", "platformspecific": true, "extrabundles": ["static-libs"]},
 
     "oraclejdk17":        {"name": "jpg-jdk",   "version": "17.0.7",  "build_id": "jdk-17.0.7+8", "platformspecific": true, "extrabundles": ["static-libs"]},
     "labsjdk-ce-17":      {"name": "labsjdk",   "version": "ce-17.0.7+4-jvmci-23.1-b02", "platformspecific": true },
@@ -45,13 +45,13 @@
 
     "oraclejdk23":       {"name": "jpg-jdk",   "version": "23", "build_id": "jdk-23+37", "platformspecific": true, "extrabundles": ["static-libs"]},
 
-    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "24",      "build_id": "jdk-24+23", "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-24+23-jvmci-b01", "platformspecific": true },
-    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-24+23-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-24+23-jvmci-b01-sulong", "platformspecific": true },
-    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-24+23-jvmci-b01", "platformspecific": true },
-    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-24+23-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-24+23-jvmci-b01-sulong", "platformspecific": true }
+    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "24",      "build_id": "jdk-24+24", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-24+24-jvmci-b01", "platformspecific": true },
+    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-24+24-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-24+24-jvmci-b01-sulong", "platformspecific": true },
+    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-24+24-jvmci-b01", "platformspecific": true },
+    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-24+24-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-24+24-jvmci-b01-sulong", "platformspecific": true }
   },
 
   "eclipse": {

compiler/mx.compiler/mx_compiler.py

@@ -640,7 +640,7 @@ def compiler_gate_benchmark_runner(tasks, extraVMarguments=None, prefix='', task
     }
 
     # Renaissance is missing the msvc redistributable on Windows [GR-50132]
-    if not mx.is_windows():
+    if not mx.is_windows() and jdk.javaCompliance <= '21':
         for name in renaissance_suite.benchmarkList(bmSuiteArgs):
             iterations = renaissance_gate_iterations.get(name, -1)
             with Task(prefix + 'Renaissance:' + name, tasks, tags=GraalTags.benchmarktest, report=task_report_component) as t:

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

@@ -66,7 +66,6 @@ public class GraalHotSpotVMConfig extends GraalHotSpotVMConfigAccess {
     GraalHotSpotVMConfig(HotSpotVMConfigStore store) {
         super(store);
 
-        assert narrowKlassShift <= logKlassAlignment : Assertions.errorMessageContext("narrowKlassShift", narrowKlassShift, "logKlassAlignment", logKlassAlignment);
         int logMinObjAlignment = logMinObjAlignment();
         assert narrowOopShift <= logMinObjAlignment : Assertions.errorMessageContext("narrowOopShift", narrowOopShift, "logMinObjAlignment", logMinObjAlignment);
         oopEncoding = new CompressEncoding(narrowOopBase, narrowOopShift);
@@ -201,6 +200,11 @@ public long gcTotalCollectionsAddress() {
     // Compressed Oops related values.
     public final boolean useCompressedOops = getFlag("UseCompressedOops", Boolean.class);
     public final boolean useCompressedClassPointers = getFlag("UseCompressedClassPointers", Boolean.class);
+    // JDK-8305895 allows storing the compressed class pointer in the upper 22 bits of the mark
+    // word. This runtime optimization is guarded by the flag UseCompactObjectHeaders. It depends
+    // on compressed class pointers, meaning that if useCompactObjectHeaders is true,
+    // useCompressedClassPointers is certainly true.
+    public final boolean useCompactObjectHeaders = getFlag("UseCompactObjectHeaders", Boolean.class, false, JDK >= 24);
 
     public final long narrowOopBase = getFieldValue("CompilerToVM::Data::Universe_narrow_oop_base", Long.class, "address");
     public final int narrowOopShift = getFieldValue("CompilerToVM::Data::Universe_narrow_oop_shift", Integer.class, "int");
@@ -213,7 +217,6 @@ public final int logMinObjAlignment() {
     public final int narrowKlassSize = getFieldValue("CompilerToVM::Data::sizeof_narrowKlass", Integer.class, "int");
     public final long narrowKlassBase = getFieldValue("CompilerToVM::Data::Universe_narrow_klass_base", Long.class, "address");
     public final int narrowKlassShift = getFieldValue("CompilerToVM::Data::Universe_narrow_klass_shift", Integer.class, "int");
-    public final int logKlassAlignment = getConstant("LogKlassAlignmentInBytes", Integer.class);
 
     public final int stackShadowPages = getFlag("StackShadowPages", Integer.class);
     public final int vmPageSize = getFieldValue("CompilerToVM::Data::vm_page_size", Integer.class, "size_t");
@@ -255,12 +258,17 @@ public final int logMinObjAlignment() {
 
     public final int arrayOopDescSize = getFieldValue("CompilerToVM::Data::sizeof_arrayOopDesc", Integer.class, "int");
 
+    public final int arrayLengthOffsetInBytes = getFieldValue("CompilerToVM::Data::arrayOopDesc_length_offset_in_bytes", Integer.class, "int", -1, JDK >= 24);
+
     /**
      * The offset of the array length word in an array object's header.
      * <p>
      * See {@code arrayOopDesc::length_offset_in_bytes()}.
      */
     public final int arrayOopDescLengthOffset() {
+        if (JDK >= 24) {
+            return arrayLengthOffsetInBytes;
+        }
         return useCompressedClassPointers ? hubOffset + narrowKlassSize : arrayOopDescSize;
     }
 
@@ -294,6 +302,8 @@ public final int arrayOopDescLengthOffset() {
     public final int threadCarrierThreadObjectOffset = getFieldOffset("JavaThread::_threadObj", Integer.class, "OopHandle");
     public final int threadScopedValueCacheOffset = getFieldOffset("JavaThread::_scopedValueCache", Integer.class, "OopHandle");
 
+    public final int javaThreadLockIDOffset = getFieldOffset("JavaThread::_lock_id", Integer.class, "int64_t", -1, JDK > 21);
+
     public final int threadIsInVTMSTransitionOffset = getFieldOffset("JavaThread::_is_in_VTMS_transition", Integer.class, "bool");
     public final int threadIsInTmpVTMSTransitionOffset = getFieldOffset("JavaThread::_is_in_tmp_VTMS_transition", Integer.class, "bool", -1, JDK == 21);
     public final int threadIsDisableSuspendOffset = getFieldOffset("JavaThread::_is_disable_suspend", Integer.class, "bool", -1, JDK >= 22);
@@ -365,37 +375,35 @@ public int threadLastJavaFpOffset() {
     public final int frameInterpreterFrameSenderSpOffset = getConstant("frame::interpreter_frame_sender_sp_offset", Integer.class, 0, osArch.equals("amd64"));
     public final int frameInterpreterFrameLastSpOffset = getConstant("frame::interpreter_frame_last_sp_offset", Integer.class, 0, osArch.equals("amd64"));
 
-    public final int lockMaskInPlace = getConstant("markWord::lock_mask_in_place", Integer.class);
+    public final long markWordLockMaskInPlace = getConstant("markWord::lock_mask_in_place", Long.class);
+    public final long markWordHashMask = getConstant("markWord::hash_mask", Long.class);
+
+    public final long markWordNoHashInPlace = getConstant("markWord::no_hash_in_place", Long.class);
+    public final long markWordNoLockInPlace = getConstant("markWord::no_lock_in_place", Long.class);
+
+    // Mark word right shift to get identity hash code.
+    public final int markWordHashCodeShift = getConstant("markWord::hash_shift", Integer.class);
+    // Mark word right shift to get compressed klass pointer
+    public final int markWordKlassShift = getConstant("markWord::klass_shift", Integer.class, 0, JDK >= 24);
+
+    // The following three constants are declared as 64 bits uintptr_t, but known to be 32 bits
     public final int unlockedValue = getConstant("markWord::unlocked_value", Integer.class);
     public final int monitorValue = getConstant("markWord::monitor_value", Integer.class);
+    public final int ageMaskInPlace = getConstant("markWord::age_mask_in_place", Integer.class);
+    public final int unusedMark = getConstant("markWord::marked_value", Integer.class, 3, JDK > 21);
+    // Identity hash code value when uninitialized.
+    public final int uninitializedIdentityHashCodeValue = getConstant("markWord::no_hash", Integer.class);
 
     // This field has no type in vmStructs.cpp
-    public final int objectMonitorOwner = getFieldOffset("ObjectMonitor::_owner", Integer.class, null);
+    public final int objectMonitorOwner = getFieldOffset("ObjectMonitor::_owner", Integer.class, JDK > 21 ? "int64_t" : null);
     public final int objectMonitorRecursions = getFieldOffset("ObjectMonitor::_recursions", Integer.class, "intptr_t");
     public final int objectMonitorCxq = getFieldOffset("ObjectMonitor::_cxq", Integer.class, "ObjectWaiter*");
     public final int objectMonitorEntryList = getFieldOffset("ObjectMonitor::_EntryList", Integer.class, "ObjectWaiter*");
-    public final int objectMonitorSucc = getFieldOffset("ObjectMonitor::_succ", Integer.class, "JavaThread*");
-
-    public final int markWordNoHashInPlace = getConstant("markWord::no_hash_in_place", Integer.class);
-    public final int markWordNoLockInPlace = getConstant("markWord::no_lock_in_place", Integer.class);
-
-    public long defaultPrototypeMarkWord() {
-        return this.markWordNoHashInPlace | this.markWordNoLockInPlace;
-    }
-
-    /**
-     * Mark word right shift to get identity hash code.
-     */
-    public final int identityHashCodeShift = getConstant("markWord::hash_shift", Integer.class);
+    public final int objectMonitorSucc = getFieldOffset("ObjectMonitor::_succ", Integer.class, JDK > 21 ? "int64_t" : "JavaThread*");
 
     public final int contEntry = getFieldOffset("JavaThread::_cont_entry", Integer.class, "ContinuationEntry*", -1, JDK >= 24);
     public final int pinCount = getFieldOffset("ContinuationEntry::_pin_count", Integer.class, "uint32_t", -1, JDK >= 24);
 
-    /**
-     * Identity hash code value when uninitialized.
-     */
-    public final int uninitializedIdentityHashCodeValue = getConstant("markWord::no_hash", Integer.class);
-
     public final int methodCompiledEntryOffset = getFieldOffset("Method::_from_compiled_entry", Integer.class, "address");
 
     public final int compilationLevelFullOptimization = getConstant("CompLevel_full_optimization", Integer.class);

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

@@ -55,8 +55,8 @@ public final class JVMCIVersionCheck {
     private static final Map<String, Map<String, Version>> JVMCI_MIN_VERSIONS = Map.of(
                     "21", Map.of(DEFAULT_VENDOR_ENTRY, createLegacyVersion(23, 1, 33)),
                     "24", Map.of(
-                                    "Oracle Corporation", createLabsJDKVersion("24+23", 1),
-                                    DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("24+23", 1)));
+                                    "Oracle Corporation", createLabsJDKVersion("24+24", 1),
+                                    DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("24+24", 1)));
     private static final int NA = 0;
     /**
      * Minimum Java release supported by Graal.

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotBackend.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -419,15 +419,18 @@ private void emitCodePrefix(CompilationResultBuilder crb, ResolvedJavaMethod ins
             CallingConvention cc = regConfig.getCallingConvention(HotSpotCallingConventionType.JavaCallee, null, parameterTypes, this);
             Register receiver = asRegister(cc.getArgument(0));
             int size = config.useCompressedClassPointers ? 32 : 64;
-            AArch64Address klassAddress = masm.makeAddress(size, receiver, config.hubOffset);
             if (config.icSpeculatedKlassOffset == Integer.MAX_VALUE) {
                 crb.recordMark(HotSpotMarkId.UNVERIFIED_ENTRY);
                 Register klass = rscratch1;
                 if (config.useCompressedClassPointers) {
-                    masm.ldr(32, klass, klassAddress);
+                    if (config.useCompactObjectHeaders) {
+                        ((AArch64HotSpotMacroAssembler) masm).loadCompactClassPointer(klass, receiver);
+                    } else {
+                        masm.ldr(size, klass, masm.makeAddress(size, receiver, config.hubOffset));
+                    }
                     AArch64HotSpotMove.decodeKlassPointer(masm, klass, klass, config.getKlassEncoding());
                 } else {
-                    masm.ldr(64, klass, klassAddress);
+                    masm.ldr(size, klass, masm.makeAddress(size, receiver, config.hubOffset));
                 }
                 // c1_LIRAssembler_aarch64.cpp: const Register IC_Klass = rscratch2;
                 Register inlineCacheKlass = AArch64HotSpotRegisterConfig.inlineCacheRegister;
@@ -436,7 +439,6 @@ private void emitCodePrefix(CompilationResultBuilder crb, ResolvedJavaMethod ins
                 masm.branchConditionally(AArch64Assembler.ConditionFlag.EQ, verifiedStub);
                 AArch64Call.directJmp(crb, masm, getForeignCalls().lookupForeignCall(IC_MISS_HANDLER));
             } else {
-
                 // JDK-8322630 (removed ICStubs)
                 Register data = AArch64HotSpotRegisterConfig.inlineCacheRegister;
                 Register tmp1 = rscratch1;
@@ -445,16 +447,24 @@ private void emitCodePrefix(CompilationResultBuilder crb, ResolvedJavaMethod ins
 
                 // Size of IC check sequence checked with a guarantee below.
                 int inlineCacheCheckSize = AArch64Call.isNearCall(icMissHandler) ? 20 : 32;
+                if (config.useCompactObjectHeaders) {
+                    // Extra instruction for shifting
+                    inlineCacheCheckSize += 4;
+                }
                 masm.align(config.codeEntryAlignment, masm.position() + inlineCacheCheckSize);
 
                 int startICCheck = masm.position();
                 crb.recordMark(HotSpotMarkId.UNVERIFIED_ENTRY);
                 AArch64Address icSpeculatedKlass = masm.makeAddress(size, data, config.icSpeculatedKlassOffset);
 
-                masm.ldr(size, tmp1, klassAddress);
+                if (config.useCompactObjectHeaders) {
+                    ((AArch64HotSpotMacroAssembler) masm).loadCompactClassPointer(tmp1, receiver);
+                } else {
+                    masm.ldr(size, tmp1, masm.makeAddress(size, receiver, config.hubOffset));
+                }
+
                 masm.ldr(size, tmp2, icSpeculatedKlass);
                 masm.cmp(size, tmp1, tmp2);
-
                 masm.branchConditionally(AArch64Assembler.ConditionFlag.EQ, verifiedStub);
                 AArch64Call.directJmp(crb, masm, icMissHandler);
 

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotMacroAssembler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
 import jdk.graal.compiler.asm.aarch64.AArch64Assembler;
 import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler;
 import jdk.graal.compiler.core.common.CompressEncoding;
+import jdk.graal.compiler.debug.GraalError;
 import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig;
 import jdk.graal.compiler.lir.aarch64.AArch64Move;
 import jdk.vm.ci.aarch64.AArch64;
@@ -81,23 +82,24 @@ public void verifyOop(Register value, Register tmp, Register tmp2, boolean compr
             cbz(compressed ? 32 : 64, value, ok);
         }
 
-        AArch64Address hubAddress;
-        int hubSize = config.useCompressedClassPointers ? 32 : 64;
+        Register object = value;
         if (compressed) {
             CompressEncoding encoding = config.getOopEncoding();
             mov(32, tmp, value);
             AArch64Move.UncompressPointerOp.emitUncompressCode(this, tmp, tmp, encoding, true, heapBaseRegister, false);
-            hubAddress = makeAddress(hubSize, tmp, config.hubOffset);
-        } else {
-            hubAddress = makeAddress(hubSize, value, config.hubOffset);
+            object = tmp;
         }
 
         // Load the class
         if (config.useCompressedClassPointers) {
-            ldr(32, tmp, hubAddress);
+            if (config.useCompactObjectHeaders) {
+                loadCompactClassPointer(tmp, object);
+            } else {
+                ldr(32, tmp, makeAddress(32, object, config.hubOffset));
+            }
             AArch64HotSpotMove.decodeKlassPointer(this, tmp, tmp, config.getKlassEncoding());
         } else {
-            ldr(64, tmp, hubAddress);
+            ldr(64, tmp, makeAddress(64, object, config.hubOffset));
         }
         // Klass::_super_check_offset
         ldr(32, tmp2, makeAddress(32, tmp, config.superCheckOffsetOffset));
@@ -127,4 +129,9 @@ public void verifyHeapBase() {
         }
     }
 
+    public void loadCompactClassPointer(Register result, Register receiver) {
+        GraalError.guarantee(config.useCompactObjectHeaders, "Load class pointer from markWord only when UseCompactObjectHeaders is on");
+        ldr(64, result, makeAddress(64, receiver, config.markOffset));
+        lsr(64, result, result, config.markWordKlassShift);
+    }
 }