Revert "Merge branch 'just-one-more-benchmark-suite' into temp"

This reverts commit df8919e, reversing
changes made to 3a2b324.

Author: rctcwyvrn

Sources/RegexBenchmark/Benchmark.swift

@@ -69,12 +69,11 @@ struct CrossBenchmark {
   /// TODO: Probably better ot have a whole-line vs search anywhere, maybe
   /// accomodate multi-line matching, etc.
   var isWhole: Bool = false
-  
-  /// Whether or not to do firstMatch as well or just allMatches
-  var includeFirst: Bool = false
 
   func register(_ runner: inout BenchmarkRunner) {
     let swiftRegex = try! Regex(regex)
+
+    let nsPattern = isWhole ? "^" + regex + "$" : regex
     let nsRegex: NSRegularExpression
     if isWhole {
       nsRegex = try! NSRegularExpression(pattern: "^" + regex + "$")
@@ -96,32 +95,30 @@ struct CrossBenchmark {
           type: .first,
           target: input))
     } else {
+      runner.register(
+        Benchmark(
+          name: baseName + "First",
+          regex: swiftRegex,
+          type: .first,
+          target: input))
       runner.register(
         Benchmark(
           name: baseName + "All",
           regex: swiftRegex,
           type: .allMatches,
           target: input))
+      runner.register(
+        NSBenchmark(
+          name: baseName + "First_NS",
+          regex: nsRegex,
+          type: .first,
+          target: input))
       runner.register(
         NSBenchmark(
           name: baseName + "All_NS",
           regex: nsRegex,
           type: .allMatches,
           target: input))
-      if includeFirst {
-        runner.register(
-          Benchmark(
-            name: baseName + "First",
-            regex: swiftRegex,
-            type: .first,
-            target: input))
-        runner.register(
-          NSBenchmark(
-            name: baseName + "First_NS",
-            regex: nsRegex,
-            type: .first,
-            target: input))
-      }
     }
   }
 }

Sources/RegexBenchmark/BenchmarkRegistration.swift

@@ -16,9 +16,6 @@ extension BenchmarkRunner {
     benchmark.addHTML()
     benchmark.addEmail()
     benchmark.addCustomCharacterClasses()
-    benchmark.addDna()
-    benchmark.addUnicode()
-    benchmark.addLiteralSearch()
     // -- end of registrations --
     return benchmark
   }

Sources/RegexBenchmark/CLI.swift

