Reland "Also path map transitive header jar paths with direct classpath optimization" #21401
Conversation
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 reverts commit f5d76b1.
fmeum
force-pushed
the
19872-roll-forward
branch
from
fbcbba4
to
edd47cb
Compare
github-actions
bot
added
team-Performance
|
FYI @aranguyen |
|
LGTM, and I can confirm most of the regression is gone (other than the small amount caused by the new field). However since @aranguyen has an alternative change in progress, I'd like them to confirm which way they'd like to proceed with. |
|
@hvadehra I spoke with both @fmeum and @cushon about both fixes and if this updated fix does not have any serious regression, let's go ahead with this one because this makes sure the .jdeps files will only contained unmapped paths and not mixed paths. The other alternative fixing only |
|
@bazel-io fork 7.1.0 |
aranguyen
approved these changes
Feb 20, 2024
aranguyen
added
the
awaiting-PR-merge
github-actions
bot
removed
awaiting-PR-merge
bazel-io
pushed a commit
to bazel-io/bazel
that referenced
this pull request
Feb 21, 2024
…th optimization" Rollforward of fd196bf, which was rolled back in f5d76b1. The analysis-time memory regression (newly retained `NestedSet` instances) has been resolved separately in 31fae9e. The execution-time memory regression (unconditionally flattened `NestedSet`s) is now only incurred with path mapping enabled. Original description: `JavaHeaderCompileAction` can apply an optimization where it compiles the source files only against direct dependencies, making use of the fact that Turbine includes sufficient information about transitive dependencies into the direct header jars in a special directory. In order to ensure that downstream consumers of header compilation action can use its `.jdeps` file regardless of which of these actions actually uses path mapping, all such paths to transitive jars have to be unmapped. With this commit, actions can declare additional artifacts whose paths they want to apply path mapping to. By always passing all transitive jars into the path mapper, even when only the direct jars are inputs to the action, the transitive header jar paths can be unmapped and stripped path collisions between them correctly result in a noop `PathMapper` being used for the current action. Closes bazelbuild#21401. PiperOrigin-RevId: 609010786 Change-Id: I0d9ea5b11430ee40be74fe582af84fedaa52ade6
github-merge-queue bot
pushed a commit
that referenced
this pull request
Feb 21, 2024
… classpath optimization" (#21458) Rollforward of fd196bf, which was rolled back in f5d76b1. The analysis-time memory regression (newly retained `NestedSet` instances) has been resolved separately in 31fae9e. The execution-time memory regression (unconditionally flattened `NestedSet`s) is now only incurred with path mapping enabled. Original description: `JavaHeaderCompileAction` can apply an optimization where it compiles the source files only against direct dependencies, making use of the fact that Turbine includes sufficient information about transitive dependencies into the direct header jars in a special directory. In order to ensure that downstream consumers of header compilation action can use its `.jdeps` file regardless of which of these actions actually uses path mapping, all such paths to transitive jars have to be unmapped. With this commit, actions can declare additional artifacts whose paths they want to apply path mapping to. By always passing all transitive jars into the path mapper, even when only the direct jars are inputs to the action, the transitive header jar paths can be unmapped and stripped path collisions between them correctly result in a noop `PathMapper` being used for the current action. Closes #21401. Commit 74fe669 PiperOrigin-RevId: 609010786 Change-Id: I0d9ea5b11430ee40be74fe582af84fedaa52ade6 Co-authored-by: Fabian Meumertzheim <fabian@meumertzhe.im>
|
The changes in this PR have been included in Bazel 7.1.0 RC1. Please test out the release candidate and report any issues as soon as possible. If you're using Bazelisk, you can point to the latest RC by setting USE_BAZEL_VERSION=last_rc. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Rollforward of fd196bf, which was rolled back in f5d76b1.
The analysis-time memory regression (newly retained
NestedSetinstances) has been resolved separately in 31fae9e. The execution-time memory regression (unconditionally flattenedNestedSets) is now only incurred with path mapping enabled.Original description:
JavaHeaderCompileActioncan apply an optimization where it compiles the source files only against direct dependencies, making use of the fact that Turbine includes sufficient information about transitive dependencies into the direct header jars in a special directory.In order to ensure that downstream consumers of header compilation action can use its
.jdepsfile regardless of which of these actions actually uses path mapping, all such paths to transitive jars have to be unmapped.With this commit, actions can declare additional artifacts whose paths they want to apply path mapping to. By always passing all transitive jars into the path mapper, even when only the direct jars are inputs to the action, the transitive header jar paths can be unmapped and stripped path collisions between them correctly result in a noop
PathMapperbeing used for the current action.