Add new benchmarks for NSString bridging to cover non-tagged cases

Author: Catfish-Man

benchmark/single-source/NSStringConversion.swift

@@ -11,19 +11,64 @@
 //===----------------------------------------------------------------------===//
 
 // <rdar://problem/19003201>
+#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
+
 import TestsUtils
 import Foundation
 
-public let NSStringConversion = BenchmarkInfo(
-  name: "NSStringConversion",
-  runFunction: run_NSStringConversion,
-  tags: [.validation, .api, .String, .bridging])
+fileprivate var test:NSString = ""
+
+public let NSStringConversion = [
+  BenchmarkInfo(name: "NSStringConversion",
+                runFunction: run_NSStringConversion,
+                tags: [.validation, .api, .String, .bridging]),
+  BenchmarkInfo(name: "NSStringConversion.UTF8",
+                runFunction: run_NSStringConversion_nonASCII,
+                tags: [.validation, .api, .String, .bridging],
+                setUpFunction: { test = NSString(cString: "tëst", encoding: String.Encoding.utf8.rawValue)! }),
+  BenchmarkInfo(name: "NSStringConversion.Mutable",
+                runFunction: run_NSMutableStringConversion,
+                tags: [.validation, .api, .String, .bridging],
+                setUpFunction: { test = NSMutableString(cString: "test", encoding: String.Encoding.ascii.rawValue)! }),
+  BenchmarkInfo(name: "NSStringConversion.Long",
+                runFunction: run_NSStringConversion_long,
+                tags: [.validation, .api, .String, .bridging],
+                setUpFunction: { test = NSString(cString: "The quick brown fox jumps over the lazy dog", encoding: String.Encoding.ascii.rawValue)! } ),
+  BenchmarkInfo(name: "NSStringConversion.LongUTF8",
+                runFunction: run_NSStringConversion_longNonASCII,
+                tags: [.validation, .api, .String, .bridging],
+                setUpFunction: { test = NSString(cString: "Thë qüick bröwn föx jumps over the lazy dög", encoding: String.Encoding.utf8.rawValue)! })]
 
 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 {
+    //Doesn't test accessing the String contents to avoid changing historical benchmark numbers
     blackHole(identity(test) as String)
   }
-#endif
 }
+
+fileprivate func innerLoop(_ str: NSString, _ N: Int, _ scale: Int = 5000) {
+  for _ in 1...N * scale {
+    for char in (identity(str) as String).utf8 {
+      blackHole(char)
+    }
+  }
+}
+
+public func run_NSStringConversion_nonASCII(_ N: Int) {
+  innerLoop(test, N, 2500)
+}
+
+public func run_NSMutableStringConversion(_ N: Int) {
+  innerLoop(test, N)
+}
+
+public func run_NSStringConversion_long(_ N: Int) {
+  innerLoop(test, N, 1000)
+}
+
+public func run_NSStringConversion_longNonASCII(_ N: Int) {
+  innerLoop(test, N, 300)
+}
+
+#endif

benchmark/utils/main.swift

@@ -92,7 +92,9 @@ import MonteCarloPi
 import NibbleSort
 import NSDictionaryCastToSwift
 import NSError
+#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
 import NSStringConversion
+#endif
 import NopDeinit
 import ObjectAllocation
 #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
@@ -262,7 +264,9 @@ registerBenchmark(MonteCarloE)
 registerBenchmark(MonteCarloPi)
 registerBenchmark(NSDictionaryCastToSwift)
 registerBenchmark(NSErrorTest)
+#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
 registerBenchmark(NSStringConversion)
+#endif
 registerBenchmark(NibbleSort)
 registerBenchmark(NopDeinit)
 registerBenchmark(ObjectAllocation)