-
Notifications
You must be signed in to change notification settings - Fork 10.5k
[stdlib] Speed up bridged Dictionary instances #17742
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.
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
Merged
Merged
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
6aec05a
[stdlib] Dictionary: Override getObjects:andKeys:count:
lorentey b954e60
[benchmark] Add NSDictionary benchmarks for dictionaries bridged from…
lorentey 91bb2c0
[test] check getObjects:andKeys:count: implementations in bridged Dic…
lorentey a951cf2
[stdlib] Dictionary: Fix getObjects:andKeys:count: implementations
lorentey 93ab767
[stdlib] _NSDictionary: Replace getObjects:andKeys: with getObjects:a…
lorentey c7da0f3
[stdlib] StdlibUnittestFoundationExtras: fix warnings
lorentey cf7e438
[stdlib] Dictionary: Optimize loops in getObjects:andKeys:count: impl…
lorentey File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| //===--- DictionaryBridgeToObjC.swift -------------------------------------===// | ||
| // | ||
| // This source file is part of the Swift.org open source project | ||
| // | ||
| // Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors | ||
| // Licensed under Apache License v2.0 with Runtime Library Exception | ||
| // | ||
| // See https://swift.org/LICENSE.txt for license information | ||
| // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors | ||
| // | ||
| //===----------------------------------------------------------------------===// | ||
|
|
||
| // Performance benchmark for common operations on Dictionary values bridged to | ||
| // NSDictionary. | ||
| import TestsUtils | ||
| #if _runtime(_ObjC) | ||
| import Foundation | ||
|
|
||
| public let DictionaryBridgeToObjC = [ | ||
| BenchmarkInfo( | ||
| name: "DictionaryBridgeToObjC_Bridge", | ||
| runFunction: run_DictionaryBridgeToObjC_BridgeToObjC, | ||
| tags: [.validation, .api, .Dictionary, .bridging]), | ||
| BenchmarkInfo( | ||
| name: "DictionaryBridgeToObjC_Access", | ||
| runFunction: run_DictionaryBridgeToObjC_Access, | ||
| tags: [.validation, .api, .Dictionary, .bridging]), | ||
| BenchmarkInfo( | ||
| name: "DictionaryBridgeToObjC_BulkAccess", | ||
| runFunction: run_DictionaryBridgeToObjC_BulkAccess, | ||
| tags: [.validation, .api, .Dictionary, .bridging]) | ||
| ] | ||
|
|
||
| let numbers: [String: Int] = [ | ||
| "one": 1, | ||
| "two": 2, | ||
| "three": 3, | ||
| "four": 4, | ||
| "five": 5, | ||
| "six": 6, | ||
| "seven": 7, | ||
| "eight": 8, | ||
| "nine": 9, | ||
| "ten": 10, | ||
| "eleven": 11, | ||
| "twelve": 12, | ||
| "thirteen": 13, | ||
| "fourteen": 14, | ||
| "fifteen": 15, | ||
| "sixteen": 16, | ||
| "seventeen": 17, | ||
| "eighteen": 18, | ||
| "nineteen": 19, | ||
| "twenty": 20 | ||
| ] | ||
|
|
||
| @inline(never) | ||
| public func run_DictionaryBridgeToObjC_BridgeToObjC(_ N: Int) { | ||
| for _ in 1 ... 100 * N { | ||
| blackHole(numbers as NSDictionary) | ||
| } | ||
| } | ||
|
|
||
| @inline(never) | ||
| public func run_DictionaryBridgeToObjC_Access(_ N: Int) { | ||
| let d = numbers as NSDictionary | ||
| blackHole(d.object(forKey: "one")) // Force bridging of contents | ||
| for _ in 1 ... 100 * N { | ||
| for key in numbers.keys { | ||
| CheckResults(identity(d).object(forKey: key) != nil) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @inline(never) | ||
| public func run_DictionaryBridgeToObjC_BulkAccess(_ N: Int) { | ||
| let d = numbers as NSDictionary | ||
| for _ in 1 ... 100 * N { | ||
| let d2 = NSDictionary(dictionary: identity(d)) | ||
| CheckResults(d2.count == d.count) | ||
| } | ||
| } | ||
|
|
||
| #else // !_runtime(ObjC) | ||
| public let DictionaryBridgeToObjC: [BenchmarkInfo] = [] | ||
| #endif |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you could eke out a one less loop iteration by checking this after you increment i -- and adding an early out above for count == 0
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good point! It can often be more than one iteration, too, since the loop skips over empty buckets.