Unified Swift Module Layout #32690

compnerd · 2020-07-02T20:14:14Z

Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate.

Resolves SR-NNNN.

compnerd · 2020-07-02T20:15:32Z

CC: @brentdax @DougGregor

This set of changes allows us to have the same module structure on all the platforms. This actually cleans up the cross-compilation path on Windows and Linux, simplifies the build rules, simplifies the driver (in the long run - in the short term, there is a little bit of complexity to get migration compatibility). It also means that there is less overhead on the developer to consider different layouts.

compnerd · 2020-07-02T20:15:38Z

@swift-ci please clean test

swift-ci · 2020-07-02T21:38:00Z

Build failed
Swift Test Linux Platform
Git Sha - 2ff2464ee5baa48792bc1e2157bd2de1208d8a9f

compnerd · 2020-07-03T00:13:25Z

@swift-ci please test Windows platform

compnerd · 2020-07-03T01:25:11Z

@swift-ci please clean test Linux platform

swift-ci · 2020-07-03T02:41:58Z

Build failed
Swift Test Linux Platform
Git Sha - 2ff2464ee5baa48792bc1e2157bd2de1208d8a9f

DougGregor

The unification here looks good, thank you!

beccadax

Just some minor suggestions—I like this change overall!

beccadax · 2020-07-09T23:08:18Z

stdlib/cmake/modules/SwiftSource.cmake

In theory, this is a change of behavior for Mac Catalyst, but I don't see any signs that this particular path was ever exercised by Catalyst libraries, so it should be fine.

This was purely a mechanical unconditonalization of the paths. I was aiming to do the minimal thing to make this work. There were a few paths that were of questionable value, but this isn't about the cleanup to the build, merely trying to get the same structure on all the targets.

lib/Serialization/SerializedModuleLoader.cpp

compnerd · 2020-07-19T19:34:01Z

@swift-ci please clean test

swift-ci · 2020-07-19T19:36:19Z

Build failed
Swift Test Linux Platform
Git Sha - 2ff2464ee5baa48792bc1e2157bd2de1208d8a9f

swift-ci · 2020-07-19T20:23:22Z

Build failed
Swift Test OS X Platform
Git Sha - b30b62c29659591035621676744bea26c3c554bd

compnerd · 2020-07-28T00:34:09Z

Updated lit configuration (there was a new substitution change), fix the interpreter test.

compnerd · 2020-07-28T00:34:14Z

@swift-ci please clean test

swift-ci · 2020-07-28T01:57:14Z

Build failed
Swift Test Linux Platform
Git Sha - 4e7bb92e5072e756d0d07fcdc1c9d9a853b3f9af

swift-ci · 2020-07-28T03:34:08Z

Build failed
Swift Test OS X Platform
Git Sha - 4e7bb92e5072e756d0d07fcdc1c9d9a853b3f9af

compnerd · 2020-07-28T16:17:41Z

@swift-ci please clean test Linux platform

swift-ci · 2020-07-28T17:38:57Z

Build failed
Swift Test Linux Platform
Git Sha - 4e7bb92e5072e756d0d07fcdc1c9d9a853b3f9af

compnerd · 2020-07-28T18:28:01Z

@swift-ci please clean test

swift-ci · 2020-07-28T18:30:53Z

Build failed
Swift Test Linux Platform
Git Sha - 4e7bb92e5072e756d0d07fcdc1c9d9a853b3f9af

swift-ci · 2020-07-28T18:32:18Z

Build failed
Swift Test OS X Platform
Git Sha - 4e7bb92e5072e756d0d07fcdc1c9d9a853b3f9af

compnerd · 2020-08-01T16:11:57Z

Please test with following PRs:
swiftlang/llvm-project#1577

@swift-ci please clean test

swift-ci · 2020-08-01T17:43:39Z

Build failed
Swift Test Linux Platform
Git Sha - cde5ac0ad291a0d6e341d3323bf018e43aecb24e

