Commit Graph

1731 Commits

Author SHA1 Message Date
Hugh Bellamy
097a18e4cc Merge pull request #7559 from hughbe/cmake-dead-code
[CMake] remove some unused functions and versioning dead code
2017-02-18 00:09:46 +07:00
Hugh Bellamy
38d9cb5d33 [CMake] remove dead version specific checks 2017-02-17 14:35:56 +07:00
Hugh Bellamy
2b1c5efe4b [CMake] remove redundant USES_TERMINAL checks
The minimum version of CMake is 3.4.3
2017-02-17 14:33:42 +07:00
Hugh Bellamy
aba6d41648 [CMake] remove redundant generator expression checks
The minimum version of CMake is 3.4.3
2017-02-17 14:33:08 +07:00
Hugh Bellamy
cb5800aa69 [CMake] remove some unused functions 2017-02-17 14:21:52 +07:00
Hugh Bellamy
a733b51bcb [CMake] improve precondition error message when negative precondition fails 2017-02-17 11:58:09 +07:00
Hugh Bellamy
3387b90c4b [CMake] Replace manual fatal error messages in SwiftSource.cmake with preconditions 2017-02-17 11:53:41 +07:00
Hugh Bellamy
9746582ece [CMake] Replace manual fatal error messages in AddSwift.cmake with preconditions 2017-02-17 11:51:15 +07:00
Hugh Bellamy
95f93d463d [CMake] update precondition error message 2017-02-17 11:41:29 +07:00
Chris Bieneman
01b36c061a [CMake] Re-apply all the changes from PR7500
This was reverted in PR7517 as collateral for an unrelated issue.
2017-02-16 10:07:28 -08:00
Hugh Bellamy
901b73e89c Merge pull request #7450 from hughbe/cleanup-compiler-flags
Fix potentially appending "/wd4068" on mac builds
2017-02-17 00:20:35 +07:00
Hugh Bellamy
cd34d544cb Merge pull request #7487 from hughbe/link-flags-common
Consolidate common fuse-ld linker flag setting in AddSwift
2017-02-16 19:05:31 +07:00
Michael Gottesman
8437819b5a [CMake] Revert recent changes.
These changes caused a number of issues:

1. No debug info is emitted when a release-debug info compiler is built.
2. OS X deployment target specification is broken.
3. Swift options were broken without any attempt any recreating that
functionality. The specific option in question is --force-optimized-typechecker.

Such refactorings should be done in a fashion that does not break existing
users and use cases.

This reverts commit e6ce2ff388.
This reverts commit e8645f3750.
This reverts commit 89b038ea7e.
This reverts commit 497cac64d9.
This reverts commit 953ad094da.
This reverts commit e096d1c033.

rdar://30549345
2017-02-15 22:26:06 -08:00
swift-ci
191a19c4bb Merge pull request #7500 from llvm-beanz/cmake-buildtree-package 2017-02-15 13:02:11 -08:00
Chris Bieneman
e6ce2ff388 [CMake] Fixing up CMark exports to expand at configuration
Expanding this at include time doesn't work correctly for LLDB because the variable conventions aren't consistent. Expanding and configure time means the Swift variables get expanded and passed along.
2017-02-15 10:24:55 -08:00
Hugh Bellamy
3fae0fbdec Consolidate common fuse-ld linker flag setting in AddSwift 2017-02-15 16:15:03 +07:00
Hugh Bellamy
bc432e639b Cleanup CMake _require_empty list 2017-02-15 15:20:12 +07:00
Chris Bieneman
e8645f3750 [CMake] A few fixups to the Swift CMake package generation
I messed up a few of the variable substitutions. This should get them all correct.
2017-02-14 20:03:51 -08:00
Saleem Abdulrasool
a21545e152 Merge pull request #7415 from hughbe/cmark-fixes
Fix Windows linker errors trying to statically link to cmark
2017-02-14 19:56:19 -08:00
Chris Bieneman
89b038ea7e [CMake] Include the CMark exports in SwiftConfig.cmake
Since Swift's build tree configuration depends on CMark, we should also include the CMark targets if they are not present and the Exports file is available.
2017-02-14 19:43:28 -08:00
Chris Bieneman
497cac64d9 [CMake] Add support for Swift buildtrees including CMake packages
This patch generates SwiftExports.cmake and SwiftConfig.cmake in the build tree to be compatible with CMake's `find_package` function for importing targets between CMake build trees. This will allow LLDB to consume Swift's targets and infer their transitive dependencies.
2017-02-14 19:23:13 -08:00
Chris Bieneman
953ad094da [CMake] Fix up an issue encountered in Linux PR testing
This should fix out-of-tree LLDB builds.

This patch overrides the output directories setup by llvm_add_library.
This is required because swift deviates from the LLVM convention of using the LLVM_*_INTDIR variables.

This was causing failures on LLDB's PR testing because LLDB has a terrible mechanism for picking the swift libraries. It finds all the .a files by searching a directory.
2017-02-14 14:50:50 -08:00
Chris Bieneman
e096d1c033 [CMake] Simplify add_swift_library
This patch splits add_swift_library into two functions one which handles
the simple case of adding a library that is part of the compiler being
built and the second handling the more complicated case of "target"
libraries, which may need to build for one or more targets.

The new add_swift_library is built using llvm_add_library, which re-uses
LLVM's CMake modules. In adapting to use LLVM's modules some of
add_swift_library's named parameters have been removed and
LINK_LIBRARIES has changed to LINK_LIBS, and LLVM_LINK_COMPONENTS
changed to LINK_COMPONENTS.

This patch also cleans up libswiftBasic's handling of UUID library and
headers, and how it interfaces with gyb sources.

add_swift_library also no longer has the FILE_DEPENDS parameter, which
doesn't matter because llvm_add_library's DEPENDS parameter has the same
behavior.
2017-02-14 14:28:10 -08:00
John McCall
038303b1b1 Switch MetadataCache to use a global slab allocator.
This seems to more than fix a performance regression that we
detected on a metadata-allocation microbenchmark.

A few months ago, I improved the metadata cache representation
and changed the metadata allocation scheme to primarily use malloc.
Previously, we'd been using malloc in the concurrent tree data
structure but a per-cache slab allocator for the metadata itself.
At the time, I was concerned about the overhead of per-cache
allocators, since many metadata patterns see only a small number
of instantiations.  That's still an important factor, so in the
new scheme we're using a global allocator; but instead of using
malloc for individual allocations, we're using a slab allocator,
which should have better peak, single-thread performance, at the
cost of not easily supporting deallocation.  Deallocation is
only used for metadata when there's contention on the cache, and
specifically only when there's contention for the same key, so
leaking a little isn't the worst thing in the world.

The initial slab is a 64K globally-allocated buffer.
Successive slabs are 16K and allocated with malloc.

rdar://28189496
2017-02-14 11:10:44 -05:00
Hugh Bellamy
70054ba09e Fix build, edit, build loop on Windows 2017-02-14 09:40:54 +07:00
Hugh Bellamy
46ccacd7fa Fix potentially appending "/wd4068" on mac builds 2017-02-14 09:20:50 +07:00
Hugh Bellamy
15a0a2c337 Fix Windows linker errors trying to statically link to cmark 2017-02-13 18:05:47 +07:00
Chris Bieneman
04c06945ec Fix the Xcode build broken in PR7344
In Xcode builds the library dir variable contains the build configuration in the path, but the exports file doesn't. If we construct the export file path from the build directory instead of the library directory it should all work.
2017-02-09 16:47:47 -08:00
Chris Bieneman
44b6f32f0e Clean up handling of CMark library dependency.
This change depends on:

https://github.com/apple/swift-cmark/pull/4
2017-02-08 14:32:50 -08:00
swift-ci
37c7641c38 Merge pull request #7258 from gottesmm/swift_force_optimized_typechecker 2017-02-05 18:22:34 -08:00
Saleem Abdulrasool
a891f544a1 Merge pull request #7134 from compnerd/exherbo
build: avoid re-including system paths
2017-02-05 17:49:02 -08:00
Michael Gottesman
fee2db81de [cmake] Add a new option called SWIFT_FORCE_OPTIMIZED_TYPECHECKER that forces Sema to be built optimized.
This should help speed up people trying to compile the standard library and do
SILGen work. *NOTE* This will not necessarily result in a type checker that is
as fast as a release build since most likely the type checker will use some
link_once odr functions that are debug. But it should still be significantly
faster otherwise.

This makes getting to SILGen take 16 seconds on my machine instead of forever
when compiling with everything else in the compiler in debug mode.
2017-02-05 16:48:54 -08:00
Doug Coleman
9e11d8dc7e cmake: For overlays, install to sdk-overlay target by default, but don't
hardcode it.

