| commit | 951fdf97d0d2a412fc57772a6bc4f43eb98b5254 | [log] [tgz] |
|---|---|---|
| author | Shikha Panwar <shikhapanwar@google.com> | Fri Sep 23 18:23:02 2022 +0000 |
| committer | Shikha Panwar <shikhapanwar@google.com> | Tue Sep 27 16:11:11 2022 +0000 |
| tree | 39fd481c6ff6096398da17312219b196d44b403d | |
| parent | 47984f553776c0ba376303d7af75b870c94daf3a [diff] |
bootloader_time should exclude time spent in ABL It will only include time of pvmfw stage. ABL is being removed from boot flow. Bug: 240235424 Test: atest MicrodroidBenchmarks#testMicrodroidBootTime Change-Id: I6cb1082de0015c25fa9c755fd6dd3b6a64be8d98
diff --git a/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java b/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java index fdc846e..33de61c 100644 --- a/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java +++ b/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
@@ -276,7 +276,9 @@ } private long getKernelStartedNanoTime() { - return kernelStartedNanoTime.getAsLong(); + // pvmfw emits log at the end which is used to estimate the kernelStart time. + // In case of no pvmfw run(non-protected mode), use vCPU started time instead. + return kernelStartedNanoTime.orElse(vcpuStartedNanoTime.getAsLong()); } private long getInitStartedNanoTime() {