Fixed
Status Update
Comments
se...@google.com <se...@google.com> #2
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
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
cc...@google.com <cc...@google.com> #3
ra...@google.com <ra...@google.com> #4
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
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 (
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
ap...@google.com <ap...@google.com> #5
Project: platform/frameworks/support
Branch: androidx-main
commit 94e856176e65acf13e87974d0cfc522766bff3c5
Author: Rahul Ravikumar <rahulrav@google.com>
Date: Fri Aug 20 11:59:54 2021
Clear profiles for StartupMode.COLD and CompilationMode.None.
* With this change COLD startup benchmarks will become more reliable.
ART dumps profile state every N seconds to the `cur` profile path.
ART could decide to compile code on the fly, if methods are hot enough
across runs. We want to prevent this from happening for the first
iteration of a StartupMode.COLD & a CompilationMode.None benchmark.
Test: N/A
Bug: b/196074999
Relnote: `StartupMode.COLD` and `CompilationMode.None` benchmarks are now more stable.
Change-Id: I770cd76def3add73a14bee1b6acb1deea8900e93
M benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/Macrobenchmark.kt
https://android-review.googlesource.com/1804377
Branch: androidx-main
commit 94e856176e65acf13e87974d0cfc522766bff3c5
Author: Rahul Ravikumar <rahulrav@google.com>
Date: Fri Aug 20 11:59:54 2021
Clear profiles for StartupMode.COLD and CompilationMode.None.
* With this change COLD startup benchmarks will become more reliable.
ART dumps profile state every N seconds to the `cur` profile path.
ART could decide to compile code on the fly, if methods are hot enough
across runs. We want to prevent this from happening for the first
iteration of a StartupMode.COLD & a CompilationMode.None benchmark.
Test: N/A
Bug:
Relnote: `StartupMode.COLD` and `CompilationMode.None` benchmarks are now more stable.
Change-Id: I770cd76def3add73a14bee1b6acb1deea8900e93
M benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/Macrobenchmark.kt
ap...@google.com <ap...@google.com> #6
Project: platform/frameworks/support
Branch: androidx-main
commit b255edc640d90610530169c5144356f5ba814f31
Author: Rahul Ravikumar <rahulrav@google.com>
Date: Mon Aug 23 12:19:02 2021
Ensure ProfileInstaller always installs a profile for `CompilationMode.BaselineProfile`.
* Throw an error message, when the target APK is not using the latest `profileinstaller` version.
Test: While the numbers are still not what we expect to see, here are the current benchmarks:
```
SmallListStartupBenchmark_startup[startup=COLD,compilation=None]
startupMs min 256, median 258, max 316
Traces: Iteration 0 1 2
SmallListStartupBenchmark_startup[startup=COLD,compilation=BaselineProfile]
startupMs min 252, median 262, max 265
Traces: Iteration 0 1 2
SmallListStartupBenchmark_startup[startup=COLD,compilation=SpeedProfile(iterations=3)]
startupMs min 186, median 187, max 187
Traces: Iteration 0 1 2
```
Bug: b/196074999
Change-Id: I426579600594e238b5b46adc20a6d4b33da3bab5
Relnote: Fix `ProfileInstaller` to make it easier for apps using baseline profiles to run MacroBenchmarks using `CompilationMode.BaselineProfile`.
M benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/CompilationMode.kt
M profileinstaller/profileinstaller/src/main/java/androidx/profileinstaller/ProfileInstallReceiver.java
M profileinstaller/profileinstaller/src/main/java/androidx/profileinstaller/ProfileInstaller.java
https://android-review.googlesource.com/1798393
Branch: androidx-main
commit b255edc640d90610530169c5144356f5ba814f31
Author: Rahul Ravikumar <rahulrav@google.com>
Date: Mon Aug 23 12:19:02 2021
Ensure ProfileInstaller always installs a profile for `CompilationMode.BaselineProfile`.
* Throw an error message, when the target APK is not using the latest `profileinstaller` version.
Test: While the numbers are still not what we expect to see, here are the current benchmarks:
```
SmallListStartupBenchmark_startup[startup=COLD,compilation=None]
startupMs min 256, median 258, max 316
Traces: Iteration 0 1 2
SmallListStartupBenchmark_startup[startup=COLD,compilation=BaselineProfile]
startupMs min 252, median 262, max 265
Traces: Iteration 0 1 2
SmallListStartupBenchmark_startup[startup=COLD,compilation=SpeedProfile(iterations=3)]
startupMs min 186, median 187, max 187
Traces: Iteration 0 1 2
```
Bug:
Change-Id: I426579600594e238b5b46adc20a6d4b33da3bab5
Relnote: Fix `ProfileInstaller` to make it easier for apps using baseline profiles to run MacroBenchmarks using `CompilationMode.BaselineProfile`.
M benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/CompilationMode.kt
M profileinstaller/profileinstaller/src/main/java/androidx/profileinstaller/ProfileInstallReceiver.java
M profileinstaller/profileinstaller/src/main/java/androidx/profileinstaller/ProfileInstaller.java
Description
For a while, the benchmark was somewhat faster than uncompiled, but it appears to have swung back upward, I'm guessing due to the above CL.
Strangely TrivialStartupBenchmark doesn't appear affected, and is still working fine.
Possibly an issue with how profile timestamps are reused multiple times now?
I don't see an affect fromhttps://android-review.googlesource.com/c/platform/frameworks/support/+/1790831 , so not sure what's going on there.
We need some integration tests for macrobench + baseline profile.