Skip to content

Commit ad3d3ad

Browse files
committed
[benchmark] Update/fix availability checks
1 parent d4564e4 commit ad3d3ad

File tree

2 files changed

+41
-36
lines changed

2 files changed

+41
-36
lines changed

benchmark/single-source/CharacterRecognizer.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import TestsUtils
1414

1515
public var benchmarks: [BenchmarkInfo] {
16-
guard #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) else {
16+
guard #available(macOS 14.0, iOS 17.0, watchOS 10.0, tvOS 17.0, *) else {
1717
return []
1818
}
1919
return [
@@ -82,7 +82,7 @@ let _asciiString = #"""
8282
"""#
8383
let asciiString = String(repeating: _asciiString, count: 10)
8484

85-
@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
85+
@available(macOS 14.0, iOS 17.0, watchOS 10.0, tvOS 17.0, *)
8686
func run(string: String, n: Int) {
8787
var state = Unicode._CharacterRecognizer()
8888
var c = 0

benchmark/single-source/StringTests.swift

Lines changed: 39 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,43 @@ import TestsUtils
1414
@_spi(_Unicode)
1515
import Swift
1616

17-
public let benchmarks = [
18-
BenchmarkInfo(
19-
name: "StringEqualPointerComparison",
20-
runFunction: run_StringEqualPointerComparison,
21-
tags: [.validation, .api, .String]),
22-
BenchmarkInfo(
23-
name: "StringHasPrefixAscii",
24-
runFunction: run_StringHasPrefixAscii,
25-
tags: [.validation, .api, .String],
26-
legacyFactor: 10),
27-
BenchmarkInfo(
28-
name: "StringHasPrefixUnicode",
29-
runFunction: run_StringHasPrefixUnicode,
30-
tags: [.validation, .api, .String],
31-
legacyFactor: 1000),
32-
BenchmarkInfo(
33-
name: "StringHasSuffixAscii",
34-
runFunction: run_StringHasSuffixAscii,
35-
tags: [.validation, .api, .String],
36-
legacyFactor: 10),
37-
BenchmarkInfo(
38-
name: "StringHasSuffixUnicode",
39-
runFunction: run_StringHasSuffixUnicode,
40-
tags: [.validation, .api, .String],
41-
legacyFactor: 1000),
42-
BenchmarkInfo(
43-
name: "StringIterateWords",
44-
runFunction: run_iterateWords,
45-
tags: [.validation, .String]),
46-
]
17+
public var benchmarks: [BenchmarkInfo] {
18+
var result = [
19+
BenchmarkInfo(
20+
name: "StringEqualPointerComparison",
21+
runFunction: run_StringEqualPointerComparison,
22+
tags: [.validation, .api, .String]),
23+
BenchmarkInfo(
24+
name: "StringHasPrefixAscii",
25+
runFunction: run_StringHasPrefixAscii,
26+
tags: [.validation, .api, .String],
27+
legacyFactor: 10),
28+
BenchmarkInfo(
29+
name: "StringHasPrefixUnicode",
30+
runFunction: run_StringHasPrefixUnicode,
31+
tags: [.validation, .api, .String],
32+
legacyFactor: 1000),
33+
BenchmarkInfo(
34+
name: "StringHasSuffixAscii",
35+
runFunction: run_StringHasSuffixAscii,
36+
tags: [.validation, .api, .String],
37+
legacyFactor: 10),
38+
BenchmarkInfo(
39+
name: "StringHasSuffixUnicode",
40+
runFunction: run_StringHasSuffixUnicode,
41+
tags: [.validation, .api, .String],
42+
legacyFactor: 1000),
43+
]
44+
45+
if #available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *) {
46+
result.append(
47+
BenchmarkInfo(
48+
name: "StringIterateWords",
49+
runFunction: run_iterateWords,
50+
tags: [.validation, .String]))
51+
}
52+
return result
53+
}
4754

4855
// FIXME(string)
4956
public func run_StringHasPrefixAscii(_ n: Int) {
@@ -1644,11 +1651,8 @@ architecture on Linux.</p>
16441651

16451652
extension String {
16461653
@inline(never)
1647-
@available(SwiftStdlib 5.9, *)
1654+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
16481655
var _words: [Substring] {
1649-
guard #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) else {
1650-
fatalError("Can't run this benchmark")
1651-
}
16521656
var result: [Substring] = []
16531657

16541658
var i = startIndex
@@ -1666,6 +1670,7 @@ extension String {
16661670
}
16671671
}
16681672

1673+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
16691674
public func run_iterateWords(_ n: Int) {
16701675
for _ in 0 ..< n {
16711676
blackHole(swiftOrgHTML._words)

0 commit comments

Comments
 (0)