packages/openjdk-17
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
openjdk-17/add-8292296-Use-multiple-threads-to-process-Par.patch

273 lines
12 KiB
Diff
Raw Blame History

From e29cbf64958dc5728a40290e6150ed4bf158e1d9 Mon Sep 17 00:00:00 2001
Date: Thu, 21 Sep 2023 16:45:13 +0800
Subject: add 8292296-Use-multiple-threads-to-process-Par
---
.../share/gc/parallel/psCompactionManager.cpp | 17 +++++-
.../share/gc/parallel/psCompactionManager.hpp | 7 ++-
.../share/gc/parallel/psParallelCompact.cpp | 58 +++++++------------
.../share/gc/parallel/psParallelCompact.hpp | 18 ++----
4 files changed, 47 insertions(+), 53 deletions(-)
diff --git a/src/hotspot/share/gc/parallel/psCompactionManager.cpp b/src/hotspot/share/gc/parallel/psCompactionManager.cpp
index bab67b219..1461dfe86 100644
--- a/src/hotspot/share/gc/parallel/psCompactionManager.cpp
+++ b/src/hotspot/share/gc/parallel/psCompactionManager.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -63,6 +63,8 @@ ParCompactionManager::ParCompactionManager() {
_region_stack.initialize();
reset_bitmap_query_cache();
+
+ _deferred_obj_array = new (ResourceObj::C_HEAP, mtGC) GrowableArray<HeapWord*>(10, mtGC);
}
void ParCompactionManager::initialize(ParMarkBitMap* mbm) {
@@ -168,6 +170,15 @@ void ParCompactionManager::drain_region_stacks() {
} while (!region_stack()->is_empty());
}
+void ParCompactionManager::drain_deferred_objects() {
+ while (!_deferred_obj_array->is_empty()) {
+ HeapWord* addr = _deferred_obj_array->pop();
+ assert(addr != NULL, "expected a deferred object");
+ PSParallelCompact::update_deferred_object(this, addr);
+ }
+ _deferred_obj_array->clear_and_deallocate();
+}
+
size_t ParCompactionManager::pop_shadow_region_mt_safe(PSParallelCompact::RegionData* region_ptr) {
MonitorLocker ml(_shadow_region_monitor, Mutex::_no_safepoint_check_flag);
while (true) {
@@ -198,6 +209,10 @@ void ParCompactionManager::remove_all_shadow_regions() {
_shadow_region_array->clear();
}
+void ParCompactionManager::push_deferred_object(HeapWord* addr) {
+ _deferred_obj_array->push(addr);
+}
+
#ifdef ASSERT
void ParCompactionManager::verify_all_marking_stack_empty() {
uint parallel_gc_threads = ParallelGCThreads;
diff --git a/src/hotspot/share/gc/parallel/psCompactionManager.hpp b/src/hotspot/share/gc/parallel/psCompactionManager.hpp
index 86810d32c..6ce30f827 100644
--- a/src/hotspot/share/gc/parallel/psCompactionManager.hpp
+++ b/src/hotspot/share/gc/parallel/psCompactionManager.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -75,6 +75,8 @@ class ParCompactionManager : public CHeapObj<mtGC> {
// type of TaskQueue.
RegionTaskQueue _region_stack;
+ GrowableArray<HeapWord*>* _deferred_obj_array;
+
static ParMarkBitMap* _mark_bitmap;
// Contains currently free shadow regions. We use it in
@@ -123,6 +125,8 @@ class ParCompactionManager : public CHeapObj<mtGC> {
return next_shadow_region();
}
+ void push_deferred_object(HeapWord* addr);
+
void reset_bitmap_query_cache() {
_last_query_beg = NULL;
_last_query_obj = NULL;
@@ -188,6 +192,7 @@ class ParCompactionManager : public CHeapObj<mtGC> {
// Process tasks remaining on any stack
void drain_region_stacks();
+ void drain_deferred_objects();
void follow_contents(oop obj);
void follow_array(objArrayOop array, int index);
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
index 8ac733fa5..33e6efa5f 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -2522,6 +2522,10 @@ public:
// Once a thread has drained it's stack, it should try to steal regions from
// other threads.
compaction_with_stealing_work(&_terminator, worker_id);
+
+ // At this point all regions have been compacted, so it's now safe
+ // to update the deferred objects that cross region boundaries.
+ cm->drain_deferred_objects();
}
};
@@ -2551,24 +2555,13 @@ void PSParallelCompact::compact() {
ParallelScavengeHeap::heap()->workers().run_task(&task);
#ifdef ASSERT
- // Verify that all regions have been processed before the deferred updates.
+ // Verify that all regions have been processed.
for (unsigned int id = old_space_id; id < last_space_id; ++id) {
verify_complete(SpaceId(id));
}
#endif
}
- {
- GCTraceTime(Trace, gc, phases) tm("Deferred Updates", &_gc_timer);
- // Update the deferred objects, if any. In principle, any compaction
- // manager can be used. However, since the current thread is VM thread, we
- // use the rightful one to keep the verification logic happy.
- ParCompactionManager* cm = ParCompactionManager::get_vmthread_cm();
- for (unsigned int id = old_space_id; id < last_space_id; ++id) {
- update_deferred_objects(cm, SpaceId(id));
- }
- }
-
DEBUG_ONLY(write_block_fill_histogram());
}
@@ -2695,32 +2688,23 @@ PSParallelCompact::SpaceId PSParallelCompact::space_id(HeapWord* addr) {
return last_space_id;
}
-void PSParallelCompact::update_deferred_objects(ParCompactionManager* cm,
- SpaceId id) {
- assert(id < last_space_id, "bad space id");
+void PSParallelCompact::update_deferred_object(ParCompactionManager* cm, HeapWord *addr) {
+#ifdef ASSERT
ParallelCompactData& sd = summary_data();
- const SpaceInfo* const space_info = _space_info + id;
- ObjectStartArray* const start_array = space_info->start_array();
+ size_t region_idx = sd.addr_to_region_idx(addr);
+ assert(sd.region(region_idx)->completed(), "first region must be completed before deferred updates");
+ assert(sd.region(region_idx + 1)->completed(), "second region must be completed before deferred updates");
+#endif
- const MutableSpace* const space = space_info->space();
- assert(space_info->dense_prefix() >= space->bottom(), "dense_prefix not set");
- HeapWord* const beg_addr = space_info->dense_prefix();
- HeapWord* const end_addr = sd.region_align_up(space_info->new_top());
-
- const RegionData* const beg_region = sd.addr_to_region_ptr(beg_addr);
- const RegionData* const end_region = sd.addr_to_region_ptr(end_addr);
- const RegionData* cur_region;
- for (cur_region = beg_region; cur_region < end_region; ++cur_region) {
- HeapWord* const addr = cur_region->deferred_obj_addr();
- if (addr != NULL) {
- if (start_array != NULL) {
- start_array->allocate_block(addr);
- }
- cm->update_contents(cast_to_oop(addr));
- assert(oopDesc::is_oop_or_null(cast_to_oop(addr)), "Expected an oop or NULL at " PTR_FORMAT, p2i(cast_to_oop(addr)));
- }
+ const SpaceInfo* const space_info = _space_info + space_id(addr);
+ ObjectStartArray* const start_array = space_info->start_array();
+ if (start_array != NULL) {
+ start_array->allocate_block(addr);
}
+
+ cm->update_contents(cast_to_oop(addr));
+ assert(oopDesc::is_oop(cast_to_oop(addr)), "Expected an oop at " PTR_FORMAT, p2i(cast_to_oop(addr)));
}
// Skip over count live words starting from beg, and return the address of the
@@ -2967,7 +2951,6 @@ void PSParallelCompact::fill_region(ParCompactionManager* cm, MoveAndUpdateClosu
if (closure.is_full()) {
decrement_destination_counts(cm, src_space_id, src_region_idx,
closure.source());
- region_ptr->set_deferred_obj_addr(NULL);
closure.complete_region(cm, dest_addr, region_ptr);
return;
}
@@ -3012,7 +2995,7 @@ void PSParallelCompact::fill_region(ParCompactionManager* cm, MoveAndUpdateClosu
if (status == ParMarkBitMap::would_overflow) {
// The last object did not fit. Note that interior oop updates were
// deferred, then copy enough of the object to fill the region.
- region_ptr->set_deferred_obj_addr(closure.destination());
+ cm->push_deferred_object(closure.destination());
status = closure.copy_until_full(); // copies from closure.source()
decrement_destination_counts(cm, src_space_id, src_region_idx,
@@ -3024,7 +3007,6 @@ void PSParallelCompact::fill_region(ParCompactionManager* cm, MoveAndUpdateClosu
if (status == ParMarkBitMap::full) {
decrement_destination_counts(cm, src_space_id, src_region_idx,
closure.source());
- region_ptr->set_deferred_obj_addr(NULL);
closure.complete_region(cm, dest_addr, region_ptr);
return;
}
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.hpp b/src/hotspot/share/gc/parallel/psParallelCompact.hpp
index c4319a080..7c8b1873a 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.hpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -243,13 +243,6 @@ public:
// Reuse _source_region to store the corresponding shadow region index
size_t shadow_region() const { return _source_region; }
- // The object (if any) starting in this region and ending in a different
- // region that could not be updated during the main (parallel) compaction
- // phase. This is different from _partial_obj_addr, which is an object that
- // extends onto a source region. However, the two uses do not overlap in
- // time, so the same field is used to save space.
- HeapWord* deferred_obj_addr() const { return _partial_obj_addr; }
-
// The starting address of the partial object extending onto the region.
HeapWord* partial_obj_addr() const { return _partial_obj_addr; }
@@ -312,7 +305,6 @@ public:
void set_destination(HeapWord* addr) { _destination = addr; }
void set_source_region(size_t region) { _source_region = region; }
void set_shadow_region(size_t region) { _source_region = region; }
- void set_deferred_obj_addr(HeapWord* addr) { _partial_obj_addr = addr; }
void set_partial_obj_addr(HeapWord* addr) { _partial_obj_addr = addr; }
void set_partial_obj_size(size_t words) {
_partial_obj_size = (region_sz_t) words;
@@ -948,8 +940,8 @@ inline void ParMarkBitMapClosure::decrement_words_remaining(size_t words) {
// but do not have their references updated. References are not updated because
// it cannot easily be determined if the klass pointer KKK for the object AAA
// has been updated. KKK likely resides in a region to the left of the region
-// containing AAA. These AAA's have there references updated at the end in a
-// clean up phase. See the method PSParallelCompact::update_deferred_objects().
+// containing AAA. These AAA's have their references updated at the end in a
+// clean up phase. See the method PSParallelCompact::update_deferred_object().
// An alternate strategy is being investigated for this deferral of updating.
//
// Compaction is done on a region basis. A region that is ready to be filled is
@@ -1233,8 +1225,8 @@ class PSParallelCompact : AllStatic {
// Fill in the block table for the specified region.
static void fill_blocks(size_t region_idx);
- // Update the deferred objects in the space.
- static void update_deferred_objects(ParCompactionManager* cm, SpaceId id);
+ // Update a single deferred object.
+ static void update_deferred_object(ParCompactionManager* cm, HeapWord* addr);
static ParMarkBitMap* mark_bitmap() { return &_mark_bitmap; }
static ParallelCompactData& summary_data() { return _summary_data; }
--
2.22.0
Reference in New Issue View Git Blame Copy Permalink