Commit Graph

1144 Commits

Author SHA1 Message Date
Saleem Abdulrasool
7020740dcf Merge pull request #21326 from xiaobai/swift_component_required
[CMake] Require SWIFT_COMPONENT for add_swift_host_tool
2018-12-14 17:30:47 -08:00
Nathan Lanza
c442763219 Cache VCVARS variables for incremental building on Windows
The initial configure & generate of a build on Windows should have
the necessary VCVARS set in the environment. After that, we should be
incrementally building with those same vars to avoid conflicts between
Windows SDKs.

Cache these vars so that the same Windows SDKs are consistently used
in future incremental builds.
2018-12-14 15:06:28 -08:00
Saleem Abdulrasool
3225e36d63 stdlib: reorder add_subdirectory to repair the Windows build
Due to the horrible attrocities against software of the attempt to perform
cross-compilation in the swift build system, we need to emulate the linking
behaviour for Windows with the link against the import library.  The emulation
requires the custom creation of import library targets.  In order to actually
get the linking semantics correct, the dependendency targets must be created
prior to use (unlike standard CMake).  The reordering ensures that we get
correct linkage when building for Windows.

Perform a simple optimization to avoid a number of string comparisions for the
host system.
2018-12-14 13:56:16 -08:00
Greg Parker
41f048410a [build] Fix generated header files in standalone overlay builds. (#21206) 2018-12-14 13:28:53 -08:00
Daniel Rodríguez Troitiño
bcf800a15d [android] Link with static C++ ABI for Android.
Normally, the C++ shared library would have link against the C++ ABI
shared library, but the Android NDK does not distribute the later, so
one need to link manually against the static C++ ABI from the NDK.
2018-12-14 13:23:31 -08:00
Alex Langford
5d5d01a2fe [CMake] Require SWIFT_COMPONENT for add_swift_host_tool 2018-12-14 12:27:53 -08:00
Saleem Abdulrasool
883966edda build: only add -Fsystem path if configured
The system framework paths are only configured for the Apple targets.  Add a
condition to avoid a search path to be added for other SDKs.
2018-12-13 09:42:04 -08:00
Michael Gottesman
b2ae3a8b2c [cmake] Move add_swift_target_executable into the new stdlib cmake directory.
This will ensure that additional target executables can not be added to the rest
of the swift project without anyone noticing since the non-stdlib parts of
Swift's cmake will not have visibility of the declaration unless they change the
cmake lookup paths.
2018-12-11 16:43:49 -08:00
Saleem Abdulrasool
522f97da43 build: simplify the blocks handling
`-fblocks` is a core driver option now, so it can be used with both the GCC
style driver as well as the cl style driver.  Simplify the logic for the
handling of this option.
2018-12-07 08:24:19 -08:00
Saleem Abdulrasool
0a601defd5 build: use the right extension for Windows for swiftrt
The swift image registrar uses the extension `.obj` as is traditional on
Windows.  Ensure that we get the extension correct when cross-compiling with the
Swift specific cross-compilation system.
2018-12-06 15:51:35 -08:00
Daniel Rodríguez Troitiño
b3b0d87055 [android] Avoid linking twice with C++
The Android targetted libraries already link (manually) with the Android
NDK C++ libraries. When using Clang and lld, an extra link to libc++ is
requested, which will fail because Android names it libc++_shared.so
instead. To avoid looking for the wrong name, and since the library is
referenced manually either way, request no linking with the standard C++
libraries (but add the math library in, which is implicitly linked when
C++ is linked, and it is needed for Glibc at least).
2018-12-06 11:10:22 -08:00
Argyrios Kyrtzidis
9694851c23 Merge pull request #21075 from akyrtzi/syntax-parser-cmake-prep
[CMake] Move cross-platform dispatch/blocks support to the tools level, in preparation for the syntax parser library
2018-12-06 09:35:52 -08:00
Argyrios Kyrtzidis
92377cc145 [CMake] Move cross-platform dispatch/blocks support to the tools level, in preparation for the syntax parser library 2018-12-05 22:41:39 -08:00
Saleem Abdulrasool
e3b699bb59 build: overwrite the fat libraries with the targets
Ensure that the use the target specific names for the fat libraries for
non-MachO targets which do not support fat libraries.  This fixes the
windows build.
2018-12-03 19:39:50 -08:00
swift-ci
1c703bfc94 Merge pull request #20902 from compnerd/windows-modules 2018-11-29 22:16:04 -08:00
Saleem Abdulrasool
3d1839a016 build: support SWIFT_MODULE_DEPENDS_WINDOWS
Add support for depending on swift modules for the windows target.  This
is needed as the private swift modules start to build on Windows.
2018-11-29 19:26:59 -08:00
Saleem Abdulrasool
16a4af0e5b build: assume a parallel tree layout for unified builds
Attempt to repair the build for the unified swift build.  This allows us
to build a single unified toolchain with swift support.  In this layout
assume that cmark and clang are peers of LLVM rather than located in
`tools`.  Doing so allows a uniform layout of the tree and a simpler
build approach.
2018-11-29 12:26:02 -08:00
Michael Gottesman
f0fb3cf70f [gardening] Invert an if condition to reduce indentation. 2018-11-28 23:18:27 -08:00
Daniel Rodríguez Troitiño
def11722a9 Split link flags and link libraries lists to make gold happy.
gold is more strict than lld about the order of the arguments, that's
why CMake offers two different properties for the linker: LINK_FLAGS and
LINK_LIBRARIES. The former _add_variant_link_flags was adding the
libraries to LINK_FLAGS, when the correct thing is to add them to
LINK_LIBRARIES.

The change adds a new output variable for _add_variant_link_flags which
will containt the linked libraries, and CMake will be able to generate
the correct command line invocation for when gold is used.

This should fix the Android CI build.
2018-11-27 15:24:52 -08:00
Jordan Rose
db7529fa5c Merge pull request #20784 from jrose-apple/generated-nine-out-of-ten
[CMake] Conditionalize generation of .swiftinterface files
2018-11-27 09:09:55 -08:00
Saleem Abdulrasool
d1eb3a54b4 Merge pull request #20766 from compnerd/importing-fat
build; correct swift fat library linking on Windows
2018-11-26 21:36:31 -08:00
Jordan Rose
605c9f619f [CMake] Conditionalize generation of .swiftinterface files
SWIFT_ENABLE_PARSEABLE_MODULE_INTERFACES is the new setting.

rdar://problem/44942414
2018-11-26 17:04:46 -08:00
Saleem Abdulrasool
d8bce85076 build; correct swift fat library linking on Windows
Windows does not link against the library but the import library.  When
building the target specific bits, we unfortunately do not use the cmake
build infrastructure properly.  This results in us trying to link
against libraries which do not exist.  Redirect the link to the right
files.  This allows us to build swift-reflection-test.
2018-11-26 16:38:38 -08:00
Saleem Abdulrasool
6a0989b7a2 build: pass /GR- when using cl-like drivers
When building with clang-cl, we should pass /GR- rather than the
gcc-style driver options.  This repairs the build of swift on Windows.
2018-11-26 12:50:18 -08:00
Saleem Abdulrasool
66fa742732 Merge pull request #20718 from compnerd/host-tools-dce
host tools DCE
2018-11-26 09:55:17 -08:00
Saleem Abdulrasool
adfb508317 build: specify architecture when building for Windows
The Windows SDK requires that the architecture is specified.
2018-11-25 19:09:29 -08:00
Saleem Abdulrasool
1f9feb550f add_swift_host_tool: DCE DEPENDS (NFC) 2018-11-23 11:03:34 -08:00
Saleem Abdulrasool
9110ae733e add_swift_host_tool: DCE COMPILE_FLAGS (NFC) 2018-11-23 11:03:34 -08:00
Saleem Abdulrasool
47e060878d add_swift_host_tool: DCE SWIFT_MODULE_DEPENDS (NFC) 2018-11-23 11:03:34 -08:00
Harlan Haskins
b707b891d5 Merge pull request #20554 from harlanhaskins/swiftsyntaxn't
[CMake] Remove swift-syntax install component
2018-11-14 11:16:06 -08:00
Harlan Haskins
0a861af752 [CMake] Remove swift-syntax install component 2018-11-13 17:29:01 -08:00
Michael Gottesman
e2d7f77557 [semantic-sil] Enable the mandatory sil ownership optimization on all stdlib overlays.
We can do this b/c all overlays pass the ownership verifier, so it is safe.
2018-11-13 16:08:14 -08:00
Saleem Abdulrasool
5e9a70812f Merge pull request #20351 from compnerd/optionless
build: remove DONT_STRIP_MAIN_SYMBOL, DISABLE_ASLR flags
2018-11-12 10:34:38 -08:00
Andrew Trick
945ee929ad Merge pull request #20302 from atrick/enforce-exclusivity
Enable run-time exclusivity checking in release mode.
2018-11-07 08:47:01 -08:00
Michael Gottesman
a761d7c0ba Revert "Revert "Revert "[Build System: CMake] make add_swift_library a wrapper to add_llvm_library"""
This reverts commit 121f5b64be.

Sorry to revert this again. This commit makes some pretty big changes. After
messing with the merge-conflict created by this internally, I did not feel
comfortable landing this now. I talked with Saleem and he agreed with me that
this was the right thing to do.
2018-11-06 13:24:00 -08:00
Saleem Abdulrasool
f3e4982179 build: remove DONT_STRIP_MAIN_SYMBOL, DISABLE_ASLR flags
These flags are unused by the single add_swift_executable call.  Remove
support for these flags.
2018-11-05 22:46:09 -08:00
Saleem Abdulrasool
d082e15d99 Merge pull request #20340 from compnerd/symlinks
build: do not create WinSDK symlinks when unneeded
2018-11-05 22:33:59 -08:00
Saleem Abdulrasool
a5d360ba7a build: do not create WinSDK symlinks when unneeded
When building on case insensitive filesystems, there is no need to
create the library symlink forest as the paths will be resolved properly
due to the insensitivity.  This avoids a bit of work and spew on
Windows.
2018-11-05 16:16:08 -08:00
Saleem Abdulrasool
121f5b64be Revert "Revert "[Build System: CMake] make add_swift_library a wrapper to add_llvm_library""
This reverts commit 103f9a8246.
2018-11-05 14:37:40 -08:00
Saleem Abdulrasool
c46f61c83c build: handle directories for unified build
The directory paths would collide with a cross-compiled unified build of
LLVM and swift.  Adjust the directories to work in that environment.
2018-11-03 18:14:01 -07:00
Andrew Trick
a17dbc7c74 Enable run-time exclusivity checking in release mode.
This change could impact Swift programs that previously appeared
well-behaved, but weren't fully tested in debug mode. Now, when running
in release mode, they may trap with the message "error: overlapping
accesses...".

Recent optimizations have brought performance where I think it needs
to be for adoption. More optimizations are planned, and some
benchmarks should be further improved, but at this point we're ready
to begin receiving bug reports. That will help prioritize the
remaining work for Swift 5.

Of the 656 public microbenchmarks in the Swift repository, there are
still several regressions larger than 10%:

TEST                    OLD      NEW      DELTA      RATIO
ClassArrayGetter2       139      1307     +840.3%    **0.11x**
HashTest                631      1233     +95.4%     **0.51x**
NopDeinit               21269    32389    +52.3%     **0.66x**
Hanoi                   1478     2166     +46.5%     **0.68x**
Calculator              127      158      +24.4%     **0.80x**
Dictionary3OfObjects    391      455      +16.4%     **0.86x**
CSVParsingAltIndices2   526      604      +14.8%     **0.87x**
Prims                   549      626      +14.0%     **0.88x**
CSVParsingAlt2          1252     1411     +12.7%     **0.89x**
Dictionary4OfObjects    206      232      +12.6%     **0.89x**
ArrayInClass            46       51       +10.9%     **0.90x**

The common pattern in these benchmarks is to define an array of data
as a class property and to repeatedly access that array through the
class reference. Each of those class property accesses now incurs a
runtime call. Naturally, introducing a runtime call in a loop that
otherwise does almost no work incurs substantial overhead. This is
similar to the issue caused by automatic reference counting. In some
cases, more sophistacated optimization will be able to determine the
same object is repeatedly accessed. Furthermore, the overhead of the
runtime call itself can be improved. But regardless of how well we
optimize, there will always a class of microbenchmarks in which the
runtime check has a noticeable impact.

As a general guideline, avoid performing class property access within
the most performance critical loops, particularly on different objects
in each loop iteration. If that isn't possible, it may help if the
visibility of those class properties is private or internal.
2018-11-02 16:54:31 -07:00
Xi Ge
103f9a8246 Revert "[Build System: CMake] make add_swift_library a wrapper to add_llvm_library" 2018-11-02 12:49:07 -07:00
Saleem Abdulrasool
c3555cf0c4 add_swift_host_library: special handling for GYB sources 2018-10-31 12:46:31 -07:00
Saleem Abdulrasool
e92c2a251e add_swift_host_library: make a trivial wrapper around add_llvm_library 2018-10-31 12:46:31 -07:00
Saleem Abdulrasool
1bb88b7ec4 add_swift_host_library: remove LINK_FLAGS 2018-10-31 12:46:31 -07:00
Saleem Abdulrasool
ce32a87d79 add_swift_host_library: remove LINK_INTERFACE_LIBRARIES 2018-10-31 12:46:31 -07:00
Saleem Abdulrasool
c5c64ca3ea add_swift_host_library: rename LLVM_COMPONENT_DEPENDS to LINK_COMPONENTS 2018-10-31 12:46:31 -07:00
Saleem Abdulrasool
39dde93c88 add_swift_host_library: rename LINK_LIBRARIES to LINK_LIBS 2018-10-31 12:46:31 -07:00
Saleem Abdulrasool
e0b839330d add_swift_host_library: remove C_COMPILE_FLAGS 2018-10-31 12:46:31 -07:00
Saleem Abdulrasool
738a00a0c0 add_swift_host_library: remove FILE_DEPENDS 2018-10-31 12:46:31 -07:00