Skip to content

Commit f63ba17

Browse files
OracleLabsAutomationzapster
OracleLabsAutomation
authored and
zapster
committed
[GR-64422] Update labsjdk to 25+19-jvmci-b01
PullRequest: graal/20594
2 parents e596ba6 + def2580 commit f63ba17

File tree

9 files changed

+54
-42
lines changed

9 files changed

+54
-42
lines changed

‎common.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -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": "25", "build_id": "jdk-25+18", "platformspecific": true, "extrabundles": ["static-libs"]},
49-
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-25+18-jvmci-b01", "platformspecific": true },
50-
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-25+18-jvmci-b01-debug", "platformspecific": true },
51-
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-25+18-jvmci-b01-sulong", "platformspecific": true },
52-
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-25+18-jvmci-b01", "platformspecific": true },
53-
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-25+18-jvmci-b01-debug", "platformspecific": true },
54-
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-25+18-jvmci-b01-sulong", "platformspecific": true }
48+
"oraclejdk-latest": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25+19", "platformspecific": true, "extrabundles": ["static-libs"]},
49+
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-25+19-jvmci-b01", "platformspecific": true },
50+
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-25+19-jvmci-b01-debug", "platformspecific": true },
51+
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-25+19-jvmci-b01-sulong", "platformspecific": true },
52+
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-25+19-jvmci-b01", "platformspecific": true },
53+
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-25+19-jvmci-b01-debug", "platformspecific": true },
54+
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-25+19-jvmci-b01-sulong", "platformspecific": true }
5555
},
5656

