-
Notifications
You must be signed in to change notification settings - Fork 38
feat: integrate Baseline Profiles for performance optimization #135
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
markrizkalla
wants to merge
2
commits into
openMF:dev
Choose a base branch
from
markrizkalla:feature/baseline-profiler
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 @@ | ||
| /build |
This file contains hidden or 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,58 @@ | ||
| plugins { | ||
| alias(libs.plugins.android.test) | ||
| alias(libs.plugins.kotlin.android) | ||
| alias(libs.plugins.baselineprofile) | ||
| } | ||
|
|
||
| android { | ||
| namespace = "org.mifos.baselineprofile" | ||
| compileSdk = 36 | ||
|
|
||
| compileOptions { | ||
| sourceCompatibility = JavaVersion.VERSION_11 | ||
| targetCompatibility = JavaVersion.VERSION_11 | ||
| } | ||
|
|
||
| kotlinOptions { | ||
| jvmTarget = "11" | ||
| } | ||
|
|
||
| defaultConfig { | ||
| minSdk = 28 | ||
| targetSdk = 36 | ||
|
|
||
| testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" | ||
| } | ||
|
|
||
| targetProjectPath = ":cmp-android" | ||
|
|
||
| flavorDimensions += listOf("contentType") | ||
| productFlavors { | ||
| create("demo") { dimension = "contentType" } | ||
| create("prod") { dimension = "contentType" } | ||
| } | ||
|
|
||
| } | ||
|
|
||
| // This is the configuration block for the Baseline Profile plugin. | ||
| // You can specify to run the generators on a managed devices or connected devices. | ||
| baselineProfile { | ||
| useConnectedDevices = true | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation(libs.androidx.test.ext.junit) | ||
| implementation(libs.androidx.espresso.core) | ||
| implementation(libs.androidx.uiautomator) | ||
| implementation(libs.androidx.benchmark.macro.junit4) | ||
| } | ||
|
|
||
| androidComponents { | ||
| onVariants { v -> | ||
| val artifactsLoader = v.artifacts.getBuiltArtifactsLoader() | ||
| v.instrumentationRunnerArguments.put( | ||
| "targetAppId", | ||
| v.testedApks.map { artifactsLoader.load(it)?.applicationId } | ||
| ) | ||
| } | ||
| } | ||
This file contains hidden or 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 @@ | ||
| <manifest /> |
76 changes: 76 additions & 0 deletions
76
baselineProfile/src/main/java/org/mifos/baselineprofile/BaselineProfileGenerator.kt
This file contains hidden or 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,76 @@ | ||
| package org.mifos.baselineprofile | ||
|
|
||
| import androidx.benchmark.macro.junit4.BaselineProfileRule | ||
| import androidx.test.ext.junit.runners.AndroidJUnit4 | ||
| import androidx.test.filters.LargeTest | ||
| import androidx.test.platform.app.InstrumentationRegistry | ||
| import org.junit.Rule | ||
| import org.junit.Test | ||
| import org.junit.runner.RunWith | ||
|
|
||
| /** | ||
| * This test class generates a basic startup baseline profile for the target package. | ||
| * | ||
| * We recommend you start with this but add important user flows to the profile to improve their | ||
| * performance. | ||
| * Refer to the [baseline profile documentation] | ||
| * (https://d.android.com/topic/performance/baselineprofiles) | ||
| * for more information. | ||
| * | ||
| * You can run the generator with the "Generate Baseline Profile" run configuration in | ||
| * Android Studio or | ||
| * the equivalent `generateBaselineProfile` gradle task: | ||
| * ``` | ||
| * ./gradlew :cmp-android:generateReleaseBaselineProfile | ||
| * ``` | ||
| * The run configuration runs the Gradle task and applies filtering to run only the generators. | ||
| * | ||
| * Check [documentation] | ||
| * (https://d.android.com/topic/performance/benchmarking/macrobenchmark-instrumentation-args) | ||
| * for more information about available instrumentation arguments. | ||
| * | ||
| * After you run the generator, you can verify the improvements running the [StartupBenchmarks] | ||
| * benchmark. | ||
| * | ||
| * When using this class to generate a baseline profile, | ||
| * only API 33+ or rooted API 28+ are supported. | ||
| * | ||
| * The minimum required version of androidx.benchmark to generate a baseline profile is 1.2.0. | ||
| **/ | ||
| @RunWith(AndroidJUnit4::class) | ||
| @LargeTest | ||
| class BaselineProfileGenerator { | ||
|
|
||
| @get:Rule | ||
| val rule = BaselineProfileRule() | ||
|
|
||
| @Test | ||
| fun generate() { | ||
| // The application id for the running build variant is read from the | ||
| // instrumentation arguments. | ||
| rule.collect( | ||
| packageName = InstrumentationRegistry.getArguments().getString("targetAppId") | ||
| ?: throw Exception("targetAppId not passed as instrumentation runner arg"), | ||
|
|
||
| // See:https://d.android.com/topic/performance/baselineprofiles/dex-layout-optimizations | ||
| includeInStartupProfile = true | ||
| ) { | ||
| // This block defines the app's critical user journey. Here we are interested in | ||
| // optimizing for app startup. But you can also navigate and | ||
| // scroll through your most important UI. | ||
|
|
||
| // Start default activity for your app | ||
| pressHome() | ||
| startActivityAndWait() | ||
|
|
||
| // TODO Write more interactions to optimize advanced journeys of your app. | ||
| // For example: | ||
| // 1. Wait until the content is asynchronously loaded | ||
| // 2. Scroll the feed content | ||
| // 3. Navigate to detail screen | ||
|
|
||
| // Check UiAutomator documentation for more information how to interact with the app. | ||
| // https://d.android.com/training/testing/other-components/ui-automator | ||
| } | ||
| } | ||
| } |
81 changes: 81 additions & 0 deletions
81
baselineProfile/src/main/java/org/mifos/baselineprofile/StartupBenchmarks.kt
This file contains hidden or 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,81 @@ | ||
| package org.mifos.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 androidx.test.platform.app.InstrumentationRegistry | ||
| import org.junit.Rule | ||
| import org.junit.Test | ||
| import org.junit.runner.RunWith | ||
|
|
||
| /** | ||
| * This test class benchmarks the speed of app startup. | ||
| * Run this benchmark to verify how effective a Baseline Profile is. | ||
| * It does this by comparing [CompilationMode.None], which represents the app with no Baseline | ||
| * Profiles optimizations, and [CompilationMode.Partial], which uses Baseline Profiles. | ||
| * | ||
| * Run this benchmark to see startup measurements and captured system traces for verifying | ||
| * the effectiveness of your Baseline Profiles. You can run it directly from Android | ||
| * Studio as an instrumentation test, or run all benchmarks for a variant | ||
| * for example benchmarkRelease, | ||
| * with this Gradle task: | ||
| * ``` | ||
| * ./gradlew :baselineprofile:connectedBenchmarkReleaseAndroidTest | ||
| * ``` | ||
| * | ||
| * You should run the benchmarks on a physical device, not an Android emulator, because the | ||
| * emulator doesn't represent real world performance and shares system resources with its host. | ||
| * | ||
| * For more information, see the [Macrobenchmark documentation] | ||
| * (https://d.android.com/macrobenchmark#create-macrobenchmark) | ||
| * and the [instrumentation arguments documentation] | ||
| * (https://d.android.com/topic/performance/benchmarking/macrobenchmark-instrumentation-args). | ||
| **/ | ||
| @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) { | ||
| //The application id for the running build variant is | ||
| // read from the instrumentation arguments. | ||
| rule.measureRepeated( | ||
| packageName = InstrumentationRegistry.getArguments().getString("targetAppId") | ||
| ?: throw Exception("targetAppId not passed as instrumentation runner arg"), | ||
| metrics = listOf(StartupTimingMetric()), | ||
| compilationMode = compilationMode, | ||
| startupMode = StartupMode.COLD, | ||
| iterations = 10, | ||
| setupBlock = { | ||
| pressHome() | ||
| }, | ||
| measureBlock = { | ||
| startActivityAndWait() | ||
|
|
||
| // TODO Add interactions to wait for when your app is fully drawn. | ||
| // The app is fully drawn when Activity.reportFullyDrawn is called. | ||
| // For Jetpack Compose | ||
| // you can use ReportDrawn, ReportDrawnWhen and ReportDrawnAfter | ||
| // from the AndroidX Activity library. | ||
|
|
||
| // Check the UiAutomator documentation for more information on how to | ||
| // interact with the app. | ||
| // https://d.android.com/training/testing/other-components/ui-automator | ||
| } | ||
| ) | ||
| } | ||
| } |
This file contains hidden or 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 hidden or 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
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Handle potential null
applicationIdgracefully.The expression
artifactsLoader.load(it)?.applicationIdcan yieldnullif the artifacts fail to load or theapplicationIdis unavailable. Passing a null value toinstrumentationRunnerArgumentswould cause the benchmark to fail silently or with an unclear error at runtime.🛡️ Proposed fix to add null handling
androidComponents { onVariants { v -> val artifactsLoader = v.artifacts.getBuiltArtifactsLoader() v.instrumentationRunnerArguments.put( "targetAppId", - v.testedApks.map { artifactsLoader.load(it)?.applicationId } + v.testedApks.map { apks -> + artifactsLoader.load(apks)?.applicationId + ?: error("Failed to load applicationId from tested APKs for variant ${v.name}") + } ) } }📝 Committable suggestion
🤖 Prompt for AI Agents