diff --git a/common.json b/common.json index 7a08d2915bc0..b6f8dc164ac8 100644 --- a/common.json +++ b/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": "25", "build_id": "jdk-25+10-1066", "platformspecific": true, "extrabundles": ["static-libs"]}, + "galahad-jdk": {"name": "jpg-jdk", "version": "25", "build_id": "2025-02-25-1756029.yudi.zheng.jdk", "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 }, diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/aarch64/AArch64LibCHelper.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/aarch64/AArch64LibCHelper.java index 53c142c44e07..86c549c9dfff 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/aarch64/AArch64LibCHelper.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/aarch64/AArch64LibCHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2019, 2020, Arm Limited. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -131,6 +131,14 @@ public interface CPUFeatures extends PointerBase { @AllowNarrowingCast @CField boolean fSVEBITPERM(); + + @AllowNarrowingCast + @CField + boolean fFPHP(); + + @AllowNarrowingCast + @CField + boolean fASIMDHP(); } // Checkstyle: resume } diff --git a/substratevm/src/com.oracle.svm.native.libchelper/include/aarch64cpufeatures.h b/substratevm/src/com.oracle.svm.native.libchelper/include/aarch64cpufeatures.h index eafe95ee3af6..a6092e4a05a9 100644 --- a/substratevm/src/com.oracle.svm.native.libchelper/include/aarch64cpufeatures.h +++ b/substratevm/src/com.oracle.svm.native.libchelper/include/aarch64cpufeatures.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2019, 2020, Arm Limited. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -46,4 +46,6 @@ typedef struct { uint8_t fDMB_ATOMICS; uint8_t fPACA; uint8_t fSVEBITPERM; + uint8_t fFPHP; + uint8_t fASIMDHP; } CPUFeatures; diff --git a/substratevm/src/com.oracle.svm.native.libchelper/src/cpuid.c b/substratevm/src/com.oracle.svm.native.libchelper/src/cpuid.c index 783c26d7e1bd..43d2711b2cd0 100644 --- a/substratevm/src/com.oracle.svm.native.libchelper/src/cpuid.c +++ b/substratevm/src/com.oracle.svm.native.libchelper/src/cpuid.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2025, 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 @@ -728,6 +728,12 @@ void determineCPUFeatures(CPUFeatures* features) { #ifndef HWCAP_PACA #define HWCAP_PACA (1L << 30) #endif +#ifndef HWCAP_FPHP +#define HWCAP_FPHP (1L << 9) +#endif +#ifndef HWCAP_ASIMDHP +#define HWCAP_ASIMDHP (1L << 10) +#endif #ifndef HWCAP2_SVE2 #define HWCAP2_SVE2 (1L << 1) #endif @@ -765,6 +771,8 @@ void determineCPUFeatures(CPUFeatures* features) { features->fDMB_ATOMICS = 0; features->fPACA = !!(auxv & HWCAP_PACA); features->fSVEBITPERM = !!(auxv2 & HWCAP2_SVEBITPERM); + features->fFPHP = !!(auxv & HWCAP_FPHP); + features->fASIMDHP = !!(auxv & HWCAP_ASIMDHP); //checking for features signaled in another way