[cmake] add Synchronization library to Supplemental build #81310

justice-adams-apple · 2025-05-05T22:13:36Z

Addresses rdar://150300769

Add Synchronization library to new build system

Land #81215 first

compnerd · 2025-05-05T22:15:26Z

Runtimes/Supplemental/Synchronization/CMakeLists.txt

+
+set(CMAKE_POSITION_INDEPENDENT_CODE YES)
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake/modules")


These can come after the project call.

compnerd · 2025-05-05T22:15:47Z

Runtimes/Supplemental/Synchronization/CMakeLists.txt

+if(NOT PROJECT_IS_TOP_LEVEL)
+  message(SEND_ERROR "Swift Synchronization must build as a standalone project")
+endif()


We should likely hoist this to right after the project call

compnerd · 2025-05-05T22:16:56Z

Runtimes/Supplemental/Synchronization/CMakeLists.txt

+option(${PROJECT_NAME}_ARCH_SUBDIR "Architecture used for setting the architecture subdirectory"
+  ${SwiftCore_ARCH_SUBDIR})
+
+option(${PROJECT_NAME}_INSTALL_NESTED_SUBDIR "Install libraries under a platform and architecture subdirectory"
+  ${SwiftCore_INSTALL_NESTED_SUBDIR})
+
+option(${PROJECT_NAME}_PLATFORM_SUBDIR "Platform name used for installed swift{doc,module,interface} files"
+  ${SwiftCore_PLATFORM_SUBDIR})
+
+option(${PROJECT_NAME}_COMPILER_VARIANT_TARGET "Compiler variant target to use when emiting modules"
+  ${SwiftCore_COMPILER_VARIANT_TARGET})


@etcwilde - whats your take on these defaults? I'm kinda somewhat torn. I don't like introducing more option values, but these feel like it might make sense to separate.

I think inheriting the value for library evolution and prespecialization is probably fine. They're defaults so if someone really doesn't want them to match, passing the option directly, using a cmake cache, or modifying the value with ccmake later will all work. Whether or not to install into the nested subdirectory is also probably fine to default to match.

The arch and platform subdirs are computed by the compiler for the platform and they aren't boolean options, so they shouldn't be options. We don't need to inherit them, just use the value coming out of PlatformInfo. Maybe later, we could look to see if these values have all been set and avoid invoking the compiler to get this info since process launches are expensive on Windows, but I don't think it's worth worrying about now.

Lets drop the defaults for:

platform subdirectory

arch subdirectory

compiler variant target

Runtimes/Supplemental/Synchronization/CMakeLists.txt

etcwilde · 2025-05-06T02:42:18Z

Runtimes/Supplemental/Synchronization/CMakeLists.txt

+option(${PROJECT_NAME}_ARCH_SUBDIR "Architecture used for setting the architecture subdirectory"
+  ${SwiftCore_ARCH_SUBDIR})
+
+option(${PROJECT_NAME}_INSTALL_NESTED_SUBDIR "Install libraries under a platform and architecture subdirectory"
+  ${SwiftCore_INSTALL_NESTED_SUBDIR})
+
+option(${PROJECT_NAME}_PLATFORM_SUBDIR "Platform name used for installed swift{doc,module,interface} files"
+  ${SwiftCore_PLATFORM_SUBDIR})
+
+option(${PROJECT_NAME}_COMPILER_VARIANT_TARGET "Compiler variant target to use when emiting modules"
+  ${SwiftCore_COMPILER_VARIANT_TARGET})


I think inheriting the value for library evolution and prespecialization is probably fine. They're defaults so if someone really doesn't want them to match, passing the option directly, using a cmake cache, or modifying the value with ccmake later will all work. Whether or not to install into the nested subdirectory is also probably fine to default to match.

The arch and platform subdirs are computed by the compiler for the platform and they aren't boolean options, so they shouldn't be options. We don't need to inherit them, just use the value coming out of PlatformInfo. Maybe later, we could look to see if these values have all been set and avoid invoking the compiler to get this info since process launches are expensive on Windows, but I don't think it's worth worrying about now.

Lets drop the defaults for:

platform subdirectory

arch subdirectory

compiler variant target

Runtimes/Supplemental/Synchronization/CMakeLists.txt

etcwilde · 2025-05-06T02:51:59Z

Runtimes/Supplemental/Synchronization/CMakeLists.txt

+
+set_target_properties(swiftSynchronization PROPERTIES
+  Swift_MODULE_NAME Synchronization
+  Swift_COMPILATION_MODE wholemodule)


Is WMO required to build the synchronization library? It should be fine to set CMAKE_Swift_COMPILATION_MODE in a cache or as a flag. Incremental builds make iterating on the library faster.

etcwilde · 2025-05-06T02:52:57Z

Runtimes/Supplemental/Synchronization/CMakeLists.txt

+  Swift_COMPILATION_MODE wholemodule)
+
+if(APPLE AND BUILD_SHARED_LIBS)
+  target_link_options(swiftSynchronization PRIVATE "SHELL:-Xlinker -headerpad_max_install_names")


I think this is an Apple-ism that isn't needed externally. We can move it into the vendor files.

I think that leaving this in an APPLE clause is fine. This is mostly a MachO thing (which has a similar issue on ELF). Changing the encoded values post-facto is difficult unless padding is included when linking.

justice-adams-apple · 2025-05-13T16:25:38Z

@swift-ci please smoke test

edymtt · 2025-05-13T21:21:51Z

Runtimes/Supplemental/CMakeLists.txt