compnerd · 2020-08-03T15:48:06Z

@swift-ci please clean test

swift-ci · 2020-08-03T21:28:23Z

Build failed
Swift Test Linux Platform
Git Sha - 97bacd5e10a33d28407ed95420bd68b9c41f0060

compnerd · 2020-08-03T23:55:35Z

@swift-ci please test Linux platform

swift-ci · 2020-08-04T00:32:34Z

Build failed
Swift Test Linux Platform
Git Sha - 97bacd5e10a33d28407ed95420bd68b9c41f0060

compnerd · 2020-08-04T16:14:21Z

Please test with following PRs:
swiftlang/llvm-project#1577

@swift-ci please clean test

swift-ci · 2020-08-04T16:20:43Z

Build failed
Swift Test Linux Platform
Git Sha - 97bacd5e10a33d28407ed95420bd68b9c41f0060

swift-ci · 2020-08-04T16:22:27Z

Build failed
Swift Test OS X Platform
Git Sha - 97bacd5e10a33d28407ed95420bd68b9c41f0060

compnerd · 2020-08-04T18:56:05Z

@swift-ci please clean test

swift-ci · 2020-08-04T20:20:08Z

Build failed
Swift Test Linux Platform
Git Sha - 97bacd5e10a33d28407ed95420bd68b9c41f0060

Adjust the serialized module loader to allow directory layouts for the Swift module on non-Darwin targets, unifying the layout across all the platforms. It also eases cross-architecture and cross-platform development by having the same layout, which can enable more similar flag usage.

compnerd · 2020-09-13T17:55:57Z

@swift-ci please clean test

swift-ci · 2020-09-13T19:16:13Z

Build failed
Swift Test Linux Platform
Git Sha - a7a17880990b7fa778c8cc9ac455f048a6703acb

This changes the install layout to be similar across Darwin and non-Darwin platforms. This will enable simplifying the user experience, build infrastructure, and the driver as the SDK layout converges towards a single layout on all the platforms.

compnerd · 2020-09-14T00:47:16Z

@swift-ci please clean test

swift-ci · 2020-09-14T00:50:13Z

Build failed
Swift Test OS X Platform
Git Sha - a7a17880990b7fa778c8cc9ac455f048a6703acb

swift-ci · 2020-09-14T00:50:15Z

Build failed
Swift Test Linux Platform
Git Sha - a7a17880990b7fa778c8cc9ac455f048a6703acb

compnerd · 2020-09-14T01:30:26Z

@swift-ci please test windows platform

compnerd · 2020-09-14T17:09:53Z

Please test with following PRs:
swiftlang/llvm-project#1799

@swift-ci please test Linux platform

swift-ci · 2020-09-14T18:29:50Z

Build failed
Swift Test Linux Platform
Git Sha - af868e5

compnerd · 2020-09-14T20:08:04Z

CC: @adrian-prantl

compnerd · 2020-09-14T21:02:33Z

Please test with following PRs:
swiftlang/llvm-project#1799

@swift-ci please test Linux platform

adrian-prantl · 2020-09-14T21:19:50Z

Do you have an example of old versus new layout?

compnerd · 2020-09-14T22:05:32Z

@adrian-prantl sure:

Old:

usr/lib/swift/linux/x86_64/Swift.swiftmodule
usr/lib/swift/linux/x86_64/Swift.swiftdoc
usr/lib/swift/linux/x86_64/Swift.swiftinterface

New:

usr/lib/swift/linux/Swift.swiftmodule/x86_64-unknown-linux-gnu.swiftmodule
usr/lib/swift/linux/Swift.swiftmodule/x86_64-unknown-linux-gnu.swiftdoc
usr/lib/swift/linux/Swift.swiftmodule/x86_64-unknown-linux-gnu.swiftinterface

Basically, the Darwin layout and Linux/Windows layout will be identical.

compnerd · 2020-09-14T23:36:19Z

