Force enabling SwiftCompilerSources in the build #73417
Conversation
|
@swift-ci test |
| @@ -910,6 +897,10 @@ set(SWIFT_MAIN_INCLUDE_DIR "${SWIFT_SOURCE_DIR}/include") | |||
| set(SWIFT_SHIMS_INCLUDE_DIR "${SWIFT_SOURCE_DIR}/stdlib/public/SwiftShims") | |||
| set(SWIFT_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/include") | |||
|
|
|||
| if (NOT BOOTSTRAPPING_MODE) | |||
There was a problem hiding this comment.
We still need to be able to have bootstrapping mode off until we can reliably cross-compile the compiler. Otherwise there is no way to bring up new platforms. (Unless you're okay restricting features to what is available and works with the 5.10 compiler.)
There was a problem hiding this comment.
Is anybody checking that building with bootstrapping off then using that to build a full Swift compiler still works? For example, the regular bootstrapping modes are no longer checked on CI, and have been broken for months on linux.
There was a problem hiding this comment.
I have been checking. It takes two build-script invocations to get the complete toolchain built. The first stage 0 compiler doesn't have macros or SwiftCompilerSources and it won't pass the test suite. You use that one as the host-tools compiler to bring up a stage 1 compiler with macros and SwiftCompilerSources support. That one will (or should) pass its tests. Finally, I like to do one more stage 2 build with the stage 1 compiler, which compounds issues in either of the other two. Then I run the tests, validation tests, stress tests, and long tests on that stage 2 compiler.
Unfortunately, Swift 6 doesn't build at the moment since there are some unguarded macros in the stdlib, so you can't get through the stage-0 build, but that should be reversible at the moment. You're right though, we really need some level of testing. Either that a stage-0 bootstrapping=off build works, or that we can build the 5.10 compiler, and then build the latest compiler with the 5.10 compiler or we won't be able to bring up Swift on new platforms (at least until we can cross-compile reliably).
There was a problem hiding this comment.
I have been cross-compiling the Swift compiler to run natively on Android since Swift 5.2, termux/termux-packages#5134, so works fine for me.
There was a problem hiding this comment.
Wait, @eeckstein, if Evan is still using the compiler with bootstrapping off, can't we keep that mode around until his cross-compilation changes are in? I don't use it and I'm all for your first change in this patch of changing the default mode to HOSTTOOLS, but why disable being able to turn it off right now?
There was a problem hiding this comment.
It's still possible to turn if off by not providing a host compiler
There was a problem hiding this comment.
Oh, I didn't understand your comment below before, you simply turned it into an undocumented internal option.
eeckstein
force-pushed
the
force-bootstrapping
branch
from
3cf47d4
to
3babeb0
Compare
Only two small things are disabled: an instruction simplification (#73253) and unit tests (#73252). Both should be fixed soon (cc @ahatanaka, @nate-chandler) |
|
For bringing swift on a new platform we have two short-term solutions:
The long-term solution will be cross compiling. I don't see another option. |
|
@swift-ci test |
I think it is the solution now, as spelled out on the forum by Doug years ago. Hopefully, Evan's work later this year on retooling the CMake support for cross-compilation will make it easier on those porting to a new platform. |
This was already the intention before, but it didn't work because cmake's `option` only works for boolean variables. Using `set` instead of `option` fixes that. This change also enables SwiftCompilerSources in lldb on Windows. apple#73322
This means that `bootstrapping=off` cannot be used anymore.
Now that SwiftCompilerSources are always enabled, `swift_in_compiler` is not needed anymore. Set this feature unconditionally for tests which still include `REQUIRES: swift_in_compiler`.
eeckstein
force-pushed
the
force-bootstrapping
branch
from
3babeb0
to
eac23ed
Compare
|
@swift-ci test |
This PR is a follow-up of #73247. Now that SwiftCompilerSources work on all supported platforms, we can make sure the compiler is always built with SwiftCompilerSources.
This means that
bootstrapping=offcannot be used anymore.Also,
hosttoolsis now the default bootstrapping mode on all platforms.This change also enables SwiftCompilerSources in lldb on Windows (#73322)
Before this PR can be merged, apple/llvm-project#8683 must land in llvm-project.