Merge "Periodically GC and finalize during Collators alloc test." into main am: 8d6fd6ea5b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3491733

Change-Id: I4f13c0dc6ae2a6f6cc77f955981fac7b3932a5a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 22 insertions, 0 deletions

diff --git a/apct-tests/perftests/core/src/android/libcore/regression/ExpensiveObjectsPerfTest.java b/apct-tests/perftests/core/src/android/libcore/regression/ExpensiveObjectsPerfTest.java
index ecbfc7169945..10ec2bfcb49a 100644
--- a/apct-tests/perftests/core/src/android/libcore/regression/ExpensiveObjectsPerfTest.java
+++ b/apct-tests/perftests/core/src/android/libcore/regression/ExpensiveObjectsPerfTest.java
@@ -75,8 +75,19 @@ public class ExpensiveObjectsPerfTest {
     @Test(timeout = 900000)
     public void timeNewCollator() {
         BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
+        int i = 0;
         while (state.keepRunning()) {
             Collator.getInstance(Locale.US);
+
+            if (++i % 1000 == 0) {
+                state.pauseTiming();
+                // GC and finalize occasionally to avoid GC for alloc and/or
+                // blocking on finalization during benchmark time.
+                // See: b/394961590
+                System.gc();
+                System.runFinalization();
+                state.resumeTiming();
+            }
         }
     }
 
@@ -84,8 +95,19 @@ public class ExpensiveObjectsPerfTest {
     public void timeClonedCollator() {
         Collator c = Collator.getInstance(Locale.US);
         BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
+        int i = 0;
         while (state.keepRunning()) {
             c.clone();
+
+            if (++i % 1000 == 0) {
+                state.pauseTiming();
+                // GC and finalize occasionally to avoid GC for alloc and/or
+                // blocking on finalization during benchmark time.
+                // See: b/394961590
+                System.gc();
+                System.runFinalization();
+                state.resumeTiming();
+            }
         }
     }