From 073fe9962dd083ea380931abce1838c853cbb606 Mon Sep 17 00:00:00 2001
From: Andy Labrada <andylabrada@google.com>
Date: Wed, 3 Aug 2022 22:54:08 +0000
Subject: [PATCH] SurfaceFlingerPerfTests: Add arguments to simpleperf listener

Added testing arguments to report certain events within surfaceflinger
and gather performance metrics.

Test: atest SurfaceFlingerPerfTests:SurfaceFlingerPerfTest
Bug: 230039226
Change-Id: Ic8f07222c8307223c030dab08f4acd3eb18e18aa
---
 apct-tests/perftests/surfaceflinger/AndroidTest.xml       | 8 ++++++++
 .../android/surfaceflinger/SurfaceFlingerPerfTest.java    | 1 -
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/apct-tests/perftests/surfaceflinger/AndroidTest.xml b/apct-tests/perftests/surfaceflinger/AndroidTest.xml
index b8bd8b42917b0..0f3a0681f85eb 100644
--- a/apct-tests/perftests/surfaceflinger/AndroidTest.xml
+++ b/apct-tests/perftests/surfaceflinger/AndroidTest.xml
@@ -52,12 +52,20 @@
         <!-- PerfettoListener related arguments -->
         <option name="instrumentation-arg" key="perfetto_config_text_proto" value="true" />
         <option name="instrumentation-arg" key="perfetto_config_file" value="trace_config.textproto" />
+
+        <!-- SimpleperfListener related arguments -->
+        <option name="instrumentation-arg" key="report" value="true" />
+        <option name="instrumentation-arg" key="arguments" value="&quot;&quot;" />
+        <option name="instrumentation-arg" key="events_to_record" value="instructions,cpu-cycles,raw-l3d-cache-refill,sched:sched_waking" />
+        <option name="instrumentation-arg" key="processes_to_record" value="surfaceflinger" />
+        <option name="instrumentation-arg" key="symbols_to_report" value="&quot;android::SurfaceFlinger::commit(long, long, long)&quot;" />
     </test>
 
     <metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector">
         <option name="directory-keys" value="/data/local/tmp/SurfaceFlingerPerfTests" />
         <!-- Needed for pulling the collected trace config on to the host -->
         <option name="pull-pattern-keys" value="perfetto_file_path" />
+        <option name="pull-pattern-keys" value="simpleperf_file_path" />
     </metrics_collector>
 
 </configuration>
diff --git a/apct-tests/perftests/surfaceflinger/src/android/surfaceflinger/SurfaceFlingerPerfTest.java b/apct-tests/perftests/surfaceflinger/src/android/surfaceflinger/SurfaceFlingerPerfTest.java
index 347cb7867a363..8efe48daed224 100644
--- a/apct-tests/perftests/surfaceflinger/src/android/surfaceflinger/SurfaceFlingerPerfTest.java
+++ b/apct-tests/perftests/surfaceflinger/src/android/surfaceflinger/SurfaceFlingerPerfTest.java
@@ -48,6 +48,5 @@ public class SurfaceFlingerPerfTest {
         while (state.keepRunning()) {
             // Do Something
         }
-
     }
 }