[Darwin] Further restrict inference of the simulator environment #30771

DougGregor · 2020-04-02T17:08:57Z

The *-simulator target triples have been used mostly consistently in build systems for
several years to indicate simulator targets... except for Swift's own CMake configuration
and build-script, which was still not doing it until recently. There are still .swiftinterface
files around that depend on the inference.

Rather than outright removing inference of the "simulator" environment, move it into
the driver and warn that it's happening, so other tools can move off it over time. This
ensures that all frontend/linker/etc. jobs see the "simulator" environment, so the hack is
only in a single place.

This is as far as we can go toward completely removing the hack (rdar://problem/35810403),
because of the need to continue supporting existing .swiftinterface files.

DougGregor · 2020-04-02T17:09:07Z

@swift-ci please test

harlanhaskins · 2020-04-02T18:01:12Z

Seems like we should also remove this from swift-driver. https://github.com/apple/swift-driver/blob/master/Sources/SwiftDriver/Utilities/Triple%2BPlatforms.swift#L133

swift-ci · 2020-04-02T18:28:11Z

Build failed
Swift Test Linux Platform
Git Sha - 2d66f2b50a3a28f3b8beb7986eec59cc8aa5cc48

DougGregor · 2020-04-02T18:51:07Z

Linux failure is unrelated. Trying again...

DougGregor · 2020-04-02T18:51:15Z

@swift-ci please test source compatibility

DougGregor · 2020-04-02T18:51:23Z

@swift-ci please smoke test Linux

DougGregor · 2020-04-02T20:18:48Z

GitHub connectivity problems affected the compatibility suite. Sigh.

DougGregor · 2020-04-02T20:23:44Z

GitHub connectivity problems affected the compatibility suite. Sigh.

DougGregor · 2020-04-02T20:36:13Z

@swift please test source compatibility

swift-ci · 2020-04-02T21:51:10Z

Build failed
Swift Test OS X Platform
Git Sha - 2d66f2b50a3a28f3b8beb7986eec59cc8aa5cc48

DougGregor · 2020-04-03T19:50:26Z

@swift-ci please test

swift-ci · 2020-04-03T19:52:33Z

Build failed
Swift Test Linux Platform
Git Sha - 2d66f2b50a3a28f3b8beb7986eec59cc8aa5cc48

swift-ci · 2020-04-03T19:53:57Z

Build failed
Swift Test OS X Platform
Git Sha - 2d66f2b50a3a28f3b8beb7986eec59cc8aa5cc48

DougGregor · 2020-04-04T03:57:28Z

@swift-ci please clean test

DougGregor · 2020-04-04T03:58:28Z

@swift-ci please clean test

DougGregor · 2020-04-04T03:58:35Z

@swift-ci please test source compatibility

DougGregor · 2020-04-04T03:59:17Z

@swift-ci please clean test

DougGregor · 2020-04-04T03:59:26Z

@swift-ci please test source compatibility

swift-ci · 2020-04-04T05:05:50Z

Build failed
Swift Test OS X Platform
Git Sha - 7346da6a2719ce6024eb8758e5feacbee3dcea18

swift-ci · 2020-04-04T05:20:43Z

Build failed
Swift Test Linux Platform
Git Sha - 7346da6a2719ce6024eb8758e5feacbee3dcea18

DougGregor · 2020-04-06T17:26:34Z

@swift-ci please test

swift-ci · 2020-04-06T17:29:13Z

Build failed
Swift Test Linux Platform
Git Sha - 7346da6a2719ce6024eb8758e5feacbee3dcea18

swift-ci · 2020-04-06T17:30:12Z

Build failed
Swift Test OS X Platform
Git Sha - 7346da6a2719ce6024eb8758e5feacbee3dcea18

DougGregor · 2020-04-08T03:46:18Z

Much of this pull request came in via #30843. I'll rebase the rest on top of this.

compnerd · 2020-04-08T16:20:24Z

cmake/modules/SwiftConfigureSDK.cmake

@@ -172,6 +174,13 @@ macro(configure_sdk_darwin
    "${SWIFT_SDK_${prefix}_ARCHITECTURES}"        # rhs
    SWIFT_SDK_${prefix}_MODULE_ARCHITECTURES)     # result

+  # Determine whether this is a simulator SDK.
+  if ( ${xcrun_name} MATCHES "simulator" )


The convention in LLVM (and Swift) is not have spaces after the if and not to have spaces inside the (.

Suggested change

if ( ${xcrun_name} MATCHES "simulator" )

if(xcrun_name MATCHES simulator)

I had no idea, thank you!

compnerd · 2020-04-08T16:20:38Z

cmake/modules/SwiftConfigureSDK.cmake

@@ -181,6 +190,12 @@ macro(configure_sdk_darwin
    set(SWIFT_SDK_${prefix}_ARCH_${arch}_TRIPLE
        "${arch}-apple-${SWIFT_SDK_${prefix}_TRIPLE_NAME}")

+    # If this is a simulator target, append -simulator.
+    if (SWIFT_SDK_${prefix}_IS_SIMULATOR)


Suggested change

if (SWIFT_SDK_${prefix}_IS_SIMULATOR)

if(SWIFT_SDK_${prefix}_IS_SIMULATOR)

compnerd · 2020-04-08T16:20:51Z

cmake/modules/SwiftConfigureSDK.cmake

+    if (SWIFT_SDK_${prefix}_IS_SIMULATOR)
+      set(SWIFT_SDK_${prefix}_ARCH_${arch}_TRIPLE
+          "${SWIFT_SDK_${prefix}_ARCH_${arch}_TRIPLE}-simulator")
+    endif ()


Suggested change

endif ()

endif()

The *-simulator target triples have been used consistently in tools for several years to indicate simulator targets. Stop inferring the simulator part, rdar://problem/35810403.

It's just Triple::isSimulatorEnvironment() now.

Localize the hack to infer simulator-ness of the target in the driver itself, when it first processes the target. Emit a warning about the missing "-simulator" and correct the triple immediately. This gives a longer grace period for tools that might still not pass through the simulator environment, while narrowing the hack.

DougGregor · 2020-04-16T20:40:59Z

@swift-ci please test

DougGregor · 2020-04-16T20:41:09Z

@swift-ci please test source compatibility

DougGregor · 2020-04-16T21:03:33Z

@swift-ci please test

DougGregor · 2020-04-16T21:03:43Z

@swift-ci please test source compatibility

swift-ci · 2020-04-16T21:05:38Z

Build failed
Swift Test Linux Platform
Git Sha - 643491e

swift-ci · 2020-04-16T21:07:49Z

Build failed
Swift Test OS X Platform
Git Sha - 643491e

swift-ci · 2020-04-16T21:47:35Z

Build failed
Swift Test Linux Platform
Git Sha - 643491e

swift-ci · 2020-04-16T21:49:34Z

Build failed
Swift Test OS X Platform
Git Sha - 643491e

Some code paths that see target triples go through the frontend without seeing the driver. Therefore, perform the same "simulator" inference for x86 iOS/tvOS/watchOS triples also in the frontend, to ensure that we remain compatible. Also make sure that -print-target-info performs the appropriate adjustment.

DougGregor · 2020-04-17T06:22:53Z

@swift-ci please test

DougGregor · 2020-04-17T06:23:01Z

@swift-ci please test source compatibility

swift-ci · 2020-04-17T06:25:38Z

Build failed
Swift Test Linux Platform
Git Sha - 856855d

swift-ci · 2020-04-17T06:26:27Z

Build failed
Swift Test OS X Platform
Git Sha - 856855d

…nment.

DougGregor · 2020-04-17T17:14:19Z

@swift-ci please test

DougGregor · 2020-04-17T17:14:35Z

@swift-ci please test

swift-ci · 2020-04-17T18:27:37Z

Build failed
Swift Test Linux Platform
Git Sha - 1a860e7

DougGregor · 2020-04-17T21:38:58Z

@swift-ci test platform Linux

DougGregor · 2020-04-17T22:53:00Z

@swift-ci smoke test Linux

DougGregor · 2020-04-17T22:54:14Z

@swift-ci smoke test Linux

fredriss · 2020-04-20T02:49:28Z

When this was merged, the Linux PR testing started failing in lldb tests. First Failure here: https://ci.swift.org/job/oss-swift-package-linux-ubuntu-16_04/4933/

I have no idea what's going on, it doesn't make much sense, but the revert unblocked things.

DougGregor force-pushed the stop-inferring-simulator branch from 2d66f2b to 8e0717c Compare April 3, 2020 17:11

DougGregor changed the title ~~[Platform] Stop inferring simulator-ness.~~ [CMake/build-script/Platform] Stop depending on and inferring simulator-ness. Apr 3, 2020

DougGregor force-pushed the stop-inferring-simulator branch from 8e0717c to 36bc9e3 Compare April 3, 2020 19:49

DougGregor force-pushed the stop-inferring-simulator branch from 36bc9e3 to 7346da6 Compare April 4, 2020 03:57

DougGregor force-pushed the stop-inferring-simulator branch from 7346da6 to 462a783 Compare April 6, 2020 17:18

compnerd reviewed Apr 8, 2020

View reviewed changes

DougGregor added 3 commits April 16, 2020 11:35

[Platform] Stop inferring simulator-ness.

7e7dc64

The *-simulator target triples have been used consistently in tools for several years to indicate simulator targets. Stop inferring the simulator part, rdar://problem/35810403.

[Basic] Remove swift::tripleIsAnySimulator().

992ca56

It's just Triple::isSimulatorEnvironment() now.

DougGregor force-pushed the stop-inferring-simulator branch from 462a783 to 643491e Compare April 16, 2020 20:40

DougGregor changed the title ~~[CMake/build-script/Platform] Stop depending on and inferring simulator-ness.~~ [Darwin] Further restrict inference of the simulator environment Apr 16, 2020

[Driver] Update a test for the simulator inference.

856855d

[Simulators] Only infer simulator environment when there is no enviro…

1a860e7

…nment.

DougGregor merged commit 22cdddd into swiftlang:master Apr 18, 2020

DougGregor deleted the stop-inferring-simulator branch April 18, 2020 03:59

compnerd mentioned this pull request Apr 19, 2020

Revert "[Darwin] Further restrict inference of the simulator environment" #31144

Merged

	if ( ${xcrun_name} MATCHES "simulator" )
	if(xcrun_name MATCHES simulator)

	if (SWIFT_SDK_${prefix}_IS_SIMULATOR)
	if(SWIFT_SDK_${prefix}_IS_SIMULATOR)

[Darwin] Further restrict inference of the simulator environment #30771

[Darwin] Further restrict inference of the simulator environment #30771

Uh oh!

Conversation

DougGregor commented Apr 2, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DougGregor commented Apr 2, 2020

Uh oh!

harlanhaskins commented Apr 2, 2020

Uh oh!

swift-ci commented Apr 2, 2020

Uh oh!

DougGregor commented Apr 2, 2020

Uh oh!

DougGregor commented Apr 2, 2020

Uh oh!

DougGregor commented Apr 2, 2020

Uh oh!

DougGregor commented Apr 2, 2020

Uh oh!

DougGregor commented Apr 2, 2020

Uh oh!

DougGregor commented Apr 2, 2020

Uh oh!

swift-ci commented Apr 2, 2020

Uh oh!

DougGregor commented Apr 3, 2020

Uh oh!

swift-ci commented Apr 3, 2020

Uh oh!

swift-ci commented Apr 3, 2020

Uh oh!

DougGregor commented Apr 4, 2020

Uh oh!

DougGregor commented Apr 4, 2020

Uh oh!

DougGregor commented Apr 4, 2020

Uh oh!

DougGregor commented Apr 4, 2020

Uh oh!

DougGregor commented Apr 4, 2020

Uh oh!

swift-ci commented Apr 4, 2020

Uh oh!

swift-ci commented Apr 4, 2020

Uh oh!

DougGregor commented Apr 6, 2020

Uh oh!

swift-ci commented Apr 6, 2020

Uh oh!

swift-ci commented Apr 6, 2020

Uh oh!

DougGregor commented Apr 8, 2020

Uh oh!

compnerd Apr 8, 2020

Choose a reason for hiding this comment

Uh oh!

DougGregor Apr 9, 2020

Choose a reason for hiding this comment

Uh oh!

compnerd Apr 8, 2020

Choose a reason for hiding this comment

Uh oh!

compnerd Apr 8, 2020

Choose a reason for hiding this comment

Uh oh!

DougGregor commented Apr 16, 2020

Uh oh!

DougGregor commented Apr 16, 2020

Uh oh!

DougGregor commented Apr 16, 2020

Uh oh!

DougGregor commented Apr 16, 2020

Uh oh!

swift-ci commented Apr 16, 2020

Uh oh!

swift-ci commented Apr 16, 2020

Uh oh!

swift-ci commented Apr 16, 2020

DougGregor commented Apr 2, 2020 •

edited

Loading