Merge pull request #7617 from natecook1000/nc-hash-quadtest

Add benchmark for quadratic hash performance

Author: natecook1000

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/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(dict2[size/2] == dict2[size/2],
+            "Incorrect results in HashQuadratic")
+    }
+}

benchmark/utils/main.swift

@@ -53,6 +53,7 @@ import Fibonacci
 import GlobalClass
 import Hanoi
 import Hash
+import HashQuadratic
 import Histogram
 import Integrate
 import IterateData
@@ -113,28 +114,28 @@ precommitTests = [
   "Array2D": run_Array2D,
   "ArrayAppend": run_ArrayAppend,
   "ArrayAppendArrayOfInt": run_ArrayAppendArrayOfInt,
+  "ArrayAppendAscii": run_ArrayAppendAscii,
   "ArrayAppendFromGeneric": run_ArrayAppendFromGeneric,
   "ArrayAppendGenericStructs": run_ArrayAppendGenericStructs,
+  "ArrayAppendLatin1": run_ArrayAppendLatin1,
   "ArrayAppendLazyMap": run_ArrayAppendLazyMap,
   "ArrayAppendOptionals": run_ArrayAppendOptionals,
   "ArrayAppendRepeatCol": run_ArrayAppendRepeatCol,
   "ArrayAppendReserved": run_ArrayAppendReserved,
   "ArrayAppendSequence": run_ArrayAppendSequence,
   "ArrayAppendStrings": run_ArrayAppendStrings,
-  "ArrayAppendASCII": run_ArrayAppendAscii,  
-  "ArrayAppendLatin1": run_ArrayAppendLatin1,  
-  "ArrayAppendUTF16": run_ArrayAppendUTF16,  
   "ArrayAppendToFromGeneric": run_ArrayAppendToFromGeneric,
   "ArrayAppendToGeneric": run_ArrayAppendToGeneric,
-  "ArrayPlusEqualSingleElementCollection": run_ArrayPlusEqualSingleElementCollection,
-  "ArrayPlusEqualFiveElementCollection": run_ArrayPlusEqualFiveElementCollection,
+  "ArrayAppendUTF16": run_ArrayAppendUTF16,
   "ArrayInClass": run_ArrayInClass,
   "ArrayLiteral": run_ArrayLiteral,
   "ArrayOfGenericPOD": run_ArrayOfGenericPOD,
   "ArrayOfGenericRef": run_ArrayOfGenericRef,
   "ArrayOfPOD": run_ArrayOfPOD,
   "ArrayOfRef": run_ArrayOfRef,
   "ArrayPlusEqualArrayOfInt": run_ArrayPlusEqualArrayOfInt,
+  "ArrayPlusEqualFiveElementCollection": run_ArrayPlusEqualFiveElementCollection,
+  "ArrayPlusEqualSingleElementCollection": run_ArrayPlusEqualSingleElementCollection,
   "ArraySubscript": run_ArraySubscript,
   "ArrayValueProp": run_ArrayValueProp,
   "ArrayValueProp2": run_ArrayValueProp2,
@@ -164,6 +165,7 @@ precommitTests = [
   "ErrorHandling": run_ErrorHandling,
   "GlobalClass": run_GlobalClass,
   "Hanoi": run_Hanoi,
+  "HashQuadratic": run_HashQuadratic,
   "HashTest": run_HashTest,
   "Histogram": run_Histogram,
   "Integrate": run_Integrate,
@@ -172,15 +174,16 @@ precommitTests = [
   "LinkedList": run_LinkedList,
   "MapReduce": run_MapReduce,
   "MapReduceAnyCollection": run_MapReduceAnyCollection,
-  "MapReduceShort": run_MapReduceShort,
-  "MapReduceSequence": run_MapReduceSequence,
-  "MapReduceLazySequence": run_MapReduceLazySequence,
+  "MapReduceAnyCollectionShort": run_MapReduceAnyCollectionShort,
+  "MapReduceClass": run_MapReduceClass,
+  "MapReduceClassShort": run_MapReduceClassShort,
   "MapReduceLazyCollection": run_MapReduceLazyCollection,
   "MapReduceLazyCollectionShort": run_MapReduceLazyCollectionShort,
-  "MapReduceString": run_MapReduceString,
+  "MapReduceLazySequence": run_MapReduceLazySequence,
+  "MapReduceSequence": run_MapReduceSequence,
+  "MapReduceShort": run_MapReduceShort,
   "MapReduceShortString": run_MapReduceShortString,
-  "MapReduceClass": run_MapReduceClass,
-  "MapReduceClassShort": run_MapReduceClassShort,
+  "MapReduceString": run_MapReduceString,
   "Memset": run_Memset,
   "MonteCarloE": run_MonteCarloE,
   "MonteCarloPi": run_MonteCarloPi,