Add Synchronization module

Azoy · Azoy · commit 2c0b473b8dba · 2023-12-18T14:01:16.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -647,6 +647,10 @@ option(SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION
   "Enable build of the Swift observation module"
   FALSE)
 
+option(SWIFT_ENABLE_SYNCHRONIZATION
+  "Enable build of the Swift Synchronization module"
+  FALSE)
+
 option(SWIFT_ENABLE_DISPATCH
   "Enable use of libdispatch"
   TRUE)
@@ -1222,6 +1226,7 @@ if(SWIFT_BUILD_STDLIB OR SWIFT_BUILD_SDK_OVERLAY)
   message(STATUS "Backtracing Support:                ${SWIFT_ENABLE_BACKTRACING}")
   message(STATUS "Unicode Support:                    ${SWIFT_STDLIB_ENABLE_UNICODE_DATA}")
   message(STATUS "Observation Support:                ${SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION}")
+  message(STATUS "Synchronization Support:            ${SWIFT_ENABLE_SYNCHRONIZATION}")
   message(STATUS "")
 else()
   message(STATUS "Not building Swift standard library, SDK overlays, and runtime")
diff --git a/stdlib/cmake/modules/SwiftSource.cmake b/stdlib/cmake/modules/SwiftSource.cmake
@@ -321,6 +321,10 @@ function(_add_target_variant_swift_compile_flags
     list(APPEND result "-D" "SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION")
   endif()
 
+  if(SWIFT_ENABLE_SYNCHRONIZATION)
+    list(APPEND result "-D" "SWIFT_ENABLE_SYNCHRONIZATION")
+  endif()
+
   if(SWIFT_STDLIB_OS_VERSIONING)
     list(APPEND result "-D" "SWIFT_RUNTIME_OS_VERSIONING")
   endif()
diff --git a/stdlib/public/CMakeLists.txt b/stdlib/public/CMakeLists.txt
@@ -245,6 +245,10 @@ if(SWIFT_BUILD_STDLIB AND NOT SWIFT_STDLIB_BUILD_ONLY_CORE_MODULES)
   if(SWIFT_ENABLE_BACKTRACING)
     add_subdirectory(Backtracing)
   endif()
+
+  if(SWIFT_ENABLE_SYNCHRONIZATION)
+    add_subdirectory(Synchronization)
+  endif()
 endif()
 
 if(SWIFT_BUILD_REMOTE_MIRROR)
diff --git a/stdlib/public/Synchronization/Atomic.swift b/stdlib/public/Synchronization/Atomic.swift
@@ -10,6 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+import Builtin
+
 /// An atomic value.
 @available(SwiftStdlib 5.11, *)
 @_rawLayout(like: Value.AtomicRepresentation)
diff --git a/stdlib/public/Synchronization/AtomicBool.swift b/stdlib/public/Synchronization/AtomicBool.swift
@@ -10,6 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+import Builtin
+
 //===----------------------------------------------------------------------===//
 // Bool AtomicValue conformance
 //===----------------------------------------------------------------------===//
diff --git a/stdlib/public/Synchronization/AtomicFloats.swift b/stdlib/public/Synchronization/AtomicFloats.swift
diff --git a/stdlib/public/Synchronization/AtomicIntegers.swift.gyb b/stdlib/public/Synchronization/AtomicIntegers.swift.gyb
@@ -10,6 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+import Builtin
+
 % from SwiftAtomics import *
 
 % for (intType, intStorage, builtinInt) in intTypes:
diff --git a/stdlib/public/Synchronization/AtomicLazyReference.swift b/stdlib/public/Synchronization/AtomicLazyReference.swift
diff --git a/stdlib/public/Synchronization/AtomicMemoryOrderings.swift b/stdlib/public/Synchronization/AtomicMemoryOrderings.swift
@@ -10,6 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+import Builtin
+
 //===----------------------------------------------------------------------===//
 // Load Orderings
 //===----------------------------------------------------------------------===//
diff --git a/stdlib/public/Synchronization/AtomicOptional.swift b/stdlib/public/Synchronization/AtomicOptional.swift
diff --git a/stdlib/public/Synchronization/AtomicPointers.swift b/stdlib/public/Synchronization/AtomicPointers.swift
diff --git a/stdlib/public/Synchronization/AtomicStorage.swift.gyb b/stdlib/public/Synchronization/AtomicStorage.swift.gyb
@@ -10,6 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+import Builtin
+
 % from SwiftAtomics import *
 
 % for (type, size, alignment, builtin) in atomicTypes:
diff --git a/stdlib/public/Synchronization/AtomicValue.swift b/stdlib/public/Synchronization/AtomicValue.swift
diff --git a/stdlib/public/Synchronization/CMakeLists.txt b/stdlib/public/Synchronization/CMakeLists.txt
@@ -0,0 +1,39 @@
+#===--- CMakeLists.txt - Synchronization library ---------------------------===#
+#
+# This source file is part of the Swift.org open source project
+#
+# Copyright (c) 2023 Apple Inc. and the Swift project authors
+# Licensed under Apache License v2.0 with Runtime Library Exception
+#
+# See https://swift.org/LICENSE.txt for license information
+# See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+#
+#===----------------------------------------------------------------------===#
+
+add_swift_target_library(swiftSynchronization ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
+# List of files here:
+  Atomic.swift
+  AtomicBool.swift
+  AtomicFloats.swift
+  AtomicLazyReference.swift
+  AtomicMemoryOrderings.swift
+  AtomicOptional.swift
+  AtomicPointers.swift
+  AtomicValue.swift
+  WordPair.swift
+
+  GYB_SOURCES
+    AtomicIntegers.swift.gyb
+    AtomicStorage.swift.gyb
+
+  SWIFT_COMPILE_FLAGS
+    ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
+    "-enable-builtin-module"
+    "-enable-experimental-feature" "RawLayout"
+
+  INSTALL_IN_COMPONENT
+    stdlib
+
+  MACCATALYST_BUILD_FLAVOR
+    "zippered"
+)
diff --git a/stdlib/public/Synchronization/WordPair.swift b/stdlib/public/Synchronization/WordPair.swift
@@ -10,6 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+import Builtin
+
 /// A pair of two word sized `UInt`s.
 ///
 /// This type's primary purpose is to be used in double wide atomic operations.
diff --git a/stdlib/public/core/CMakeLists.txt b/stdlib/public/core/CMakeLists.txt
@@ -42,17 +42,6 @@ split_embedded_sources(
     NORMAL ASCII.swift
   EMBEDDED Assert.swift
   EMBEDDED AssertCommon.swift
-
-    NORMAL Atomics/Atomic.swift
-    NORMAL Atomics/AtomicBool.swift
-    NORMAL Atomics/AtomicFloats.swift
-    NORMAL Atomics/AtomicLazyReference.swift
-    NORMAL Atomics/AtomicMemoryOrderings.swift
-    NORMAL Atomics/AtomicOptional.swift
-    NORMAL Atomics/AtomicPointers.swift
-    NORMAL Atomics/AtomicValue.swift
-    NORMAL Atomics/WordPair.swift
-
   EMBEDDED BidirectionalCollection.swift
     NORMAL Bitset.swift
   EMBEDDED Bool.swift
@@ -250,9 +239,6 @@ split_embedded_sources(
   OUT_LIST_EMBEDDED SWIFTLIB_EMBEDDED_GYB_SOURCES
   OUT_LIST_NORMAL SWIFTLIB_GYB_SOURCES
 
-    NORMAL Atomics/AtomicIntegers.swift.gyb
-    NORMAL Atomics/AtomicStorage.swift.gyb
-
     NORMAL AtomicInt.swift.gyb
     NORMAL FloatingPointParsing.swift.gyb
   EMBEDDED FloatingPointTypes.swift.gyb
diff --git a/stdlib/public/core/Duration.swift b/stdlib/public/core/Duration.swift
@@ -35,15 +35,13 @@
 @frozen
 public struct Duration: Sendable {
   /// The low 64 bits of a 128-bit signed integer value counting attoseconds.
-  @usableFromInline
-  internal var _low: UInt64
+  public var _low: UInt64
 
   /// The high 64 bits of a 128-bit signed integer value counting attoseconds.
-  @usableFromInline
-  internal var _high: Int64
+  public var _high: Int64
 
   @inlinable
-  internal init(_high: Int64, low: UInt64) {
+  public init(_high: Int64, low: UInt64) {
     self._low = low
     self._high = _high
   }
diff --git a/utils/build_swift/build_swift/driver_arguments.py b/utils/build_swift/build_swift/driver_arguments.py
@@ -1342,6 +1342,10 @@ def create_argument_parser():
            default=True,
            help='Enable experimental Swift observation.')
 
+    option('--enable-synchronization', toggle_true,
+           default=True,
+           help='Enable Swift Synchronization.')
+
     # -------------------------------------------------------------------------
     in_group('Unsupported options')
 
diff --git a/utils/swift-api-dump.py b/utils/swift-api-dump.py
@@ -106,6 +106,8 @@ def create_parser():
                         help='Enable experimental distributed actors.')
     parser.add_argument('--enable-experimental-observation', action='store_true',
                         help='Enable experimental observation.')
+    parser.add_argument('--enable-synchronization', action='store_true',
+                        help='Enable Synchronization.')
     parser.add_argument('-swift-version', metavar='N',
                         help='the Swift version to use')
     parser.add_argument('-show-overlay', action='store_true',
diff --git a/utils/swift_build_support/swift_build_support/products/swift.py b/utils/swift_build_support/swift_build_support/products/swift.py
@@ -65,6 +65,9 @@ def __init__(self, args, toolchain, source_dir, build_dir):
         # Add experimental observation flag.
         self.cmake_options.extend(self._enable_experimental_observation)
 
+        # Add synchronization flag.
+        self.cmake_options.extend(self._enable_synchronization)
+
         # Add static vprintf flag
         self.cmake_options.extend(self._enable_stdlib_static_vprintf)
 
@@ -197,6 +200,11 @@ def _enable_experimental_observation(self):
         return [('SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION:BOOL',
                  self.args.enable_experimental_observation)]
 
+    @property
+    def _enable_synchronization(self):
+        return [('SWIFT_ENABLE_SYNCHRONIZATION:BOOL',
+                 self.args.enable_synchronization)]
+
     @property
     def _enable_stdlib_static_vprintf(self):
         return [('SWIFT_STDLIB_STATIC_PRINT',
