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

Commit e7ed1bd8 authored by Miguel Aranda's avatar Miguel Aranda Committed by Automerger Merge Worker
Browse files

Merge "Correct AdditionPerfTest to return void." am: 4e7f5518 am: c7c95e18... 

Merge "Correct AdditionPerfTest to return void." am: 4e7f5518 am: c7c95e18 am: e25e36ac am: bfb23e71

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



Change-Id: I2456d3526b50f244d3e358e7cca55914b81c46f4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4209bddc bfb23e71

apct-tests/perftests/core/src/android/libcore/AdditionPerfTest.java

+8 −16
Original line number Diff line number Diff line
@@ -37,79 +37,71 @@ public class AdditionPerfTest { 
    public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter();



    @Test

    public int timeAddConstantToLocalInt() {

    public void timeAddConstantToLocalInt() {

        BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        int result = 0;

        while (state.keepRunning()) {

            result += 123;

        }

        return result;

    }

    @Test

    public int timeAddTwoLocalInts() {

    public void timeAddTwoLocalInts() {

        BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        int result = 0;

        int constant = 123;

        while (state.keepRunning()) {

            result += constant;

        }

        return result;

    }

    @Test

    public long timeAddConstantToLocalLong() {

    public void timeAddConstantToLocalLong() {

        BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        long result = 0;

        while (state.keepRunning()) {

            result += 123L;

        }

        return result;

    }

    @Test

    public long timeAddTwoLocalLongs() {

    public void timeAddTwoLocalLongs() {

        BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        long result = 0;

        long constant = 123L;

        while (state.keepRunning()) {

            result += constant;

        }

        return result;

    }

    @Test

    public float timeAddConstantToLocalFloat() {

    public void timeAddConstantToLocalFloat() {

        BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        float result = 0.0f;

        while (state.keepRunning()) {

            result += 123.0f;

        }

        return result;

    }

    @Test

    public float timeAddTwoLocalFloats() {

    public void timeAddTwoLocalFloats() {

        BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        float result = 0.0f;

        float constant = 123.0f;

        while (state.keepRunning()) {

            result += constant;

        }

        return result;

    }

    @Test

    public double timeAddConstantToLocalDouble() {

    public void timeAddConstantToLocalDouble() {

        BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        double result = 0.0;

        while (state.keepRunning()) {

            result += 123.0;

        }

        return result;

    }

    @Test

    public double timeAddTwoLocalDoubles() {

    public void timeAddTwoLocalDoubles() {

        BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        double result = 0.0;

        double constant = 123.0;

        while (state.keepRunning()) {

            result += constant;

        }

        return result;

    }

}