Skip to content

8317452: [JVMCI] Export symbols used by lightweight locking to JVMCI compilers. #16032

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

Closed
wants to merge 2 commits into from
Closed

8317452: [JVMCI] Export symbols used by lightweight locking to JVMCI compilers. #16032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f37b12
[JVMCI] Export symbols used by lightweight locking to JVMCI compilers.
mur47x111 Oct 3, 2023
ed5e31a
remove JVMCIUseFastLocking.
mur47x111 Oct 4, 2023
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/jvmci/jvmciCompilerToVMInit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,6 @@ JVMCIObjectArray CompilerToVM::initialize_intrinsics(JVMCI_TRAPS) {
do_bool_flag(Inline) \
do_intx_flag(JVMCICounterSize) \
do_bool_flag(JVMCIPrintProperties) \
do_bool_flag(JVMCIUseFastLocking) \
do_int_flag(ObjectAlignmentInBytes) \
do_bool_flag(PrintInlining) \
do_bool_flag(ReduceInitialCardMarks) \
Expand Down
1 change: 0 additions & 1 deletion src/hotspot/share/jvmci/jvmci_globals.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ bool JVMCIGlobals::check_jvmci_flags_are_consistent() {
CHECK_NOT_SET(JVMCITraceLevel, EnableJVMCI)
CHECK_NOT_SET(JVMCICounterSize, EnableJVMCI)
CHECK_NOT_SET(JVMCICountersExcludeCompiler, EnableJVMCI)
CHECK_NOT_SET(JVMCIUseFastLocking, EnableJVMCI)
CHECK_NOT_SET(JVMCINMethodSizeLimit, EnableJVMCI)
CHECK_NOT_SET(JVMCIPrintProperties, EnableJVMCI)
CHECK_NOT_SET(JVMCIThreadsPerNativeLibraryRuntime, EnableJVMCI)
Expand Down
3 changes: 0 additions & 3 deletions src/hotspot/share/jvmci/jvmci_globals.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,6 @@ class fileStream;
product(bool, JVMCICountersExcludeCompiler, true, EXPERIMENTAL, \
"Exclude JVMCI compiler threads from benchmark counters") \
\
develop(bool, JVMCIUseFastLocking, true, \
Copy link
Member

Choose a reason for hiding this comment

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

You should just delete this option - JVMCI is clearly marked as experimental.
What you have in this PR is not proper deprecation. What if someone specifies -XX:-JVMCIUseFastLocking? They will get no warning or VM exit.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Indeed. I have deleted the option.

"Use fast inlined locking code") \
\
product(intx, JVMCINMethodSizeLimit, (80*K)*wordSize, EXPERIMENTAL, \
"Maximum size of a compiled method.") \
range(0, max_jint) \
Expand Down
10 changes: 10 additions & 0 deletions src/hotspot/share/jvmci/vmStructs_jvmci.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,12 @@
nonstatic_field(JavaThread, _poll_data, SafepointMechanism::ThreadData) \
nonstatic_field(JavaThread, _stack_overflow_state._reserved_stack_activation, address) \
nonstatic_field(JavaThread, _held_monitor_count, intx) \
nonstatic_field(JavaThread, _lock_stack, LockStack) \
JVMTI_ONLY(nonstatic_field(JavaThread, _is_in_VTMS_transition, bool)) \
JVMTI_ONLY(nonstatic_field(JavaThread, _is_in_tmp_VTMS_transition, bool)) \
\
nonstatic_field(LockStack, _top, uint32_t) \
\
JVMTI_ONLY(static_field(JvmtiVTMSTransitionDisabler, _VTMS_notify_jvmti_events, bool)) \
\
static_field(java_lang_Class, _klass_offset, int) \
Expand Down Expand Up @@ -494,6 +497,7 @@
declare_constant(BranchData::not_taken_off_set) \
\
declare_constant_with_value("CardTable::dirty_card", CardTable::dirty_card_val()) \
declare_constant_with_value("LockStack::_end_offset", LockStack::end_offset()) \
\
declare_constant(CodeInstaller::VERIFIED_ENTRY) \
declare_constant(CodeInstaller::UNVERIFIED_ENTRY) \
Expand Down Expand Up @@ -680,6 +684,10 @@
declare_constant(InstanceKlass::being_initialized) \
declare_constant(InstanceKlass::fully_initialized) \
\
declare_constant(LockingMode::LM_MONITOR) \
declare_constant(LockingMode::LM_LEGACY) \
declare_constant(LockingMode::LM_LIGHTWEIGHT) \
\
/*********************************/ \
/* InstanceKlass _misc_flags */ \
/*********************************/ \
Expand Down Expand Up @@ -727,6 +735,8 @@
AARCH64_ONLY(declare_constant(NMethodPatchingType::conc_instruction_and_data_patch)) \
AARCH64_ONLY(declare_constant(NMethodPatchingType::conc_data_patch)) \
\
declare_constant(ObjectMonitor::ANONYMOUS_OWNER) \
\
declare_constant(ReceiverTypeData::receiver_type_row_cell_count) \
declare_constant(ReceiverTypeData::receiver0_offset) \
declare_constant(ReceiverTypeData::count0_offset) \
Expand Down
1 change: 1 addition & 0 deletions src/hotspot/share/runtime/lockStack.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ class outputStream;

class LockStack {
friend class VMStructs;
JVMCI_ONLY(friend class JVMCIVMStructs;)
private:
static const int CAPACITY = 8;

Expand Down