Skip to content

8374169: too many unsafe intrinsics (simplify unsafe intrinsic processing) #28940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
rose00 wants to merge 9 commits into
base: master
Choose a base branch
from
Draft

8374169: too many unsafe intrinsics (simplify unsafe intrinsic processing) #28940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f0f522f
8374169: too many intrinsics (first cut)
Dec 20, 2025
d2f0c35
cleanups in C1 code
Dec 21, 2025
b056dce
fix DMH bug with Volatile and also restore Volatile API points
Dec 22, 2025
67b31dd
tweaks in Unsafe.java
Dec 22, 2025
550a2da
adjust unit tests for deleted API points; use MO_RELEASE etc.
Dec 22, 2025
c43b97e
tweaks in Unsafe.java and unsafe.cpp
Dec 22, 2025
1016a61
consolidate processing of atomic intrinsics in C1
Dec 23, 2025
a276e3d
update MO definitions, correct MO_OPAQUE
Dec 24, 2025
0f2bea1
get C2 working; now passes test/hotspot/jtreg/compiler/unsafe
Dec 24, 2025
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
1 change: 0 additions & 1 deletion src/hotspot/share/c1/c1_Canonicalizer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,6 @@ void Canonicalizer::do_OsrEntry (OsrEntry* x) {}
void Canonicalizer::do_ExceptionObject(ExceptionObject* x) {}
void Canonicalizer::do_UnsafeGet (UnsafeGet* x) {}
void Canonicalizer::do_UnsafePut (UnsafePut* x) {}
void Canonicalizer::do_UnsafeGetAndSet(UnsafeGetAndSet* x) {}
void Canonicalizer::do_ProfileCall (ProfileCall* x) {}
void Canonicalizer::do_ProfileReturnType(ProfileReturnType* x) {}
void Canonicalizer::do_ProfileInvoke (ProfileInvoke* x) {}
Expand Down
1 change: 0 additions & 1 deletion src/hotspot/share/c1/c1_Canonicalizer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ class Canonicalizer: InstructionVisitor {
virtual void do_ExceptionObject(ExceptionObject* x);
virtual void do_UnsafeGet (UnsafeGet* x);
virtual void do_UnsafePut (UnsafePut* x);
virtual void do_UnsafeGetAndSet(UnsafeGetAndSet* x);
virtual void do_ProfileCall (ProfileCall* x);
virtual void do_ProfileReturnType (ProfileReturnType* x);
virtual void do_ProfileInvoke (ProfileInvoke* x);
Expand Down
75 changes: 16 additions & 59 deletions src/hotspot/share/c1/c1_Compiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,21 +109,20 @@ bool Compiler::is_intrinsic_supported(const methodHandle& method) {

bool Compiler::is_intrinsic_supported(vmIntrinsics::ID id) {
switch (id) {
case vmIntrinsics::_compareAndSetLong:
case vmIntrinsics::_compareAndSetPrimitiveBitsMO:
case vmIntrinsics::_compareAndSetReferenceMO:
// all platforms must support at least T_OBJECT, T_INT, T_LONG
break;
case vmIntrinsics::_getAndAddInt:
if (!VM_Version::supports_atomic_getadd4()) return false;
break;
case vmIntrinsics::_getAndAddLong:
if (!VM_Version::supports_atomic_getadd8()) return false;
break;
case vmIntrinsics::_getAndSetInt:
if (!VM_Version::supports_atomic_getset4()) return false;
break;
case vmIntrinsics::_getAndSetLong:
if (!VM_Version::supports_atomic_getset8()) return false;
case vmIntrinsics::_getAndOperatePrimitiveBitsMO:
if (!(VM_Version::supports_atomic_getadd4() ||
VM_Version::supports_atomic_getadd8() ||
VM_Version::supports_atomic_getset4() ||
VM_Version::supports_atomic_getset8())) {
// if any of the hardware ops are present, try the expansion
return false;
}
break;
case vmIntrinsics::_getAndSetReference:
case vmIntrinsics::_getAndSetReferenceMO:
#ifdef _LP64
if (!UseCompressedOops && !VM_Version::supports_atomic_getset8()) return false;
if (UseCompressedOops && !VM_Version::supports_atomic_getset4()) return false;
Expand Down Expand Up @@ -176,50 +175,10 @@ bool Compiler::is_intrinsic_supported(vmIntrinsics::ID id) {
case vmIntrinsics::_dpow:
case vmIntrinsics::_fmaD:
case vmIntrinsics::_fmaF:
case vmIntrinsics::_getReference:
case vmIntrinsics::_getBoolean:
case vmIntrinsics::_getByte:
case vmIntrinsics::_getShort:
case vmIntrinsics::_getChar:
case vmIntrinsics::_getInt:
case vmIntrinsics::_getLong:
case vmIntrinsics::_getFloat:
case vmIntrinsics::_getDouble:
case vmIntrinsics::_putReference:
case vmIntrinsics::_putBoolean:
case vmIntrinsics::_putByte:
case vmIntrinsics::_putShort:
case vmIntrinsics::_putChar:
case vmIntrinsics::_putInt:
case vmIntrinsics::_putLong:
case vmIntrinsics::_putFloat:
case vmIntrinsics::_putDouble:
case vmIntrinsics::_getReferenceVolatile:
case vmIntrinsics::_getBooleanVolatile:
case vmIntrinsics::_getByteVolatile:
case vmIntrinsics::_getShortVolatile:
case vmIntrinsics::_getCharVolatile:
case vmIntrinsics::_getIntVolatile:
case vmIntrinsics::_getLongVolatile:
case vmIntrinsics::_getFloatVolatile:
case vmIntrinsics::_getDoubleVolatile:
case vmIntrinsics::_putReferenceVolatile:
case vmIntrinsics::_putBooleanVolatile:
case vmIntrinsics::_putByteVolatile:
case vmIntrinsics::_putShortVolatile:
case vmIntrinsics::_putCharVolatile:
case vmIntrinsics::_putIntVolatile:
case vmIntrinsics::_putLongVolatile:
case vmIntrinsics::_putFloatVolatile:
case vmIntrinsics::_putDoubleVolatile:
case vmIntrinsics::_getShortUnaligned:
case vmIntrinsics::_getCharUnaligned:
case vmIntrinsics::_getIntUnaligned:
case vmIntrinsics::_getLongUnaligned:
case vmIntrinsics::_putShortUnaligned:
case vmIntrinsics::_putCharUnaligned:
case vmIntrinsics::_putIntUnaligned:
case vmIntrinsics::_putLongUnaligned:
case vmIntrinsics::_getPrimitiveBitsMO:
case vmIntrinsics::_putPrimitiveBitsMO:
case vmIntrinsics::_getReferenceMO:
case vmIntrinsics::_putReferenceMO:
case vmIntrinsics::_Preconditions_checkIndex:
case vmIntrinsics::_Preconditions_checkLongIndex:
case vmIntrinsics::_updateCRC32:
Expand All @@ -230,8 +189,6 @@ bool Compiler::is_intrinsic_supported(vmIntrinsics::ID id) {
case vmIntrinsics::_updateDirectByteBufferCRC32C:
#endif
case vmIntrinsics::_vectorizedMismatch:
case vmIntrinsics::_compareAndSetInt:
case vmIntrinsics::_compareAndSetReference:
case vmIntrinsics::_getCharStringU:
case vmIntrinsics::_putCharStringU:
#ifdef JFR_HAVE_INTRINSICS
Expand Down
Loading