From 57b33e9142d5351eb60aa3f7f3c9e3ac60f817a9 Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Sat, 16 Sep 2023 23:48:00 -0400 Subject: android: Remove benchmark module --- .../dolphin/benchmark/BaselineProfileGenerator.kt | 43 ---------------------- .../java/com/dolphin/benchmark/StartupBenchmark.kt | 40 -------------------- 2 files changed, 83 deletions(-) delete mode 100644 Source/Android/benchmark/src/main/java/com/dolphin/benchmark/BaselineProfileGenerator.kt delete mode 100644 Source/Android/benchmark/src/main/java/com/dolphin/benchmark/StartupBenchmark.kt (limited to 'Source/Android/benchmark/src/main/java') diff --git a/Source/Android/benchmark/src/main/java/com/dolphin/benchmark/BaselineProfileGenerator.kt b/Source/Android/benchmark/src/main/java/com/dolphin/benchmark/BaselineProfileGenerator.kt deleted file mode 100644 index 366a22ab6a..0000000000 --- a/Source/Android/benchmark/src/main/java/com/dolphin/benchmark/BaselineProfileGenerator.kt +++ /dev/null @@ -1,43 +0,0 @@ -package com.dolphin.benchmark - -import androidx.benchmark.macro.ExperimentalBaselineProfilesApi -import androidx.benchmark.macro.junit4.BaselineProfileRule -import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner -import androidx.test.uiautomator.UiSelector -import org.junit.Rule -import org.junit.Test -import org.junit.runner.RunWith - -@OptIn(ExperimentalBaselineProfilesApi::class) -@RunWith(AndroidJUnit4ClassRunner::class) -class BaselineProfileGenerator { - - @get:Rule - val rule = BaselineProfileRule() - - @Test - fun generate() = rule.collectBaselineProfile( - packageName = "org.dolphinemu.dolphinemu.benchmark", - profileBlock = { - pressHome() - startActivityAndWait() - - // Dismiss analytics dialog due to issue with finding button - device.pressBack() - - // Navigate through activities that don't require games - // TODO: Make all activities testable without having games available - // TODO: Use resource strings to support more languages - - // Navigate to the Settings Activity - val settings = device.findObject(UiSelector().description("Settings")) - settings.clickAndWaitForNewWindow(30_000) - - // Go through settings and to the User Data Activity - val config = device.findObject(UiSelector().textContains("Config")) - config.click() - val userData = device.findObject(UiSelector().textContains("User Data")) - userData.clickAndWaitForNewWindow(30_000) - }, - ) -} diff --git a/Source/Android/benchmark/src/main/java/com/dolphin/benchmark/StartupBenchmark.kt b/Source/Android/benchmark/src/main/java/com/dolphin/benchmark/StartupBenchmark.kt deleted file mode 100644 index 5ae5d40f6b..0000000000 --- a/Source/Android/benchmark/src/main/java/com/dolphin/benchmark/StartupBenchmark.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.dolphin.benchmark - -import androidx.benchmark.macro.BaselineProfileMode -import androidx.benchmark.macro.CompilationMode -import androidx.benchmark.macro.StartupMode -import androidx.benchmark.macro.StartupTimingMetric -import androidx.benchmark.macro.junit4.MacrobenchmarkRule -import androidx.test.ext.junit.runners.AndroidJUnit4 -import org.junit.Rule -import org.junit.Test -import org.junit.runner.RunWith - -@RunWith(AndroidJUnit4::class) -class StartupBenchmark { - @get:Rule - val benchmarkRule = MacrobenchmarkRule() - - @Test - fun startupBaselineProfileDisabled() = startup( - CompilationMode.Partial(baselineProfileMode = BaselineProfileMode.Disable, warmupIterations = 1) - ) - - @Test - fun startupBaselineProfile() = startup( - CompilationMode.Partial(baselineProfileMode = BaselineProfileMode.Require, warmupIterations = 1) - ) - - private fun startup(compilationMode: CompilationMode) = benchmarkRule.measureRepeated( - packageName = "org.dolphinemu.dolphinemu.benchmark", - metrics = listOf(StartupTimingMetric()), - iterations = 10, - compilationMode = compilationMode, - startupMode = StartupMode.COLD, - setupBlock = { - pressHome() - } - ) { - startActivityAndWait() - } -} -- cgit v1.2.3 From c5d81c100683836608ee42b74a878a890fe9c099 Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Mon, 18 Sep 2023 15:49:57 -0400 Subject: android: Regenerate baseline profile module for AGP 8.2.0 --- .../baselineprofile/BaselineProfileGenerator.kt | 44 +++++++++++++++++++++ .../baselineprofile/StartupBenchmarks.kt | 46 ++++++++++++++++++++++ 2 files changed, 90 insertions(+) create mode 100644 Source/Android/benchmark/src/main/java/org/dolphinemu/baselineprofile/BaselineProfileGenerator.kt create mode 100644 Source/Android/benchmark/src/main/java/org/dolphinemu/baselineprofile/StartupBenchmarks.kt (limited to 'Source/Android/benchmark/src/main/java') diff --git a/Source/Android/benchmark/src/main/java/org/dolphinemu/baselineprofile/BaselineProfileGenerator.kt b/Source/Android/benchmark/src/main/java/org/dolphinemu/baselineprofile/BaselineProfileGenerator.kt new file mode 100644 index 0000000000..9bf621d6c1 --- /dev/null +++ b/Source/Android/benchmark/src/main/java/org/dolphinemu/baselineprofile/BaselineProfileGenerator.kt @@ -0,0 +1,44 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + +package org.dolphinemu.baselineprofile + +import androidx.benchmark.macro.junit4.BaselineProfileRule +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.LargeTest +import androidx.test.uiautomator.UiSelector +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(AndroidJUnit4::class) +@LargeTest +class BaselineProfileGenerator { + + @get:Rule + val rule = BaselineProfileRule() + + @Test + fun generate() { + rule.collect("org.dolphinemu.dolphinemu") { + pressHome() + startActivityAndWait() + + // Dismiss analytics dialog due to issue with finding button + device.pressBack() + + // Navigate through activities that don't require games + // TODO: Make all activities testable without having games available (or use homebrew) + // TODO: Use resource strings to support more languages + + // Navigate to the Settings Activity + val settings = device.findObject(UiSelector().description("Settings")) + settings.clickAndWaitForNewWindow(30_000) + + // Go through settings and to the User Data Activity + val config = device.findObject(UiSelector().textContains("Config")) + config.click() + val userData = device.findObject(UiSelector().textContains("User Data")) + userData.clickAndWaitForNewWindow(30_000) + } + } +} diff --git a/Source/Android/benchmark/src/main/java/org/dolphinemu/baselineprofile/StartupBenchmarks.kt b/Source/Android/benchmark/src/main/java/org/dolphinemu/baselineprofile/StartupBenchmarks.kt new file mode 100644 index 0000000000..359a3df584 --- /dev/null +++ b/Source/Android/benchmark/src/main/java/org/dolphinemu/baselineprofile/StartupBenchmarks.kt @@ -0,0 +1,46 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + +package org.dolphinemu.baselineprofile + +import androidx.benchmark.macro.BaselineProfileMode +import androidx.benchmark.macro.CompilationMode +import androidx.benchmark.macro.StartupMode +import androidx.benchmark.macro.StartupTimingMetric +import androidx.benchmark.macro.junit4.MacrobenchmarkRule +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.LargeTest +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(AndroidJUnit4::class) +@LargeTest +class StartupBenchmarks { + + @get:Rule + val rule = MacrobenchmarkRule() + + @Test + fun startupCompilationNone() = + benchmark(CompilationMode.None()) + + @Test + fun startupCompilationBaselineProfiles() = + benchmark(CompilationMode.Partial(BaselineProfileMode.Require)) + + private fun benchmark(compilationMode: CompilationMode) { + rule.measureRepeated( + packageName = "org.dolphinemu.dolphinemu", + metrics = listOf(StartupTimingMetric()), + compilationMode = compilationMode, + startupMode = StartupMode.COLD, + iterations = 10, + setupBlock = { + pressHome() + }, + measureBlock = { + startActivityAndWait() + } + ) + } +} -- cgit v1.2.3