Merge remote-tracking branch 'origin/master' into swift-3-api-guidelines

Author: Max Moiseev

Diff for: .pep8

@@ -1,3 +1,3 @@
 [flake8]
 filename = *.py,Benchmark_Driver,Benchmark_DTrace.in,Benchmark_GuardMalloc.in,Benchmark_RuntimeLeaksRunner.in,build-script,gyb,line-directive,ns-html2rst,recursive-lipo,rth,submit-benchmark-results,update-checkout,viewcfg
-ignore = D100,D101,D102,D103,D104,D105,E101,E111,E128,E302,E402,E501,W191
+ignore = D100,D101,D102,D103,D104,D105,E402,E501

Diff for: README.md

@@ -83,6 +83,7 @@ uploading SSH keys to GitHub):
     cd swift
     ./utils/update-checkout --clone-with-ssh
 
+#### CMake
 [CMake](http://cmake.org) is the core infrastructure used to configure builds of
 Swift and its companion projects; at least version 2.8.12.2 is required. Your
 favorite Linux distribution likely already has a CMake package you can install.
@@ -92,23 +93,32 @@ command line tools to your `PATH`:
 
     export PATH=/Applications/CMake.app/Contents/bin:$PATH
 
+#### Ninja
 [Ninja](https://ninja-build.org) is the current recommended build system
 for building Swift and is the default configuration generated by CMake. If
 you're on OS X or don't install it as part of your Linux distribution, clone
 it next to the other projects and it will be bootstrapped automatically:
 
-    git clone https://github.com/ninja-build/ninja.git
+##### Build from source
+**Via https**
 
-or
+    git clone https://github.com/ninja-build/ninja.git && cd ninja
+    git checkout release
+    cat README
 
-    git clone git@github.com:ninja-build/ninja.git
+**Via ssh**
 
-You can also install CMake and Ninja on OS X using a third-party
-packaging tool like [Homebrew](http://brew.sh)…
+    git clone git@github.com:ninja-build/ninja.git && cd ninja
+    git checkout release
+    cat README
+
+#### Install via third-party packaging tool (OSX only)
+
+**[Homebrew](http://brew.sh/)**
 
     brew install cmake ninja
 
-…or [MacPorts](https://macports.org).
+**[MacPorts](https://macports.org)**
 
     sudo port install cmake ninja
 

Diff for: benchmark/CMakeLists.txt

@@ -15,6 +15,7 @@ list(APPEND CMAKE_MODULE_PATH
 include(AddSwiftBenchmarkSuite)
 
 set(SWIFT_BENCH_MODULES
+    single-source/unit-tests/StackPromo
     single-source/Ackermann
     single-source/AngryPhonebook
     single-source/Array2D

Diff for: benchmark/scripts/Benchmark_DTrace.in

@@ -27,6 +27,7 @@ import perf_test_driver
 XFAIL_LIST = [
 ]
 
+
 class DTraceResult(perf_test_driver.Result):
 
     def __init__(self, name, status, output, csv_output):
@@ -59,11 +60,14 @@ class DTraceResult(perf_test_driver.Result):
 
         print(DTraceResult.data_format(max_test_len).format(*result))
 
+
 class DTraceBenchmarkDriver(perf_test_driver.BenchmarkDriver):
+
     def __init__(self, binary, xfail_list, csv_output):
-        perf_test_driver.BenchmarkDriver.__init__(self, binary, xfail_list,
-                                                 enable_parallel=False,
-                                                 opt_levels=['O'])
+        perf_test_driver.BenchmarkDriver.__init__(
+            self, binary, xfail_list,
+            enable_parallel=False,
+            opt_levels=['O'])
         self.csv_output = csv_output
 
     def print_data_header(self, max_test_len):
@@ -74,7 +78,7 @@ class DTraceBenchmarkDriver(perf_test_driver.BenchmarkDriver):
 
     def process_input(self, data):
         test_name = '({}_{})'.format(data['opt'], data['test_name'])
-        print "Running {}...".format(test_name)
+        print("Running {}...".format(test_name))
         sys.stdout.flush()
 
         def get_results_with_iters(iters):
@@ -94,6 +98,7 @@ class DTraceBenchmarkDriver(perf_test_driver.BenchmarkDriver):
 
 SWIFT_BIN_DIR = os.path.dirname(os.path.abspath(__file__))
 
+
 def parse_args():
     parser = argparse.ArgumentParser()
     parser.add_argument('-filter', type=str, default=None,