Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[master] Apple Silicon support #32705

Merged
merged 37 commits into from
Jul 5, 2020
Merged

[master] Apple Silicon support #32705

merged 37 commits into from
Jul 5, 2020

Conversation

shahmishal
Copy link
Member

No description provided.

Most of the changes fall into a few categories:
* Replace explicit "x86_64" with %target-cpu in lit tests
* Cope with architecture differences in IR/asm/etc. macOS-specific tests
…n macOS.

Most of this is enabled by an upstream change to generalize the tests
for the api-digester to properly handle all targets. The primary change
here is to account for the Swift-level ABI differences for the standard
library between Apple Silicon macOS and Intel macOS. Specifically, anything
related to Float80 will be removed from the standard library on Apple Silicon
macOS, so account for the differences.
…iling

clang and compiler-rt are rev-locked and should match.  Currently, we build clang (and use it to bootstrap the rest) but don't build compiler-rt.  We should.

This doesn't completely achieve that: this only makes us build compiler-rt for the local host.

This used to be pretty much impossible, but, since then, compiler-rt cmake support was rewritten.

We should build it for the other hosts as well, but that's trickier, because we'd need to make the cross-compiled compiler-rt build use a separate just-built clang (from the local host). We do that for the other projects, but compiler-rt is special (because it's cmake'd as a runtime part of clang/llvm).
…acy-impl.

LIPO_SRC_DIRS wasn't set for '--only-execute merged-hosts-lipo',
because the logic was skipped for actions other than install.
@shahmishal
Copy link
Member Author

@swift-ci test

@shahmishal shahmishal changed the title [master] Apple silicon support [master] Apple Silicon support Jul 3, 2020
@swift-ci
Copy link
Contributor

swift-ci commented Jul 4, 2020

Build failed
Swift Test Linux Platform
Git Sha - 899925a

@swift-ci
Copy link
Contributor

swift-ci commented Jul 4, 2020

Build failed
Swift Test OS X Platform
Git Sha - 899925a

@shahmishal
Copy link
Member Author

Screen Shot 2020-07-03 at 5 53 19 PM

swift/release/5.3 -> swift/master
- 12 unmerged commits. 1 commits are currently being merged/build/tested.
- Unmerged commits:
* 8e65afd5a004d6ee3b2420efba17d053775c1c52 Fri Jul 3 10:04:43 2020: Conflict
... 10 commits in-between ...
* f0497aca6e6f7945ca429cdcb03aa961c0335b5d Wed Jul 1 19:30:25 2020: Auto merge in progress

The bot failed because automerger is currently blocked.

Copy link
Member

@DougGregor DougGregor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great, thank you!

@shahmishal
Copy link
Member Author

@swift-ci test

${SWIFT_OSX_SDK_VERSION} STREQUAL "10.15")
set(SUPPORTED_OSX_ARCHS "x86_64")
else()
set(SUPPORTED_OSX_ARCHS "x86_64;arm64e")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this include arm64 like line 17?

Copy link
Member Author

@shahmishal shahmishal Jul 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Going to file a bugs.swift.org and follow up in the future PR. SR-13144

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This bit of code should be dead now

lib/AST/PlatformKind.cpp Outdated Show resolved Hide resolved
lib/Parse/ParseExpr.cpp Outdated Show resolved Hide resolved
shahmishal and others added 3 commits July 4, 2020 18:52
Co-authored-by: Olivier Halligon <olivier@halligon.net>
Co-authored-by: Xiaodi Wu <13952+xwu@users.noreply.github.com>
Co-authored-by: Xiaodi Wu <13952+xwu@users.noreply.github.com>
@shahmishal
Copy link
Member Author

shahmishal commented Jul 5, 2020

Full test was already done, going to only run smoke test for comment update.

@shahmishal
Copy link
Member Author

@swift-ci smoke test

@shahmishal
Copy link
Member Author

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants