Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Swift 6 preparedness #54

Merged
merged 3 commits into from
Jun 10, 2024
Merged

Swift 6 preparedness #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
71e4681
Swift 6 preparedness
Lukasa May 28, 2024
6e24ab8
Update benchmark thresholds
Lukasa May 30, 2024
cbee10a
Stop counting retain/releases
Lukasa Jun 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Benchmarks/Benchmarks/SwiftASN1Benchmark/Benchmarks.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ let benchmarks = {
.readSyscalls,
.writeSyscalls,
.memoryLeaked,
.retainCount,
.releaseCount,
]
)

Expand Down
4 changes: 1 addition & 3 deletions ...ks/Thresholds/5.10/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_PEM_to_PEMDocument.p90.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"mallocCountTotal" : 960,
"mallocCountTotal" : 976,
"memoryLeaked" : 0,
"readSyscalls" : 0,
"releaseCount" : 13983,
"retainCount" : 12200,
"writeSyscalls" : 0
}
2 changes: 0 additions & 2 deletions ...sholds/5.10/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_multi_PEM_to_PEMDocument_.p90.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,5 @@
"mallocCountTotal" : 967,
"memoryLeaked" : 0,
"readSyscalls" : 0,
"releaseCount" : 12900,
"retainCount" : 11382,
"writeSyscalls" : 0
}
4 changes: 1 addition & 3 deletions ...rks/Thresholds/5.8/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_PEM_to_PEMDocument.p90.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"mallocCountTotal" : 960,
"mallocCountTotal" : 976,
"memoryLeaked" : 0,
"readSyscalls" : 0,
"releaseCount" : 17688,
"retainCount" : 15905,
"writeSyscalls" : 0
}
2 changes: 0 additions & 2 deletions ...esholds/5.8/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_multi_PEM_to_PEMDocument_.p90.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,5 @@
"mallocCountTotal" : 967,
"memoryLeaked" : 0,
"readSyscalls" : 0,
"releaseCount" : 16605,
"retainCount" : 15087,
"writeSyscalls" : 0
}
4 changes: 1 addition & 3 deletions ...rks/Thresholds/5.9/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_PEM_to_PEMDocument.p90.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"mallocCountTotal" : 960,
"mallocCountTotal" : 976,
"memoryLeaked" : 0,
"readSyscalls" : 0,
"releaseCount" : 13846,
"retainCount" : 12063,
"writeSyscalls" : 0
}
2 changes: 0 additions & 2 deletions ...esholds/5.9/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_multi_PEM_to_PEMDocument_.p90.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,5 @@
"mallocCountTotal" : 967,
"memoryLeaked" : 0,
"readSyscalls" : 0,
"releaseCount" : 12763,
"retainCount" : 11245,
"writeSyscalls" : 0
}
4 changes: 1 addition & 3 deletions ...ks/Thresholds/main/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_PEM_to_PEMDocument.p90.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"mallocCountTotal" : 960,
"mallocCountTotal" : 976,
"memoryLeaked" : 0,
"readSyscalls" : 0,
"releaseCount" : 13983,
"retainCount" : 12200,
"writeSyscalls" : 0
}
2 changes: 0 additions & 2 deletions ...sholds/main/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_multi_PEM_to_PEMDocument_.p90.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,5 @@
"mallocCountTotal" : 967,
"memoryLeaked" : 0,
"readSyscalls" : 0,
"releaseCount" : 12900,
"retainCount" : 11382,
"writeSyscalls" : 0
}
28 changes: 28 additions & 0 deletions docker/docker-compose.2204.60.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
version: "3"

services:

runtime-setup:
image: swift-asn1:22.04-6.0
build:
args:
base_image: "swiftlang/swift:nightly-6.0-jammy"

test:
image: swift-asn1:22.04-6.0
environment:
- SWIFT_VERSION=6.0
- WARN_AS_ERROR_ARG=-Xswiftc -warnings-as-errors
- IMPORT_CHECK_ARG=--explicit-target-dependency-import-check error
- EXPLICIT_SENDABLE_ARG=-Xswiftc -require-explicit-sendable
- STRICT_CONCURRENCY_ARG=-Xswiftc -strict-concurrency=complete
# - SANITIZER_ARG=--sanitize=thread # TSan broken still

shell:
image: swift-asn1:22.04-6.0

update-benchmark-baseline:
image: swift-asn1:22.04-6.0
environment:
- SWIFT_VERSION=6.0

2 changes: 2 additions & 0 deletions docker/docker-compose.2204.main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ services:
- SWIFT_VERSION=main
- WARN_AS_ERROR_ARG=-Xswiftc -warnings-as-errors
- IMPORT_CHECK_ARG=--explicit-target-dependency-import-check error
- EXPLICIT_SENDABLE_ARG=-Xswiftc -require-explicit-sendable
- STRICT_CONCURRENCY_ARG=-Xswiftc -strict-concurrency=complete
# - SANITIZER_ARG=--sanitize=thread # TSan broken still

shell:
Expand Down
3 changes: 2 additions & 1 deletion docker/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ services:

test:
<<: *common
command: /bin/bash -xcl "swift $${SWIFT_TEST_VERB-test} $${WARN_AS_ERROR_ARG-} $${SANITIZER_ARG-} $${IMPORT_CHECK_ARG-} && cd Benchmarks && swift package benchmark baseline check --check-absolute-path Thresholds/$${SWIFT_VERSION-}/"
command: /bin/bash -xcl "swift $${SWIFT_TEST_VERB-test} $${WARN_AS_ERROR_ARG-} $${SANITIZER_ARG-} $${IMPORT_CHECK_ARG-} $${EXPLICIT_SENDABLE_ARG-} $${STRICT_CONCURRENCY_ARG} && cd Benchmarks && swift package benchmark baseline check --check-absolute-path Thresholds/$${SWIFT_VERSION-}/"

update-benchmark-baseline:
<<: *common
Expand All @@ -36,3 +36,4 @@ services:
shell:
<<: *common
entrypoint: /bin/bash