This repository has been archived by the owner on Jun 17, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 331
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bug 1807324 - Add macrobenchmarks for startup metrics
- Loading branch information
1 parent
fd1e41a
commit 610c40d
Showing
10 changed files
with
176 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
plugins { | ||
id 'com.android.test' | ||
id 'org.jetbrains.kotlin.android' | ||
} | ||
|
||
android { | ||
namespace 'org.mozilla.fenix.benchmark' | ||
compileSdk Config.compileSdkVersion | ||
|
||
compileOptions { | ||
sourceCompatibility = JavaVersion.VERSION_1_8 | ||
targetCompatibility = JavaVersion.VERSION_1_8 | ||
} | ||
|
||
kotlinOptions { | ||
jvmTarget = "1.8" | ||
} | ||
|
||
defaultConfig { | ||
minSdk 23 | ||
targetSdk Config.targetSdkVersion | ||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" | ||
} | ||
|
||
buildTypes { | ||
// This benchmark buildType is used for benchmarking, and should function like your | ||
// release build (for example, with minification on). It's signed with a debug key | ||
// for easy local/CI testing. | ||
benchmark { | ||
debuggable = true | ||
if (gradle.hasProperty("localProperties.autosignReleaseWithDebugKey")) { | ||
signingConfig signingConfigs.debug | ||
} | ||
matchingFallbacks = ["release"] | ||
} | ||
} | ||
|
||
targetProjectPath = ":app" | ||
experimentalProperties["android.experimental.self-instrumenting"] = true | ||
} | ||
|
||
/** | ||
* This fixes the dependency resolution issue with Glean Native. The glean gradle plugin does this | ||
* and that's applied to the app module. Since there are no other uses of the glean plugin in the | ||
* benchmark module, we do this manually here. | ||
*/ | ||
configurations.all { | ||
resolutionStrategy.capabilitiesResolution.withCapability("org.mozilla.telemetry:glean-native") { | ||
def toBeSelected = candidates.find { it.id instanceof ModuleComponentIdentifier && it.id.module.contains('geckoview') } | ||
if (toBeSelected != null) { | ||
select(toBeSelected) | ||
} | ||
because 'use GeckoView Glean instead of standalone Glean' | ||
} | ||
} | ||
|
||
dependencies { | ||
implementation FenixDependencies.kotlin_stdlib | ||
implementation FenixDependencies.androidx_junit | ||
implementation FenixDependencies.espresso_core | ||
implementation FenixDependencies.uiautomator | ||
implementation FenixDependencies.androidx_benchmark_macro_junit4 | ||
} | ||
|
||
androidComponents { | ||
beforeVariants(selector().all()) { | ||
enabled = buildType == "benchmark" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"> | ||
|
||
<queries> | ||
<package android:name="org.mozilla.fenix" /> | ||
</queries> | ||
</manifest> |
45 changes: 45 additions & 0 deletions
45
fenix/benchmark/src/main/java/org/mozilla/fenix/benchmark/StartupBenchmark.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
package org.mozilla.fenix.benchmark | ||
|
||
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 | ||
import org.mozilla.fenix.benchmark.utils.measureRepeatedDefault | ||
|
||
/** | ||
* This is a startup benchmark. | ||
* It navigates to the device's home screen, and launches the default activity. | ||
* | ||
* Before running this benchmark, | ||
* switch your app's active build variant in the Studio (affects Studio runs only) | ||
* | ||
* Run this benchmark from Studio to see startup measurements, and captured system traces | ||
* for investigating your app's performance. | ||
*/ | ||
@RunWith(AndroidJUnit4::class) | ||
class StartupBenchmark { | ||
@get:Rule | ||
val benchmarkRule = MacrobenchmarkRule() | ||
|
||
@Test | ||
fun startupCold() = startupBenchmark(StartupMode.COLD) | ||
|
||
@Test | ||
fun startupWarm() = startupBenchmark(StartupMode.WARM) | ||
|
||
@Test | ||
fun startupHot() = startupBenchmark(StartupMode.HOT) | ||
|
||
private fun startupBenchmark(startupMode: StartupMode) = benchmarkRule.measureRepeatedDefault( | ||
metrics = listOf(StartupTimingMetric()), | ||
startupMode = startupMode, | ||
setupBlock = { | ||
pressHome() | ||
} | ||
) { | ||
startActivityAndWait() | ||
} | ||
} |
4 changes: 4 additions & 0 deletions
4
fenix/benchmark/src/main/java/org/mozilla/fenix/benchmark/utils/Constants.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
package org.mozilla.fenix.benchmark.utils | ||
|
||
const val TARGET_PACKAGE = "org.mozilla.fenix" | ||
const val DEFAULT_ITERATIONS = 5 |
33 changes: 33 additions & 0 deletions
33
fenix/benchmark/src/main/java/org/mozilla/fenix/benchmark/utils/MacroBenchmarkRule.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
package org.mozilla.fenix.benchmark.utils | ||
|
||
import androidx.annotation.IntRange | ||
import androidx.benchmark.macro.CompilationMode | ||
import androidx.benchmark.macro.MacrobenchmarkScope | ||
import androidx.benchmark.macro.Metric | ||
import androidx.benchmark.macro.StartupMode | ||
import androidx.benchmark.macro.junit4.MacrobenchmarkRule | ||
|
||
/** | ||
* Extension function that calls [MacrobenchmarkRule.measureRepeated] with | ||
* defaults parameters set for [packageName] and [iterations]. | ||
*/ | ||
fun MacrobenchmarkRule.measureRepeatedDefault( | ||
packageName: String = TARGET_PACKAGE, | ||
metrics: List<Metric>, | ||
compilationMode: CompilationMode = CompilationMode.DEFAULT, | ||
startupMode: StartupMode? = null, | ||
@IntRange(from = 1) | ||
iterations: Int = DEFAULT_ITERATIONS, | ||
setupBlock: MacrobenchmarkScope.() -> Unit = {}, | ||
measureBlock: MacrobenchmarkScope.() -> Unit, | ||
) { | ||
measureRepeated( | ||
packageName = packageName, | ||
metrics = metrics, | ||
compilationMode = compilationMode, | ||
startupMode = startupMode, | ||
iterations = iterations, | ||
setupBlock = setupBlock, | ||
measureBlock = measureBlock, | ||
) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters