Skip to content

Commit e61a15e

Browse files
eecksteineeckstein
authored
Merge pull request #13255 from eeckstein/fix-benchmarks
benchmarks: Mark some unstable benchmarks as unstable.
2 parents 2cda5a9 + 9931b3c commit e61a15e

11 files changed

+15
-30
lines changed

‎benchmark/single-source/DeadArray.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import TestsUtils
1616
public let DeadArray = BenchmarkInfo(
1717
name: "DeadArray",
1818
runFunction: run_DeadArray,
19-
tags: [.regression])
19+
tags: [.regression, .unstable])
2020

2121
@inline(__always)
2222
func debug(_ m:String) {}

‎benchmark/single-source/DropLast.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public let DropLast = [
5151
BenchmarkInfo(
5252
name: "DropLastArray",
5353
runFunction: run_DropLastArray,
54-
tags: [.validation, .api, .Array]),
54+
tags: [.validation, .api, .Array, .unstable]),
5555
BenchmarkInfo(
5656
name: "DropLastCountableRangeLazy",
5757
runFunction: run_DropLastCountableRangeLazy,

‎benchmark/single-source/DropLast.swift.gyb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public let DropLast = [
4747
BenchmarkInfo(
4848
name: "DropLast${Name}",
4949
runFunction: run_DropLast${Name},
50-
tags: [.validation, .api${', .Array' if Name == 'Array' else ''}]),
50+
tags: [.validation, .api${', .Array, .unstable' if Name == 'Array' else ''}]),
5151
% end
5252
]
5353

‎benchmark/single-source/DropWhile.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public let DropWhile = [
5151
BenchmarkInfo(
5252
name: "DropWhileArray",
5353
runFunction: run_DropWhileArray,
54-
tags: [.validation, .api, .Array]),
54+
tags: [.validation, .api, .Array, .unstable]),
5555
BenchmarkInfo(
5656
name: "DropWhileCountableRangeLazy",
5757
runFunction: run_DropWhileCountableRangeLazy,

‎benchmark/single-source/DropWhile.swift.gyb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public let DropWhile = [
4747
BenchmarkInfo(
4848
name: "DropWhile${Name}",
4949
runFunction: run_DropWhile${Name},
50-
tags: [.validation, .api${', .Array' if Name == 'Array' else ''}]),
50+
tags: [.validation, .api${', .Array, .unstable' if Name == 'Array' else ''}]),
5151
% end
5252
]
5353

