-
Notifications
You must be signed in to change notification settings - Fork 4.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Automated rollback of commit 650142f.
*** Reason for rollback *** Rollforward with fixes Preserve analysis cache through `--run_under` command changes Work towards #3325 Fixes #10782 RELNOTES: Changing any part of --run_under that isn't the label (such as the shell command) no longer invalidates the analysis cache. Closes #24411. PiperOrigin-RevId: 703516108 Change-Id: Ief9bd2547fe87b4c09b132ada87aed369753e550
- Loading branch information
1 parent
d93c1cb
commit 45d4cff
Showing
7 changed files
with
173 additions
and
24 deletions.
There are no files selected for viewing
This file contains 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 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 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 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
76 changes: 76 additions & 0 deletions
76
src/main/java/com/google/devtools/build/lib/analysis/test/TestTrimmingLogic.java
This file contains 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 @@ | ||
| // Copyright 2024 The Bazel Authors. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package com.google.devtools.build.lib.analysis.test; | ||
|
|
||
| import com.google.common.collect.ImmutableSet; | ||
| import com.google.devtools.build.lib.analysis.config.BuildOptions; | ||
| import com.google.devtools.build.lib.analysis.config.BuildOptionsCache; | ||
| import com.google.devtools.build.lib.analysis.config.BuildOptionsView; | ||
| import com.google.devtools.build.lib.analysis.config.CoreOptions; | ||
| import com.google.devtools.build.lib.analysis.config.FragmentOptions; | ||
| import com.google.devtools.build.lib.analysis.config.RunUnder; | ||
| import com.google.devtools.build.lib.analysis.test.TestConfiguration.TestOptions; | ||
|
|
||
| /** | ||
| * Contains the pure logic for trimming test configuration from non-test targets that backs {@link | ||
| * com.google.devtools.build.lib.analysis.test.TestTrimmingTransitionFactory}. | ||
| */ | ||
| public final class TestTrimmingLogic { | ||
|
|
||
| static final ImmutableSet<Class<? extends FragmentOptions>> REQUIRED_FRAGMENTS = | ||
| ImmutableSet.of(CoreOptions.class, TestOptions.class); | ||
|
|
||
| // This cache is to prevent major slowdowns when using --trim_test_configuration. This | ||
| // transition is always invoked on every target in the top-level invocation. Thus, a wide | ||
| // invocation, like //..., will cause the transition to be invoked on a large number of targets | ||
| // leading to significant performance degradation. (Notably, the transition itself is somewhat | ||
| // fast; however, the post-processing of the BuildOptions into the actual BuildConfigurationValue | ||
| // takes a significant amount of time). | ||
| // | ||
| // Test any caching changes for performance impact in a longwide scenario with | ||
| // --trim_test_configuration on versus off. | ||
| // LINT.IfChange | ||
| private static final BuildOptionsCache<Boolean> CACHE = | ||
| new BuildOptionsCache<>( | ||
| (options, unused, unusedNonEventHandler) -> { | ||
| BuildOptions.Builder builder = options.underlying().toBuilder(); | ||
| builder.removeFragmentOptions(TestOptions.class); | ||
| // Only the label of the --run_under target (if any) needs to be part of the | ||
| // configuration for non-test targets, all other information is directly obtained | ||
| // from the options in RunCommand. | ||
| CoreOptions coreOptions = builder.getFragmentOptions(CoreOptions.class); | ||
| coreOptions.runUnder = RunUnder.trimForNonTestConfiguration(coreOptions.runUnder); | ||
| return builder.build(); | ||
| }); | ||
|
|
||
| // LINT.ThenChange(TestConfiguration.java) | ||
|
|
||
| /** Returns a new {@link BuildOptions} instance with test configuration removed. */ | ||
| public static BuildOptions trim(BuildOptions buildOptions) { | ||
| return trim(new BuildOptionsView(buildOptions, REQUIRED_FRAGMENTS)); | ||
| } | ||
|
|
||
| /** Returns a new {@link BuildOptions} instance with test configuration removed. */ | ||
| static BuildOptions trim(BuildOptionsView buildOptions) { | ||
| try { | ||
| return CACHE.applyTransition(buildOptions, Boolean.TRUE, /* eventHandler= */ null); | ||
| } catch (InterruptedException e) { | ||
| // The transition logic doesn't throw InterruptedException. | ||
| throw new IllegalStateException(e); | ||
| } | ||
| } | ||
|
|
||
| private TestTrimmingLogic() {} | ||
| } |
This file contains 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 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