Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1177f3cf authored by Alexus Allen's avatar Alexus Allen Committed by Vishnu Nair
Browse files

DO NOT MERGE: Add SurfaceFlingerPerfTests 

cherry-pick following change ids from U so we can get
a performance baseline in t-qpr
 I4577987a8c06243b58f3982b379540104ca19a10
 Ic8f07222c8307223c030dab08f4acd3eb18e18aa
 Ic2b49ddbba9d27a8f9ac8015870a1c4aa86014f6
 I28e280b8df2d7140fb51fb05fd4e897e23478143
 I89c75c956d6aa644367a834453e80c550d351fc2
 I3c273a71ed29d5011848517b2bff81c1f3b5b80d

Test: atest SurfaceFlingerPerfTests
Bug: b/230039226
Ignore-AOSP-First: New folder that does not exist within AOSP.
Change-Id: If31b1b573faeed269cf2cc8c7e483e4c5a351dba
parent 1f8fded5

apct-tests/perftests/surfaceflinger/Android.bp

0 → 100644
+40 −0
Original line number Diff line number Diff line 
// Copyright (C) 2022 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



package {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "frameworks_base_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_base_license"],

}



android_test {

    name: "SurfaceFlingerPerfTests",

    srcs: ["src/**/*.java"],

    libs: ["android.test.runner.stubs"],

    static_libs: [

        "androidx.test.rules",

        "androidx.test.ext.junit",

        "androidx.annotation_annotation",

        "apct-perftests-utils",

        "collector-device-lib",

        "platform-test-annotations",

    ],

    test_suites: ["device-tests"],

    data: [":perfetto_artifacts"],

    platform_apis: true,

    certificate: "platform",

}

apct-tests/perftests/surfaceflinger/AndroidManifest.xml

0 → 100644
+37 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2022 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          package="android.perftests.surfaceflinger">



    <!-- permission needed to write perfetto trace and read/write simpleperf report -->

    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />

    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />



    <application android:label="SurfaceFlingerPerfTests">

        <uses-library android:name="android.test.runner" />

        <activity android:name="android.surfaceflinger.SurfaceFlingerTestActivity"

                  android:exported="true">



            <intent-filter>

                <action android:name="com.android.perftests.core.PERFTEST" />

            </intent-filter>

        </activity>

    </application>



    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"

                     android:targetPackage="android.perftests.surfaceflinger">

    </instrumentation>

</manifest>

apct-tests/perftests/surfaceflinger/AndroidTest.xml

0 → 100644
+79 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2022 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<configuration description="Runs SurfaceFlingerPerfTests metric instrumentation.">

    <option name="test-suite-tag" value="apct" />

    <option name="test-suite-tag" value="apct-metric-instrumentation" />

    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">

        <option name="cleanup-apks" value="true" />

        <option name="install-arg" value="-t" />

        <option name="test-file-name" value="SurfaceFlingerPerfTests.apk" />

    </target_preparer>



    <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">

        <option name="force-skip-system-props" value="true" />

        <option name="run-command" value="input keyevent KEYCODE_WAKEUP" />

        <option name="run-command" value="cmd window dismiss-keyguard" />

        <option name="run-command" value="cmd package compile -m speed android.perftests.surfaceflinger" />

    </target_preparer>



    <!-- Needed for pushing the trace config file -->

    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>

    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">

        <option name="push-file" key="trace_config_detailed.textproto" value="/data/misc/perfetto-traces/trace_config.textproto" />

    </target_preparer>



    <!-- Needed for storing the perfetto trace files in the sdcard/test_results-->

    <option name="isolated-storage" value="false" />



    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >

        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />

        <option name="package" value="android.perftests.surfaceflinger" />

        <option name="hidden-api-checks" value="false"/>



        <!-- Listener related args for collecting the traces and waiting for the device to stabilize. -->

        <option name="device-listeners" value="android.device.collectors.ProcLoadListener,android.device.collectors.PerfettoListener,android.device.collectors.SimpleperfListener" />



        <!-- Guarantee that user defined RunListeners will be running before any of the default listeners defined in this runner. -->

        <option name="instrumentation-arg" key="newRunListenerMode" value="true" />



        <!-- 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(;android::SurfaceFlinger::composite(&quot;" />



        <!-- ProcLoadListener related arguments -->

        <!-- Wait for device last minute threshold to reach 3 with 2 minute timeout before starting the test run -->

        <option name="instrumentation-arg" key="procload-collector:per_run" value="true" />

        <option name="instrumentation-arg" key="proc-loadavg-threshold" value="3" />

        <option name="instrumentation-arg" key="proc-loadavg-timeout" value="120000" />

        <option name="instrumentation-arg" key="proc-loadavg-interval" value="10000" />



    </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>

apct-tests/perftests/surfaceflinger/OWNERS

0 → 100644
+1 −0
Original line number Diff line number Diff line 
include /services/core/java/com/android/server/wm/OWNERS

apct-tests/perftests/surfaceflinger/README.md

0 → 100644
+34 −0
Original line number Diff line number Diff line 
## SurfaceFlinger performance tests



### Precondition

To reduce the variance of the test, if `perf-setup.sh` (platform_testing/scripts/perf-setup)

is available, it is better to use the following instructions to lock CPU and GPU frequencies.

```

m perf-setup

PERF_SETUP_PATH=/data/local/tmp/perf-setup.sh

adb push $OUT/$PERF_SETUP_PATH $PERF_SETUP_PATH

adb shell chmod +x $PERF_SETUP_PATH

adb shell $PERF_SETUP_PATH

```



### Example to run

Use `atest`

```

atest SurfaceFlingerPerfTests:SurfaceFlingerPerfTest -- \

      --module-arg SurfaceFlingerPerfTests:instrumentation-arg:kill-bg:=true

```

Use `am instrument`

```

adb shell am instrument -w -r -e class android.surfaceflinger.SurfaceFlingerPerfTest \

          -e kill-bg true \

          com.android.perftests.surfaceflinger/androidx.test.runner.AndroidJUnitRunner

```

* `kill-bg` is optional.



Test arguments

- kill-bg

    * boolean: Kill background process before running test.

- profiling-iterations

    * int: Run the extra iterations with enabling method profiling.

- profiling-sampling

    * int: The interval (0=trace each method, default is 10) of sample profiling in microseconds.