commit 6ca68eb96d6bdea3f7c565168e5b93ea1a234a33
author Roland Levillain <rpl@google.com> Wed Feb 22 19:14:14 2023 +0000
committer Roland Levillain <rpl@google.com> Tue Feb 28 15:33:22 2023 +0000
tree 1cf815962aa35f1780272d629873f63af25167f4
parent fc5866e0575d059d12812f9d9d3a87701e842fbc

Enable the computation and testing of GC metrics in ART's CMC collector.

These metrics were previously only enabled in ART's Concurrent Copying
(CC) collector; also enable them in the Concurrent Mark-Compact (CMC)
collector.

Amend test `HeapTest.GCMetrics` (in ART gtest `art_runtime_tests`) to
reflect this new behavior of ART's CMC collector.

(cherry picked from commit 68643f562e6e8faf0408a123a937041e4ea3cc2f)

Test: ART_USE_READ_BARRIER=true ART_USE_GENERATIONAL_CC=true \
        m test-art-host-gtest-art_runtime_tests
Test: ART_USE_READ_BARRIER=true ART_USE_GENERATIONAL_CC=false \
        m test-art-host-gtest-art_runtime_tests
Test: ART_USE_READ_BARRIER=false \
        m test-art-host-gtest-art_runtime_tests
Bug: 270391874
Bug: 270957146
Change-Id: Idb23c3ef145549e69fc8e97a4fe977ba71f61873
Merged-In: Idb23c3ef145549e69fc8e97a4fe977ba71f61873

runtime/gc/collector/mark_compact.cc

diff --git a/runtime/gc/collector/mark_compact.cc b/runtime/gc/collector/mark_compact.cc
index f262b66..8aba47f 100644
--- a/runtime/gc/collector/mark_compact.cc
+++ b/runtime/gc/collector/mark_compact.cc
@@ -353,6 +353,24 @@
   CHECK_EQ(*conc_compaction_termination_page_, 0);
   // In most of the cases, we don't expect more than one LinearAlloc space.
   linear_alloc_spaces_data_.reserve(1);
+
+  // Initialize GC metrics.
+  metrics::ArtMetrics* metrics = GetMetrics();
+  // The mark-compact collector supports only full-heap collections at the moment.
+  gc_time_histogram_ = metrics->FullGcCollectionTime();
+  metrics_gc_count_ = metrics->FullGcCount();
+  metrics_gc_count_delta_ = metrics->FullGcCountDelta();
+  gc_throughput_histogram_ = metrics->FullGcThroughput();
+  gc_tracing_throughput_hist_ = metrics->FullGcTracingThroughput();
+  gc_throughput_avg_ = metrics->FullGcThroughputAvg();
+  gc_tracing_throughput_avg_ = metrics->FullGcTracingThroughputAvg();
+  gc_scanned_bytes_ = metrics->FullGcScannedBytes();
+  gc_scanned_bytes_delta_ = metrics->FullGcScannedBytesDelta();
+  gc_freed_bytes_ = metrics->FullGcFreedBytes();
+  gc_freed_bytes_delta_ = metrics->FullGcFreedBytesDelta();
+  gc_duration_ = metrics->FullGcDuration();
+  gc_duration_delta_ = metrics->FullGcDurationDelta();
+  are_metrics_initialized_ = true;
 }
 
 void MarkCompact::AddLinearAllocSpaceData(uint8_t* begin, size_t len) {

runtime/gc/heap_test.cc

diff --git a/runtime/gc/heap_test.cc b/runtime/gc/heap_test.cc
index c07b8d7..e8a0f71 100644
--- a/runtime/gc/heap_test.cc
+++ b/runtime/gc/heap_test.cc
@@ -157,8 +157,9 @@
   metrics::MetricsBase<uint64_t>* young_gc_duration_delta = metrics->YoungGcDurationDelta();
 
   CollectorType fg_collector_type = heap->GetForegroundCollectorType();
-  if (fg_collector_type == kCollectorTypeCC) {
-    // Only the Concurrent Copying collector enables GC metrics at the moment.
+  if (fg_collector_type == kCollectorTypeCC || fg_collector_type == kCollectorTypeCMC) {
+    // Only the Concurrent Copying and Concurrent Mark-Compact collectors enable
+    // GC metrics at the moment.
     if (heap->GetUseGenerationalCC()) {
       // Check that full-heap and/or young-generation GC metrics are non-null
       // after trigerring the collection.
@@ -186,8 +187,12 @@
       EXPECT_FALSE(full_gc_tracing_throughput->IsNull());
       EXPECT_FALSE(full_gc_throughput_avg->IsNull());
       EXPECT_FALSE(full_gc_tracing_throughput_avg->IsNull());
-      EXPECT_FALSE(full_gc_scanned_bytes->IsNull());
-      EXPECT_FALSE(full_gc_scanned_bytes_delta->IsNull());
+      if (fg_collector_type != kCollectorTypeCMC) {
+        // TODO(b/270957146): For some reason, these metrics are still null
+        // after running the Concurrent Mark-Compact collector; investigate why.
+        EXPECT_FALSE(full_gc_scanned_bytes->IsNull());
+        EXPECT_FALSE(full_gc_scanned_bytes_delta->IsNull());
+      }
       EXPECT_FALSE(full_gc_freed_bytes->IsNull());
       EXPECT_FALSE(full_gc_freed_bytes_delta->IsNull());
       EXPECT_FALSE(full_gc_duration->IsNull());