@swift-ci please test macOS platform

adrian-prantl · 2020-09-15T01:00:15Z

That looks like an improvement :-)
Thanks!

DougGregor approved these changes Jul 6, 2020

View reviewed changes

beccadax requested changes Jul 9, 2020

View reviewed changes

compnerd force-pushed the grand-unified-module-theory branch from 2ff2464 to b30b62c Compare July 19, 2020 19:33

compnerd force-pushed the grand-unified-module-theory branch from b30b62c to 6853f07 Compare July 19, 2020 19:36

compnerd force-pushed the grand-unified-module-theory branch from 6853f07 to 6de5212 Compare July 23, 2020 15:59

beccadax approved these changes Jul 27, 2020

View reviewed changes

compnerd force-pushed the grand-unified-module-theory branch from 6de5212 to 4e7bb92 Compare July 28, 2020 00:33

compnerd force-pushed the grand-unified-module-theory branch from 4e7bb92 to cde5ac0 Compare July 28, 2020 18:27

compnerd force-pushed the grand-unified-module-theory branch from cde5ac0 to 97bacd5 Compare August 3, 2020 15:47

compnerd force-pushed the grand-unified-module-theory branch from 97bacd5 to a7a1788 Compare September 13, 2020 17:55

compnerd force-pushed the grand-unified-module-theory branch from a7a1788 to af868e5 Compare September 14, 2020 00:47

adrian-prantl self-requested a review September 15, 2020 19:01

adrian-prantl approved these changes Sep 15, 2020

View reviewed changes

compnerd merged commit 507ffe6 into swiftlang:master Sep 16, 2020

compnerd deleted the grand-unified-module-theory branch September 16, 2020 00:23

Unified Swift Module Layout #32690

Unified Swift Module Layout #32690

Uh oh!

Conversation

compnerd commented Jul 2, 2020

Uh oh!

compnerd commented Jul 2, 2020

Uh oh!

compnerd commented Jul 2, 2020

Uh oh!

swift-ci commented Jul 2, 2020

Uh oh!

compnerd commented Jul 3, 2020

Uh oh!

compnerd commented Jul 3, 2020

Uh oh!

swift-ci commented Jul 3, 2020

Uh oh!

DougGregor left a comment

Choose a reason for hiding this comment

Uh oh!

beccadax left a comment

Choose a reason for hiding this comment

Uh oh!

beccadax Jul 9, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

compnerd Jul 9, 2020

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

compnerd commented Jul 19, 2020

Uh oh!

swift-ci commented Jul 19, 2020

Uh oh!

swift-ci commented Jul 19, 2020

Uh oh!

compnerd commented Jul 28, 2020

Uh oh!

compnerd commented Jul 28, 2020

Uh oh!

swift-ci commented Jul 28, 2020

Uh oh!

swift-ci commented Jul 28, 2020

Uh oh!

compnerd commented Jul 28, 2020

Uh oh!

swift-ci commented Jul 28, 2020

Uh oh!

compnerd commented Jul 28, 2020

Uh oh!

swift-ci commented Jul 28, 2020

Uh oh!

swift-ci commented Jul 28, 2020

Uh oh!

compnerd commented Aug 1, 2020

Uh oh!

swift-ci commented Aug 1, 2020

Uh oh!

compnerd commented Aug 3, 2020

Uh oh!

swift-ci commented Aug 3, 2020

Uh oh!

compnerd commented Aug 3, 2020

Uh oh!

swift-ci commented Aug 4, 2020

Uh oh!

compnerd commented Aug 4, 2020

Uh oh!

swift-ci commented Aug 4, 2020

Uh oh!

swift-ci commented Aug 4, 2020

Uh oh!

compnerd commented Aug 4, 2020

Uh oh!

swift-ci commented Aug 4, 2020

Uh oh!

compnerd commented Sep 13, 2020

beccadax Jul 9, 2020 •

edited

Loading