Merge pull request #74489 from kubamracek/embedded-less-stdlibs

kubamracek · web-flow · commit 9e7501601c74 · 2024-06-18T13:50:25.000-07:00
[embedded] Don't build *all* the embedded stdlibs by default
diff --git a/stdlib/public/CMakeLists.txt b/stdlib/public/CMakeLists.txt
@@ -148,6 +148,10 @@ option(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB
       "Enable build of the embedded Swift standard library and runtime"
       TRUE)
 
+option(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB_CROSS_COMPILING
+      "Enable build of the embedded Swift standard library and runtime for cross-compiling targets"
+      FALSE)
+
 # Temporarily, by default only build embedded stdlib when building the compiler, to
 # unblock CI jobs that run against old(er) toolchains.
 option(SWIFT_ALLOW_BUILD_EMBEDDED_STDLIB_WITH_HOST_COMPILER
@@ -163,8 +167,9 @@ elseif(BOOTSTRAPPING_MODE STREQUAL "OFF")
   set(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB FALSE)
 endif()
 
-if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
-  set(EMBEDDED_STDLIB_TARGET_TRIPLES)
+set(EMBEDDED_STDLIB_TARGET_TRIPLES)
+
+if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB_CROSS_COMPILING)
   if("ARM" IN_LIST LLVM_TARGETS_TO_BUILD)
     list(APPEND EMBEDDED_STDLIB_TARGET_TRIPLES
       # arch    module_name               target triple
@@ -218,7 +223,9 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
       "wasm64    wasm64-unknown-none-wasm    wasm64-unknown-none-wasm"
     )
   endif()
+endif()
 
