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

Commit 50c653ca authored by Paul Thomson's avatar Paul Thomson Committed by Automerger Merge Worker
Browse files

Merge changes from topic "2022-02-24-gpu-work" into tm-dev am: a2c7a637 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/17002666

Change-Id: I44cf6dab7625ac6d72d5495ce72a6c0fad05319b
parents 32f78b1b a2c7a637

services/gpuservice/vts/AndroidTest.xml

+3 −0
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ 
     limitations under the License.

-->

<configuration description="Runs GpuServiceVendorTests">

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

        <option name="force-root" value="false" />

    </target_preparer>

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

        <option name="jar" value="GpuServiceVendorTests.jar" />

    </test>

services/gpuservice/vts/src/com/android/tests/gpuservice/GpuWorkTracepointTest.java

+5 −6
Original line number Diff line number Diff line
@@ -78,12 +78,11 @@ public class GpuWorkTracepointTest extends BaseHostJUnit4Test { 
                "\tfield:unsigned char common_flags;\toffset:2;\tsize:1;\tsigned:0;",

                "\tfield:unsigned char common_preempt_count;\toffset:3;\tsize:1;\tsigned:0;",

                "\tfield:int common_pid;\toffset:4;\tsize:4;\tsigned:1;",

                "\tfield:u32 uid;\toffset:8;\tsize:4;\tsigned:0;",

                "\tfield:u32 frequency;\toffset:12;\tsize:4;\tsigned:0;",

                "\tfield:u64 start_time;\toffset:16;\tsize:8;\tsigned:0;",

                "\tfield:u64 end_time;\toffset:24;\tsize:8;\tsigned:0;",

                "\tfield:u64 flags;\toffset:32;\tsize:8;\tsigned:0;",

                "\tfield:u32 thermally_throttled_max_frequency_khz;\toffset:40;\tsize:4;\tsigned:0;"

                "\tfield:u32 gpu_id;\toffset:8;\tsize:4;\tsigned:0;",

                "\tfield:u32 uid;\toffset:12;\tsize:4;\tsigned:0;",

                "\tfield:u64 start_time_ns;\toffset:16;\tsize:8;\tsigned:0;",

                "\tfield:u64 end_time_ns;\toffset:24;\tsize:8;\tsigned:0;",

                "\tfield:u64 total_active_duration_ns;\toffset:32;\tsize:8;\tsigned:0;"

        );



        // We use |fail| rather than |assertEquals| because it allows us to give a clearer message.