Merge branch 'main' into wip-more-tests-generic-da

Author: ktoso

CMakeLists.txt

@@ -487,6 +487,14 @@ set(SWIFT_ANDROID_NDK_PATH "" CACHE STRING
 set(SWIFT_ANDROID_DEPLOY_DEVICE_PATH "" CACHE STRING
   "Path on an Android device where build products will be pushed. These are used when running the test suite against the device")
 
+#
+# User-configurable WebAssembly specific options.
+#
+
+option(SWIFT_ENABLE_WASI_THREADS
+  "Build the Standard Library with WASI threads support"
+  FALSE)
+
 #
 # User-configurable Darwin-specific options.
 #

cmake/modules/SwiftConfigureSDK.cmake

@@ -329,7 +329,11 @@ macro(configure_sdk_unix name architectures)
   if("${prefix}" STREQUAL "LINUX")
     set(_default_threading_package "linux")
   elseif("${prefix}" STREQUAL "WASI")
-    set(_default_threading_package "none")
+    if(SWIFT_ENABLE_WASI_THREADS)
+      set(_default_threading_package "pthreads")
+    else()
+      set(_default_threading_package "none")
+    endif()
   endif()
   get_threading_package(${prefix} ${_default_threading_package}
     SWIFT_SDK_${prefix}_THREADING_PACKAGE)
@@ -418,7 +422,11 @@ macro(configure_sdk_unix name architectures)
           message(FATAL_ERROR "unsupported arch for WebAssembly: ${arch}")
         endif()
         set(SWIFT_SDK_WASI_ARCH_wasm32_PATH "${SWIFT_WASI_SYSROOT_PATH}")
-        set(SWIFT_SDK_WASI_ARCH_wasm32_TRIPLE "wasm32-unknown-wasi")
+        if(SWIFT_ENABLE_WASI_THREADS)
+          set(SWIFT_SDK_WASI_ARCH_wasm32_TRIPLE "wasm32-unknown-wasi-threads")
+        else()
+          set(SWIFT_SDK_WASI_ARCH_wasm32_TRIPLE "wasm32-unknown-wasi")
+        endif()
       else()
         message(FATAL_ERROR "unknown Unix OS: ${prefix}")
       endif()

include/swift/ABI/MetadataValues.h

@@ -2614,8 +2614,10 @@ enum class TaskStatusRecordKind : uint8_t {
 
 /// Kinds of option records that can be passed to creating asynchronous tasks.
 enum class TaskOptionRecordKind : uint8_t {
-  /// Request a task to be kicked off, or resumed, on a specific executor.
-  InitialTaskExecutor = 0,
+  /// Request a task to start running on a specific serial executor.
+  /// This was renamed in 6.0 to disambiguate with task executors, but the
+  /// support was in the runtime from the first release.
+  InitialSerialExecutor = 0,
   /// Request a child task to be part of a specific task group.
   TaskGroup = 1,
   /// DEPRECATED. AsyncLetWithBuffer is used instead.
@@ -2625,6 +2627,8 @@ enum class TaskOptionRecordKind : uint8_t {
   AsyncLetWithBuffer = 3,
   /// Information about the result type of the task, used in embedded Swift.
   ResultTypeInfo = 4,
+  /// Set the initial task executor preference of the task.
+  InitialTaskExecutor = 5,
   /// Request a child task for swift_task_run_inline.
   RunInline = UINT8_MAX,
 };

include/swift/ABI/TaskOptions.h

@@ -97,6 +97,21 @@ class InitialTaskExecutorPreferenceTaskOptionRecord : public TaskOptionRecord {
   }
 };
 
+/// Task option to specify the initial serial executor for the task.
+class InitialSerialExecutorTaskOptionRecord : public TaskOptionRecord {
+  const SerialExecutorRef Executor;
+public:
+  InitialSerialExecutorTaskOptionRecord(SerialExecutorRef executor)
+      : TaskOptionRecord(TaskOptionRecordKind::InitialSerialExecutor),
+        Executor(executor) {}
+
+  SerialExecutorRef getExecutorRef() const { return Executor; }
+
+  static bool classof(const TaskOptionRecord *record) {
+    return record->getKind() == TaskOptionRecordKind::InitialSerialExecutor;
+  }
+};
+
 /// DEPRECATED. AsyncLetWithBufferTaskOptionRecord is used instead.
 /// Task option to specify that the created task is for an 'async let'.
 class AsyncLetTaskOptionRecord : public TaskOptionRecord {

stdlib/public/Concurrency/Task.cpp

@@ -653,6 +653,11 @@ swift_task_create_commonImpl(size_t rawTaskCreateFlags,
   RunInlineTaskOptionRecord *runInlineOption = nullptr;
   for (auto option = options; option; option = option->getParent()) {
     switch (option->getKind()) {
+    case TaskOptionRecordKind::InitialSerialExecutor:
+      serialExecutor = cast<InitialSerialExecutorTaskOptionRecord>(option)
+                          ->getExecutorRef();
+      break;
+
     case TaskOptionRecordKind::InitialTaskExecutor:
       taskExecutor = cast<InitialTaskExecutorPreferenceTaskOptionRecord>(option)
                          ->getExecutorRef();

test/IRGen/async/builtins.sil

@@ -112,8 +112,32 @@ sil hidden @launch_discarding_future_in_group_with_executor : $@convention(thin)
 bb0(%taskGroup : $Builtin.RawPointer, %taskExecutor : $Builtin.Executor, %taskFunction : $@Sendable @async @callee_guaranteed () -> @error Error, %flags: $Int):
   %optTaskGroup = enum $Optional<Builtin.RawPointer>, #Optional.some!enumelt, %taskGroup : $Builtin.RawPointer
   %optTaskExecutor = enum $Optional<Builtin.Executor>, #Optional.some!enumelt, %taskExecutor : $Builtin.Executor
+  // CHECK: [[GROUP_RECORD:%.*]] = alloca %swift.task_group_task_option
+  // CHECK: [[EXECUTOR_RECORD:%.*]] = alloca %swift.task_executor_task_option
   // CHECK-NOT: br i1
-  // CHECK: call swift{{(tail)?}}cc %swift.async_task_and_context @swift_task_create(
+
+  // CHECK: [[BASE_GEP:%.*]] = getelementptr inbounds %swift.task_group_task_option, ptr [[GROUP_RECORD]], i32 0, i32 0
+  // CHECK: [[FLAGS_GEP:%.*]] = getelementptr inbounds %swift.task_option, ptr [[BASE_GEP]], i32 0, i32 0
+  // CHECK: store [[INT]] 1, ptr [[FLAGS_GEP]], align
+  // CHECK: [[PARENT_GEP:%.*]] = getelementptr inbounds %swift.task_option, ptr [[BASE_GEP]], i32 0, i32 1
+  // CHECK: store [[INT]] 0, ptr [[PARENT_GEP]], align
+  // CHECK: [[GROUP_GEP:%.*]] = getelementptr inbounds %swift.task_group_task_option, ptr [[GROUP_RECORD]], i32 0, i32 1
+  // CHECK: store ptr %0, ptr [[GROUP_GEP]], align
+  // CHECK: [[OPTIONS_PTR:%.*]] = ptrtoint ptr [[GROUP_RECORD]] to [[INT]]
+
+  // CHECK: [[BASE_GEP:%.*]] = getelementptr inbounds %swift.task_executor_task_option, ptr [[EXECUTOR_RECORD]], i32 0, i32 0
+  // CHECK: [[FLAGS_GEP:%.*]] = getelementptr inbounds %swift.task_option, ptr [[BASE_GEP]], i32 0, i32 0
+  // CHECK: store [[INT]] 5, ptr [[FLAGS_GEP]], align
+  // CHECK: [[PARENT_GEP:%.*]] = getelementptr inbounds %swift.task_option, ptr [[BASE_GEP]], i32 0, i32 1
+  // CHECK: store [[INT]] [[OPTIONS_PTR]], ptr [[PARENT_GEP]], align
+  // CHECK: [[EXECUTOR_GEP:%.*]] = getelementptr inbounds %swift.task_executor_task_option, ptr [[EXECUTOR_RECORD]], i32 0, i32 1
+  // CHECK: [[EXECUTOR_IDENT_GEP:%.*]] = getelementptr inbounds %swift.executor, ptr [[EXECUTOR_GEP]], i32 0, i32 0
+  // CHECK: store [[INT]] %1, ptr [[EXECUTOR_IDENT_GEP]], align
+  // CHECK: [[EXECUTOR_IMPL_GEP:%.*]] = getelementptr inbounds %swift.executor, ptr [[EXECUTOR_GEP]], i32 0, i32 1
+  // CHECK: store [[INT]] %2, ptr [[EXECUTOR_IMPL_GEP]], align
+  // CHECK: [[OPTIONS_PTR:%.*]] = ptrtoint ptr [[EXECUTOR_RECORD]] to [[INT]]
+
+  // CHECK: call swift{{(tail)?}}cc %swift.async_task_and_context @swift_task_create([[INT]] %5, [[INT]] [[OPTIONS_PTR]]
   %9 = builtin "createAsyncTask"(%flags : $Int, %optTaskGroup : $Optional<Builtin.RawPointer>, %optTaskExecutor: $Optional<Builtin.Executor>, %taskFunction : $@Sendable @async @callee_guaranteed () -> @error Error) : $(Builtin.NativeObject, Builtin.RawPointer)
   %10 = tuple_extract %9 : $(Builtin.NativeObject, Builtin.RawPointer), 0
   strong_release %10 : $Builtin.NativeObject