‎benchmark/single-source/ObjectiveCBridging.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ public let ObjectiveCBridging = [
2323
BenchmarkInfo(name: "ObjectiveCBridgeFromNSArrayAnyObjectToString", runFunction: run_ObjectiveCBridgeFromNSArrayAnyObjectToString, tags: [.validation, .bridging, .String]),
2424
BenchmarkInfo(name: "ObjectiveCBridgeFromNSArrayAnyObjectToStringForced", runFunction: run_ObjectiveCBridgeFromNSArrayAnyObjectToStringForced, tags: [.validation, .bridging, .String]),
2525
BenchmarkInfo(name: "ObjectiveCBridgeFromNSDictionaryAnyObject", runFunction: run_ObjectiveCBridgeFromNSDictionaryAnyObject, tags: [.validation, .bridging]),
26-
BenchmarkInfo(name: "ObjectiveCBridgeFromNSDictionaryAnyObjectForced", runFunction: run_ObjectiveCBridgeFromNSDictionaryAnyObjectForced, tags: [.validation, .bridging]),
26+
BenchmarkInfo(name: "ObjectiveCBridgeFromNSDictionaryAnyObjectForced", runFunction: run_ObjectiveCBridgeFromNSDictionaryAnyObjectForced, tags: [.validation, .bridging, .unstable]),
2727
BenchmarkInfo(name: "ObjectiveCBridgeToNSDictionary", runFunction: run_ObjectiveCBridgeToNSDictionary, tags: [.validation, .bridging]),
28-
BenchmarkInfo(name: "ObjectiveCBridgeFromNSDictionaryAnyObjectToString", runFunction: run_ObjectiveCBridgeFromNSDictionaryAnyObjectToString, tags: [.validation, .bridging, .String]),
29-
BenchmarkInfo(name: "ObjectiveCBridgeFromNSDictionaryAnyObjectToStringForced", runFunction: run_ObjectiveCBridgeFromNSDictionaryAnyObjectToStringForced, tags: [.validation, .bridging, .String]),
28+
BenchmarkInfo(name: "ObjectiveCBridgeFromNSDictionaryAnyObjectToString", runFunction: run_ObjectiveCBridgeFromNSDictionaryAnyObjectToString, tags: [.validation, .bridging, .String, .unstable]),
29+
BenchmarkInfo(name: "ObjectiveCBridgeFromNSDictionaryAnyObjectToStringForced", runFunction: run_ObjectiveCBridgeFromNSDictionaryAnyObjectToStringForced, tags: [.validation, .bridging, .String, .unstable]),
3030
BenchmarkInfo(name: "ObjectiveCBridgeFromNSSetAnyObject", runFunction: run_ObjectiveCBridgeFromNSSetAnyObject, tags: [.validation, .bridging]),
3131
BenchmarkInfo(name: "ObjectiveCBridgeFromNSSetAnyObjectForced", runFunction: run_ObjectiveCBridgeFromNSSetAnyObjectForced, tags: [.validation, .bridging]),
3232
BenchmarkInfo(name: "ObjectiveCBridgeToNSSet", runFunction: run_ObjectiveCBridgeToNSSet, tags: [.validation, .bridging]),
3333
BenchmarkInfo(name: "ObjectiveCBridgeFromNSSetAnyObjectToString", runFunction: run_ObjectiveCBridgeFromNSSetAnyObjectToString, tags: [.validation, .bridging, .String]),
34-
BenchmarkInfo(name: "ObjectiveCBridgeFromNSSetAnyObjectToStringForced", runFunction: run_ObjectiveCBridgeFromNSSetAnyObjectToStringForced, tags: [.validation, .bridging, .String]),
34+
BenchmarkInfo(name: "ObjectiveCBridgeFromNSSetAnyObjectToStringForced", runFunction: run_ObjectiveCBridgeFromNSSetAnyObjectToStringForced, tags: [.validation, .bridging, .String, .unstable]),
3535
]
3636

3737
#if _runtime(_ObjC)

‎benchmark/single-source/ObjectiveCBridgingStubs.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import ObjectiveCTests
1818

