8342382: Implement JEP 522: G1 GC: Improve Throughput by Reducing Synchronization

src/hotspot/share/gc/g1/c1/g1BarrierSetC1.cpp

@@ -29,6 +29,7 @@
 #include "gc/g1/g1BarrierSetAssembler.hpp"
 #include "gc/g1/g1HeapRegion.hpp"
 #include "gc/g1/g1ThreadLocalData.hpp"
+#include "utilities/formatBuffer.hpp"
 #include "utilities/macros.hpp"
 #ifdef COMPILER1
 #include "c1/c1_LIR.hpp"

src/hotspot/share/gc/g1/g1ConcurrentMark.cpp

@@ -1236,7 +1236,7 @@ class G1UpdateRegionLivenessAndSelectForRebuildTask : public WorkerTask {
     void reclaim_empty_region_common(G1HeapRegion* hr) {
       _freed_bytes += hr->used();
       hr->set_containing_set(nullptr);
-      hr->clear_cardtable();
+      hr->clear_card_table();
       hr->clear_refinement_table();
       _g1h->concurrent_mark()->clear_statistics(hr);
       G1HeapRegionPrinter::mark_reclaim(hr);

src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp

@@ -149,7 +149,7 @@ void G1FullGCCompactTask::free_non_overlapping_regions(uint src_start_idx, uint
     G1HeapRegion* hr = _g1h->region_at(i);
     if (VerifyDuringGC) {
       // Satisfy some asserts in free_..._region
-      hr->clear_cardtable();
+      hr->clear_card_table();
       hr->clear_refinement_table();
     }
     _g1h->free_humongous_region(hr, nullptr);

src/hotspot/share/gc/g1/g1FullGCPrepareTask.inline.hpp

@@ -37,7 +37,7 @@
 void G1DetermineCompactionQueueClosure::free_empty_humongous_region(G1HeapRegion* hr) {
   if (VerifyDuringGC) {
     // Satisfy some asserts in free_..._region.
-    hr->clear_cardtable();
+    hr->clear_card_table();
     hr->clear_refinement_table();
   }
   _g1h->free_humongous_region(hr, nullptr);

src/hotspot/share/gc/g1/g1FullGCResetMetadataTask.cpp

@@ -32,7 +32,7 @@ G1FullGCResetMetadataTask::G1ResetMetadataClosure::G1ResetMetadataClosure(G1Full
 
 void G1FullGCResetMetadataTask::G1ResetMetadataClosure::reset_region_metadata(G1HeapRegion* hr) {
   hr->rem_set()->clear();
-  hr->clear_cardtable();
+  hr->clear_card_table();
   hr->clear_refinement_table();
 }
 

src/hotspot/share/gc/g1/g1HeapRegion.cpp

@@ -133,7 +133,7 @@ void G1HeapRegion::hr_clear(bool clear_space) {
   if (clear_space) clear(SpaceDecorator::Mangle);
 }
 
-void G1HeapRegion::clear_cardtable() {
+void G1HeapRegion::clear_card_table() {
   G1CardTable* ct = G1CollectedHeap::heap()->card_table();
   ct->clear_MemRegion(MemRegion(bottom(), end()));
 }

src/hotspot/share/gc/g1/g1HeapRegion.hpp

@@ -472,7 +472,7 @@ class G1HeapRegion : public CHeapObj<mtGC> {
   // Callers must ensure this is not called by multiple threads at the same time.
   void hr_clear(bool clear_space);
   // Clear the card table corresponding to this region.
-  void clear_cardtable();
+  void clear_card_table();
   void clear_refinement_table();
 
   // Notify the region that an evacuation failure occurred for an object within this

src/hotspot/share/gc/g1/g1ParScanThreadState.cpp

@@ -70,8 +70,8 @@ G1ParScanThreadState::G1ParScanThreadState(G1CollectedHeap* g1h,
     _tenuring_threshold(g1h->policy()->tenuring_threshold()),
     _scanner(g1h, this),
     _worker_id(worker_id),
-    _num_marked_as_dirty_cards(0),
-    _num_marked_as_into_cset_cards(0),
+    _num_cards_marked_dirty(0),
+    _num_cards_marked_to_cset(0),
     _stack_trim_upper_threshold(GCDrainStackTargetSize * 2 + 1),
     _stack_trim_lower_threshold(GCDrainStackTargetSize),
     _trim_ticks(),
@@ -87,7 +87,7 @@ G1ParScanThreadState::G1ParScanThreadState(G1CollectedHeap* g1h,
     ALLOCATION_FAILURE_INJECTOR_ONLY(_allocation_failure_inject_counter(0) COMMA)
     _evacuation_failed_info(),
     _evac_failure_regions(evac_failure_regions),
-    _evac_failure_marked_cards(0)
+    _num_cards_from_evac_failure(0)
 {
   // We allocate number of young gen regions in the collection set plus one
   // entries, since entry 0 keeps track of surviving bytes for non-young regions.
@@ -145,16 +145,16 @@ size_t G1ParScanThreadState::lab_undo_waste_words() const {
   return _plab_allocator->undo_waste();
 }
 
-size_t G1ParScanThreadState::num_pending_cards() const {
-  return _num_marked_as_dirty_cards + _evac_failure_marked_cards;
+size_t G1ParScanThreadState::num_cards_pending() const {
+  return _num_cards_marked_dirty + _num_cards_from_evac_failure;
 }
 
 size_t G1ParScanThreadState::num_marked_cards() const {
-  return num_pending_cards() + _num_marked_as_into_cset_cards;
+  return num_cards_pending() + _num_cards_marked_to_cset;
 }
 
-size_t G1ParScanThreadState::evac_failure_marked_cards() const {
-  return _evac_failure_marked_cards;
+size_t G1ParScanThreadState::num_cards_from_evac_failure() const {
+  return _num_cards_from_evac_failure;
 }
 
 #ifdef ASSERT
@@ -592,17 +592,17 @@ void G1ParScanThreadStateSet::flush_stats() {
     size_t lab_waste_bytes = pss->lab_waste_words() * HeapWordSize;
     size_t lab_undo_waste_bytes = pss->lab_undo_waste_words() * HeapWordSize;
     size_t copied_bytes = pss->flush_stats(_surviving_young_words_total, _num_workers) * HeapWordSize;
-    size_t pending_cards = pss->num_pending_cards();
-    size_t to_young_gen_cards = pss->num_marked_cards() - pss->num_pending_cards();
-    size_t evac_fail_marked_cards = pss->evac_failure_marked_cards();
+    size_t pending_cards = pss->num_cards_pending();
+    size_t to_young_gen_cards = pss->num_marked_cards() - pss->num_cards_pending();
+    size_t evac_failure_cards = pss->num_cards_from_evac_failure();
     size_t marked_cards = pss->num_marked_cards();
 
     p->record_or_add_thread_work_item(G1GCPhaseTimes::MergePSS, worker_id, copied_bytes, G1GCPhaseTimes::MergePSSCopiedBytes);
     p->record_or_add_thread_work_item(G1GCPhaseTimes::MergePSS, worker_id, lab_waste_bytes, G1GCPhaseTimes::MergePSSLABWasteBytes);
     p->record_or_add_thread_work_item(G1GCPhaseTimes::MergePSS, worker_id, lab_undo_waste_bytes, G1GCPhaseTimes::MergePSSLABUndoWasteBytes);
     p->record_or_add_thread_work_item(G1GCPhaseTimes::MergePSS, worker_id, pending_cards, G1GCPhaseTimes::MergePSSPendingCards);
     p->record_or_add_thread_work_item(G1GCPhaseTimes::MergePSS, worker_id, to_young_gen_cards, G1GCPhaseTimes::MergePSSToYoungGenCards);
-    p->record_or_add_thread_work_item(G1GCPhaseTimes::MergePSS, worker_id, evac_fail_marked_cards, G1GCPhaseTimes::MergePSSEvacFail);
+    p->record_or_add_thread_work_item(G1GCPhaseTimes::MergePSS, worker_id, evac_failure_cards, G1GCPhaseTimes::MergePSSEvacFail);
     p->record_or_add_thread_work_item(G1GCPhaseTimes::MergePSS, worker_id, marked_cards, G1GCPhaseTimes::MergePSSMarked);
 
     delete pss;

src/hotspot/share/gc/g1/g1ParScanThreadState.hpp

@@ -63,8 +63,8 @@ class G1ParScanThreadState : public CHeapObj<mtGC> {
 
   uint _worker_id;
 
-  size_t _num_marked_as_dirty_cards;
-  size_t _num_marked_as_into_cset_cards;
+  size_t _num_cards_marked_dirty;
+  size_t _num_cards_marked_to_cset;
 
   // Upper and lower threshold to start and end work queue draining.
   uint const _stack_trim_upper_threshold;
@@ -102,7 +102,7 @@ class G1ParScanThreadState : public CHeapObj<mtGC> {
   EvacuationFailedInfo _evacuation_failed_info;
   G1EvacFailureRegions* _evac_failure_regions;
   // Number of additional cards into evacuation failed regions.
-  size_t _evac_failure_marked_cards;
+  size_t _num_cards_from_evac_failure;
 
   // Mark the card if not already in the set; this is a best-effort attempt on
   // detecting duplicates.
@@ -150,8 +150,8 @@ class G1ParScanThreadState : public CHeapObj<mtGC> {
   size_t lab_waste_words() const;
   size_t lab_undo_waste_words() const;
 
-  size_t num_pending_cards() const;
-  size_t evac_failure_marked_cards() const;
+  size_t num_cards_pending() const;
+  size_t num_cards_from_evac_failure() const;
   size_t num_marked_cards() const;
 
   // Pass locally gathered statistics to global state. Returns the total number of

src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp

@@ -113,7 +113,7 @@ template <class T> void G1ParScanThreadState::mark_card_into_evac_fail_region(T*
   assert(_g1h->heap_region_containing(obj)->in_collection_set(), "Only for enqeueing reference into collection set region");
 
   if (mark_if_new(p, false /* into_new_survivor */)) { // The reference is never into survivor regions.
-    _evac_failure_marked_cards++;
+    _num_cards_from_evac_failure++;
   }
 }
 
@@ -163,9 +163,9 @@ template <class T> void G1ParScanThreadState::mark_card_if_tracked(G1HeapRegionA
   bool into_survivor = region_attr.is_new_survivor();
   if (mark_if_new(p, into_survivor)) {
     if (into_survivor) {
-      _num_marked_as_into_cset_cards++;
+      _num_cards_marked_to_cset++;
     } else {
-      _num_marked_as_dirty_cards++;
+      _num_cards_marked_dirty++;
     }
   }
 }

src/hotspot/share/gc/g1/g1RemSet.cpp

@@ -64,7 +64,7 @@
 // Collects information about the overall heap root scan progress during an evacuation.
 //
 // Scanning the remembered sets works by first merging all sources of cards to be
-// scanned (log buffers, remembered sets) into a single data structure to remove
+// scanned (refinement table, remembered sets) into a single data structure to remove
 // duplicates and simplify work distribution.
 //
 // During the following card scanning we not only scan this combined set of cards, but
@@ -222,7 +222,7 @@ class G1ClearCardTableTask : public G1AbstractSubTask {
           //
           // Humongous reclaim candidates are not in the dirty set. This is fine because
           // their card and refinement table should always be clear as they are typeArrays.
-          r->clear_cardtable();
+          r->clear_card_table();
           // There is no need to clear the refinement table here: at the start of the collection
           // we had to clear the refinement card table for collection set regions already, and any
           // old regions use it for old->collection set candidates, so they should not be cleared

src/hotspot/share/gc/g1/g1RemSet.hpp

@@ -41,7 +41,6 @@
 class BitMap;
 class CardTableBarrierSet;
 class G1AbstractSubTask;
-class G1RemSetScanState;
 class G1CollectedHeap;
 class G1CMBitMap;
 class G1HeapRegionClaimer;

src/hotspot/share/gc/g1/g1ThreadLocalData.hpp

@@ -26,7 +26,6 @@
 
 #include "gc/g1/g1BarrierSet.hpp"
 #include "gc/g1/g1CardTable.hpp"
-#include "gc/g1/g1CollectedHeap.hpp"
 #include "gc/g1/g1RegionPinCache.hpp"
 #include "gc/shared/gc_globals.hpp"
 #include "gc/shared/satbMarkQueue.hpp"