Skip to content

Commit

Permalink
[GR-59375] Update labsjdk to 24+21-jvmci-b01
Browse files Browse the repository at this point in the history 
PullRequest: graal/19136
  • Loading branch information
@OracleLabsAutomation @marwan-hallaoui
OracleLabsAutomation authored and marwan-hallaoui committed Oct 28, 2024
2 parents 5f95334 + 4638e9f commit f897b31
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 14 deletions.
16 changes: 8 additions & 8 deletions common.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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+20-2281", "platformspecific": true, "extrabundles": ["static-libs"]},
"galahad-jdk": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+21-2436", "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 },
Expand Down Expand Up @@ -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+20", "platformspecific": true, "extrabundles": ["static-libs"]},
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-24+20-jvmci-b01", "platformspecific": true },
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-24+20-jvmci-b01-debug", "platformspecific": true },
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-24+20-jvmci-b01-sulong", "platformspecific": true },
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-24+20-jvmci-b01", "platformspecific": true },
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-24+20-jvmci-b01-debug", "platformspecific": true },
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-24+20-jvmci-b01-sulong", "platformspecific": true }
"oraclejdk-latest": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+21", "platformspecific": true, "extrabundles": ["static-libs"]},
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-24+21-jvmci-b01", "platformspecific": true },
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-24+21-jvmci-b01-debug", "platformspecific": true },
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-24+21-jvmci-b01-sulong", "platformspecific": true },
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-24+21-jvmci-b01", "platformspecific": true },
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-24+21-jvmci-b01-debug", "platformspecific": true },
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-24+21-jvmci-b01-sulong", "platformspecific": true }
},

"eclipse": {
Expand Down
4 changes: 2 additions & 2 deletions compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/JVMCIVersionCheck.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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+20", 1),
DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("24+20", 1)));
"Oracle Corporation", createLabsJDKVersion("24+21", 1),
DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("24+21", 1)));
private static final int NA = 0;
/**
* Minimum Java release supported by Graal.
Expand Down
6 changes: 5 additions & 1 deletion substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/amd64/AMD64LibCHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
* - substratevm/src/com.oracle.svm.native.libchelper/include/amd64hotspotcpuinfo.h
* - substratevm/src/com.oracle.svm.native.libchelper/src/cpuid.c
*/
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+2/src/hotspot/cpu/x86/vm_version_x86.hpp#L41-L325")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+21/src/hotspot/cpu/x86/vm_version_x86.hpp#L41-L325")
@CLibrary(value = "libchelper", requireStatic = true)
public class AMD64LibCHelper {
@Platforms(Platform.AMD64.class)
Expand Down Expand Up @@ -306,6 +306,10 @@ public interface CPUFeatures extends PointerBase {
@AllowNarrowingCast
@CField
boolean fAPX_F();

@AllowNarrowingCast
@CField
boolean fSHA512();
}
// Checkstyle: resume
}
4 changes: 2 additions & 2 deletions substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/container/ContainerLibrary.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+19/src/hotspot/os/linux/cgroupV2Subsystem_linux.hpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/os/linux/osContainer_linux.cpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/os/linux/osContainer_linux.hpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+20/src/hotspot/os/linux/os_linux.cpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+21/src/hotspot/os/linux/os_linux.cpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/os/linux/os_linux.hpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/os/linux/os_linux.inline.hpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/os/posix/include/jvm_md.h")
Expand All @@ -71,7 +71,7 @@
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/share/memory/allocation.inline.hpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/share/memory/allStatic.hpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/share/nmt/memTag.hpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+17/src/hotspot/share/runtime/os.cpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+21/src/hotspot/share/runtime/os.cpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+20/src/hotspot/share/runtime/os.hpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/share/runtime/os.inline.hpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/share/utilities/checkedCast.hpp")
Expand Down
1 change: 1 addition & 0 deletions substratevm/src/com.oracle.svm.native.libchelper/include/amd64cpufeatures.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,5 @@ typedef struct {
uint8_t fAVX512_IFMA;
uint8_t fAVX_IFMA;
uint8_t fAPX_F;
uint8_t fSHA512;
} CPUFeatures;
3 changes: 2 additions & 1 deletion substratevm/src/com.oracle.svm.native.libchelper/include/amd64hotspotcpuinfo.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,8 @@ typedef union {
typedef union {
uint32_t value;
struct {
uint32_t : 23,
uint32_t sha512 : 1,
: 22,
avx_ifma : 1,
: 8;
} bits;
Expand Down
2 changes: 2 additions & 0 deletions substratevm/src/com.oracle.svm.native.libchelper/src/cpuid.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,8 @@ NO_INLINE static void set_cpufeatures(CPUFeatures *features, CpuidInfo *_cpuid_i
{
features->fAVX = 1;
features->fVZEROUPPER = 1;
if (_cpuid_info->sefsl1_cpuid7_eax.bits.sha512 != 0)
features->fSHA512 = 1;
if (_cpuid_info->std_cpuid1_ecx.bits.f16c != 0)
features->fF16C = 1;
if (_cpuid_info->sef_cpuid7_ebx.bits.avx2 != 0)
Expand Down

0 comments on commit f897b31

Please sign in to comment.