Don't merge [benchmark] Compile and run benchmark on Linux

CHANGELOG.md

@@ -6431,3 +6431,11 @@ Swift 1.0
 [SE-0145]: <https://github.com/apple/swift-evolution/blob/master/proposals/0145-package-manager-version-pinning.md>
 [SE-0146]: <https://github.com/apple/swift-evolution/blob/master/proposals/0146-package-manager-product-definitions.md>
 [SE-0147]: <https://github.com/apple/swift-evolution/blob/master/proposals/0147-move-unsafe-initialize-from.md>
+[SE-0148]: <https://github.com/apple/swift-evolution/blob/master/proposals/0148-generic-subscripts.md>
+[SE-0149]: <https://github.com/apple/swift-evolution/blob/master/proposals/0149-package-manager-top-of-tree.md>
+[SE-0150]: <https://github.com/apple/swift-evolution/blob/master/proposals/0150-package-manager-branch-support.md>
+[SE-0151]: <https://github.com/apple/swift-evolution/blob/master/proposals/0151-package-manager-swift-language-compatibility-version.md>
+[SE-0152]: <https://github.com/apple/swift-evolution/blob/master/proposals/0152-package-manager-tools-version.md>
+[SE-0153]: <https://github.com/apple/swift-evolution/blob/master/proposals/0153-compensate-for-the-inconsistency-of-nscopyings-behaviour.md>
+[SE-0154]: <https://github.com/apple/swift-evolution/blob/master/proposals/0154-dictionary-key-and-value-collections.md>
+[SE-0155]: <https://github.com/apple/swift-evolution/blob/master/proposals/0155-normalize-enum-case-representation.md>

benchmark/CMakeLists.txt

@@ -48,6 +48,7 @@ set(SWIFT_BENCH_MODULES
     single-source/GlobalClass
     single-source/Hanoi
     single-source/Hash
+    single-source/HashQuadratic
     single-source/Histogram
     single-source/Integrate
     single-source/IterateData

benchmark/scripts/generate_harness/CMakeLists.txt_template

@@ -67,9 +67,18 @@ if(NOT SWIFT_LIBRARY_PATH)
   set(SWIFT_LIBRARY_PATH "${tmp_dir}/lib/swift")
 endif()
 
-runcmd(COMMAND "xcrun" "-toolchain" "${SWIFT_DARWIN_XCRUN_TOOLCHAIN}" "-f" "clang"
-       VARIABLE CLANG_EXEC
-       ERROR "Unable to find Clang driver")
+# If the CMAKE_C_COMPILER is already clang, don't find it again,
+# thus allowing the --host-cc build-script argument to work here.
+get_filename_component(c_compiler ${CMAKE_C_COMPILER} NAME)
+
+if(${c_compiler} STREQUAL "clang")
+  set(CLANG_EXEC ${CMAKE_C_COMPILER})
+else()
+  runcmd(COMMAND "xcrun" "-toolchain" "${SWIFT_DARWIN_XCRUN_TOOLCHAIN}" "-f" "clang"
+         VARIABLE CLANG_EXEC
+         ERROR "Unable to find Clang driver")
+endif()
+
 
 # You have to delete CMakeCache.txt in the swift build to force a
 # reconfiguration.

benchmark/single-source/DictionaryBridge.swift

@@ -16,6 +16,7 @@
 import Foundation
 import TestsUtils
 
+#if _runtime(_ObjC)
 class Thing : NSObject {
 
   required override init() {
@@ -50,10 +51,13 @@ class Stuff {
 
   }
 }
+#endif
 
 @inline(never)
 public func run_DictionaryBridge(_ N: Int) {
+#if _runtime(_ObjC)
     for _ in 1...100*N {
         _ = Stuff()
     }
+#endif
 }

benchmark/single-source/HashQuadratic.swift

@@ -0,0 +1,33 @@
+//===--- HashQuadratic.swift ----------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+import TestsUtils
+
+let size = 3_000_000
+
+@inline(never)
+public func run_HashQuadratic(_ N: Int) {
+    for _ in 1...N {
+        var dict1: [Int: Int] = [:]
+        for i in 0..<size {
+            dict1[i] = i * 2
+        }
+
+        var dict2: [Int: Int] = [:]
+        for (k, v) in dict1 {
+            dict2[k] = v
+        }
+
+        CheckResults(dict1[size/2] == dict2[size/2],
+            "Incorrect results in HashQuadratic")
+    }
+}

benchmark/single-source/MapReduce.swift

@@ -133,6 +133,7 @@ public func run_MapReduceShortString(_ N: Int) {
 
 @inline(never)
 public func run_MapReduceClass(_ N: Int) {
+#if _runtime(_ObjC)
   let numbers = (0..<1000).map { NSDecimalNumber(value: $0) }
 
   var c = 0
@@ -141,10 +142,12 @@ public func run_MapReduceClass(_ N: Int) {
     c += mapped.reduce(0, &+)
   }
   CheckResults(c != 0, "IncorrectResults in MapReduce")
+#endif
 }
 
 @inline(never)
 public func run_MapReduceClassShort(_ N: Int) {
+#if _runtime(_ObjC)
   let numbers = (0..<10).map { NSDecimalNumber(value: $0) }
 
   var c = 0
@@ -153,5 +156,6 @@ public func run_MapReduceClassShort(_ N: Int) {
     c += mapped.reduce(0, &+)
   }
   CheckResults(c != 0, "IncorrectResults in MapReduce")
+#endif
 }
 

benchmark/single-source/NSDictionaryCastToSwift.swift

@@ -20,6 +20,7 @@ import TestsUtils
 
 @inline(never)
 public func run_NSDictionaryCastToSwift(_ N: Int) {
+#if _runtime(_ObjC)
     let NSDict = NSDictionary()
     var swiftDict = [String: NSObject]()
     for _ in 1...10000*N {
@@ -31,4 +32,5 @@ public func run_NSDictionaryCastToSwift(_ N: Int) {
     CheckResults(swiftDict.isEmpty,
             "Incorrect result in swiftDict.isEmpty: " +
             "\(swiftDict.isEmpty) != true\n")
+#endif
 }

benchmark/single-source/NSStringConversion.swift

@@ -15,8 +15,10 @@ import TestsUtils
 import Foundation
 
 public func run_NSStringConversion(_ N: Int) {
+#if _runtime(_ObjC)
 let test:NSString = NSString(cString: "test", encoding: String.Encoding.ascii.rawValue)!
   for _ in 1...N * 10000 {
     _ = test as String
   }
+#endif
 }