Skip to content

Commit

Permalink
8317452: [JVMCI] Export symbols used by lightweight locking to JVMCI …
Browse files Browse the repository at this point in the history
…compilers.

Reviewed-by: dnsimon
  • Loading branch information
Yudi Zheng authored and Doug Simon committed Oct 4, 2023
1 parent 0d4de8a commit 9718f49
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 5 deletions.
1 change: 0 additions & 1 deletion src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
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
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
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, \
"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
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
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

3 comments on commit 9718f49

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@rkennke
Copy link
Contributor

Choose a reason for hiding this comment

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

/backport lilliput-jdk21u

@openjdk
Copy link

@openjdk openjdk bot commented on 9718f49 Mar 25, 2024

Choose a reason for hiding this comment

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

@rkennke Could not automatically backport 9718f490 to openjdk/lilliput-jdk21u due to conflicts in the following files:

  • src/hotspot/share/jvmci/vmStructs_jvmci.cpp

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/lilliput-jdk21u. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/lilliput-jdk21u.git lilliput:lilliput

# Check out the target branch and create your own branch to backport
$ git checkout lilliput
$ git checkout -b backport-rkennke-9718f490

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git 9718f490fb76f6712ac8f9c7f5248ca10bf83e6f

# Backport the commit
$ git cherry-pick --no-commit 9718f490fb76f6712ac8f9c7f5248ca10bf83e6f
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 9718f490fb76f6712ac8f9c7f5248ca10bf83e6f'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/lilliput-jdk21u with the title Backport 9718f490fb76f6712ac8f9c7f5248ca10bf83e6f.

Below you can find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 9718f490 from the openjdk/jdk repository.

The commit being backported was authored by Yudi Zheng on 4 Oct 2023 and was reviewed by Doug Simon.

Thanks!

Please sign in to comment.