Cannot generate baseline profile for bundle [270587281]

Fixed

Bug

Status Update

No update yet.

Description

mh...@google.com

created issue #1

Feb 23, 2023 07:54PM

Component used: not sure what this means but BaselineProfileRule from macrobenchmark library

Version used: latest nightly snapshot from androidx.dev (1.2.0-SNAPSHOT)

Devices/Android versions reproduced on: Android P on go/acid

The macrobenchmark library fails to get a profile when the apk under test is actually a bundle with multiple splits. We at chrome use bundles with multiple splits (actually most of our code lives in splits rather than in the base module). When I try to generate a profile I get this in the output of the instrumentation:

java.lang.IllegalStateException: Expected no stderr from profman --dump-classes-and-methods --profile-file=/data/misc/profiles/ref/org.chromium.chrome/primary.prof --apk=/data/app/org.chromium.chrome-1CGJyRx56jh5RwfbZL4cQA==/base.apk
package:/data/app/org.chromium.chrome-1CGJyRx56jh5RwfbZL4cQA==/split_cablev2_authenticator.apk
package:/data/app/org.chromium.chrome-1CGJyRx56jh5RwfbZL4cQA==/split_chrome.apk, saw /storage/emulated/0/Android/media/org.chromium.chrome.startup.benchmark.tests/temporaryScript387305115831681219.tmp[2]: package:/data/app/org.chromium.chrome-1CGJyRx56jh5RwfbZL4cQA==/split_cablev2_authenticator.apk: inaccessible or not found
/storage/emulated/0/Android/media/org.chromium.chrome.startup.benchmark.tests/temporaryScript387305115831681219.tmp[4]: package:/data/app/org.chromium.chrome-1CGJyRx56jh5RwfbZL4cQA==/split_chrome.apk: inaccessible or not found

	at androidx.benchmark.Shell.executeScriptCaptureStdout$default(chromium-ChromeStartupBenchmark.apk-default-1:53)
	at androidx.benchmark.macro.BaselineProfilesKt.extractProfileRooted(chromium-ChromeStartupBenchmark.apk-default-1:100)
	at androidx.benchmark.macro.junit4.BaselineProfileRule.collectBaselineProfile(chromium-ChromeStartupBenchmark.apk-default-1:22)
	at org.chromium.chrome.browser.perf.StartupBenchmarkTest.testGenerateBaselineProfile(chromium-ChromeStartupBenchmark.apk-default-1:53)

The cause of this is this line here expects only a single path to return but for bundles, you get multiple ones (one for each split). eg:

generic_x86:/ # pm path org.chromium.chrome
package:/data/app/org.chromium.chrome-1CGJyRx56jh5RwfbZL4cQA==/base.apk
package:/data/app/org.chromium.chrome-1CGJyRx56jh5RwfbZL4cQA==/split_cablev2_authenticator.apk
package:/data/app/org.chromium.chrome-1CGJyRx56jh5RwfbZL4cQA==/split_chrome.apk

The rest of the code in BaselineProfiles.kt also expects only the one profile. But there are usually multiple (one for each split).

generic_x86:/ # ls /data/misc/profiles/ref/org.chromium.chrome/                                                                      
cablev2_authenticator.split.prof chrome.split.prof primary.prof

The documentation for baseline profiles mentions both APKs and Bundles so I assume bundles should be supported?

Comments

mh...@google.com <mh...@google.com> #2Feb 23, 2023 08:05PM

Project: platform/frameworks/support
Branch: androidx-master-dev

commit b90079595f33f58fece04026a97faa0d243acdb1
Author: Yuichi Araki <yaraki@google.com>
Date: Wed Sep 18 16:55:49 2019

Change the way to detect mismatch between POJO and query

This fixes cursor mismatch warnings with expandProjection.

Bug: 140759491
Test: QueryMethodProcessorTest
Change-Id: I7659002e5e0d1ef60fc1af2a625c0c36da0664d8

M room/compiler/src/main/kotlin/androidx/room/processor/QueryMethodProcessor.kt
M room/compiler/src/main/kotlin/androidx/room/solver/TypeAdapterStore.kt
M room/compiler/src/main/kotlin/androidx/room/solver/query/result/PojoRowAdapter.kt
M room/compiler/src/test/kotlin/androidx/room/processor/QueryMethodProcessorTest.kt
M room/compiler/src/test/kotlin/androidx/room/testing/TestProcessor.kt

