infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-28 14:22:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

8213538: VM crashes when MaxVectorSize is set to 0, 1 or 2

Browse Source 
Require MaxVectorSize minimum 4 on 64 bit

Reviewed-by: kvn, thartmann
This commit is contained in:
Nils Eliasson 2018-11-15 09:45:18 +01:00
parent 1fa2af5b82
commit 898b4d83c0
1 changed files with 41 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -984,44 +984,50 @@ void VM_Version::get_processor_features() {
}
}
#endif
#if COMPILER2_OR_JVMCI
if (MaxVectorSize > 0) {
int max_vector_size = 0;
if (UseSSE < 2) {
// Vectors (in XMM) are only supported with SSE2+
// SSE is always 2 on x64.
max_vector_size = 0;
} else if (UseAVX == 0 || !os_supports_avx_vectors()) {
// 16 byte vectors (in XMM) are supported with SSE2+
max_vector_size = 16;
} else if (UseAVX == 1 || UseAVX == 2) {
// 32 bytes vectors (in YMM) are only supported with AVX+
max_vector_size = 32;
} else if (UseAVX > 2 ) {
// 64 bytes vectors (in ZMM) are only supported with AVX 3
max_vector_size = 64;
}
#ifdef _LP64
int min_vector_size = 4; // We require MaxVectorSize to be at least 4 on 64bit
#else
int min_vector_size = 0;
#endif
if (!FLAG_IS_DEFAULT(MaxVectorSize)) {
if (MaxVectorSize < min_vector_size) {
warning("MaxVectorSize must be at least %i on this platform", min_vector_size);
FLAG_SET_DEFAULT(MaxVectorSize, min_vector_size);
}
if (MaxVectorSize > max_vector_size) {
warning("MaxVectorSize must be at most %i on this platform", max_vector_size);
FLAG_SET_DEFAULT(MaxVectorSize, max_vector_size);
}
if (!is_power_of_2(MaxVectorSize)) {
warning("MaxVectorSize must be a power of 2");
FLAG_SET_DEFAULT(MaxVectorSize, 64);
}
if (UseSSE < 2) {
// Vectors (in XMM) are only supported with SSE2+
if (MaxVectorSize > 0) {
if (!FLAG_IS_DEFAULT(MaxVectorSize))
warning("MaxVectorSize must be 0");
FLAG_SET_DEFAULT(MaxVectorSize, 0);
}
}
else if (UseAVX == 0 || !os_supports_avx_vectors()) {
// 32 bytes vectors (in YMM) are only supported with AVX+
if (MaxVectorSize > 16) {
if (!FLAG_IS_DEFAULT(MaxVectorSize))
warning("MaxVectorSize must be <= 16");
FLAG_SET_DEFAULT(MaxVectorSize, 16);
}
}
else if (UseAVX == 1 || UseAVX == 2) {
// 64 bytes vectors (in ZMM) are only supported with AVX 3
if (MaxVectorSize > 32) {
if (!FLAG_IS_DEFAULT(MaxVectorSize))
warning("MaxVectorSize must be <= 32");
FLAG_SET_DEFAULT(MaxVectorSize, 32);
}
}
else if (UseAVX > 2 ) {
if (MaxVectorSize > 64) {
if (!FLAG_IS_DEFAULT(MaxVectorSize))
warning("MaxVectorSize must be <= 64");
FLAG_SET_DEFAULT(MaxVectorSize, 64);
}
warning("MaxVectorSize must be a power of 2, setting to default: %i", max_vector_size);
FLAG_SET_DEFAULT(MaxVectorSize, max_vector_size);
}
} else {
// If default, use highest supported configuration
FLAG_SET_DEFAULT(MaxVectorSize, max_vector_size);
}
#if defined(COMPILER2) && defined(ASSERT)
if (MaxVectorSize > 0) {
if (supports_avx() && PrintMiscellaneous && Verbose && TraceNewVectors) {
tty->print_cr("State of YMM registers after signal handle:");
int nreg = 2 LP64_ONLY(+2);
@ -1034,8 +1040,8 @@ void VM_Version::get_processor_features() {
tty->cr();
}
}
#endif // COMPILER2 && ASSERT
}
#endif // COMPILER2 && ASSERT
#endif // COMPILER2_OR_JVMCI
#ifdef COMPILER2