+if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
   if (SWIFT_HOST_VARIANT STREQUAL "linux")
     set(EMBEDDED_STDLIB_TARGET_TRIPLES ${EMBEDDED_STDLIB_TARGET_TRIPLES}
       "${SWIFT_HOST_VARIANT_ARCH} ${SWIFT_HOST_VARIANT_ARCH}-unknown-linux-gnu ${SWIFT_HOST_VARIANT_ARCH}-unknown-linux-gnu"
diff --git a/test/embedded/float-abi-hard.swift b/test/embedded/float-abi-hard.swift
@@ -8,6 +8,7 @@
 // REQUIRES: optimized_stdlib
 // REQUIRES: OS=macosx || OS=linux-gnu
 // REQUIRES: CODEGENERATOR=ARM
+// REQUIRES: embedded_stdlib_cross_compiling
 
 // BEGIN BridgingHeader.h
 
diff --git a/test/embedded/fragile-reference.swift b/test/embedded/fragile-reference.swift
@@ -3,6 +3,7 @@
 // REQUIRES: swift_in_compiler
 // REQUIRES: OS=macosx || OS=linux-gnu
 // REQUIRES: CODEGENERATOR=ARM
+// REQUIRES: embedded_stdlib_cross_compiling
 
 @main
 public struct Application {
diff --git a/test/embedded/modules-empty-object.swift b/test/embedded/modules-empty-object.swift
@@ -10,6 +10,7 @@
 // REQUIRES: swift_in_compiler
 // REQUIRES: OS=macosx || OS=linux-gnu
 // REQUIRES: CODEGENERATOR=ARM
+// REQUIRES: embedded_stdlib_cross_compiling
 
 //--- MyModuleA.swift
 
diff --git a/test/embedded/no-allocations-print.swift b/test/embedded/no-allocations-print.swift
@@ -7,6 +7,7 @@
 // REQUIRES: optimized_stdlib
 // REQUIRES: OS=macosx || OS=linux-gnu
 // REQUIRES: CODEGENERATOR=ARM
+// REQUIRES: embedded_stdlib_cross_compiling
 
 print("Hello Embedded Swift!")
 print(42)
diff --git a/test/embedded/optionset2.swift b/test/embedded/optionset2.swift
@@ -4,6 +4,7 @@
 // REQUIRES: swift_in_compiler
 // REQUIRES: optimized_stdlib
 // REQUIRES: CODEGENERATOR=ARM
+// REQUIRES: embedded_stdlib_cross_compiling
 
 // https://github.com/apple/swift/issues/73249
 // UNSUPPORTED: OS=windows-msvc
diff --git a/test/embedded/ouroboros-bug.swift b/test/embedded/ouroboros-bug.swift
@@ -9,6 +9,7 @@
 // REQUIRES: swift_in_compiler
 // REQUIRES: optimized_stdlib
 // REQUIRES: CODEGENERATOR=ARM
+// REQUIRES: embedded_stdlib_cross_compiling
 
 // https://github.com/apple/swift/issues/73249
 // UNSUPPORTED: OS=windows-msvc
diff --git a/test/embedded/stdlib-array.swift b/test/embedded/stdlib-array.swift
@@ -4,6 +4,7 @@
 // REQUIRES: swift_in_compiler
 // REQUIRES: optimized_stdlib
 // REQUIRES: CODEGENERATOR=ARM
+// REQUIRES: embedded_stdlib_cross_compiling
 
 // https://github.com/apple/swift/issues/73249
 // UNSUPPORTED: OS=windows-msvc
diff --git a/test/embedded/stdlib-basic.swift b/test/embedded/stdlib-basic.swift
@@ -3,6 +3,7 @@
 
 // REQUIRES: swift_in_compiler
 // REQUIRES: CODEGENERATOR=ARM
+// REQUIRES: embedded_stdlib_cross_compiling
 
 // https://github.com/apple/swift/issues/73249
 // UNSUPPORTED: OS=windows-msvc
diff --git a/test/embedded/stdlib-dictionary.swift b/test/embedded/stdlib-dictionary.swift
@@ -3,6 +3,7 @@
 
 // REQUIRES: swift_in_compiler
 // REQUIRES: optimized_stdlib
+// REQUIRES: embedded_stdlib_cross_compiling
 
 // https://github.com/apple/swift/issues/73249
 // UNSUPPORTED: OS=windows-msvc
diff --git a/test/embedded/stdlib-random.swift b/test/embedded/stdlib-random.swift
@@ -3,6 +3,7 @@
 
 // REQUIRES: swift_in_compiler
 // REQUIRES: optimized_stdlib
+// REQUIRES: embedded_stdlib_cross_compiling
 
 // https://github.com/apple/swift/issues/73249
 // UNSUPPORTED: OS=windows-msvc
diff --git a/test/embedded/stdlib-set.swift b/test/embedded/stdlib-set.swift
@@ -4,6 +4,7 @@
 // REQUIRES: swift_in_compiler
 // REQUIRES: optimized_stdlib
 // REQUIRES: CODEGENERATOR=ARM
+// REQUIRES: embedded_stdlib_cross_compiling
 
 // https://github.com/apple/swift/issues/73249
 // UNSUPPORTED: OS=windows-msvc
diff --git a/test/embedded/stdlib-strings-interpolation3.swift b/test/embedded/stdlib-strings-interpolation3.swift
@@ -5,6 +5,7 @@
 // REQUIRES: swift_in_compiler
 // REQUIRES: OS=macosx || OS=linux-gnu
 // REQUIRES: CODEGENERATOR=ARM
+// REQUIRES: embedded_stdlib_cross_compiling
 
 @main
 struct Main {
diff --git a/test/embedded/stdlib-types-riscv.swift b/test/embedded/stdlib-types-riscv.swift
@@ -4,6 +4,7 @@
 // REQUIRES: swift_in_compiler
 // REQUIRES: optimized_stdlib
 // REQUIRES: CODEGENERATOR=RISCV
+// REQUIRES: embedded_stdlib_cross_compiling
 
 class MyClass {}
 
diff --git a/test/embedded/stdlib-types.swift b/test/embedded/stdlib-types.swift
@@ -4,6 +4,7 @@
 // REQUIRES: swift_in_compiler
 // REQUIRES: optimized_stdlib
 // REQUIRES: CODEGENERATOR=ARM
+// REQUIRES: embedded_stdlib_cross_compiling
 
 // https://github.com/apple/swift/issues/73249
 // UNSUPPORTED: OS=windows-msvc
diff --git a/test/embedded/wasm/classes.swift b/test/embedded/wasm/classes.swift
@@ -7,6 +7,7 @@
 // RUN: %target-run %t/check.wasm
 // REQUIRES: executable_test
 // REQUIRES: CPU=wasm32
+// REQUIRES: embedded_stdlib_cross_compiling
 
 //--- rt.c
 
diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in
@@ -161,6 +161,8 @@ if "@SWIFT_ENABLE_SYNCHRONIZATION@" == "TRUE":
     config.available_features.add('synchronization')
 if "@SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB@" == "TRUE":
     config.available_features.add('embedded_stdlib')
+if "@SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB_CROSS_COMPILING@" == "TRUE":
+    config.available_features.add('embedded_stdlib_cross_compiling')
 
 config.swift_freestanding_is_darwin = "@SWIFT_FREESTANDING_IS_DARWIN@" == "TRUE"
 config.swift_stdlib_use_relative_protocol_witness_tables = "@SWIFT_STDLIB_USE_RELATIVE_PROTOCOL_WITNESS_TABLES@" == "TRUE"
diff --git a/utils/build-presets.ini b/utils/build-presets.ini
@@ -36,6 +36,8 @@ build-ninja
 
 build-swift-stdlib-unittest-extra
 
+build-embedded-stdlib-cross-compiling
+
 install-llvm
 install-static-linux-config
 install-swift
@@ -343,6 +345,8 @@ build-ninja
 
 skip-test-cmark
 
+build-embedded-stdlib-cross-compiling
+
 [preset: buildbot_incremental_base_all_platforms]
 mixin-preset=buildbot_incremental_base
 
@@ -858,6 +862,7 @@ install-swiftdocc
 build-swift-static-stdlib
 build-swift-static-sdk-overlay
 build-swift-stdlib-unittest-extra
+build-embedded-stdlib-cross-compiling
 
 # Executes the lit tests for the installable package that is created
 # Assumes the swift-integration-tests repo is checked out
@@ -1166,6 +1171,8 @@ relocate-xdg-cache-home-under-build-subdir
 llvm-cmake-options=
   -DCLANG_DEFAULT_LINKER=gold
 
+build-embedded-stdlib-cross-compiling
+
 [preset: buildbot_incremental_linux]
 mixin-preset=
     buildbot_incremental_linux_base
@@ -1336,6 +1343,8 @@ lldb-build-type=Release
 build-ninja
 build-swift-stdlib-unittest-extra
 
+build-embedded-stdlib-cross-compiling
+
 # Don't build the benchmarks
 skip-build-benchmarks
 
diff --git a/utils/build_swift/build_swift/driver_arguments.py b/utils/build_swift/build_swift/driver_arguments.py
@@ -1147,6 +1147,9 @@ def create_argument_parser():
     option('--build-swift-stdlib-static-print', toggle_true,
            help='Build constant-folding print() support')
 
+    option('--build-embedded-stdlib-cross-compiling', toggle_true,
+           help='Build embedded stdlib for cross-compiling targets.')
+
     option('--build-swift-stdlib-unicode-data', toggle_true,
            default=True,
            help='Include Unicode data in the standard library.'
diff --git a/utils/build_swift/tests/expected_options.py b/utils/build_swift/tests/expected_options.py
@@ -89,6 +89,7 @@
     'build_swift_stdlib_unittest_extra': False,
     'build_swift_stdlib_static_print': False,
     'build_swift_stdlib_unicode_data': True,
+    'build_embedded_stdlib_cross_compiling': False,
     'build_swift_clang_overlays': True,
     'build_swift_remote_mirror': True,
     'build_swiftpm': False,
@@ -598,6 +599,7 @@ class BuildScriptImplOption(_BaseOption):
     EnableOption('--build-toolchain-only'),
     EnableOption('--build-swift-private-stdlib'),
     EnableOption('--build-swift-stdlib-unicode-data'),
+    EnableOption('--build-embedded-stdlib-cross-compiling'),
     EnableOption('--build-swift-libexec'),
     EnableOption('--build-swift-clang-overlays'),
     EnableOption('--build-swift-remote-mirror'),
diff --git a/utils/swift_build_support/swift_build_support/products/swift.py b/utils/swift_build_support/swift_build_support/products/swift.py
@@ -85,6 +85,8 @@ def __init__(self, args, toolchain, source_dir, build_dir):
 
         self.cmake_options.extend(self._enable_stdlib_unicode_data)
 
+        self.cmake_options.extend(self._enable_embedded_stdlib_cross_compiling)
+
         self.cmake_options.extend(
             self._swift_tools_ld64_lto_codegen_only_for_supporting_targets)
 
@@ -257,6 +259,11 @@ def _enable_experimental_parser_validation(self):
         return [('SWIFT_ENABLE_EXPERIMENTAL_PARSER_VALIDATION:BOOL',
                  self.args.enable_experimental_parser_validation)]
 
+    @property
+    def _enable_embedded_stdlib_cross_compiling(self):
+        return [('SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB_CROSS_COMPILING',
+                 self.args.build_embedded_stdlib_cross_compiling)]
+
     def _handle_swift_debuginfo_non_lto_args(self):
         if ('swift_debuginfo_non_lto_args' not in self.args
                 or self.args.swift_debuginfo_non_lto_args is None):
diff --git a/utils/swift_build_support/tests/products/test_swift.py b/utils/swift_build_support/tests/products/test_swift.py
@@ -67,6 +67,7 @@ def setUp(self):
             build_early_swiftsyntax=False,
             build_swift_stdlib_static_print=False,
             build_swift_stdlib_unicode_data=True,
+            build_embedded_stdlib_cross_compiling=False,
             swift_freestanding_is_darwin=False,
             build_swift_private_stdlib=True,
             swift_tools_ld64_lto_codegen_only_for_supporting_targets=False)
@@ -115,6 +116,7 @@ def test_by_default_no_cmake_options(self):
             '-DSWIFT_FREESTANDING_IS_DARWIN:BOOL=FALSE',
             '-DSWIFT_STDLIB_BUILD_PRIVATE:BOOL=TRUE',
             '-DSWIFT_STDLIB_ENABLE_UNICODE_DATA=TRUE',
+            '-DSWIFT_SHOULD_BUILD_EMBEDDED_STDLIB_CROSS_COMPILING=FALSE',
             '-DSWIFT_TOOLS_LD64_LTO_CODEGEN_ONLY_FOR_SUPPORTING_TARGETS:BOOL=FALSE',
             '-USWIFT_DEBUGINFO_NON_LTO_ARGS'
         ]
@@ -147,6 +149,7 @@ def test_swift_runtime_tsan(self):
             '-DSWIFT_FREESTANDING_IS_DARWIN:BOOL=FALSE',
             '-DSWIFT_STDLIB_BUILD_PRIVATE:BOOL=TRUE',
             '-DSWIFT_STDLIB_ENABLE_UNICODE_DATA=TRUE',
+            '-DSWIFT_SHOULD_BUILD_EMBEDDED_STDLIB_CROSS_COMPILING=FALSE',
             '-DSWIFT_TOOLS_LD64_LTO_CODEGEN_ONLY_FOR_SUPPORTING_TARGETS:BOOL=FALSE',
             '-USWIFT_DEBUGINFO_NON_LTO_ARGS'
         ]
