Merge pull request #2367 from swiftwasm/katei/embed-swms

Enable stdlib thin CMO

Author: kateinoigakukun

cmake/caches/Runtime-WASI-wasm32.cmake

@@ -22,6 +22,7 @@ set(SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY NO CACHE BOOL "")
 # TODO(katei): This should get turned off, as this is not an ABI stable platform.
 # But current CMake build system doesn't support SWIFT_STDLIB_STABLE_ABI=NO
 set(SWIFT_STDLIB_STABLE_ABI YES CACHE BOOL "")
+set(SWIFT_STDLIB_ENABLE_THINCMO YES CACHE BOOL "")
 
 # build with the host compiler
 set(SWIFT_BUILD_RUNTIME_WITH_HOST_COMPILER YES CACHE BOOL "")

include/swift/AST/IRGenOptions.h

@@ -244,6 +244,9 @@ class IRGenOptions {
   /// Frameworks that we should not autolink against.
   SmallVector<std::string, 1> DisableAutolinkFrameworks;
 
+  /// Disable autolinking swiftCore for stdlib thin CMO
+  unsigned DisableAutolinkStdlib : 1;
+
   /// Print the LLVM inline tree at the end of the LLVM pass pipeline.
   unsigned PrintInlineTree : 1;
 
@@ -358,6 +361,7 @@ class IRGenOptions {
         DisableLLVMOptzns(false), DisableSwiftSpecificLLVMOptzns(false),
         DisableLLVMSLPVectorizer(false), Playground(false),
         EmitStackPromotionChecks(false), FunctionSections(false),
+        DisableAutolinkStdlib(false),
         PrintInlineTree(false), EmbedMode(IRGenEmbedMode::None),
         LLVMLTOKind(IRGenLLVMLTOKind::None), HasValueNamesSetting(false),
         ValueNames(false), EnableReflectionMetadata(true),

include/swift/Option/Options.td

@@ -713,6 +713,10 @@ def no_stdlib_rpath: Flag<["-"], "no-stdlib-rpath">,
   Flags<[HelpHidden,DoesNotAffectIncrementalBuild]>,
   HelpText<"Don't add any rpath entries.">;
 
+def no_stdlib_link: Flag<["-"], "no-stdlib-link">,
+  Flags<[FrontendOption, DoesNotAffectIncrementalBuild]>,
+  HelpText<"Don't link stdlib.">;
+
 def static_executable : Flag<["-"], "static-executable">,
   HelpText<"Statically link the executable">;
 def no_static_executable : Flag<["-"], "no-static-executable">,

lib/Driver/ToolChains.cpp

@@ -306,6 +306,7 @@ void ToolChain::addCommonFrontendArgs(const OutputInfo &OI,
   }
 
   addLTOArgs(OI, arguments);
+  inputArgs.AddLastArg(arguments, options::OPT_no_stdlib_link);
 
   // -g implies -enable-anonymous-context-mangled-names, because the extra
   // metadata aids debugging.

lib/Driver/WebAssemblyToolChains.cpp

@@ -163,6 +163,12 @@ toolchains::WebAssembly::constructInvocation(const DynamicLinkJobAction &job,
     llvm::report_fatal_error(linkFile + " not found");
   }
 
+  if (context.Args.hasArg(options::OPT_no_stdlib_link)) {
+    Arguments.push_back("-lswiftStandaloneRuntime");
+  } else {
+    Arguments.push_back("-lswiftCore");
+  }
+
   // Explicitly pass the target to the linker
   Arguments.push_back(
       context.Args.MakeArgString("--target=" + getTriple().str()));

lib/Frontend/CompilerInvocation.cpp

@@ -1559,6 +1559,10 @@ static bool ParseIRGenArgs(IRGenOptions &Opts, ArgList &Args,
                      A->getAsString(Args), A->getValue());
   }
 
+  if (Args.hasArg(OPT_no_stdlib_link)) {
+    Opts.DisableAutolinkStdlib = true;
+  }
+
   if (const Arg *A = Args.getLastArg(options::OPT_sanitize_coverage_EQ)) {
     Opts.SanitizeCoverage =
         parseSanitizerCoverageArgValue(A, Triple, Diags, Opts.Sanitizers);

lib/IRGen/IRGenModule.cpp

@@ -1220,6 +1220,8 @@ void IRGenModule::addLinkLibrary(const LinkLibrary &linkLib) {
 
   switch (linkLib.getKind()) {
   case LibraryKind::Library: {
+    if (linkLib.getName() == "swiftCore" && IRGen.Opts.DisableAutolinkStdlib)
+      return;
     AutolinkEntries.emplace_back(linkLib);
     break;
   }

stdlib/CMakeLists.txt

@@ -59,6 +59,10 @@ option(SWIFT_ENABLE_MODULE_INTERFACES
        "Generate .swiftinterface files alongside .swiftmodule files"
        "${SWIFT_STDLIB_STABLE_ABI}")
 
+option(SWIFT_STDLIB_ENABLE_THINCMO
+       "Generate .swiftmodulesummary and .sib files alongside .swiftmodule files for thin cross module optimization"
+       FALSE)
+
 option(SWIFT_ENABLE_COMPATIBILITY_OVERRIDES
        "Support back-deploying compatibility fixes for newer apps running on older runtimes."
        TRUE)

stdlib/cmake/modules/SwiftSource.cmake

@@ -806,6 +806,28 @@ function(_compile_swift_files
           ${copy_legacy_layouts_dep}
         COMMENT "Generating ${module_file}")
 
+    set(modulesummary_file "${module_base}.swiftmodulesummary")
+    set(modulesummary_file_static "${module_base_static}.swiftmodulesummary")
+    set(thincmo_sib_file "${module_base}.sib")
+    set(thincmo_sib_file_static "${module_base_static}.sib")
+    if(SWIFT_STDLIB_ENABLE_THINCMO)
+      add_custom_command_target(
+        thincmo_intermediate_target
+        COMMAND
+          "$<TARGET_FILE:Python3::Interpreter>" "${line_directive_tool}" "@${file_path}" --
+          "${swift_compiler_tool}" "-emit-sib" "-o" "${thincmo_sib_file}"
+          ${swift_flags} "-emit-module-summary" "@${file_path}"
+        OUTPUT "${modulesummary_file}" "${thincmo_sib_file}"
+        DEPENDS
+          ${swift_compiler_tool_dep}
+          ${source_files} ${SWIFTFILE_DEPENDS}
+          ${swift_ide_test_dependency}
+          ${create_dirs_dependency_target}
+          ${copy_legacy_layouts_dep}
+          ${module_dependency_target}
+        COMMENT "Generating ${modulesummary_file}")
+    endif()
+
     if(SWIFTFILE_STATIC)
       add_custom_command_target(
         module_dependency_target_static
@@ -823,8 +845,22 @@ function(_compile_swift_files
           "${module_dependency_target}"
         COMMENT "Generating ${module_file}")
       set("${dependency_module_target_out_var_name}" "${module_dependency_target_static}" PARENT_SCOPE)
+
+      if(SWIFT_STDLIB_ENABLE_THINCMO)
+        add_custom_command_target(
+          thincmo_intermediate_target_static
+          COMMAND
+            "${CMAKE_COMMAND}" "-E" "copy" ${modulesummary_file} ${modulesummary_file_static}
+          COMMAND
+            "${CMAKE_COMMAND}" "-E" "copy" ${thincmo_sib_file} ${thincmo_sib_file_static}
+          OUTPUT ${modulesummary_file_static}
+          DEPENDS
+            "${thincmo_intermediate_target}" "${module_dependency_target_static}"
+          COMMENT "Generating ${modulesummary_file_static}")
+        set("${dependency_module_target_out_var_name}" "${module_dependency_target_static}" "${thincmo_intermediate_target_static}" PARENT_SCOPE)
+      endif()
     else()
-      set("${dependency_module_target_out_var_name}" "${module_dependency_target}" PARENT_SCOPE)
+      set("${dependency_module_target_out_var_name}" "${module_dependency_target}" "${thincmo_intermediate_target}" PARENT_SCOPE)
     endif()
 
     # macCatalyst zippered swiftmodule

stdlib/public/runtime/CMakeLists.txt

@@ -153,6 +153,13 @@ add_swift_target_library(swiftRuntime OBJECT_LIBRARY
   SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
   INSTALL_IN_COMPONENT never_install)
 
+
+add_swift_target_library(swiftStandaloneRuntime STATIC IS_STDLIB
+  INCORPORATE_OBJECT_LIBRARIES
+    swiftRuntime swiftLLVMSupport swiftDemangling swiftStdlibStubs
+  INSTALL_IN_COMPONENT
+    stdlib)
+
 set(ELFISH_SDKS)
 set(COFF_SDKS)
 set(WASM_SDKS)