infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-06-11 13:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

8353572: x86: AMD platforms miss the check for CLWB feature flag

Browse Source 
Reviewed-by: vlivanov, kvn
This commit is contained in:
Aleksey Shipilev 2025-04-15 06:03:50 +00:00
parent 76ff97811a
commit 3090e2187c
1 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/hotspot/cpu/x86/vm_version_x86.cpp
View File

@ -3062,6 +3062,10 @@ uint64_t VM_Version::CpuidInfo::feature_flags() const {
result |= CPU_TSCINV_BIT;
if (std_cpuid1_ecx.bits.aes != 0)
result |= CPU_AES;
if (ext_cpuid1_ecx.bits.lzcnt != 0)
result |= CPU_LZCNT;
if (ext_cpuid1_ecx.bits.prefetchw != 0)
result |= CPU_3DNOW_PREFETCH;
if (sef_cpuid7_ebx.bits.erms != 0)
result |= CPU_ERMS;
if (sef_cpuid7_edx.bits.fast_short_rep_mov != 0)
@ -3080,48 +3084,36 @@ uint64_t VM_Version::CpuidInfo::feature_flags() const {
result |= CPU_FMA;
if (sef_cpuid7_ebx.bits.clflushopt != 0)
result |= CPU_FLUSHOPT;
if (sef_cpuid7_ebx.bits.clwb != 0)
result |= CPU_CLWB;
if (ext_cpuid1_edx.bits.rdtscp != 0)
result |= CPU_RDTSCP;
if (sef_cpuid7_ecx.bits.rdpid != 0)
result |= CPU_RDPID;
// AMD|Hygon features.
// AMD|Hygon additional features.
if (is_amd_family()) {
if ((ext_cpuid1_edx.bits.tdnow != 0) ||
(ext_cpuid1_ecx.bits.prefetchw != 0))
// PREFETCHW was checked above, check TDNOW here.
if ((ext_cpuid1_edx.bits.tdnow != 0))
result |= CPU_3DNOW_PREFETCH;
if (ext_cpuid1_ecx.bits.lzcnt != 0)
result |= CPU_LZCNT;
if (ext_cpuid1_ecx.bits.sse4a != 0)
result |= CPU_SSE4A;
}
// Intel features.
// Intel additional features.
if (is_intel()) {
if (ext_cpuid1_ecx.bits.lzcnt != 0) {
result |= CPU_LZCNT;
}
if (ext_cpuid1_ecx.bits.prefetchw != 0) {
result |= CPU_3DNOW_PREFETCH;
}
if (sef_cpuid7_ebx.bits.clwb != 0) {
result |= CPU_CLWB;
}
if (sef_cpuid7_edx.bits.serialize != 0)
result |= CPU_SERIALIZE;
if (_cpuid_info.sef_cpuid7_edx.bits.avx512_fp16 != 0)
result |= CPU_AVX512_FP16;
}
// ZX features.
// ZX additional features.
if (is_zx()) {
if (ext_cpuid1_ecx.bits.lzcnt != 0) {
result |= CPU_LZCNT;
}
if (ext_cpuid1_ecx.bits.prefetchw != 0) {
result |= CPU_3DNOW_PREFETCH;
}
// We do not know if these are supported by ZX, so we cannot trust
// common CPUID bit for them.
assert((result & CPU_CLWB) == 0, "Check if it is supported?");
result &= ~CPU_CLWB;
}
// Protection key features.