Add a flag to evaluate the top level transitions in Skyframe
This adds a new PrepareAnalysisPhaseFunction, which started out as a copy of
some existing code from SkyframeExecutor, BuildView, AnalysisPhaseRunner,
AnalysisUtils, and ConfigurationResolver, which was then modified to work
inside Skyframe.
Most of our tests already work with the new code, except for some of the tests
related to configuration trimming in combination with dependency cycles. The
reason for this is that we can only recover from dependency cycles at the end
of a Skyframe invocation, but never inside a Skyframe invocation. The new code
therefore cannot return partial results like the old code.
This seems to make null builds a bit faster. In my testing, I saw null build
times for a single test target go from ~50ms to ~40ms. This is probably due to
slightly better caching - it seems that computing the configuration transitions
and top-level targets is non-negligible, even if there's only a single
top-level configuration for a single top-level target.
This might be an even bigger win if there are a lot of top-level targets and
configurations.
PiperOrigin-RevId: 207083192
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
index 9995de0..e93d119 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
@@ -15,13 +15,11 @@
package com.google.devtools.build.lib.analysis;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Function;
import com.google.common.base.Preconditions;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Lists;
import com.google.common.collect.Multimap;
import com.google.common.collect.Sets;
import com.google.common.eventbus.EventBus;
@@ -34,6 +32,8 @@
import com.google.devtools.build.lib.actions.PackageRoots;
import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
import com.google.devtools.build.lib.analysis.config.BuildConfigurationCollection;
+import com.google.devtools.build.lib.analysis.config.BuildOptions;
+import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException;
import com.google.devtools.build.lib.analysis.constraints.TopLevelConstraintSemantics;
import com.google.devtools.build.lib.analysis.test.CoverageReportActionFactory;
import com.google.devtools.build.lib.analysis.test.CoverageReportActionFactory.CoverageReportActionsWrapper;
@@ -55,11 +55,14 @@
import com.google.devtools.build.lib.packages.Target;
import com.google.devtools.build.lib.packages.TargetUtils;
import com.google.devtools.build.lib.pkgcache.PackageManager.PackageManagerStatistics;
+import com.google.devtools.build.lib.profiler.Profiler;
+import com.google.devtools.build.lib.profiler.SilentCloseable;
import com.google.devtools.build.lib.skyframe.AspectValue;
import com.google.devtools.build.lib.skyframe.AspectValue.AspectKey;
import com.google.devtools.build.lib.skyframe.AspectValue.AspectValueKey;
import com.google.devtools.build.lib.skyframe.ConfiguredTargetKey;
import com.google.devtools.build.lib.skyframe.CoverageReportValue;
+import com.google.devtools.build.lib.skyframe.PrepareAnalysisPhaseValue;
import com.google.devtools.build.lib.skyframe.SkyframeAnalysisResult;
import com.google.devtools.build.lib.skyframe.SkyframeBuildView;
import com.google.devtools.build.lib.skyframe.SkyframeExecutor;
@@ -182,7 +185,8 @@
@ThreadCompatible
public AnalysisResult update(
TargetPatternPhaseValue loadingResult,
- BuildConfigurationCollection configurations,
+ BuildOptions targetOptions,
+ Set<String> multiCpu,
List<String> aspects,
AnalysisOptions viewOptions,
boolean keepGoing,
@@ -190,7 +194,7 @@
TopLevelArtifactContext topLevelOptions,
ExtendedEventHandler eventHandler,
EventBus eventBus)
- throws ViewCreationFailedException, InterruptedException {
+ throws ViewCreationFailedException, InvalidConfigurationException, InterruptedException {
logger.info("Starting analysis");
pollInterruptedStatus();
@@ -202,12 +206,49 @@
loadingResult.getTargets(eventHandler, skyframeExecutor.getPackageManager());
eventBus.post(new AnalysisPhaseStartedEvent(targets));
+ // Prepare the analysis phase
+ BuildConfigurationCollection configurations;
+ Collection<TargetAndConfiguration> topLevelTargetsWithConfigs;
+ if (viewOptions.skyframePrepareAnalysis) {
+ PrepareAnalysisPhaseValue prepareAnalysisPhaseValue;
+ try (SilentCloseable c = Profiler.instance().profile("Prepare analysis phase")) {
+ prepareAnalysisPhaseValue = skyframeExecutor.prepareAnalysisPhase(
+ eventHandler, targetOptions, multiCpu, loadingResult.getTargetLabels());
+
+ // Determine the configurations
+ configurations =
+ prepareAnalysisPhaseValue.getConfigurations(eventHandler, skyframeExecutor);
+ topLevelTargetsWithConfigs =
+ prepareAnalysisPhaseValue.getTopLevelCts(eventHandler, skyframeExecutor);
+ }
+ } else {
+ // Configuration creation.
+ // TODO(gregce): Consider dropping this phase and passing on-the-fly target / host configs as
+ // needed. This requires cleaning up the invalidation in SkyframeBuildView.setConfigurations.
+ try (SilentCloseable c = Profiler.instance().profile("createConfigurations")) {
+ configurations =
+ skyframeExecutor
+ .createConfigurations(
+ eventHandler,
+ targetOptions,
+ multiCpu,
+ keepGoing);
+ }
+ try (SilentCloseable c = Profiler.instance().profile("AnalysisUtils.getTargetsWithConfigs")) {
+ topLevelTargetsWithConfigs =
+ AnalysisUtils.getTargetsWithConfigs(
+ configurations, targets, eventHandler, ruleClassProvider, skyframeExecutor);
+ }
+ }
+
skyframeBuildView.setConfigurations(eventHandler, configurations);
- // Determine the configurations.
- List<TargetAndConfiguration> topLevelTargetsWithConfigs =
- AnalysisUtils.getTargetsWithConfigs(
- configurations, targets, eventHandler, ruleClassProvider, skyframeExecutor);
+ if (configurations.getTargetConfigurations().size() == 1) {
+ eventBus
+ .post(
+ new MakeEnvironmentEvent(
+ configurations.getTargetConfigurations().get(0).getMakeEnvironment()));
+ }
// Report the generated association of targets to configurations
Multimap<Label, BuildConfiguration> byLabel =
@@ -220,14 +261,10 @@
}
List<ConfiguredTargetKey> topLevelCtKeys =
- Lists.transform(
- topLevelTargetsWithConfigs,
- new Function<TargetAndConfiguration, ConfiguredTargetKey>() {
- @Override
- public ConfiguredTargetKey apply(TargetAndConfiguration node) {
- return ConfiguredTargetKey.of(node.getLabel(), node.getConfiguration());
- }
- });
+ topLevelTargetsWithConfigs
+ .stream()
+ .map(node -> ConfiguredTargetKey.of(node.getLabel(), node.getConfiguration()))
+ .collect(Collectors.toList());
Multimap<Pair<Label, String>, BuildConfiguration> aspectConfigurations =
ArrayListMultimap.create();
@@ -362,7 +399,7 @@
AnalysisOptions viewOptions,
SkyframeAnalysisResult skyframeAnalysisResult,
Set<ConfiguredTarget> targetsToSkip,
- List<TargetAndConfiguration> topLevelTargetsWithConfigs)
+ Collection<TargetAndConfiguration> topLevelTargetsWithConfigs)
throws InterruptedException {
Set<Label> testsToRun = loadingResult.getTestsToRunLabels();
Set<ConfiguredTarget> configuredTargets =
