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

Commit 7c2e2b55 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Emit trace sections for warmup and benchmark phases" into main am: b4e99e7d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3407759



Change-Id: I3aac08c496e9a114dce7a6d3f33c23ee5006d3cf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f991ca6b b4e99e7d

apct-tests/perftests/utils/src/android/perftests/utils/BenchmarkState.java

+14 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.app.Activity; 
import android.app.Instrumentation;

import android.os.Bundle;

import android.os.Debug;

import android.os.Trace;

import android.util.Log;



import androidx.test.InstrumentationRegistry;
@@ -129,17 +130,23 @@ public final class BenchmarkState { 
    }



    private void beginWarmup() {

        Trace.beginSection("Warmup");

        mStartTimeNs = System.nanoTime();

        mIteration = 0;

        mState = WARMUP;

    }



    private void endWarmup() {

        Trace.endSection();

    }



    private void beginBenchmark(long warmupDuration, int iterations) {

        if (ENABLE_PROFILING) {

            File f = new File(InstrumentationRegistry.getContext().getDataDir(), "benchprof");

            Log.d(TAG, "Tracing to: " + f.getAbsolutePath());

            Debug.startMethodTracingSampling(f.getAbsolutePath(), 16 * 1024 * 1024, 100);

        }

        Trace.beginSection("Benchmark");

        mMaxIterations = (int) (TARGET_TEST_DURATION_NS / (warmupDuration / iterations));

        mMaxIterations = Math.min(MAX_TEST_ITERATIONS,

                Math.max(mMaxIterations, MIN_TEST_ITERATIONS));
@@ -150,6 +157,10 @@ public final class BenchmarkState { 
        mStartTimeNs = System.nanoTime();

    }



    private void endBenchmark() {

        Trace.endSection();

    }



    private boolean startNextTestRun() {

        final long currentTime = System.nanoTime();

        mResults.add((currentTime - mStartTimeNs - mPausedDurationNs) / mMaxIterations);
@@ -165,6 +176,7 @@ public final class BenchmarkState { 
                return true;

            }

            mState = FINISHED;

            endBenchmark();

            return false;

        }

        mPausedDurationNs = 0;
@@ -189,6 +201,7 @@ public final class BenchmarkState { 
                // don't yet have a target iteration count.

                final long duration = System.nanoTime() - mStartTimeNs;

                if (mIteration >= WARMUP_MIN_ITERATIONS && duration >= WARMUP_DURATION_NS) {

                    endWarmup();

                    beginBenchmark(duration, mIteration);

                }

                return true;
@@ -208,6 +221,7 @@ public final class BenchmarkState { 
                mCustomizedIterations++;

                if (mCustomizedIterations >= mMaxCustomizedIterations) {

                    mState = FINISHED;

                    endBenchmark();

                    return false;

                }

                mCustomizedIterationListener.onStart(mCustomizedIterations);