Skip to content

8382257: Shenandoah: Clean up stack watermark barrier support #739

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

Open
shipilev wants to merge 1 commit into
base: master
Choose a base branch
from
Open

8382257: Shenandoah: Clean up stack watermark barrier support #739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/gc/shenandoah/mode/shenandoahPassiveMode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ void ShenandoahPassiveMode::initialize_flags() const {
SHENANDOAH_ERGO_DISABLE_FLAG(ShenandoahSATBBarrier);
SHENANDOAH_ERGO_DISABLE_FLAG(ShenandoahCASBarrier);
SHENANDOAH_ERGO_DISABLE_FLAG(ShenandoahCloneBarrier);
SHENANDOAH_ERGO_DISABLE_FLAG(ShenandoahStackWatermarkBarrier);
SHENANDOAH_ERGO_DISABLE_FLAG(ShenandoahCardBarrier);

// Final configuration checks
Expand Down
1 change: 0 additions & 1 deletion src/hotspot/share/gc/shenandoah/mode/shenandoahSATBMode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,5 @@ void ShenandoahSATBMode::initialize_flags() const {
SHENANDOAH_CHECK_FLAG_SET(ShenandoahSATBBarrier);
SHENANDOAH_CHECK_FLAG_SET(ShenandoahCASBarrier);
SHENANDOAH_CHECK_FLAG_SET(ShenandoahCloneBarrier);
SHENANDOAH_CHECK_FLAG_SET(ShenandoahStackWatermarkBarrier);
SHENANDOAH_CHECK_FLAG_UNSET(ShenandoahCardBarrier);
}
22 changes: 9 additions & 13 deletions src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,11 +150,9 @@ void ShenandoahBarrierSet::on_thread_attach(Thread *thread) {
BarrierSetNMethod* bs_nm = barrier_set_nmethod();
thread->set_nmethod_disarmed_guard_value(bs_nm->disarmed_guard_value());

if (ShenandoahStackWatermarkBarrier) {
JavaThread* const jt = JavaThread::cast(thread);
StackWatermark* const watermark = new ShenandoahStackWatermark(jt);
StackWatermarkSet::add_watermark(jt, watermark);
}
JavaThread* const jt = JavaThread::cast(thread);
StackWatermark* const watermark = new ShenandoahStackWatermark(jt);
StackWatermarkSet::add_watermark(jt, watermark);
}
}

Expand All @@ -174,14 +172,12 @@ void ShenandoahBarrierSet::on_thread_detach(Thread *thread) {
}

// SATB protocol requires to keep alive reachable oops from roots at the beginning of GC
if (ShenandoahStackWatermarkBarrier) {
if (_heap->is_concurrent_mark_in_progress()) {
ShenandoahKeepAliveClosure oops;
StackWatermarkSet::finish_processing(JavaThread::cast(thread), &oops, StackWatermarkKind::gc);
} else if (_heap->is_concurrent_weak_root_in_progress() && _heap->is_evacuation_in_progress()) {
ShenandoahContextEvacuateUpdateRootsClosure oops;
StackWatermarkSet::finish_processing(JavaThread::cast(thread), &oops, StackWatermarkKind::gc);
}
if (_heap->is_concurrent_mark_in_progress()) {
ShenandoahKeepAliveClosure oops;
StackWatermarkSet::finish_processing(JavaThread::cast(thread), &oops, StackWatermarkKind::gc);
} else if (_heap->is_concurrent_weak_root_in_progress() && _heap->is_evacuation_in_progress()) {
ShenandoahContextEvacuateUpdateRootsClosure oops;
StackWatermarkSet::finish_processing(JavaThread::cast(thread), &oops, StackWatermarkKind::gc);
}
}
}
Expand Down
3 changes: 0 additions & 3 deletions src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,9 +545,6 @@
product(bool, ShenandoahLoadRefBarrier, true, DIAGNOSTIC, \
"Turn on/off load-reference barriers in Shenandoah") \
\
product(bool, ShenandoahStackWatermarkBarrier, true, DIAGNOSTIC, \
"Turn on/off stack watermark barriers in Shenandoah") \
\
develop(bool, ShenandoahVerifyOptoBarriers, trueInDebug, \
"Verify no missing barriers in C2.") \
\
Expand Down
3 changes: 1 addition & 2 deletions test/hotspot/jtreg/gc/shenandoah/options/TestSelectiveBarrierFlags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ public static void main(String[] args) throws Exception {
new String[] { "ShenandoahLoadRefBarrier" },
new String[] { "ShenandoahSATBBarrier" },
new String[] { "ShenandoahCASBarrier" },
new String[] { "ShenandoahCloneBarrier" },
new String[] { "ShenandoahStackWatermarkBarrier" }
new String[] { "ShenandoahCloneBarrier" }
};

int size = 1;
Expand Down
3 changes: 1 addition & 2 deletions test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierDisable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ public static void main(String[] args) throws Exception {
"ShenandoahLoadRefBarrier",
"ShenandoahSATBBarrier",
"ShenandoahCASBarrier",
"ShenandoahCloneBarrier",
"ShenandoahStackWatermarkBarrier",
"ShenandoahCloneBarrier"
};

String[] generational = {
Expand Down