Merge pull request #2765 from swiftwasm/swiftwasm-release/5.4-tooling

Merge SwiftWasm build scripts, thin CMO to 5.4 release

Author: yonihemi

.github/workflows/main.yml

@@ -141,7 +141,7 @@ jobs:
       - name: Pack test results
         working-directory: ${{ github.workspace }}/../
         run: |
-          tar cJf ./swift/swift-test-results.tar.gz target-build/*/swift-macosx-x86_64/swift-test-results
+          tar cJf ./swift/swift-test-results.tar.gz target-build/swift-stdlib-wasi-wasm32/swift-test-results
       - name: Upload test results
         uses: actions/upload-artifact@v1
         with:

CMakeLists.txt

@@ -903,36 +903,6 @@ function(swift_icu_variables_set sdk arch result)
   endif()
 endfunction()
 
-if(SWIFT_PRIMARY_VARIANT_SDK STREQUAL "WASI")
-  set(WASI_ICU_URL "" CACHE STRING
-    "Download URL for the WASI ICU distribution")
-  set(WASI_ICU_MD5 "" CACHE STRING
-    "The expected MD5 hash of the WASI ICU distribution archive")
-
-  file(DOWNLOAD "${WASI_ICU_URL}" "${SWIFT_SOURCE_DIR}/../icu.tar.xz"
-    EXPECTED_HASH MD5=${WASI_ICU_MD5})
-
-  get_filename_component(SWIFT_SOURCE_BASEDIR "${SWIFT_SOURCE_DIR}" DIRECTORY)
-  set(WASI_ICU_OUT_LIB "${SWIFT_SOURCE_BASEDIR}/icu_out/lib")
-  set(SWIFT_WASI_wasm32_ICU_UC_INCLUDE "${SWIFT_SOURCE_BASEDIR}/icu_out/include")
-  set(SWIFT_WASI_wasm32_ICU_I18N_INCLUDE "${SWIFT_SOURCE_BASEDIR}/icu_out/include")
-  set(SWIFT_WASI_wasm32_ICU_UC "${WASI_ICU_OUT_LIB}/libicuuc.a")
-  set(SWIFT_WASI_wasm32_ICU_I18N "${WASI_ICU_OUT_LIB}/libicui18n.a")
-  set(SWIFT_WASI_wasm32_ICU_DATA "${WASI_ICU_OUT_LIB}/libicudata.a")
-
-  set(WASI_ICU_DISTRIBUTION_TARGET)
-  add_custom_command_target(WASI_ICU_DISTRIBUTION_TARGET
-    COMMAND 
-      ${CMAKE_COMMAND} -E 
-        tar xfv "${SWIFT_SOURCE_BASEDIR}/icu.tar.xz"
-    WORKING_DIRECTORY 
-      "${SWIFT_SOURCE_BASEDIR}"
-    OUTPUT
-      "${SWIFT_WASI_wasm32_ICU_DATA}"
-      "${SWIFT_WASI_wasm32_ICU_I18N}"
-      "${SWIFT_WASI_wasm32_ICU_UC}")
-endif()
-
 # ICU is provided through CoreFoundation on Darwin.  On other hosts, if the ICU
 # unicode and i18n include and library paths are not defined, perform a standard
 # package lookup.  Otherwise, rely on the paths specified by the user.  These

cmake/caches/Runtime-WASI-wasm32.cmake

@@ -0,0 +1,29 @@
+set(SWIFT_PRIMARY_VARIANT_SDK WASI CACHE STRING "")
+set(SWIFT_PRIMARY_VARIANT_ARCH wasm32 CACHE STRING "")
+set(SWIFT_HOST_VARIANT_SDK NONE CACHE STRING "")
+set(SWIFT_HOST_VARIANT_ARCH NONE CACHE STRING "")
+
+set(SWIFT_SDKS WASI CACHE STRING "")
+
+set(SWIFT_INCLUDE_TOOLS NO CACHE BOOL "")
+set(SWIFT_INCLUDE_TESTS TRUE CACHE BOOL "")
+set(SWIFT_INCLUDE_DOCS NO CACHE BOOL "")
+
+set(SWIFT_BUILD_SYNTAXPARSERLIB NO CACHE BOOL "")
+set(SWIFT_BUILD_SOURCEKIT NO CACHE BOOL "")
+set(SWIFT_ENABLE_SOURCEKIT_TESTS NO CACHE BOOL "")
+
+set(SWIFTWASM_DISABLE_REFLECTION_TEST YES CACHE BOOL "")
+
+# stdlib configurations
+set(SWIFT_BUILD_STATIC_STDLIB YES CACHE BOOL "")
+set(SWIFT_BUILD_DYNAMIC_STDLIB NO CACHE BOOL "")
+set(SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY YES 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 "")
+
+# build with the host compiler
+set(SWIFT_BUILD_RUNTIME_WITH_HOST_COMPILER YES CACHE BOOL "")
+
+set(SWIFT_STDLIB_SINGLE_THREADED_RUNTIME YES CACHE BOOL "")

cmake/modules/SwiftConfigureSDK.cmake

@@ -352,10 +352,10 @@ macro(configure_sdk_unix name architectures)
         if(NOT arch STREQUAL wasm32)
           message(FATAL_ERROR "unsupported arch for WebAssembly: ${arch}")
         endif()
-        set(SWIFT_SDK_WASI_ARCH_wasm32_PATH "${SWIFT_WASI_SDK_PATH}/share/wasi-sysroot")
+        set(SWIFT_SDK_WASI_ARCH_wasm32_PATH "${SWIFT_WASI_SYSROOT_PATH}")
         set(SWIFT_SDK_WASI_ARCH_wasm32_TRIPLE "wasm32-unknown-wasi")
-        set(SWIFT_SDK_WASI_ARCH_wasm32_LIBC_INCLUDE_DIRECTORY "${SWIFT_WASI_SDK_PATH}/share/wasi-sysroot/include")
-        set(SWIFT_SDK_WASI_ARCH_wasm32_LIBC_ARCHITECTURE_INCLUDE_DIRECTORY "${SWIFT_WASI_SDK_PATH}/share/wasi-sysroot/include")
+        set(SWIFT_SDK_WASI_ARCH_wasm32_LIBC_INCLUDE_DIRECTORY "${SWIFT_WASI_SYSROOT_PATH}/include")
+        set(SWIFT_SDK_WASI_ARCH_wasm32_LIBC_ARCHITECTURE_INCLUDE_DIRECTORY "${SWIFT_WASI_SYSROOT_PATH}/include")
       else()
         message(FATAL_ERROR "unknown Unix OS: ${prefix}")
       endif()

include/swift/AST/IRGenOptions.h

@@ -238,6 +238,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;
 
@@ -351,6 +354,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

@@ -718,6 +718,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

@@ -304,6 +304,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

@@ -1553,6 +1553,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/GenCall.cpp

@@ -1956,27 +1956,42 @@ std::pair<llvm::Value *, llvm::Value *> irgen::getAsyncFunctionAndSize(
     { // thin
       IGF.Builder.emitBlock(thinBlock);
       auto *ptr = functionPointer.getRawPointer();
-      if (auto authInfo = functionPointer.getAuthInfo()) {
-        ptr = emitPointerAuthAuth(IGF, ptr, authInfo);
-      }
-      auto *afpPtr =
-          IGF.Builder.CreateBitCast(ptr, IGF.IGM.AsyncFunctionPointerPtrTy);
-      if (emitFunction) {
-        llvm::Value *addrPtr = IGF.Builder.CreateStructGEP(afpPtr, 0);
-        auto *uncastFnPtr = IGF.emitLoadOfRelativePointer(
-            Address(addrPtr, IGF.IGM.getPointerAlignment()), /*isFar*/ false,
-            /*expectedType*/ functionPointer.getFunctionType()->getPointerTo());
-        auto *fnPtr = IGF.Builder.CreateBitCast(uncastFnPtr, IGF.IGM.Int8PtrTy);
+
+      // If function pointer is a direct pointer to a function, it could not be
+      // an async function pointer. And additive operation to function address is
+      // illegal on some archs like wasm32, so emit undefs instead.
+      if (isa<llvm::Function>(ptr)) {
+        if (emitFunction) {
+          auto *undef = llvm::UndefValue::get(IGF.IGM.Int8PtrTy);
+          fnPhiValues.push_back({thinBlock, undef});
+        }
+        if (emitSize) {
+          auto *undef = llvm::UndefValue::get(IGF.IGM.Int32Ty);
+          sizePhiValues.push_back({thinBlock, undef});
+        }
+      } else {
         if (auto authInfo = functionPointer.getAuthInfo()) {
-          fnPtr = emitPointerAuthSign(IGF, fnPtr, authInfo);
+          ptr = emitPointerAuthAuth(IGF, ptr, authInfo);
+        }
+        auto *afpPtr =
+        IGF.Builder.CreateBitCast(ptr, IGF.IGM.AsyncFunctionPointerPtrTy);
+        if (emitFunction) {
+          llvm::Value *addrPtr = IGF.Builder.CreateStructGEP(afpPtr, 0);
+          auto *uncastFnPtr = IGF.emitLoadOfRelativePointer(
+                                                            Address(addrPtr, IGF.IGM.getPointerAlignment()), /*isFar*/ false,
+                                                            /*expectedType*/ functionPointer.getFunctionType()->getPointerTo());
+          auto *fnPtr = IGF.Builder.CreateBitCast(uncastFnPtr, IGF.IGM.Int8PtrTy);
+          if (auto authInfo = functionPointer.getAuthInfo()) {
+            fnPtr = emitPointerAuthSign(IGF, fnPtr, authInfo);
+          }
+          fnPhiValues.push_back({thinBlock, fnPtr});
+        }
+        if (emitSize) {
+          auto *sizePtr = IGF.Builder.CreateStructGEP(afpPtr, 1);
+          auto *size =
+          IGF.Builder.CreateLoad(sizePtr, IGF.IGM.getPointerAlignment());
+          sizePhiValues.push_back({thinBlock, size});
         }
-        fnPhiValues.push_back({thinBlock, fnPtr});
-      }
-      if (emitSize) {
-        auto *sizePtr = IGF.Builder.CreateStructGEP(afpPtr, 1);
-        auto *size =
-            IGF.Builder.CreateLoad(sizePtr, IGF.IGM.getPointerAlignment());
-        sizePhiValues.push_back({thinBlock, size});
       }
       IGF.Builder.CreateBr(joinBlock);
     }