Merge "Don't use &mut for immutable data" into main
diff --git a/tests/benchmark/assets/vm_config_gki-android14-6.1.json b/tests/benchmark/assets/vm_config_gki-android14-6.1.json
new file mode 100644
index 0000000..c4fdc6e
--- /dev/null
+++ b/tests/benchmark/assets/vm_config_gki-android14-6.1.json
@@ -0,0 +1,10 @@
+{
+ "os": {
+ "name": "microdroid_gki-android14-6.1"
+ },
+ "task": {
+ "type": "microdroid_launcher",
+ "command": "MicrodroidIdleNativeLib.so"
+ },
+ "export_tombstones": true
+}
diff --git a/tests/benchmark/src/java/com/android/microdroid/benchmark/MicrodroidBenchmarks.java b/tests/benchmark/src/java/com/android/microdroid/benchmark/MicrodroidBenchmarks.java
index 5d3ce9e..e31a55d 100644
--- a/tests/benchmark/src/java/com/android/microdroid/benchmark/MicrodroidBenchmarks.java
+++ b/tests/benchmark/src/java/com/android/microdroid/benchmark/MicrodroidBenchmarks.java
@@ -248,6 +248,16 @@
}
@Test
+ public void testMicrodroidGkiBootTime()
+ throws VirtualMachineException, InterruptedException, IOException {
+ runBootTimeTest(
+ "test_vm_boot_time",
+ "assets/vm_config_gki-android14-6.1.json",
+ /* reportDetailed */ false,
+ (builder) -> builder.setCpuTopology(CPU_TOPOLOGY_ONE_CPU));
+ }
+
+ @Test
public void testMicrodroidHostCpuTopologyBootTime()
throws VirtualMachineException, InterruptedException, IOException {
runBootTimeTest(
@@ -258,6 +268,16 @@
}
@Test
+ public void testMicrodroidGkiHostCpuTopologyBootTime()
+ throws VirtualMachineException, InterruptedException, IOException {
+ runBootTimeTest(
+ "test_vm_boot_time_host_topology",
+ "assets/vm_config_gki-android14-6.1.json",
+ /* reportDetailed */ false,
+ (builder) -> builder.setCpuTopology(CPU_TOPOLOGY_MATCH_HOST));
+ }
+
+ @Test
public void testMicrodroidDebugBootTime()
throws VirtualMachineException, InterruptedException, IOException {
runBootTimeTest(
@@ -268,6 +288,16 @@
}
@Test
+ public void testMicrodroidGkiDebugBootTime()
+ throws VirtualMachineException, InterruptedException, IOException {
+ runBootTimeTest(
+ "test_vm_boot_time_debug",
+ "assets/vm_config_gki-android14-6.1.json",
+ /* reportDetailed */ true,
+ (builder) -> builder);
+ }
+
+ @Test
public void testMicrodroidDebugBootTime_withVendorPartition() throws Exception {
assume().withMessage(
"Cuttlefish doesn't support device tree under"