Baseline profiles plugin overrides variant enable property on test modules [343249144]

Fixed

Bug

Status Update

No update yet.

Description

r....@gmail.com

created issue #1

May 29, 2024 01:34PM

Component used: Baseline profiles plugin

Version used: 1.3.0-alpha05

Devices/Android versions reproduced on: N/A

We were trying to configure a variant filter using a convention plugin. For test modules (with plugin com.android.test), if baseline profiles plugin is applied after our convention plugin, it'll end up reenabling variants we just disabled before.

There's probably some ordering going on when registering/triggering androidComponents.beforeVariants callbacks?

I've narrowed it down to this line: https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:benchmark/baseline-profile-gradle-plugin/src/main/kotlin/androidx/baselineprofile/gradle/producer/BaselineProfileProducerPlugin.kt;l=231;drc=cebe814cae93028747ec8594b6edebb3ceee0daf

Is it possible for the plugin to consider the current enable state?

variantBuilder.enable =
    variantBuilder.enable &&
        (buildType in baselineProfileExtendedToOriginalTypeMap.keys ||
            buildType in benchmarkExtendedToOriginalTypeMap.keys)

Thanks!

Comments

ma...@google.com <ma...@google.com> May 30, 2024 05:03PM

Reassigned to ma...@google.com.

ma...@google.com <ma...@google.com> #2May 31, 2024 05:29PM

Accepted by ma...@google.com.

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

commit 3283536a57f7caf087786f6030f6bf246489df85
Author: Chris Craik <ccraik@google.com>
Date: Fri Feb 02 16:27:30 2024

Speculative fix for Failed to stop [ProcessPid(processName=perfetto...

Bug: 323601788
Bug: 307649002
Relnote: "Adjusted data source timeouts to attempt to fix java.lang.IllegalStateException: Failed to stop [ProcessPid(processName=perfetto, pid=...)]"

Test: ./gradlew bench:b-m:cC
Change-Id: I8dc7d5091ea1a8e68cb5effb21363f1c3196cf56

M benchmark/benchmark-common/src/main/java/androidx/benchmark/perfetto/PerfettoConfig.kt
M benchmark/benchmark-common/src/main/java/androidx/benchmark/perfetto/PerfettoHelper.kt

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

ap...@google.com <ap...@google.com> #3May 31, 2024 07:22PM

This is expected to be fixed with the change above, which made it into 1.3.0-alpha01.

Please let us know if you still see this issue after updating to that version

ma...@google.com <ma...@google.com> May 31, 2024 07:22PM

Marked as fixed.

pr...@google.com <pr...@google.com> #4Jun 12, 2024 10:45PM

Hey I'm still seeing this issue with 1.3.0-alpha01, this is the stack:

java.lang.IllegalStateException: Failed to stop [ProcessPid(processName=perfetto, pid=2784)]
at androidx.benchmark.Shell.terminateProcessesAndWait(Shell.kt:596)
at androidx.benchmark.perfetto.PerfettoHelper.stopPerfetto(PerfettoHelper.kt:258)
at androidx.benchmark.perfetto.PerfettoHelper.stopCollecting(PerfettoHelper.kt:236)
at androidx.benchmark.perfetto.PerfettoCapture.stop(PerfettoCapture.kt:87)
at androidx.benchmark.perfetto.PerfettoCaptureWrapper$stop$1.invoke(PerfettoCaptureWrapper.kt:91)
at androidx.benchmark.perfetto.PerfettoCaptureWrapper$stop$1.invoke(PerfettoCaptureWrapper.kt:88)
at androidx.benchmark.Outputs.writeFile(Outputs.kt:136)
at androidx.benchmark.Outputs.writeFile$default(Outputs.kt:125)
at androidx.benchmark.perfetto.PerfettoCaptureWrapper.stop(PerfettoCaptureWrapper.kt:88)
at androidx.benchmark.perfetto.PerfettoCaptureWrapper.record(PerfettoCaptureWrapper.kt:145)
at androidx.benchmark.perfetto.PerfettoCaptureWrapper.record$default(PerfettoCaptureWrapper.kt:101)
at androidx.benchmark.macro.MacrobenchmarkKt$macrobenchmark$measurements$1.invoke(Macrobenchmark.kt:271)
at androidx.benchmark.macro.MacrobenchmarkKt$macrobenchmark$measurements$1.invoke(Macrobenchmark.kt:255)
at androidx.benchmark.perfetto.PerfettoTraceProcessor$Companion.runServer(PerfettoTraceProcessor.kt:108)
at androidx.benchmark.macro.MacrobenchmarkKt.macrobenchmark(Macrobenchmark.kt:255)
at androidx.benchmark.macro.MacrobenchmarkKt.macrobenchmarkWithStartupMode(Macrobenchmark.kt:438)
at androidx.benchmark.macro.junit4.MacrobenchmarkRule.measureRepeated(MacrobenchmarkRule.kt:107)
at com.meta.compose.macrobenchmark.scroll.HomeFeedScrollBenchmark.scroll(HomeFeedScrollBenchmark.kt:43)
at com.meta.compose.macrobenchmark.scroll.HomeFeedScrollBenchmark.noCompilation(HomeFeedScrollBenchmark.kt:35)

Issue 343249144