From cc3315a297a9d087ce51a5f87f5370193bad6d46 Mon Sep 17 00:00:00 2001 From: Kohsuke Yatoh Date: Wed, 20 Jul 2022 06:07:28 +0000 Subject: [PATCH] Revert perf test target time to previous one. ManualBenchmarkState has different default values for test target time and warmup time. Perf test numbers may change depending on target time and warmup time. This CL reverts them to previous ones so that we can get consistent numbers. Bug: 174672300 Test: atest CorePerfTests:android.graphics.perftests.TypefaceSerializationPerfTest Change-Id: I836ed9ba37b1fb424da152d3b53814b7b5115060 --- .../TypefaceSerializationPerfTest.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/apct-tests/perftests/core/src/android/graphics/perftests/TypefaceSerializationPerfTest.java b/apct-tests/perftests/core/src/android/graphics/perftests/TypefaceSerializationPerfTest.java index 675ff0107081d..d3fcaa1651c0b 100644 --- a/apct-tests/perftests/core/src/android/graphics/perftests/TypefaceSerializationPerfTest.java +++ b/apct-tests/perftests/core/src/android/graphics/perftests/TypefaceSerializationPerfTest.java @@ -42,9 +42,17 @@ public class TypefaceSerializationPerfTest { private static final String TAG = "TypefaceSerializationPerfTest"; + // Those values were taken from android.perftests.utils.BenchmarkState. + // Note: we cannot use TimeUnit.toNanos() because these constants are used in annotation. + private static final long WARMUP_DURATION_NS = 250_000_000; // 250ms + private static final long TARGET_TEST_DURATION_NS = 500_000_000; // 500ms + @Rule public PerfManualStatusReporter mPerfManualStatusReporter = new PerfManualStatusReporter(); + @ManualBenchmarkState.ManualBenchmarkTest( + warmupDurationNs = WARMUP_DURATION_NS, + targetTestDurationNs = TARGET_TEST_DURATION_NS) @Test public void testSerializeFontMap() throws Exception { Map systemFontMap = Typeface.getSystemFontMap(); @@ -58,6 +66,9 @@ public class TypefaceSerializationPerfTest { } } + @ManualBenchmarkState.ManualBenchmarkTest( + warmupDurationNs = WARMUP_DURATION_NS, + targetTestDurationNs = TARGET_TEST_DURATION_NS) @Test public void testSerializeFontMap_memory() throws Exception { Map systemFontMap = Typeface.getSystemFontMap(); @@ -70,6 +81,9 @@ public class TypefaceSerializationPerfTest { } } + @ManualBenchmarkState.ManualBenchmarkTest( + warmupDurationNs = WARMUP_DURATION_NS, + targetTestDurationNs = TARGET_TEST_DURATION_NS) @Test public void testDeserializeFontMap() throws Exception { SharedMemory memory = Typeface.serializeFontMap(Typeface.getSystemFontMap()); @@ -86,6 +100,9 @@ public class TypefaceSerializationPerfTest { } } + @ManualBenchmarkState.ManualBenchmarkTest( + warmupDurationNs = WARMUP_DURATION_NS, + targetTestDurationNs = TARGET_TEST_DURATION_NS) @Test public void testDeserializeFontMap_memory() throws Exception { SharedMemory memory = Typeface.serializeFontMap(Typeface.getSystemFontMap()); @@ -115,6 +132,9 @@ public class TypefaceSerializationPerfTest { } } + @ManualBenchmarkState.ManualBenchmarkTest( + warmupDurationNs = WARMUP_DURATION_NS, + targetTestDurationNs = TARGET_TEST_DURATION_NS) @Test public void testSetSystemFontMap() throws Exception { SharedMemory memory = null;