Benchmarking housekeeping

Author: rctcwyvrn

Sources/RegexBenchmark/Benchmark.swift

@@ -15,13 +15,13 @@ public struct Benchmark: RegexBenchmark {
   public enum MatchType {
     case whole
     case first
-    case enumerate
+    case allMatches
   }
 
   public func run() {
     switch ty {
     case .whole: blackHole(target.wholeMatch(of: regex))
-    case .enumerate: blackHole(target.matches(of: regex))
+    case .allMatches: blackHole(target.matches(of: regex))
     case .first: blackHole(target.firstMatch(of: regex))
     }
   }
@@ -54,14 +54,14 @@ public struct BenchmarkRunner {
   // Register instances of Benchmark and run them
   let suiteName: String
   var suite: [any RegexBenchmark]
-  let samples: Int = 40
+  let samples: Int = 20
 
   public init(suiteName: String) {
     self.suiteName = suiteName
     self.suite = []
   }
 
-  public mutating func register(new: some RegexBenchmark) {
+  public mutating func register(_ new: some RegexBenchmark) {
     suite.append(new)
   }
 

Sources/RegexBenchmark/Suite/Backtracking.swift

@@ -12,7 +12,7 @@ extension BenchmarkRunner {
     let basicBacktrack = Benchmark(
       name: "BasicBacktrack",
       regex: try! Regex(r),
-      ty: .enumerate,
+      ty: .allMatches,
       target: s
     )
 
@@ -37,9 +37,9 @@ extension BenchmarkRunner {
       target: s
     )
 
-    register(new: basicBacktrack)
-    register(new: basicBacktrackNS)
-    register(new: basicBacktrackFirstMatch)
-    register(new: basicBacktrackNSFirstMatch)
+    register(basicBacktrack)
+    register(basicBacktrackNS)
+    register(basicBacktrackFirstMatch)
+    register(basicBacktrackNSFirstMatch)
   }
 }

Sources/RegexBenchmark/Suite/CssRegex.swift

@@ -1656,7 +1656,7 @@ extension BenchmarkRunner {
     let cssRegex = Benchmark(
       name: "cssRegex",
       regex: try! Regex(r),
-      ty: .enumerate,
+      ty: .allMatches,
       target: css
     )
 
@@ -1666,7 +1666,7 @@ extension BenchmarkRunner {
       ty: .all,
       target: css
     )
-    register(new: cssRegex)
-    register(new: cssRegexNS)
+    register(cssRegex)
+    register(cssRegexNS)
   }
 }

Sources/RegexBenchmark/Suite/FirstMatch.swift

@@ -6,20 +6,44 @@ extension BenchmarkRunner {
     let r = "a"
     let s = String(repeating: " ", count: 100000)
 
+    // this does nothing but loop through the loop in
+    // Match.swift (Regex._firstMatch) since the engine should fail right away,
     let firstMatch = Benchmark(
       name: "FirstMatch",
       regex: try! Regex(r),
       ty: .first,
       target: s
     )
+    
+    // a comparison with now NSRegularExpression handles this situation
     let firstMatchNS = NSBenchmark(
       name: "FirstMatchNS",
       regex: try! NSRegularExpression(pattern: r),
       ty: .first,
       target: s
     )
 
-    register(new: firstMatch)
-    register(new: firstMatchNS)
+    let s2 = String(repeating: "a", count: 10000)
+    
+    // matches calls into firstMatch, so really they're the same
+    // this also stress tests the captures
+    let allMatches = Benchmark(
+      name: "AllMatches",
+      regex: try! Regex(r),
+      ty: .allMatches,
+      target: s2
+    )
+    
+    let allMatchesNS = NSBenchmark(
+      name: "AllMatchesNS",
+      regex: try! NSRegularExpression(pattern: r),
+      ty: .all,
+      target: s2
+    )
+    
+    register(firstMatch)
+    register(firstMatchNS)
+    register(allMatches)
+    register(allMatchesNS)
   }
 }

Sources/RegexBenchmark/Suite/ReluctantQuant.swift

@@ -34,8 +34,8 @@ extension BenchmarkRunner {
       target: String(repeating: "a", count: size) + ";"
     )
 
-    register(new: reluctantQuant)
-    register(new: reluctantQuantWithTerminal)
-    register(new: eagarQuantWithTerminal)
+    register(reluctantQuant)
+    register(reluctantQuantWithTerminal)
+    register(eagarQuantWithTerminal)
   }
 }