Merge pull request #38818 from Catfish-Man/home-home-on-the-rangeofstring

Add benchmarks exercizing bridged rangeOfString more thoroughly

Author: Catfish-Man

benchmark/single-source/ObjectiveCBridgingStubs.swift

@@ -18,6 +18,7 @@ import ObjectiveCTests
 
 let t: [BenchmarkCategory] = [.validation, .bridging]
 let ts: [BenchmarkCategory] = [.validation, .String, .bridging]
+let bs: [BenchmarkCategory] = [.String, .bridging]
 
 public let ObjectiveCBridgingStubs = [
   BenchmarkInfo(name: "ObjectiveCBridgeStubDataAppend",
@@ -68,9 +69,24 @@ public let ObjectiveCBridgingStubs = [
   BenchmarkInfo(name: "ObjectiveCBridgeStringGetUTF8Contents",
     runFunction: run_ObjectiveCBridgeStringGetUTF8Contents, tags: ts,
     setUpFunction: setup_StringBridgeBenchmark),
-  BenchmarkInfo(name: "ObjectiveCBridgeStringRangeOfString",
+  BenchmarkInfo(name: "ObjectiveCBridgeStringRangeOfString", //should be BridgeString.find.mixed
     runFunction: run_ObjectiveCBridgeStringRangeOfString, tags: ts,
     setUpFunction: setup_StringBridgeBenchmark),
+  BenchmarkInfo(name: "BridgeString.find.native",
+    runFunction: run_ObjectiveCBridgeStringRangeOfStringAllSwift, tags: bs,
+    setUpFunction: setup_SpecificRangeOfStringBridging),
+  BenchmarkInfo(name: "BridgeString.find.native.nonASCII",
+    runFunction: run_ObjectiveCBridgeStringRangeOfStringAllSwiftNonASCII, tags: bs,
+    setUpFunction: setup_SpecificRangeOfStringBridging),
+  BenchmarkInfo(name: "BridgeString.find.native.long",
+    runFunction: run_ObjectiveCBridgeStringRangeOfStringAllSwiftLongHaystack, tags: bs,
+    setUpFunction: setup_SpecificRangeOfStringBridging),
+  BenchmarkInfo(name: "BridgeString.find.native.longBoth",
+    runFunction: run_ObjectiveCBridgeStringRangeOfStringAllSwiftLongHaystackLongNeedle, tags: bs,
+    setUpFunction: setup_SpecificRangeOfStringBridging),
+  BenchmarkInfo(name: "BridgeString.find.native.longNonASCII",
+    runFunction: run_ObjectiveCBridgeStringRangeOfStringAllSwiftLongHaystackNonASCII, tags: bs,
+    setUpFunction: setup_SpecificRangeOfStringBridging),
   BenchmarkInfo(name: "ObjectiveCBridgeStringHash",
     runFunction: run_ObjectiveCBridgeStringHash, tags: ts,
     setUpFunction: setup_StringBridgeBenchmark),
@@ -408,6 +424,47 @@ public func run_ObjectiveCBridgeStringRangeOfString(N: Int) {
   #endif
 }
 
+@inline(__always)
+func run_rangeOfStringSpecific(needle: String, haystack: String, N: Int) {
+#if _runtime(_ObjC)
+  b.testRangeOfStringSpecific(withNeedle: needle, haystack: haystack, n: N)
+#endif
+}
+
+@inline(never)
+public func run_ObjectiveCBridgeStringRangeOfStringAllSwift(N: Int) {
+  run_rangeOfStringSpecific(needle: "y", haystack: "The quick brown fox jumps over the lazy dog", N: 100 * N)
+}
+
+var longNativeASCII: String! = nil
+var longNativeNonASCII: String! = nil
+public func setup_SpecificRangeOfStringBridging() {
+  setup_StringBridgeBenchmark()
+  longNativeASCII = Array(repeating: "The quick brown fox jump over the lazy dog", count: 1000).joined() + "s"
+  longNativeNonASCII = "ü" + longNativeASCII + "ö"
+  
+}
+
+@inline(never)
+public func run_ObjectiveCBridgeStringRangeOfStringAllSwiftLongHaystack(N: Int) {
+  run_rangeOfStringSpecific(needle: "s", haystack: longNativeASCII, N: N)
+}
+
+@inline(never)
+public func run_ObjectiveCBridgeStringRangeOfStringAllSwiftLongHaystackNonASCII(N: Int) {
+  run_rangeOfStringSpecific(needle: "s", haystack: longNativeNonASCII, N: N)
+}
+
+@inline(never)
+public func run_ObjectiveCBridgeStringRangeOfStringAllSwiftNonASCII(N: Int) {
+  run_rangeOfStringSpecific(needle: "ü", haystack: "The quick brown fox jump over the lazy dogü", N: 100 * N)
+}
+
+@inline(never)
+public func run_ObjectiveCBridgeStringRangeOfStringAllSwiftLongHaystackLongNeedle(N: Int) {
+  run_rangeOfStringSpecific(needle: "The quick brown fox jump over the lazy dogs", haystack: longNativeASCII, N: N)
+}
+
 @inline(never)
 public func run_ObjectiveCBridgeStringHash(N: Int) {
   #if _runtime(_ObjC)

benchmark/utils/ObjectiveCTests/ObjectiveCTests.h

@@ -42,6 +42,9 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)testGetUTF8Contents;
 - (void)testGetASCIIContents;
 - (void)testRangeOfString;
+- (void)testRangeOfStringSpecificWithNeedle:(NSString *)needle
+                                   haystack:(NSString *)haystack
+                                          n:(NSInteger)n;
 - (void)testHash;
 - (void)testCompare;
 - (void)testCompare2;

benchmark/utils/ObjectiveCTests/ObjectiveCTests.m

@@ -307,6 +307,14 @@ - (void)testRangeOfString {
   };
 }
 
+- (void)testRangeOfStringSpecificWithNeedle:(NSString *)needle
+                                   haystack:(NSString *)haystack
+                                          n:(NSInteger)n {
+  for (int i = 0; i < n; i++) {
+    (void)[haystack rangeOfString:needle];
+  }
+}
+
 - (void) testHash {
   for (NSString *str1 in bridgedStrings) {
     @autoreleasepool {