rdar://problem/21952953
2017-02-02 14:46:57 -08:00
Saleem Abdulrasool
e8aa6cba16 build: avoid re-including system paths
Do not add the (default) system include path as a system include path.
Doing so results in a `-isystem /usr/.../include`.  This changes the
include ordering, resulting in the failure to include headers from the
system when building the standard library.  This breaks compilation on
exherbo which uses a slightly different directory structure
(/usr/include -> /usr/host/include -> /usr/<target>/include).  If the
paths are canonicalised during the build, we would then add
/usr/<target>/include to the CPPFLAGS, resulting in the failure to
include C headers.  Unfortunately, this is insufficient as another site
is also including the path as a SYSTEM include path.  But, this is still
strictly an improvement.
2017-01-29 14:04:25 -08:00
John McCall
2b25701a93 Revert "Switch MetadataCache to use a global slab allocator."
This reverts commit ccbe5fcf73.
2017-01-29 00:17:30 -05:00
John McCall
ccbe5fcf73 Switch MetadataCache to use a global slab allocator.
This seems to more than fix a performance regression that we
detected on a metadata-allocation microbenchmark.

A few months ago, I improved the metadata cache representation
and changed the metadata allocation scheme to primarily use malloc.
Previously, we'd been using malloc in the concurrent tree data
structure but a per-cache slab allocator for the metadata itself.
At the time, I was concerned about the overhead of per-cache
allocators, since many metadata patterns see only a small number
of instantiations.  That's still an important factor, so in the
new scheme we're using a global allocator; but instead of using
malloc for individual allocations, we're using a slab allocator,
which should have better peak, single-thread performance, at the
cost of not easily supporting deallocation.  Deallocation is
only used for metadata when there's contention on the cache, and
specifically only when there's contention for the same key, so
leaking a little isn't the worst thing in the world.

The initial slab is a 64K globally-allocated buffer.
Successive slabs are 16K and allocated with malloc.

rdar://28189496
2017-01-28 02:37:22 -05:00
Hugh Bellamy
3b4187fcbb Fix line-directive tool to work around Windows command line max limit 2017-01-26 09:34:55 +00:00
practicalswift
a9d6d8938c [gardening] Fix recently introduced typos 2017-01-22 20:40:45 +01:00
Hugh Bellamy
e564bdc5b5 Merge pull request #6884 from hughbe/definitions-windows
Move Windows specific compiler definitions from _add_link_flags to _add_compile_flags
2017-01-18 15:53:36 +00:00
Hugh Bellamy
f446dd0297 Ignore unknown pragma warnings with MSVC 2017-01-18 10:33:28 +00:00
Hugh Bellamy
e2755c1058 Move Windows specific compiler definitions from _add_link_flags to _add_compile_flags 2017-01-18 10:23:28 +00:00
Slava Pestov
928a3193eb Merge pull request #3886 from tinysun212/pr-stdlib-cygwin-3
[stdlib] Fixed for Cygwin
2017-01-17 12:26:25 -08:00
Han Sangjin
a8dec7fa43 [stdlib] Fixed for Cygwin
- CYGWIN symbol is used to distinguish Cygwin environment from other OS
  and other environment in Windows.
- Added windows and windowsCygnus to OSVersion in StdlibUnittest
2017-01-17 02:31:16 +09:00
Hugh Bellamy
89205d8f6b Invoke the line directive tool from python 2017-01-14 21:37:29 +00:00
Slava Pestov
75b4be61fb Merge pull request #6461 from hughbe/icu-windows
Simplify ICU package resolution not to require PkgConfig and to be more user configurable.
2017-01-11 15:41:09 -08:00
Slava Pestov
23b2a4ace8 Merge pull request #6462 from hughbe/libraries-windows
Fix linking libraries on Windows
2017-01-10 22:31:36 -08:00
Slava Pestov
ff0451821d Merge pull request #6467 from hughbe/root-windows
Add Windows support to the root CMakeLists.txt file.
2017-01-10 22:30:16 -08:00
Michael Gottesman
4a07d7f9ac Merge pull request #6692 from gottesmm/cmake_sibopt_change
[cmake] Add support for generating targets for a -Onone sib stdlib  and a -O sib stdlib, but do not build them by default.
2017-01-10 22:01:41 -08:00
Hugh Bellamy
c66b72c5fa Simplify ICU package resolution not to require PkgConfig and to be more user configurable.
If you don't have PkgConfig, you'll need to pass the following to CMake:
```
 -DICU_UC_INCLUDE_DIRS="%swift_source_dir%/icu/include"^
 -DICU_UC_LIBRARY_DIRS="%swift_source_dir%/icu/lib64"^
 -DICU_I18N_INCLUDE_DIRS="%swift_source_dir%/icu/include"^
 -DICU_I18N_LIBRARY_DIRS="%swift_source_dir%/icu/lib64"^
 -DICU_UC_LIB_NAME="icuuc"^
 -DICU_I18N_LIB_NAME="icuin"
```

icu
2017-01-10 09:01:40 +00:00
swift-ci
294359bd69 Merge pull request #4804 from kstaring/master 2017-01-10 00:01:46 -08:00