Add same test variants for DropLast and Prefix as exist on Suffix

Author: palimondo

benchmark/single-source/DropLast.swift

@@ -23,7 +23,6 @@ let prefixCount = 1024
 let dropCount = sequenceCount - prefixCount
 let sumCount = prefixCount * (prefixCount - 1) / 2
 
-
 @inline(never)
 public func run_DropLastCountableRange(_ N: Int) {
   let s = 0..<sequenceCount
@@ -73,6 +72,18 @@ public func run_DropLastAnySeqCntRange(_ N: Int) {
   }
 }
 @inline(never)
+public func run_DropLastAnySeqCRangeIter(_ N: Int) {
+  let s = AnySequence((0..<sequenceCount).makeIterator())
+  for _ in 1...20*N {
+    var result = 0
+    for element in s.dropLast(dropCount) {
+      result += element
+    }
+    CheckResults(result == sumCount,
+      "IncorrectResults in DropLastAnySeqCRangeIter: \(result) != \(sumCount)")
+  }
+}
+@inline(never)
 public func run_DropLastAnyCollection(_ N: Int) {
   let s = AnyCollection(0..<sequenceCount)
   for _ in 1...20*N {
@@ -145,6 +156,18 @@ public func run_DropLastAnySeqCntRangeLazy(_ N: Int) {
   }
 }
 @inline(never)
+public func run_DropLastAnySeqCRangeIterLazy(_ N: Int) {
+  let s = (AnySequence((0..<sequenceCount).makeIterator())).lazy
+  for _ in 1...20*N {
+    var result = 0
+    for element in s.dropLast(dropCount) {
+      result += element
+    }
+    CheckResults(result == sumCount,
+      "IncorrectResults in DropLastAnySeqCRangeIterLazy: \(result) != \(sumCount)")
+  }
+}
+@inline(never)
 public func run_DropLastAnyCollectionLazy(_ N: Int) {
   let s = (AnyCollection(0..<sequenceCount)).lazy
   for _ in 1...20*N {

benchmark/single-source/DropLast.swift.gyb

@@ -23,7 +23,6 @@ let sequenceCount = 4096
 let prefixCount = 1024
 let dropCount = sequenceCount - prefixCount
 let sumCount = prefixCount * (prefixCount - 1) / 2
-
 %{
 # Name and Expression pairs for Sequences to test.
 
@@ -34,6 +33,7 @@ Sequences = [
   ('AnySequence',
     'AnySequence(sequence(first: 0) { $0 < sequenceCount - 1 ? $0 &+ 1 : nil })'),
   ('AnySeqCntRange', 'AnySequence(0..<sequenceCount)'),
+  ('AnySeqCRangeIter', 'AnySequence((0..<sequenceCount).makeIterator())'),
   ('AnyCollection', 'AnyCollection(0..<sequenceCount)'),
   ('Array', 'Array(0..<sequenceCount)'),
 ]

benchmark/single-source/Prefix.swift

@@ -22,7 +22,6 @@ let sequenceCount = 4096
 let prefixCount = sequenceCount - 1024
 let sumCount = prefixCount * (prefixCount - 1) / 2
 
-
 @inline(never)
 public func run_PrefixCountableRange(_ N: Int) {
   let s = 0..<sequenceCount
@@ -72,6 +71,18 @@ public func run_PrefixAnySeqCntRange(_ N: Int) {
   }
 }
 @inline(never)
+public func run_PrefixAnySeqCRangeIter(_ N: Int) {
+  let s = AnySequence((0..<sequenceCount).makeIterator())
+  for _ in 1...20*N {
+    var result = 0
+    for element in s.prefix(prefixCount) {
+      result += element
+    }
+    CheckResults(result == sumCount,
+      "IncorrectResults in PrefixAnySeqCRangeIter: \(result) != \(sumCount)")
+  }
+}
+@inline(never)
 public func run_PrefixAnyCollection(_ N: Int) {
   let s = AnyCollection(0..<sequenceCount)
   for _ in 1...20*N {
@@ -144,6 +155,18 @@ public func run_PrefixAnySeqCntRangeLazy(_ N: Int) {
   }
 }
 @inline(never)
+public func run_PrefixAnySeqCRangeIterLazy(_ N: Int) {
+  let s = (AnySequence((0..<sequenceCount).makeIterator())).lazy
+  for _ in 1...20*N {
+    var result = 0
+    for element in s.prefix(prefixCount) {
+      result += element
+    }
+    CheckResults(result == sumCount,
+      "IncorrectResults in PrefixAnySeqCRangeIterLazy: \(result) != \(sumCount)")
+  }
+}
+@inline(never)
 public func run_PrefixAnyCollectionLazy(_ N: Int) {
   let s = (AnyCollection(0..<sequenceCount)).lazy
   for _ in 1...20*N {

benchmark/single-source/Prefix.swift.gyb

@@ -22,7 +22,6 @@ import TestsUtils
 let sequenceCount = 4096
 let prefixCount = sequenceCount - 1024
 let sumCount = prefixCount * (prefixCount - 1) / 2
-
 %{
 # Name and initializer Expression pairs for Sequences to test.
 
@@ -33,6 +32,7 @@ Sequences = [
   ('AnySequence',
     'AnySequence(sequence(first: 0) { $0 < sequenceCount - 1 ? $0 &+ 1 : nil })'),
   ('AnySeqCntRange', 'AnySequence(0..<sequenceCount)'),
+  ('AnySeqCRangeIter', 'AnySequence((0..<sequenceCount).makeIterator())'),
   ('AnyCollection', 'AnyCollection(0..<sequenceCount)'),
   ('Array', 'Array(0..<sequenceCount)'),
 ]

benchmark/utils/main.swift

@@ -175,6 +175,8 @@ precommitTests = [
   "DictionarySwapOfObjects": run_DictionarySwapOfObjects,
   "DropLastAnyCollection": run_DropLastAnyCollection,
   "DropLastAnyCollectionLazy": run_DropLastAnyCollectionLazy,
+  "DropLastAnySeqCRangeIter": run_DropLastAnySeqCRangeIter,
+  "DropLastAnySeqCRangeIterLazy": run_DropLastAnySeqCRangeIterLazy,
   "DropLastAnySeqCntRange": run_DropLastAnySeqCntRange,
   "DropLastAnySeqCntRangeLazy": run_DropLastAnySeqCntRangeLazy,
   "DropLastAnySequence": run_DropLastAnySequence,
@@ -364,6 +366,8 @@ precommitTests = [
   "PopFrontUnsafePointer": run_PopFrontUnsafePointer,
   "PrefixAnyCollection": run_PrefixAnyCollection,
   "PrefixAnyCollectionLazy": run_PrefixAnyCollectionLazy,
+  "PrefixAnySeqCRangeIter": run_PrefixAnySeqCRangeIter,
+  "PrefixAnySeqCRangeIterLazy": run_PrefixAnySeqCRangeIterLazy,
   "PrefixAnySeqCntRange": run_PrefixAnySeqCntRange,
   "PrefixAnySeqCntRangeLazy": run_PrefixAnySeqCntRangeLazy,
   "PrefixAnySequence": run_PrefixAnySequence,