5757
"eclipse": {

‎compiler/ci/ci_common/benchmark-suites.libsonnet‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129

130130
barista_template(suite_version=null, suite_name="barista", max_jdk_version=null, cmd_app_prefix=["hwloc-bind --cpubind node:0.core:0-3.pu:0 --membind node:0"], non_prefix_barista_args=[]):: cc.compiler_benchmark + {
131131
suite:: suite_name,
132-
local barista_version = "v0.3.3",
132+
local barista_version = "v0.3.4",
133133
local suite_version_args = if suite_version != null then ["--bench-suite-version=" + suite_version] else [],
134134
local prefix_barista_arg = if std.length(cmd_app_prefix) > 0 then [std.format("--cmd-app-prefix=%s", std.join(" ", cmd_app_prefix))] else [],
135135
local all_barista_args = prefix_barista_arg + non_prefix_barista_args,

‎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
@@ -56,8 +56,8 @@ public final class JVMCIVersionCheck {
5656
private static final Map<String, Map<String, Version>> JVMCI_MIN_VERSIONS = Map.of(
5757
"21", Map.of(DEFAULT_VENDOR_ENTRY, createLegacyVersion(23, 1, 33)),
5858
"25", Map.of(
59-
"Oracle Corporation", createLabsJDKVersion("25+18", 1),
60-
DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("25+18", 1)));
59+
"Oracle Corporation", createLabsJDKVersion("25+19", 1),
60+
DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("25+19", 1)));
6161
private static final int NA = 0;
6262
/**
6363
* Minimum Java release supported by Graal.

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/UnimplementedGraalIntrinsics.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,17 @@ public UnimplementedGraalIntrinsics(Architecture arch) {
119119
// scalar operations
120120
"jdk/internal/vm/vector/Float16Math.fma(Ljava/lang/Class;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljdk/internal/vm/vector/Float16Math$TernaryOperator;)Ljava/lang/Object;",
121121
"jdk/internal/vm/vector/Float16Math.sqrt(Ljava/lang/Class;Ljava/lang/Object;Ljava/util/function/UnaryOperator;)Ljava/lang/Object;");
122+
123+
add(toBeInvestigated,
124+
// JDK-8349721: Add aarch64 intrinsics for ML-KEM
125+
// JDK-8351412: Add AVX-512 intrinsics for ML-KEM
126+
"com/sun/crypto/provider/ML_KEM.implKyber12To16([BI[SI)I",
127+
"com/sun/crypto/provider/ML_KEM.implKyberAddPoly([S[S[S)I",
128+
"com/sun/crypto/provider/ML_KEM.implKyberAddPoly([S[S[S[S)I",
129+
"com/sun/crypto/provider/ML_KEM.implKyberBarrettReduce([S)I",
130+
"com/sun/crypto/provider/ML_KEM.implKyberInverseNtt([S[S)I",
131+
"com/sun/crypto/provider/ML_KEM.implKyberNtt([S[S)I",
132+
"com/sun/crypto/provider/ML_KEM.implKyberNttMult([S[S[S[S)I");
122133
}
123134

124135
add(ignore,

‎substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/locale/LocaleCHelper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class LocaleCHelper {
6161
@CFunction(value = "svm_initialize_locale", transition = NO_TRANSITION)
6262
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+17/src/java.base/unix/native/libjava/java_props_md.c#L71-L357")
6363
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+17/src/java.base/unix/native/libjava/java_props_md.c#L436-L460")
64-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+17/src/java.base/windows/native/libjava/java_props_md.c#L263-L722")
64+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+19/src/java.base/windows/native/libjava/java_props_md.c#L264-L731")
6565
static native int initializeLocale();
6666

6767
@CFunction(value = "svm_get_locale", transition = NO_TRANSITION)

‎substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/container/ContainerLibrary.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
// The following annotations are for files in `src/hotspot`, which are copied from the JDK
5151
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/java.base/share/native/include/jni.h")
5252
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/java.base/unix/native/include/jni_md.h")
53-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/cgroupSubsystem_linux.cpp")
53+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+19/src/hotspot/os/linux/cgroupSubsystem_linux.cpp")
5454
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/cgroupSubsystem_linux.hpp")
5555
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/cgroupUtil_linux.cpp")
5656
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/cgroupUtil_linux.hpp")
@@ -60,7 +60,7 @@
6060
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/cgroupV2Subsystem_linux.hpp")
6161
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/osContainer_linux.cpp")
6262
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/osContainer_linux.hpp")
63-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/os_linux.cpp")
63+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+19/src/hotspot/os/linux/os_linux.cpp")
6464
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/os_linux.hpp")
6565
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/os_linux.inline.hpp")
6666
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/posix/include/jvm_md.h")
@@ -71,8 +71,8 @@
7171
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/memory/allocation.inline.hpp")
7272
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/memory/allStatic.hpp")
7373
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/nmt/memTag.hpp")
74-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/runtime/os.cpp")
75-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/runtime/os.hpp")
74+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+19/src/hotspot/share/runtime/os.cpp")
75+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+19/src/hotspot/share/runtime/os.hpp")
7676
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/runtime/os.inline.hpp")
7777
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/utilities/checkedCast.hpp")
7878
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/utilities/compilerWarnings_gcc.hpp")
@@ -85,7 +85,7 @@
8585
// The following annotations are for files in `src/svm`, which are completely customized for SVM
8686
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/logging/log.hpp")
8787
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/memory/allocation.cpp")
88-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/runtime/globals.hpp")
88+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+19/src/hotspot/share/runtime/globals.hpp")
8989
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/utilities/debug.cpp")
9090
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/utilities/debug.hpp")
9191
public class ContainerLibrary {

‎substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/methodhandles/Target_java_lang_invoke_MethodTypeForm.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import com.oracle.svm.core.annotate.TargetClass;
3333
import com.oracle.svm.core.annotate.TargetElement;
3434
import com.oracle.svm.core.fieldvaluetransformer.NewEmptyArrayFieldValueTransformer;
35+
import com.oracle.svm.core.invoke.Target_java_lang_invoke_MemberName;
3536
import com.oracle.svm.core.jdk.JDK21OrEarlier;
3637
import com.oracle.svm.core.jdk.JDKLatest;
3738

@@ -50,6 +51,10 @@ final class Target_java_lang_invoke_MethodTypeForm {
5051
@TargetElement(onlyWith = JDKLatest.class) //
5152
private Object[] lambdaForms;
5253

54+
@Alias @RecomputeFieldValue(kind = Kind.Reset) //
55+
@TargetElement(onlyWith = JDKLatest.class) //
56+
private SoftReference<Target_java_lang_invoke_MemberName> interpretEntry;
57+
5358
@Alias @RecomputeFieldValue(kind = Kind.Custom, declClass = NewEmptyArrayFieldValueTransformer.class, isFinal = true) //
5459
@TargetElement(name = "methodHandles", onlyWith = JDK21OrEarlier.class) //
5560
private SoftReference<?>[] methodHandlesJDK21;

‎substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoader.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -729,10 +729,16 @@ private Class<?> defineClass(String cn, LoadedModule loadedModule) {
729729

730730
/**
731731
* See {@code jdk.internal.loader.Loader#getPermissions}.
732+
*
733+
* The override was removed in JDK 24 by JDK-8343982.
732734
*/
735+
@SuppressWarnings("deprecation")
733736
@Override
734737
protected PermissionCollection getPermissions(CodeSource cs) {
735738
PermissionCollection perms = super.getPermissions(cs);
739+
if (JavaVersionUtil.JAVA_SPEC > 21) {
740+
return perms;
741+
}
736742

737743
URL url = cs.getLocation();
738744
if (url == null) {

‎substratevm/src/com.oracle.svm.native.libchelper/src/cpuid.c‎

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,10 @@ NO_INLINE static void set_cpufeatures(CPUFeatures *features, CpuidInfo *_cpuid_i
494494
features->fTSCINV_BIT = 1;
495495
if (_cpuid_info->std_cpuid1_ecx.bits.aes != 0)
496496
features->fAES = 1;
497+
if (_cpuid_info->ext_cpuid1_ecx.bits.lzcnt != 0)
498+
features->fLZCNT = 1;
499+
if (_cpuid_info->ext_cpuid1_ecx.bits.prefetchw != 0)
500+
features->fAMD_3DNOW_PREFETCH = 1;
497501
if (_cpuid_info->sef_cpuid7_ebx.bits.erms != 0)
498502
features->fERMS = 1;
499503
if (_cpuid_info->sef_cpuid7_edx.bits.fast_short_rep_mov != 0)
@@ -512,6 +516,8 @@ NO_INLINE static void set_cpufeatures(CPUFeatures *features, CpuidInfo *_cpuid_i
512516
features->fFMA = 1;
513517
if (_cpuid_info->sef_cpuid7_ebx.bits.clflushopt != 0)
514518
features->fFLUSHOPT = 1;
519+
if (_cpuid_info->sef_cpuid7_ebx.bits.clwb != 0)
520+
features->fCLWB = 1;
515521
if (_cpuid_info->ext_cpuid1_edx.bits.rdtscp != 0)
516522
features->fRDTSCP = 1;
517523
if (_cpuid_info->sef_cpuid7_ecx.bits.rdpid != 0)
@@ -520,47 +526,31 @@ NO_INLINE static void set_cpufeatures(CPUFeatures *features, CpuidInfo *_cpuid_i
520526
_cpuid_info->xem_xcr0_eax.bits.apx_f != 0)
521527
features->fAPX_F = 1;
522528

523-
// AMD|Hygon features.
529+
// AMD|Hygon additional features.
524530
if (is_amd_family(_cpuid_info))
525531
{
526-
if ((_cpuid_info->ext_cpuid1_edx.bits.tdnow != 0) ||
527-
(_cpuid_info->ext_cpuid1_ecx.bits.prefetchw != 0))
532+
// PREFETCHW was checked above, check TDNOW here.
533+
if (_cpuid_info->ext_cpuid1_edx.bits.tdnow != 0)
528534
features->fAMD_3DNOW_PREFETCH = 1;
529-
if (_cpuid_info->ext_cpuid1_ecx.bits.lzcnt != 0)
530-
features->fLZCNT = 1;
531535
if (_cpuid_info->ext_cpuid1_ecx.bits.sse4a != 0)
532536
features->fSSE4A = 1;
533537
}
534538

535-
// Intel features.
539+
// Intel additional features.
536540
if (is_intel(_cpuid_info))
537541
{
538-
if (_cpuid_info->ext_cpuid1_ecx.bits.lzcnt != 0) {
539-
features->fLZCNT = 1;
540-
}
541-
if (_cpuid_info->ext_cpuid1_ecx.bits.prefetchw != 0) {
542-
features->fAMD_3DNOW_PREFETCH = 1;
543-
}
544-
if (_cpuid_info->sef_cpuid7_ebx.bits.clwb != 0) {
545-
features->fCLWB = 1;
546-
}
547-
if (_cpuid_info->sef_cpuid7_edx.bits.serialize != 0) {
542+
if (_cpuid_info->sef_cpuid7_edx.bits.serialize != 0)
548543
features->fSERIALIZE = 1;
549-
}
550-
if (_cpuid_info->sef_cpuid7_edx.bits.avx512_fp16 != 0) {
544+
if (_cpuid_info->sef_cpuid7_edx.bits.avx512_fp16 != 0)
551545
features->fAVX512_FP16 = 1;
552-
}
553546
}
554547

555-
// ZX features.
548+
// ZX additional features.
556549
if (is_zx(_cpuid_info))
557550
{
558-
if (_cpuid_info->ext_cpuid1_ecx.bits.lzcnt != 0) {
559-
features->fLZCNT = 1;
560-
}
561-
if (_cpuid_info->ext_cpuid1_ecx.bits.prefetchw != 0) {
562-
features->fAMD_3DNOW_PREFETCH = 1;
563-
}
551+
// We do not know if these are supported by ZX, so we cannot trust
552+
// common CPUID bit for them.
553+
features->fCLWB = 0;
564554
}
565555

566556
// Protection key features.

0 commit comments

Comments
 (0)