[Explicit Module Builds][Target Variant] Refactor build planning to allow for a second, separate emit-module task for the target variant #1856
Conversation
This file contains hidden or 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
|
@swift-ci test |
artemcm
force-pushed
the
VariantEmitModule
branch
from
6d351de to
95c6c6d
Compare
|
@swift-ci test |
artemcm
force-pushed
the
VariantEmitModule
branch
from
95c6c6d to
e1c9db6
Compare
|
@swift-ci test |
artemcm
force-pushed
the
VariantEmitModule
branch
from
e1c9db6 to
16688ae
Compare
|
@swift-ci test |
|
@swift-ci test Windows platform |
1 similar comment
|
@swift-ci test Windows platform |
artemcm
force-pushed
the
VariantEmitModule
branch
2 times, most recently
from
80d34fb to
5d7f59a
Compare
|
@swift-ci test |
|
@swift-ci test Windows platform |
1 similar comment
|
@swift-ci test Windows platform |
artemcm
force-pushed
the
VariantEmitModule
branch
from
5d7f59a to
94c621f
Compare
|
@swift-ci test |
|
@swift-ci test Windows platform |
artemcm
force-pushed
the
VariantEmitModule
branch
from
94c621f to
e47991f
Compare
|
@swift-ci test |
|
@swift-ci test Windows platform |
artemcm
force-pushed
the
VariantEmitModule
branch
from
e47991f to
6010b76
Compare
|
@swift-ci test |
|
@swift-ci test Windows platform |
artemcm
force-pushed
the
VariantEmitModule
branch
from
6010b76 to
bdf0ec6
Compare
|
@swift-ci test Windows platform |
|
@swift-ci test |
…llow for a second, separte emit-module task for the target variant This change allows builds that specify a variant triple and which must emit a target variant module to do so from within a single `swiftc` invocation when using Explicit Module Builds. This is an extensive refactor of the build planning procedure with respect to Explicit Module Builds: - Remove 'ExplicitDependencyBuildPlanner' global state from the 'Driver' instance - Instantiate a 'ExplicitDependencyBuildPlanner' instance at the beginning if build planning and propagate/thread this instance to all the required compilation task creation routines, all the way to 'addCommonFrontendOptions' - For '-target-variant' builds which emit a variant triple module, instantiate a whole separate explicit build planner, including performing a secondary dependency scan using the variant triple. Using this information: - Schedule variant triple module pre-compile dependency tasks - Schedule a variant triple PCH compilation task, if necessary - Schedule the variant emit-module task - Schedule the variant textual module verification task, if necessary
…th known contents Similarly to a 'temporaryWithKnownContents', but at an explicitly-determined-by-the-driver 'AbsolutePath'. This is useful for when the driver is able to determine that build planning will produce an input to compilation which must be placed in a specific location. For example, the chained bridging header content and output path are determined during build planning (specifically, dependency scanning) and must be fed into compilation tasks as inputs. This new file type will allow the driver to compute the new file and its contents and then have them get written to disk when resolving input paths to said compilation tasks.
artemcm
force-pushed
the
VariantEmitModule
branch
from
91811bb to
4b8f064
Compare
|
@swift-ci test |
|
@swift-ci test Windows platform |
|
Ping for code review. |
|
@swift-ci test Windows platform |
1 similar comment
|
@swift-ci test Windows platform |
etcwilde
reviewed
Jun 23, 2025
There was a problem hiding this comment.
I think the changes look good.
Trying it out, do we want to drop the -target-variant when generating the module/interface for the target triple since it shows up as part of the module interface flags?
e.g. the target has
// swift-module-flags: -target x86_64-apple-macosx15 -target-variant x86_64-apple-ios18-macabi -enable-objc-interop -module-name hello
while the target variant interface has
// swift-module-flags: -target x86_64-apple-ios18-macabi -enable-objc-interop -module-name hello
Otherwise, I think it looks good to me. Thank you for taking care of this.
This behavior seems to be how we have been emitting flags into textual interfaces all along in the presence of a variant triple, so I'm not inclined to change it here. It would have to be done in the compiler anyways. |
etcwilde
approved these changes
Jun 24, 2025
artemcm
added a commit
to artemcm/swift
that referenced
this pull request
Jun 26, 2025
…t from a single driver invocation This flag will be used to control opting into behavior introduced in swiftlang/swift-driver#1856
edymtt
added a commit
to edymtt/swift
that referenced
this pull request
Jun 27, 2025
This is needed in order to build target variants properly with a SwiftDriver that has swiftlang/swift-driver#1856 Addresses rdar://154410676
edymtt
added a commit
to edymtt/swift
that referenced
this pull request
Jun 27, 2025
This is needed in order to build target variants properly with a SwiftDriver that has swiftlang/swift-driver#1856 Addresses rdar://154410676
edymtt
added a commit
to edymtt/swift
that referenced
this pull request
Jun 27, 2025
This is needed in order to build target variants properly with a SwiftDriver that has swiftlang/swift-driver#1856 Addresses rdar://154410676
edymtt
added a commit
to edymtt/swift
that referenced
this pull request
Jun 27, 2025
… 4.1 This is needed in order to build target variants properly with a SwiftDriver that has swiftlang/swift-driver#1856 Addresses rdar://154410676
edymtt
added a commit
to edymtt/swift
that referenced
this pull request
Jun 27, 2025
This is needed in order to build target variants properly with a SwiftDriver that has swiftlang/swift-driver#1856 Addresses rdar://154410676
edymtt
added a commit
to edymtt/swift
that referenced
this pull request
Jun 27, 2025
This is needed in order to build target variants properly with a SwiftDriver that has swiftlang/swift-driver#1856 Addresses rdar://154410676
edymtt
added a commit
to edymtt/swift
that referenced
this pull request
Jun 27, 2025
… 4.1 This is needed in order to build target variants properly with a SwiftDriver that has swiftlang/swift-driver#1856 Addresses rdar://154410676
edymtt
added a commit
to edymtt/swift
that referenced
this pull request
Jun 30, 2025
This is needed in order to build target variants properly with a SwiftDriver that has swiftlang/swift-driver#1856 Addresses rdar://154410676
edymtt
added a commit
to edymtt/swift
that referenced
this pull request
Jun 30, 2025
… 4.1 This is needed in order to build target variants properly with a SwiftDriver that has swiftlang/swift-driver#1856 Addresses rdar://154410676
susmonteiro
pushed a commit
to susmonteiro/swift
that referenced
this pull request
Jul 2, 2025
…t from a single driver invocation This flag will be used to control opting into behavior introduced in swiftlang/swift-driver#1856
susmonteiro
pushed a commit
to susmonteiro/swift
that referenced
this pull request
Jul 2, 2025
This is needed in order to build target variants properly with a SwiftDriver that has swiftlang/swift-driver#1856 Addresses rdar://154410676
susmonteiro
pushed a commit
to susmonteiro/swift
that referenced
this pull request
Jul 2, 2025
This is needed in order to build target variants properly with a SwiftDriver that has swiftlang/swift-driver#1856 Addresses rdar://154410676
susmonteiro
pushed a commit
to susmonteiro/swift
that referenced
this pull request
Jul 2, 2025
… 4.1 This is needed in order to build target variants properly with a SwiftDriver that has swiftlang/swift-driver#1856 Addresses rdar://154410676
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.
This change allows builds that specify a variant triple and which must emit a target variant module to do so from within a single
swiftcinvocation when using Explicit Module Builds.This is an extensive refactor of the build planning procedure with respect to Explicit Module Builds:
ExplicitDependencyBuildPlannerglobal state from theDriverinstanceExplicitDependencyBuildPlannerinstance at the beginning if build planning and propagate/thread this instance to all the required compilation task creation routines, all the way toaddCommonFrontendOptions-target-variantbuilds which emit a variant triple module, instantiate a whole separate explicit build planner, including performing a secondary dependency scan using the variant triple. Using this information: