Enable _Concurrency for Embedded Swift with WASI

CMakeLists.txt

@@ -487,6 +487,9 @@ set(SWIFT_NATIVE_CLANG_TOOLS_PATH "" CACHE STRING
 set(SWIFT_NATIVE_SWIFT_TOOLS_PATH "" CACHE STRING
    "Path to the directory that contains Swift tools that are executable on the build machine")
 
+set(SWIFT_WASI_SYSROOT_PATH "" CACHE PATH
+  "Path to the directory that contains WASI Sysroot")
+
 option(SWIFT_STDLIB_ENABLE_SIB_TARGETS
        "Should we generate sib targets for the stdlib or not?"
        FALSE)

stdlib/public/CMakeLists.txt

@@ -155,7 +155,10 @@ option(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB_CROSS_COMPILING
 set(SWIFT_EMBEDDED_STDLIB_EXTRA_TARGET_TRIPLES "" CACHE STRING
     "List of extra target triples to build the embedded Swift standard library for")
 
-if((NOT SWIFT_HOST_VARIANT STREQUAL "macosx") AND (NOT SWIFT_HOST_VARIANT STREQUAL "linux") AND (NOT SWIFT_HOST_VARIANT STREQUAL "windows"))
+if((NOT SWIFT_HOST_VARIANT STREQUAL "macosx") AND
+  (NOT SWIFT_HOST_VARIANT STREQUAL "linux") AND
+  (NOT SWIFT_HOST_VARIANT STREQUAL "wasi") AND
+  (NOT SWIFT_HOST_VARIANT STREQUAL "windows"))
   set(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB FALSE)
 elseif(BOOTSTRAPPING_MODE STREQUAL "OFF")
   set(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB FALSE)
@@ -168,68 +171,76 @@ endif()
 set(EMBEDDED_STDLIB_TARGET_TRIPLES)
 
 if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB_CROSS_COMPILING)
-  if("ARM" IN_LIST LLVM_TARGETS_TO_BUILD)
+  if(SWIFT_WASI_SYSROOT_PATH)
+    # Don't attempt to build any other Embedded Swift stdlib triples
+    # when building for WASI.
     list(APPEND EMBEDDED_STDLIB_TARGET_TRIPLES
-      # arch    module_name               target triple
-      "armv6    armv6-apple-none-macho    armv6-apple-none-macho"
-      "armv6m   armv6m-apple-none-macho   armv6m-apple-none-macho"
-      "armv7    armv7-apple-none-macho    armv7-apple-none-macho"
-      "armv7m   armv7m-apple-none-macho   armv7m-apple-none-macho"
-      "armv7em  armv7em-apple-none-macho  armv7em-apple-none-macho"
+      "wasm32    wasm32-unknown-wasip1-wasm  wasm32-unknown-wasip1-wasm"
     )
-  endif()
-  if("AArch64" IN_LIST LLVM_TARGETS_TO_BUILD)
-    list(APPEND EMBEDDED_STDLIB_TARGET_TRIPLES
-      "arm64    arm64-apple-none-macho    arm64-apple-none-macho"
-      "arm64e   arm64e-apple-none-macho   arm64e-apple-none-macho"
-      "arm64    arm64-apple-ios           arm64-apple-ios18"
-      "arm64e   arm64e-apple-ios          arm64e-apple-ios18"
-    )
-  endif()
+  else()
+    if("ARM" IN_LIST LLVM_TARGETS_TO_BUILD)
+      list(APPEND EMBEDDED_STDLIB_TARGET_TRIPLES
+        # arch    module_name               target triple
+        "armv6    armv6-apple-none-macho    armv6-apple-none-macho"
+        "armv6m   armv6m-apple-none-macho   armv6m-apple-none-macho"
+        "armv7    armv7-apple-none-macho    armv7-apple-none-macho"
+        "armv7m   armv7m-apple-none-macho   armv7m-apple-none-macho"
+        "armv7em  armv7em-apple-none-macho  armv7em-apple-none-macho"
+      )
+    endif()
+    if("AArch64" IN_LIST LLVM_TARGETS_TO_BUILD)
+      list(APPEND EMBEDDED_STDLIB_TARGET_TRIPLES
+        "arm64    arm64-apple-none-macho    arm64-apple-none-macho"
+        "arm64e   arm64e-apple-none-macho   arm64e-apple-none-macho"
+        "arm64    arm64-apple-ios           arm64-apple-ios18"
+        "arm64e   arm64e-apple-ios          arm64e-apple-ios18"
+      )
+    endif()
+
+    # the following are all ELF targets
+    if("ARM" IN_LIST LLVM_TARGETS_TO_BUILD)
+      list(APPEND EMBEDDED_STDLIB_TARGET_TRIPLES
+        "armv4t   armv4t-none-none-eabi     armv4t-none-none-eabi"
+        "armv6    armv6-none-none-eabi      armv6-none-none-eabi"
+        "armv6m   armv6m-none-none-eabi     armv6m-none-none-eabi"
+        "armv7    armv7-none-none-eabi      armv7-none-none-eabi"
+        "armv7em  armv7em-none-none-eabi    armv7em-none-none-eabi"
+      )
+    endif()
+    if("AArch64" IN_LIST LLVM_TARGETS_TO_BUILD)
+      list(APPEND EMBEDDED_STDLIB_TARGET_TRIPLES
+        "aarch64  aarch64-none-none-elf     aarch64-none-none-elf"
+      )
+    endif()
+    if("RISCV" IN_LIST LLVM_TARGETS_TO_BUILD)
+      list(APPEND EMBEDDED_STDLIB_TARGET_TRIPLES
+        "riscv32  riscv32-none-none-eabi    riscv32-none-none-eabi"
+        "riscv64  riscv64-none-none-eabi    riscv64-none-none-eabi"
+      )
+    endif()
+    if("X86" IN_LIST LLVM_TARGETS_TO_BUILD)
+      list(APPEND EMBEDDED_STDLIB_TARGET_TRIPLES
+        "i686    i686-unknown-none-elf       i686-unknown-none-elf"
+        "x86_64  x86_64-unknown-none-elf     x86_64-unknown-none-elf"
+      )
+    endif()
 
-  # the following are all ELF targets
-  if("ARM" IN_LIST LLVM_TARGETS_TO_BUILD)
-    list(APPEND EMBEDDED_STDLIB_TARGET_TRIPLES
-      "armv4t   armv4t-none-none-eabi     armv4t-none-none-eabi"
-      "armv6    armv6-none-none-eabi      armv6-none-none-eabi"
-      "armv6m   armv6m-none-none-eabi     armv6m-none-none-eabi"
-      "armv7    armv7-none-none-eabi      armv7-none-none-eabi"
-      "armv7em  armv7em-none-none-eabi    armv7em-none-none-eabi"
-    )
-  endif()
-  if("AArch64" IN_LIST LLVM_TARGETS_TO_BUILD)
-    list(APPEND EMBEDDED_STDLIB_TARGET_TRIPLES
-      "aarch64  aarch64-none-none-elf     aarch64-none-none-elf"
-    )
-  endif()
-  if("RISCV" IN_LIST LLVM_TARGETS_TO_BUILD)
-    list(APPEND EMBEDDED_STDLIB_TARGET_TRIPLES
-      "riscv32  riscv32-none-none-eabi    riscv32-none-none-eabi"
-      "riscv64  riscv64-none-none-eabi    riscv64-none-none-eabi"
-    )
-  endif()
-  if("X86" IN_LIST LLVM_TARGETS_TO_BUILD)
-    list(APPEND EMBEDDED_STDLIB_TARGET_TRIPLES
-      "i686    i686-unknown-none-elf       i686-unknown-none-elf"
-      "x86_64  x86_64-unknown-none-elf     x86_64-unknown-none-elf"
-    )
-  endif()
+    if("WebAssembly" IN_LIST LLVM_TARGETS_TO_BUILD)
+      list(APPEND EMBEDDED_STDLIB_TARGET_TRIPLES
+        "wasm32    wasm32-unknown-none-wasm    wasm32-unknown-none-wasm"
+        "wasm64    wasm64-unknown-none-wasm    wasm64-unknown-none-wasm"
+      )
+    endif()
 
-  if("WebAssembly" IN_LIST LLVM_TARGETS_TO_BUILD)
-    list(APPEND EMBEDDED_STDLIB_TARGET_TRIPLES
-      "wasm32    wasm32-unknown-none-wasm    wasm32-unknown-none-wasm"
-      "wasm64    wasm64-unknown-none-wasm    wasm64-unknown-none-wasm"
-    )
+    if("AVR" IN_LIST LLVM_TARGETS_TO_BUILD)
+      list(APPEND EMBEDDED_STDLIB_TARGET_TRIPLES
+        "avr  avr-none-none-elf    avr-none-none-elf"
+      )
+    endif()
   endif()
-
-  if("AVR" IN_LIST LLVM_TARGETS_TO_BUILD)
-    list(APPEND EMBEDDED_STDLIB_TARGET_TRIPLES
-      "avr  avr-none-none-elf    avr-none-none-elf"
-    )
-  endif()  
 endif()
 
-if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
+if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB AND NOT SWIFT_WASI_SYSROOT_PATH)
   if (SWIFT_HOST_VARIANT STREQUAL "linux")
     list(APPEND EMBEDDED_STDLIB_TARGET_TRIPLES
       "${SWIFT_HOST_VARIANT_ARCH} ${SWIFT_HOST_VARIANT_ARCH}-unknown-linux-gnu ${SWIFT_HOST_VARIANT_ARCH}-unknown-linux-gnu"

stdlib/public/Concurrency/CMakeLists.txt

@@ -224,6 +224,11 @@ elseif(BOOTSTRAPPING_MODE STREQUAL "OFF")
 elseif(SWIFT_HOST_VARIANT STREQUAL "windows") # For now, don't build embedded Concurrency on Windows
   set(SWIFT_SHOULD_BUILD_EMBEDDED_CONCURRENCY FALSE)
 endif()
+
+message(STATUS "SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB is ${SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB}")
+message(STATUS "SWIFT_SHOULD_BUILD_EMBEDDED_CONCURRENCY is ${SWIFT_SHOULD_BUILD_EMBEDDED_CONCURRENCY}")
+message(STATUS "EMBEDDED_STDLIB_TARGET_TRIPLES is ${EMBEDDED_STDLIB_TARGET_TRIPLES}")
+
 if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB AND SWIFT_SHOULD_BUILD_EMBEDDED_CONCURRENCY)
   add_custom_target(embedded-concurrency)
   add_dependencies(embedded-libraries embedded-concurrency)
@@ -245,13 +250,13 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB AND SWIFT_SHOULD_BUILD_EMBEDDED_CONCURRENC
     list(GET list 2 triple)
 
     if (SWIFT_HOST_VARIANT STREQUAL "linux")
-      if(NOT "${mod}" MATCHES "-linux-gnu$")
+      if((NOT "${mod}" MATCHES "-linux-gnu$") AND (NOT "${mod}" MATCHES "-wasip1"))
         continue()
       endif()
       set(extra_c_compile_flags)
       set(extra_swift_compile_flags)
     elseif (SWIFT_HOST_VARIANT STREQUAL "macosx")
-      if(NOT "${mod}" MATCHES "-macos$")
+      if((NOT "${mod}" MATCHES "-macos$") AND (NOT "${mod}" MATCHES "-wasip1"))
         continue()
       endif()
       if("${mod}" MATCHES "riscv")
@@ -260,8 +265,25 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB AND SWIFT_SHOULD_BUILD_EMBEDDED_CONCURRENC
       if("${mod}" MATCHES "armv6m")
         continue()
       endif()
-      set(extra_c_compile_flags -D__MACH__ -D__APPLE__ -ffreestanding -stdlib=libc++)
-      set(extra_swift_compile_flags -Xcc -D__MACH__ -Xcc -D__APPLE__ -Xcc -ffreestanding)
+
+      if("${mod}" MATCHES "-macos$")
+        set(extra_c_compile_flags -D__MACH__ -D__APPLE__ -ffreestanding -stdlib=libc++)
+        set(extra_swift_compile_flags -Xcc -D__MACH__ -Xcc -D__APPLE__ -Xcc -ffreestanding)
+      endif()
+
+    elseif (SWIFT_HOST_VARIANT STREQUAL "wasi")
+      message(STATUS "SWIFT_WASI_SYSROOT_PATH is ${SWIFT_WASI_SYSROOT_PATH}")
+      message(STATUS "mod is ${mod}")
+      if("${mod}" MATCHES "-wasip1")
+        set(extra_c_compile_flags "-I${SWIFT_WASI_SYSROOT_PATH}/include/c++/v1")
+        if(${SWIFT_WASI_SYSROOT_PATH} MATCHES "threads")
+          list(APPEND extra_c_compile_flags "-I${SWIFT_WASI_SYSROOT_PATH}/include/wasm32-wasip1-threads")
+        else()
+          list(APPEND extra_c_compile_flags "-I${SWIFT_WASI_SYSROOT_PATH}/include/wasm32-wasi")
+        endif()
+      endif()
+
+      message(STATUS "extra_c_compile_flags is ${extra_c_compile_flags}")
     endif()
 
     set(SWIFT_SDK_embedded_THREADING_PACKAGE none)
