Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 0 additions & 42 deletions src/hotspot/cpu/x86/vm_version_x86.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3225,48 +3225,6 @@ bool VM_Version::is_intrinsic_supported(vmIntrinsicID id) {
return false;
}
break;
case vmIntrinsics::_electronicCodeBook_encryptAESCrypt:
case vmIntrinsics::_electronicCodeBook_decryptAESCrypt:
case vmIntrinsics::_galoisCounterMode_AESCrypt:
if (!(supports_avx512_vaes() && supports_avx512vl() && supports_avx512dq())) {
return false;
}
break;
case vmIntrinsics::_bigIntegerRightShiftWorker:
case vmIntrinsics::_bigIntegerLeftShiftWorker:
if (!supports_avx512_vbmi2()) {
return false;
}
break;
case vmIntrinsics::_floatIsInfinite:
case vmIntrinsics::_doubleIsInfinite:
if (!supports_avx512dq()) {
return false;
}
break;
case vmIntrinsics::_dcopySign:
case vmIntrinsics::_fcopySign:
if (UseAVX < 3 || !is_LP64) {
return false;
}
if (!supports_avx512vl()) {
return false;
}
break;
#ifdef _LP64
case vmIntrinsics::_maxF:
case vmIntrinsics::_minF:
case vmIntrinsics::_maxD:
case vmIntrinsics::_minD:
case vmIntrinsics::_maxF_strict:
case vmIntrinsics::_minF_strict:
case vmIntrinsics::_maxD_strict:
case vmIntrinsics::_minD_strict:
if (UseAVX < 1) { // enabled for AVX only
return false;
}
break;
#endif
default:
break;
}
Expand Down
12 changes: 9 additions & 3 deletions src/hotspot/share/opto/c2compiler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,15 @@ bool C2Compiler::is_intrinsic_supported(vmIntrinsics::ID id) {
case vmIntrinsics::_electronicCodeBook_decryptAESCrypt:
if (StubRoutines::electronicCodeBook_decryptAESCrypt() == nullptr) return false;
break;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These two intrinsics were marked as supported on non-x86 platforms where the underlying stubs are not generated

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch

case vmIntrinsics::_galoisCounterMode_AESCrypt:
if (StubRoutines::galoisCounterMode_AESCrypt() == nullptr) return false;
break;
case vmIntrinsics::_bigIntegerRightShiftWorker:
if (StubRoutines::bigIntegerRightShift() == nullptr) return false;
break;
case vmIntrinsics::_bigIntegerLeftShiftWorker:
if (StubRoutines::bigIntegerLeftShift() == nullptr) return false;
break;
case vmIntrinsics::_encodeAsciiArray:
if (!Matcher::match_rule_supported(Op_EncodeISOArray) || !Matcher::supports_encode_ascii_array) return false;
break;
Expand Down Expand Up @@ -727,7 +736,6 @@ bool C2Compiler::is_intrinsic_supported(vmIntrinsics::ID id) {
case vmIntrinsics::_cipherBlockChaining_encryptAESCrypt:
case vmIntrinsics::_cipherBlockChaining_decryptAESCrypt:
case vmIntrinsics::_counterMode_AESCrypt:
case vmIntrinsics::_galoisCounterMode_AESCrypt:
case vmIntrinsics::_md5_implCompress:
case vmIntrinsics::_sha_implCompress:
case vmIntrinsics::_sha2_implCompress:
Expand All @@ -739,8 +747,6 @@ bool C2Compiler::is_intrinsic_supported(vmIntrinsics::ID id) {
case vmIntrinsics::_mulAdd:
case vmIntrinsics::_montgomeryMultiply:
case vmIntrinsics::_montgomerySquare:
case vmIntrinsics::_bigIntegerRightShiftWorker:
case vmIntrinsics::_bigIntegerLeftShiftWorker:
case vmIntrinsics::_vectorizedMismatch:
case vmIntrinsics::_ghash_processBlocks:
case vmIntrinsics::_chacha20Block:
Expand Down