https://android-review.googlesource.com/1123258

https://goto.google.com/android-sha1/b90079595f33f58fece04026a97faa0d243acdb1

ra...@google.com <ra...@google.com> #3Feb 23, 2023 09:21PM

The following changes were cherrypicked through Coastguard (

https://android-build.googleplex.com/coastguard/)
Release Track: (

https://android-build.googleplex.com/coastguard/dashboard/6093116828680192/#/cherrypickHistory/all)
Created: 2019-10-14 17:23:42.610596+00:00
Changes: aosp/1123258

cc...@google.com <cc...@google.com> #4Feb 28, 2023 12:59AM

Accepted by cc...@google.com.

Project: platform/frameworks/support
Branch: androidx-master-dev

commit bdde5a1a970ddc9007b28de4aa29d60ffa588f08
Author: Yigit Boyar <yboyar@google.com>
Date: Thu Apr 16 16:47:05 2020

Re-factor how errors are dismissed when query is re-written

This CL changes how we handle errors/warnings if query is
re-written.
There was a bug in expandProjection where we would report warnings
for things that Room already fixes automatically (

b/140759491

).
The solution to that problem (I7659002e5e0d1ef60fc1af2a625c0c36da0664d8)
solved it by deferring validating of columns until after re-write
decision is made. Unfortunately, this required changing PojoRowAdapter
to have a dummy mapping until it is validating, make it hard to use
as it does have a non-null mapping which is not useful.

This CL partially reverts that change and instead rely on the log
deferring logic we have in Context. This way, we don't need to break
the stability of PojoRowAdapter while still having the ability to
drop warnings that room fixes. This will also play nicer when we
have different query re-writing options that can use more information
about the query results.

Bug: 153387066
Bug: 140759491
Test: existing tests pass
Change-Id: I2ec967c763d33d7a3ff02c1a13c6953b460d1e5f

M room/compiler/src/main/kotlin/androidx/room/log/RLog.kt
M room/compiler/src/main/kotlin/androidx/room/processor/QueryMethodProcessor.kt
M room/compiler/src/main/kotlin/androidx/room/solver/TypeAdapterStore.kt
M room/compiler/src/main/kotlin/androidx/room/solver/query/result/PojoRowAdapter.kt

https://android-review.googlesource.com/1288456

ap...@google.com <ap...@google.com> #5Feb 28, 2023 09:07PM

Marked as fixed.

Project: platform/frameworks/support
Branch: androidx-main

commit bf0289331e88399e38f5486200199bc857932e24
Author: Chris Craik <ccraik@google.com>
Date: Mon Feb 27 16:46:31 2023

MacrobenchmarkRule and BaselineProfileRule support for app bundles

Fixes: 270587281
Test: BaselineProfileRuleTest (manually installed target as bundle)
Test: CompilationModeTest (manually installed target as bundle, forcing reinstall compilation)
Relnote: "Fix crashes in MacrobenchmarkRule and BaselineProfileRule
when reinstalling or extracting profiles from an app bundle with
multiple APKs."

Installed macrobenchmark target with the following steps:

```
./gradlew benchmark:integ:macrobenchmark-target:bundleRelease
java -jar bundletool.jar build-apks --local-testing --bundle=../../out/androidx/benchmark/integration-tests/macrobenchmark-target/build/outputs/bundle/release/macrobenchmark-target-release.aab --output=out.apks --overwrite --ks=/path/to/androidx/frameworks/support/development/keystore/debug.keystore --connected-device --ks-key-alias=AndroidDebugKey --ks-pass=pass:android
java -jar bundletool.jar install-apks --apks=out.apks
```

And verified both codepaths using `pm path <package>` no longer crash.

Change-Id: I0d8c8a50daee8ef3951a5d0266b5767f65fad4e7

M benchmark/benchmark-common/src/main/java/androidx/benchmark/Shell.kt
M benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/BaselineProfiles.kt
M benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/CompilationMode.kt

https://android-review.googlesource.com/2459548

na...@google.com <na...@google.com> #6Mar 8, 2023 07:51PM

The following release(s) address this bug.It is possible this bug has only been partially addressed:

androidx.benchmark:benchmark-common:1.2.0-alpha11
androidx.benchmark:benchmark-macro:1.2.0-alpha11

Issue 270587281