@@ -2,7 +2,7 @@ import ArgumentParser
 
 @main
 struct Runner: ParsableCommand {
-  @Argument(help: "Patterns for benchmarks to run")
+  @Argument(help: "Names of benchmarks to run")
   var specificBenchmarks: [String] = []
 
   @Flag(help: "Run only once for profiling purposes")
@@ -20,30 +20,19 @@ struct Runner: ParsableCommand {
   @Flag(help: "Should the results be saved")
   var save = false
 
-  @Flag(help: "Compare this result with a saved result")
+  @Flag(help: "Compare this result with the latest saved result")
   var compare = false
 
   @Option(help: "The result file to compare against, if this flag is not set it will compare against the most recent result file")
   var compareFile: String?
 
-  @Flag(help: "Exclude the comparisons to NSRegex")
-  var excludeNs = false
-  
   mutating func run() throws {
     var runner = BenchmarkRunner.makeRunner(samples, outputPath)
-        
-    if !self.specificBenchmarks.isEmpty {
-      runner.suite = runner.suite.filter { b in
-        specificBenchmarks.contains { pattern in
-          try! Regex(pattern).wholeMatch(in: b.name) != nil
-        }
-      }
-    }
 
-    if excludeNs {
-      runner.suite = runner.suite.filter { b in !b.name.contains("NS") }
+    // todo: regex based filter 
+    if !self.specificBenchmarks.isEmpty {
+      runner.suite = runner.suite.filter { b in specificBenchmarks.contains(b.name) }
     }
-    
     switch (profile, debug) {
     case (true, true): print("Cannot run both profile and debug")
     case (true, false): runner.profile()

Sources/RegexBenchmark/Inputs/DnaFASTA.swift

@@ -6,7 +6,7 @@ extension BenchmarkRunner {
     let r = #"--([a-zA-Z0-9_-]+)\s*:\s*(.*?);"#
 
     let css = CrossBenchmark(
-      baseName: "Css", regex: r, input: Inputs.swiftOrgCSS)
+      baseName: "css", regex: r, input: Inputs.swiftOrgCSS)
     css.register(&self)
   }
 }

Sources/RegexBenchmark/Inputs/TaggedUnicode.swift

@@ -13,37 +13,37 @@ extension BenchmarkRunner {
     let input = Inputs.graphemeBreakData
 
     register(Benchmark(
-      name: "BasicCCC",
+      name: "basicCCC",
       regex: try! Regex(basic),
       type: .allMatches,
       target: input))
 
     register(Benchmark(
-      name: "BasicRangeCCC",
+      name: "basicRangeCCC",
       regex: try! Regex(basicRange),
       type: .allMatches,
       target: input))
 
     register(Benchmark(
-      name: "CaseInsensitiveCCC",
+      name: "caseInsensitiveCCC",
       regex: try! Regex(caseInsensitive),
       type: .allMatches,
       target: input))
 
     register(Benchmark(
-      name: "InvertedCCC",
+      name: "invertedCCC",
       regex: try! Regex(inverted),
       type: .allMatches,
       target: input))
 
     register(Benchmark(
-      name: "SubtractionCCC",
+      name: "subtractionCCC",
       regex: try! Regex(subtraction),
       type: .allMatches,
       target: input))
 
     register(Benchmark(
-      name: "IntersectionCCC",
+      name: "intersectionCCC",
       regex: try! Regex(intersection),
       type: .allMatches,
       target: input))

Sources/RegexBenchmark/Suite/CssRegex.swift

@@ -13,22 +13,22 @@ extension BenchmarkRunner {
     let emailWithLookaheads = #"(?=[A-z0-9][A-z0-9@._%+-]{5,253})[A-z0-9._%+-]{1,64}@(?:(?=[A-z0-9-]{1,63}\.)[A-z0-9]+(?:-[A-z0-9]+)*\.){1,8}[A-z]{2,63}"#
 
     let emailRFCValid = CrossBenchmark(
-      baseName: "EmailRFC", regex: emailRFC, input: Inputs.validEmails)
+      baseName: "emailRFC", regex: emailRFC, input: Inputs.validEmails)
 
     let emailRFCInvalid = CrossBenchmark(
-      baseName: "EmailRFCNoMatches",
+      baseName: "emailRFCNoMatches",
       regex: emailRFC,
       input: Inputs.graphemeBreakData
     )
 
     let emailValid = CrossBenchmark(
-      baseName: "EmailLookahead",
+      baseName: "emailLookahead",
       regex: emailWithLookaheads,
       input: Inputs.validEmails
     )
 
     let emailInvalid = CrossBenchmark(
-      baseName: "EmailLookaheadNoMatches",
+      baseName: "emailLookaheadNoMatches",
       regex: emailWithLookaheads,
       input: Inputs.graphemeBreakData
     )

Sources/RegexBenchmark/Suite/CustomCharacterClasses.swift

@@ -18,7 +18,7 @@ extension BenchmarkRunner {
     let regex = #"HANGUL SYLLABLE [A-Z]+(?:\.\.HANGUL SYLLABLE [A-Z]+)?"#
 
     let benchmark = CrossBenchmark(
-      baseName: "HangulSyllable", regex: regex, input: input, includeFirst: true)
+      baseName: "HangulSyllable", regex: regex, input: input)
     benchmark.register(&self)
   }
 }