1919
public let ObjectiveCBridgingStubs = [
2020
BenchmarkInfo(name: "ObjectiveCBridgeStubDataAppend", runFunction: run_ObjectiveCBridgeStubDataAppend, tags: [.validation, .bridging]),
21-
BenchmarkInfo(name: "ObjectiveCBridgeStubDateAccess", runFunction: run_ObjectiveCBridgeStubDateAccess, tags: [.validation, .bridging]),
21+
BenchmarkInfo(name: "ObjectiveCBridgeStubDateAccess", runFunction: run_ObjectiveCBridgeStubDateAccess, tags: [.validation, .bridging, .unstable]),
2222
BenchmarkInfo(name: "ObjectiveCBridgeStubDateMutation", runFunction: run_ObjectiveCBridgeStubDateMutation, tags: [.validation, .bridging]),
2323
BenchmarkInfo(name: "ObjectiveCBridgeStubFromArrayOfNSString", runFunction: run_ObjectiveCBridgeStubFromArrayOfNSString, tags: [.validation, .bridging]),
2424
BenchmarkInfo(name: "ObjectiveCBridgeStubFromNSDate", runFunction: run_ObjectiveCBridgeStubFromNSDate, tags: [.validation, .bridging]),

‎benchmark/single-source/ObjectiveCNoBridgingStubs.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ import ObjectiveCTests
2424
public let ObjectiveCNoBridgingStubs = [
2525
BenchmarkInfo(name: "ObjectiveCBridgeStubToNSStringRef", runFunction: run_ObjectiveCBridgeStubToNSStringRef, tags: [.validation, .bridging]),
2626
BenchmarkInfo(name: "ObjectiveCBridgeStubToNSDateRef", runFunction: run_ObjectiveCBridgeStubToNSDateRef, tags: [.validation, .bridging]),
27-
BenchmarkInfo(name: "ObjectiveCBridgeStubNSDateRefAccess", runFunction: run_ObjectiveCBridgeStubNSDateRefAccess, tags: [.validation, .bridging]),
27+
BenchmarkInfo(name: "ObjectiveCBridgeStubNSDateRefAccess", runFunction: run_ObjectiveCBridgeStubNSDateRefAccess, tags: [.validation, .bridging, .unstable]),
2828
BenchmarkInfo(name: "ObjectiveCBridgeStubNSDateMutationRef", runFunction: run_ObjectiveCBridgeStubNSDateMutationRef, tags: [.validation, .bridging]),
2929
BenchmarkInfo(name: "ObjectiveCBridgeStubNSDataAppend", runFunction: run_ObjectiveCBridgeStubNSDataAppend, tags: [.validation, .bridging]),
3030
BenchmarkInfo(name: "ObjectiveCBridgeStubFromNSStringRef", runFunction: run_ObjectiveCBridgeStubFromNSStringRef, tags: [.validation, .bridging]),
31-
BenchmarkInfo(name: "ObjectiveCBridgeStubFromNSDateRef", runFunction: run_ObjectiveCBridgeStubFromNSDateRef, tags: [.validation, .bridging]),
31+
BenchmarkInfo(name: "ObjectiveCBridgeStubFromNSDateRef", runFunction: run_ObjectiveCBridgeStubFromNSDateRef, tags: [.validation, .bridging, .unstable]),
3232
BenchmarkInfo(name: "ObjectiveCBridgeStubURLAppendPathRef", runFunction: run_ObjectiveCBridgeStubURLAppendPathRef, tags: [.validation, .bridging]),
3333
]
3434

‎benchmark/single-source/ProtocolDispatch.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import TestsUtils
1515
public let ProtocolDispatch = BenchmarkInfo(
1616
name: "ProtocolDispatch",
1717
runFunction: run_ProtocolDispatch,
18-
tags: [.validation, .abstraction])
18+
tags: [.validation, .abstraction, .unstable])
1919

2020
@inline(never)
2121
public func run_ProtocolDispatch(_ N: Int) {

‎benchmark/single-source/ProtocolDispatch2.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import Foundation
2020
public let ProtocolDispatch2 = BenchmarkInfo(
2121
name: "ProtocolDispatch2",
2222
runFunction: run_ProtocolDispatch2,
23-
tags: [.validation, .abstraction])
23+
tags: [.validation, .abstraction, .unstable])
2424

2525
protocol Pingable { func ping() -> Int; func pong() -> Int}
2626

‎benchmark/utils/DriverUtils.swift

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,6 @@ struct Test {
8686
}
8787
}
8888

89-
// Legacy test dictionaries.
90-
public var precommitTests: [BenchmarkInfo] = []
91-
public var otherTests: [BenchmarkInfo] = []
92-
public var stringTests: [BenchmarkInfo] = []
93-
9489
// We should migrate to a collection of BenchmarkInfo.
9590
public var registeredBenchmarks: [BenchmarkInfo] = []
9691

@@ -231,22 +226,12 @@ struct TestConfig {
231226
}
232227

233228
mutating func findTestsToRun() {
234-
// Begin by creating a set of our non-legacy registeredBenchmarks
235-
var allTests = Set(registeredBenchmarks)
236-
237-
// Merge legacy benchmark info into allTests. If we already have a
238-
// registered benchmark info, formUnion leaves this alone. This allows for
239-
// us to perform incremental work.
240-
for testList in [precommitTests, otherTests, stringTests] {
241-
allTests.formUnion(testList)
242-
}
243-
244229
let benchmarkNameFilter = Set(filters)
245230

246231
// t is needed so we don't capture an ivar of a mutable inout self.
247232
let t = tags
248233
let st = skipTags
249-
let filteredTests = Array(allTests.filter { benchInfo in
234+
let filteredTests = Array(registeredBenchmarks.filter { benchInfo in
250235
if !t.isSubset(of: benchInfo.tags) {
251236
return false
252237
}

0 commit comments

Comments
 (0)