@@ -304,7 +326,10 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB AND SWIFT_SHOULD_BUILD_EMBEDDED_CONCURRENC
       COMPONENT "stdlib"
       PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
       )
-    set_property(TARGET embedded-concurrency-${mod} PROPERTY OSX_ARCHITECTURES "${arch}")
+
+    if(NOT "${arch}" MATCHES "wasm32")
+      set_property(TARGET embedded-concurrency-${mod} PROPERTY OSX_ARCHITECTURES "${arch}")
+    endif()
     add_dependencies(embedded-concurrency embedded-concurrency-${mod})
 
     # lib/swift/embedded/<triple>/libswift_ConcurrencyDefaultExecutor.a

utils/build-script-impl

@@ -1639,13 +1639,6 @@ for host in "${ALL_HOSTS[@]}"; do
                     )
                 fi
 
-                if [[ ! "${SKIP_BUILD_WASM}" ]]; then
-                    cmake_options=(
-                        "${cmake_options[@]}"
-                        -DSWIFT_WASI_SYSROOT_PATH:STRING="${WASI_SYSROOT}"
-                    )
-                fi
-
                 if [[ $(is_cross_tools_host ${host}) && "${host}" == "openbsd-"* && -n "${OPENBSD_USE_TOOLCHAIN_FILE}" ]]; then
                     cmake_options=(
                         "${cmake_options[@]}"
@@ -2503,7 +2496,7 @@ for host in "${ALL_HOSTS[@]}"; do
                   cmake_options=(
                     -DENABLE_SWIFT=YES
                     ${cmake_options[@]}
-                    
+
                     -DCMAKE_BUILD_TYPE:STRING="${LIBDISPATCH_BUILD_TYPE}"
                     -DCMAKE_C_COMPILER:PATH="${CLANG_BIN}/clang"
                     -DCMAKE_CXX_COMPILER:PATH="${CLANG_BIN}/clang++"

utils/swift_build_support/swift_build_support/products/wasmstdlib.py

@@ -141,7 +141,6 @@ def _build_stdlib(self, host_target, target_triple, llvm_cmake_dir):
         self.cmake_options.define('SWIFT_STDLIB_TRACING:BOOL', 'FALSE')
         self.cmake_options.define('SWIFT_STDLIB_HAS_ASLR:BOOL', 'FALSE')
         self.cmake_options.define('SWIFT_STDLIB_CONCURRENCY_TRACING:BOOL', 'FALSE')
-        self.cmake_options.define('SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB:BOOL', 'FALSE')
         self.cmake_options.define(
             'SWIFT_STDLIB_INSTALL_PARENT_MODULE_FOR_SHIMS:BOOL', 'FALSE')
         self.cmake_options.define('SWIFT_RUNTIME_CRASH_REPORTER_CLIENT:BOOL', 'FALSE')
@@ -165,6 +164,10 @@ def _build_stdlib(self, host_target, target_triple, llvm_cmake_dir):
         self.cmake_options.define('SWIFT_ENABLE_VOLATILE:BOOL', 'TRUE')
         self.cmake_options.define('SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION:BOOL', 'TRUE')
 
+        self.cmake_options.define('SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB:BOOL', 'TRUE')
+        self.cmake_options.define(
+            'SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB_CROSS_COMPILING', 'TRUE')
+
         self.add_extra_cmake_options()
 
         # Test configuration