@@ -22,6 +22,7 @@ endif()

 set(COMMON_OPTIONS
  -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
+  -DSDKROOT=${SDKROOT}


I believe we want to pass Swift_SDKROOT to be used by find_package(SwiftCore...) -- SDKROOT is meant to be an environment variable, and that should be passed as a result of child processes inheriting the environment of the parent.

Suggested change

-DSDKROOT=${SDKROOT}

-DSwift_SDKROOT=${Swift_SDKROOT}

justice-adams-apple · 2025-05-13T21:49:46Z

@swift-ci please smoke test

edymtt · 2025-05-14T15:48:24Z

Runtimes/Supplemental/CMakeLists.txt

@@ -22,6 +22,7 @@ endif()

 set(COMMON_OPTIONS
  -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
+  -DSwift_SDKROOT=${SDKROOT}


I believe the name of the source variable needs to be amended

Suggested change

-DSwift_SDKROOT=${SDKROOT}

-DSwift_SDKROOT=${Swift_SDKROOT}

edymtt · 2025-05-14T15:52:35Z

Runtimes/Supplemental/Synchronization/CMakeLists.txt

+set(${PROJECT_NAME}_INSTALL_SWIFTMODULEDIR "${CMAKE_INSTALL_LIBDIR}/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>$<$<BOOL:${Supplemental_INSTALL_NESTED_SUBDIR}>:/${Supplemental_PLATFORM_SUBDIR}>" CACHE STRING "")
+
+install(TARGETS swiftSynchronization
+  EXPORT SwiftSupplementalTargets


Probably it does not make sense to reference Supplemental here (since each library can be build standalone)

Suggested change

EXPORT SwiftSupplementalTargets

EXPORT SwiftSynchronizationTargets

edymtt · 2025-05-14T17:09:46Z

Runtimes/Supplemental/Synchronization/CMakeLists.txt

+  ${SwiftCore_ENABLE_PRESPECIALIZATION})
+
+include(CatalystSupport)
+include(EmitSwiftInterface)


We likely need to import InstallSwiftInterface to be able to call install_swift_interface

include(InstallSwiftInterface)

Addresses rdar://150300769

justice-adams-apple · 2025-05-15T16:32:53Z

@swift-ci please smoke test

compnerd · 2025-05-16T00:12:43Z

Turns out that I need this to enable the early-swift-driver on Windows :(

compnerd · 2025-05-16T03:30:27Z

Playing around with this for Windows, I found a couple of issues. But in fixing that, I also re-ordered things to make it more uniform with the other builds. Would you like me to push the changes to this branch?

justice-adams-apple · 2025-05-16T16:15:20Z

@compnerd I'll go ahead and land this and then you can open a new PR to make it a bit easier to manage

compnerd · 2025-05-16T16:17:55Z

@justice-adams-apple that sounds like a plan to me - please merge this.

compnerd

Let's merge this to unblock/fix the remaining issues.

justice-adams-apple requested review from etcwilde, compnerd and edymtt as code owners May 5, 2025 22:13

compnerd reviewed May 5, 2025

View reviewed changes

etcwilde reviewed May 6, 2025

View reviewed changes

justice-adams-apple force-pushed the add-synchronization branch 2 times, most recently from ed8ed44 to c3f5f51 Compare May 13, 2025 16:24

edymtt approved these changes May 13, 2025

View reviewed changes

justice-adams-apple force-pushed the add-synchronization branch from c3f5f51 to 32b2846 Compare May 13, 2025 21:49

edymtt reviewed May 14, 2025

View reviewed changes

edymtt mentioned this pull request May 15, 2025

[Runtimes][CMake] Build Differentiation in new style. #81239

Open

[cmake] add Synchronization library to Supplemental build

c9b6e23

Addresses rdar://150300769

justice-adams-apple force-pushed the add-synchronization branch from 32b2846 to c9b6e23 Compare May 15, 2025 16:31

edymtt mentioned this pull request May 15, 2025

[Runtimes][CMake] Add Distributed to Supplemental build #81529

Open

compnerd approved these changes May 16, 2025

View reviewed changes

justice-adams-apple merged commit 50e3070 into main May 16, 2025
3 checks passed

justice-adams-apple deleted the add-synchronization branch May 16, 2025 16:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[cmake] add Synchronization library to Supplemental build #81310

[cmake] add Synchronization library to Supplemental build #81310

justice-adams-apple commented May 5, 2025 •

edited

Loading

compnerd May 5, 2025

compnerd May 5, 2025

compnerd May 5, 2025

etcwilde May 6, 2025

etcwilde May 6, 2025

etcwilde May 6, 2025

etcwilde May 6, 2025

compnerd May 8, 2025

justice-adams-apple commented May 13, 2025

edymtt May 13, 2025 •

edited

Loading

justice-adams-apple commented May 13, 2025

edymtt May 14, 2025

edymtt May 14, 2025

edymtt May 14, 2025

justice-adams-apple commented May 15, 2025

compnerd commented May 16, 2025

compnerd commented May 16, 2025

justice-adams-apple commented May 16, 2025

compnerd commented May 16, 2025

compnerd left a comment


		set(CMAKE_POSITION_INDEPENDENT_CODE YES)

		list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake/modules")

	EXPORT SwiftSupplementalTargets
	EXPORT SwiftSynchronizationTargets

[cmake] add Synchronization library to Supplemental build #81310

[cmake] add Synchronization library to Supplemental build #81310

Conversation

justice-adams-apple commented May 5, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

justice-adams-apple commented May 13, 2025

edymtt May 13, 2025 • edited Loading

Choose a reason for hiding this comment

justice-adams-apple commented May 13, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

justice-adams-apple commented May 15, 2025

compnerd commented May 16, 2025

compnerd commented May 16, 2025

justice-adams-apple commented May 16, 2025

compnerd commented May 16, 2025

compnerd left a comment

Choose a reason for hiding this comment

justice-adams-apple commented May 5, 2025 •

edited

Loading

edymtt May 13, 2025 •

edited

Loading