swift 6.0+ performance tweaks 3x-6x #9067
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
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 |
|---|---|---|
|
|
@@ -26,8 +26,9 @@ public struct ByteBuffer { | |
| /// deallocating the memory that was held by (memory: UnsafeMutableRawPointer) | ||
| @usableFromInline | ||
| final class Storage { | ||
| #if compiler(>=6.0) | ||
| @usableFromInline | ||
| @frozen enum Blob: ~Copyable { | ||
| #if !os(WASI) | ||
| case data(Data) | ||
| case bytes(ContiguousBytes) | ||
|
|
@@ -36,15 +37,73 @@ public struct ByteBuffer { | |
| case byteBuffer(_InternalByteBuffer) | ||
| case array([UInt8]) | ||
| case pointer(UnsafeMutableRawPointer) | ||
|
|
||
| init(_ other: borrowing Blob) { | ||
| switch other { | ||
| case .data(let data): | ||
| self = .data(data) | ||
| case .bytes(let contiguousBytes): | ||
| self = .bytes(contiguousBytes) | ||
| case .byteBuffer(let internalByteBuffer): | ||
| self = .byteBuffer(internalByteBuffer) | ||
| case .array(let array): | ||
| self = .array(array) | ||
| case .pointer(let unsafeMutableRawPointer): | ||
| self = .pointer(unsafeMutableRawPointer) | ||
| } | ||
| } | ||
|
|
||
| var description: String { | ||
| switch self { | ||
| case .data(let data): | ||
| "data: \(data)" | ||
| case .bytes(let contiguousBytes): | ||
| "bytes: \(contiguousBytes)" | ||
| case .byteBuffer(let internalByteBuffer): | ||
| "byteBuffer: \(internalByteBuffer)" | ||
| case .array(let array): | ||
| "array: \(array)" | ||
| case .pointer(let unsafeMutableRawPointer): | ||
| "pointer: \(unsafeMutableRawPointer)" | ||
| } | ||
| } | ||
| } | ||
| #else | ||
| @usableFromInline | ||
| @frozen enum Blob { | ||
| #if !os(WASI) | ||
| case data(Data) | ||
| case bytes(ContiguousBytes) | ||
| #endif | ||
|
|
||
| case byteBuffer(_InternalByteBuffer) | ||
| case array([UInt8]) | ||
| case pointer(UnsafeMutableRawPointer) | ||
|
|
||
| var description: String { | ||
| switch self { | ||
| case .data(let data): | ||
| return "data: \(data)" | ||
| case .bytes(let contiguousBytes): | ||
| return "bytes: \(contiguousBytes)" | ||
| case .byteBuffer(let internalByteBuffer): | ||
| return "byteBuffer: \(internalByteBuffer)" | ||
| case .array(let array): | ||
| return "array: \(array)" | ||
| case .pointer(let unsafeMutableRawPointer): | ||
| return "pointer: \(unsafeMutableRawPointer)" | ||
| } | ||
| } | ||
| } | ||
| #endif | ||
|
|
||
| /// This storage doesn't own the memory, therefore, we won't deallocate on deinit. | ||
| private let isOwned: Bool | ||
| /// Capacity of UInt8 the buffer can hold | ||
| private let capacity: Int | ||
| /// Retained blob of data that requires the storage to retain a pointer to. | ||
| @usableFromInline | ||
| let retainedBlob: Blob | ||
|
|
||
| @usableFromInline | ||
| init(count: Int) { | ||
|
|
@@ -56,12 +115,21 @@ public struct ByteBuffer { | |
| isOwned = true | ||
| } | ||
|
|
||
| #if compiler(>=6.0) | ||
| @usableFromInline | ||
| init(blob: borrowing Blob, capacity count: Int) { | ||
| capacity = count | ||
| retainedBlob = .init(blob) | ||
| isOwned = false | ||
| } | ||
| #else | ||
| @usableFromInline | ||
| init(blob: Blob, capacity count: Int) { | ||
| capacity = count | ||
| retainedBlob = blob | ||
| isOwned = false | ||
| } | ||
| #endif | ||
|
|
||
| deinit { | ||
| guard isOwned else { return } | ||
|
|
@@ -150,6 +218,7 @@ public struct ByteBuffer { | |
|
|
||
| @discardableResult | ||
| @inline(__always) | ||
| @inlinable | ||
| func readWithUnsafeRawPointer<T>( | ||
| position: Int, | ||
| _ body: (UnsafeRawPointer) throws -> T) rethrows -> T | ||
|
|
@@ -276,6 +345,18 @@ public struct ByteBuffer { | |
| /// - memory: Current memory of the buffer | ||
| /// - count: count of bytes | ||
| /// - removeBytes: Removes a number of bytes from the current size | ||
| #if compiler(>=6.0) | ||
| @inline(__always) | ||
| init( | ||
| blob: borrowing Storage.Blob, | ||
| count: Int, | ||
| removing removeBytes: Int) | ||
| { | ||
| _storage = Storage(blob: blob, capacity: count) | ||
| _readerIndex = removeBytes | ||
| capacity = count | ||
| } | ||
| #else | ||
|
Comment on lines
+348
to
+359
Collaborator
There was a problem hiding this comment. Im wondering if we can reduce the amount of
Contributor
Author
There was a problem hiding this comment. I think I can wait for #8983 and remove all swift>=6.0 annotations all together. |
||
| @inline(__always) | ||
| init( | ||
| blob: Storage.Blob, | ||
|
|
@@ -286,6 +367,7 @@ public struct ByteBuffer { | |
| _readerIndex = removeBytes | ||
| capacity = count | ||
| } | ||
| #endif | ||
|
|
||
| /// Write stores an object into the buffer directly or indirectly. | ||
| /// | ||
|
|
@@ -317,13 +399,25 @@ public struct ByteBuffer { | |
| /// - Parameters: | ||
| /// - def: Type of the object | ||
| /// - position: the index of the object in the buffer | ||
| #if compiler(>=6.0) | ||
| @inline(__always) | ||
| @inlinable | ||
| public func read<T: BitwiseCopyable>(def: T.Type, position: Int) -> T { | ||
| _storage.readWithUnsafeRawPointer(position: position) { | ||
| $0.bindMemory(to: T.self, capacity: 1) | ||
| .pointee | ||
| } | ||
| } | ||
| #else | ||
| @inline(__always) | ||
| @inlinable | ||
| public func read<T>(def: T.Type, position: Int) -> T { | ||
| _storage.readWithUnsafeRawPointer(position: position) { | ||
| $0.bindMemory(to: T.self, capacity: 1) | ||
| .pointee | ||
| } | ||
| } | ||
| #endif | ||
|
|
||
| /// Reads a slice from the memory assuming a type of T | ||
| /// - Parameters: | ||
|
|
@@ -412,7 +506,7 @@ public struct ByteBuffer { | |
| /// - Parameter removeBytes: the amount of bytes to remove from the current Size | ||
| @inline(__always) | ||
| public func duplicate(removing removeBytes: Int = 0) -> ByteBuffer { | ||
| assert(removeBytes >= 0, "Can NOT remove negative bytes") | ||
| assert( | ||
| removeBytes < capacity, | ||
| "Can NOT remove more bytes than the ones allocated") | ||
|
|
@@ -464,8 +558,9 @@ public struct ByteBuffer { | |
| extension ByteBuffer: CustomDebugStringConvertible { | ||
|
|
||
| public var debugDescription: String { | ||
| let blobDescription = _storage.retainedBlob.description | ||
| return """ | ||
| buffer located at: \(blobDescription), | ||
| with capacity of \(capacity), | ||
| { writtenSize: \(_readerIndex), readerSize: \(reader), | ||
| size: \(size) } | ||
|
|
||
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.
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.
requires OS not wasm flag