Skip to content

[5.1] Drop @inline(__always) from Accelerate overlay #24650

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

Merged
merged 2 commits into from
May 10, 2019
Merged

[5.1] Drop @inline(__always) from Accelerate overlay #24650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a70b97a
Drop @inline(__always) from Accelerate overlay; it doesn't do what yo…
stephentyrone May 9, 2019
8fc0c61
Also apply @inlinable to AccelerateBuffer default implementations.
stephentyrone May 9, 2019
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
10 changes: 6 additions & 4 deletions stdlib/public/Darwin/Accelerate/AccelerateBuffer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public protocol AccelerateBuffer {
/// Calls a closure with a pointer to the object's contiguous storage.
func withUnsafeBufferPointer<R>(
_ body: (UnsafeBufferPointer<Element>) throws -> R
) rethrows -> R
) rethrows -> R
}

/// A mutable object composed of count elements that are stored contiguously
Expand All @@ -40,23 +40,25 @@ public protocol AccelerateMutableBuffer: AccelerateBuffer {
/// contiguous storage.
mutating func withUnsafeMutableBufferPointer<R>(
_ body: (inout UnsafeMutableBufferPointer<Element>) throws -> R
) rethrows -> R
) rethrows -> R
}

@available(iOS 9999, macOS 9999, tvOS 9999, watchOS 9999, *)
public extension AccelerateBuffer where Self: Collection {
@inlinable
func withUnsafeBufferPointer<R>(
_ body: (UnsafeBufferPointer<Element>) throws -> R
) rethrows -> R {
) rethrows -> R {
return try withContiguousStorageIfAvailable(body)!
}
}

@available(iOS 9999, macOS 9999, tvOS 9999, watchOS 9999, *)
extension AccelerateMutableBuffer where Self: MutableCollection {
@inlinable
public mutating func withUnsafeMutableBufferPointer<R>(
_ body: (inout UnsafeMutableBufferPointer<Element>) throws -> R
) rethrows -> R {
) rethrows -> R {
return try withContiguousMutableStorageIfAvailable(body)!
}
}
Expand Down
196 changes: 98 additions & 98 deletions stdlib/public/Darwin/Accelerate/vDSP_Arithmetic.swift
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions stdlib/public/Darwin/Accelerate/vDSP_Biquad.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ extension vDSP {
struct BiquadFunctions {

@available(iOS 9999, OSX 9999, tvOS 9999, watchOS 9999, *)
@inline(__always)
@inlinable
static func applyBiquadSingle<U, V, Scalar>(source: U,
destination: inout V,
delays: inout [Scalar],
Expand All @@ -186,7 +186,7 @@ extension vDSP {
}

@available(iOS 9999, OSX 9999, tvOS 9999, watchOS 9999, *)
@inline(__always)
@inlinable
static func applyBiquadMulti<U, V>(source: U,
destination: inout V,
setup: OpaquePointer,
Expand Down Expand Up @@ -289,7 +289,7 @@ public protocol vDSP_BiquadFunctions {
extension vDSP.VectorizableFloat: vDSP_BiquadFunctions {

/// Returns a data structure that contains precalculated data for use by the cascaded biquad IIR filter function.
@inline(__always)
@inlinable
public static func makeBiquadSetup(channelCount: UInt,
coefficients: [Double],
sectionCount: UInt) -> OpaquePointer? {
Expand All @@ -304,7 +304,7 @@ extension vDSP.VectorizableFloat: vDSP_BiquadFunctions {
}

/// Applies a single-channel biquad IIR filter.
@inline(__always)
@inlinable
public static func applySingle<U, V>(source: U,
destination: inout V,
delays: UnsafeMutablePointer<Scalar>,
Expand All @@ -328,7 +328,7 @@ extension vDSP.VectorizableFloat: vDSP_BiquadFunctions {
}

/// Applies a multichannel biquad IIR filter.
@inline(__always)
@inlinable
public static func applyMulti(setup: vDSP_biquadm_SetupD,
pInputs: UnsafeMutablePointer<UnsafePointer<Scalar>>,
pOutputs: UnsafeMutablePointer<UnsafeMutablePointer<Scalar>>,
Expand All @@ -340,7 +340,7 @@ extension vDSP.VectorizableFloat: vDSP_BiquadFunctions {
}

/// Destroys a setup object.
@inline(__always)
@inlinable
public static func destroySetup(channelCount: UInt,
biquadSetup: OpaquePointer) {
if channelCount == 1 {
Expand All @@ -355,7 +355,7 @@ extension vDSP.VectorizableFloat: vDSP_BiquadFunctions {
extension vDSP.VectorizableDouble: vDSP_BiquadFunctions {

/// Returns a data structure that contains precalculated data for use by the cascaded biquad IIR filter function.
@inline(__always)
@inlinable
public static func makeBiquadSetup(channelCount: vDSP_Length,
coefficients: [Double],
sectionCount: vDSP_Length) -> OpaquePointer? {
Expand All @@ -370,7 +370,7 @@ extension vDSP.VectorizableDouble: vDSP_BiquadFunctions {
}

/// Applies a single-channel biquad IIR filter.
@inline(__always)
@inlinable
public static func applySingle<U, V>(source: U,
destination: inout V,
delays: UnsafeMutablePointer<Scalar>,
Expand All @@ -394,7 +394,7 @@ extension vDSP.VectorizableDouble: vDSP_BiquadFunctions {
}

/// Applies a multichannel biquad IIR filter.
@inline(__always)
@inlinable
public static func applyMulti(setup: vDSP_biquadm_SetupD,
pInputs: UnsafeMutablePointer<UnsafePointer<Scalar>>,
pOutputs: UnsafeMutablePointer<UnsafeMutablePointer<Scalar>>,
Expand All @@ -406,7 +406,7 @@ extension vDSP.VectorizableDouble: vDSP_BiquadFunctions {
}

/// Destroys a setup object.
@inline(__always)
@inlinable
public static func destroySetup(channelCount: UInt,
biquadSetup: OpaquePointer) {
if channelCount == 1 {
Expand Down
30 changes: 14 additions & 16 deletions stdlib/public/Darwin/Accelerate/vDSP_ClippingLimitThreshold.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ extension vDSP {
/// - Parameter vector: Source vector.
/// - Parameter bounds: Clipping threshold.
/// - Returns: The clipped result.
@inline(__always)
@inlinable
@available(iOS 9999, macOS 9999, tvOS 9999, watchOS 9999, *)
public static func clip<U>(_ vector: U,
to bounds: ClosedRange<Float>) -> [Float]
Expand All @@ -45,7 +45,7 @@ extension vDSP {
/// - Parameter vector: Source vector.
/// - Parameter bounds: Clipping threshold.
/// - Parameter result: The clipped result.
@inline(__always)
@inlinable
@available(iOS 9999, macOS 9999, tvOS 9999, watchOS 9999, *)
public static func clip<U, V>(_ vector: U,
to bounds: ClosedRange<Float>,
Expand Down Expand Up @@ -78,7 +78,7 @@ extension vDSP {
/// - Parameter vector: Source vector.
/// - Parameter bounds: Clipping threshold.
/// - Returns: The clipped result.
@inline(__always)
@inlinable
@available(iOS 9999, macOS 9999, tvOS 9999, watchOS 9999, *)
public static func clip<U>(_ vector: U,
to bounds: ClosedRange<Double>) -> [Double]
Expand All @@ -104,7 +104,7 @@ extension vDSP {
/// - Parameter vector: Source vector.
/// - Parameter bounds: Clipping threshold.
/// - Parameter result: The clipped result.
@inline(__always)
@inlinable
@available(iOS 9999, macOS 9999, tvOS 9999, watchOS 9999, *)
public static func clip<U, V>(_ vector: U,
to bounds: ClosedRange<Double>,
Expand Down Expand Up @@ -152,7 +152,7 @@ extension vDSP {
/// D[n] = *C;
/// }
/// ```
@inline(__always)
@inlinable
@available(iOS 9999, macOS 9999, tvOS 9999, watchOS 9999, *)
public static func invertedClip<U>(_ vector: U,
to bounds: ClosedRange<Float>) -> [Float]
Expand Down Expand Up @@ -191,7 +191,7 @@ extension vDSP {
/// D[n] = *C;
/// }
/// ```
@inline(__always)
@inlinable
@available(iOS 9999, macOS 9999, tvOS 9999, watchOS 9999, *)
public static func invertedClip<U, V>(_ vector: U,
to bounds: ClosedRange<Float>,
Expand Down Expand Up @@ -237,7 +237,7 @@ extension vDSP {
/// D[n] = *C;
/// }
/// ```
@inline(__always)
@inlinable
@available(iOS 9999, macOS 9999, tvOS 9999, watchOS 9999, *)
public static func invertedClip<U>(_ vector: U,
to bounds: ClosedRange<Double>) -> [Double]
Expand Down Expand Up @@ -276,7 +276,7 @@ extension vDSP {
/// D[n] = *C;
/// }
/// ```
@inline(__always)
@inlinable
@available(iOS 9999, macOS 9999, tvOS 9999, watchOS 9999, *)
public static func invertedClip<U, V>(_ vector: U,
to bounds: ClosedRange<Double>,
Expand Down Expand Up @@ -321,7 +321,7 @@ extension vDSP {
/// - Parameter vector: Source vector.
/// - Parameter bounds: Clipping threshold.
/// - Returns: The clipped result.
@inline(__always)
@inlinable
@available(iOS 9999, macOS 9999, tvOS 9999, watchOS 9999, *)
public static func threshold<U>(_ vector: U,
to lowerBound: Float,
Expand Down Expand Up @@ -356,7 +356,6 @@ extension vDSP {
/// - Parameter lowerBound: Low clipping threshold.
/// - Parameter rule: The thresholding rule.
/// - Parameter result: The threshold result.
@inline(__always)
@available(iOS 9999, macOS 9999, tvOS 9999, watchOS 9999, *)
public static func threshold<U, V>(_ vector: U,
to lowerBound: Float,
Expand Down Expand Up @@ -402,7 +401,7 @@ extension vDSP {
/// - Parameter vector: Source vector.
/// - Parameter bounds: Clipping threshold.
/// - Returns: The clipped result.
@inline(__always)
@inlinable
@available(iOS 9999, macOS 9999, tvOS 9999, watchOS 9999, *)
public static func threshold<U>(_ vector: U,
to lowerBound: Double,
Expand Down Expand Up @@ -437,7 +436,6 @@ extension vDSP {
/// - Parameter lowerBound: Low clipping threshold.
/// - Parameter rule: The thresholding rule.
/// - Parameter result: The threshold result.
@inline(__always)
@available(iOS 9999, macOS 9999, tvOS 9999, watchOS 9999, *)
public static func threshold<U, V>(_ vector: U,
to lowerBound: Double,
Expand Down Expand Up @@ -488,7 +486,7 @@ extension vDSP {
/// - Parameter limit: Limit.
/// - Parameter x: Value written to result.
/// - Returns: The clipped result.
@inline(__always)
@inlinable
@available(iOS 9999, macOS 9999, tvOS 9999, watchOS 9999, *)
public static func limit<U>(_ vector: U,
limit: Float,
Expand Down Expand Up @@ -519,7 +517,7 @@ extension vDSP {
/// - Parameter limit: Limit.
/// - Parameter x: Value written to result.
/// - Parameter result: The clipped result.
@inline(__always)
@inlinable
@available(iOS 9999, macOS 9999, tvOS 9999, watchOS 9999, *)
public static func limit<U, V>(_ vector: U,
limit: Float,
Expand Down Expand Up @@ -556,7 +554,7 @@ extension vDSP {
/// - Parameter limit: Limit.
/// - Parameter x: Value written to result.
/// - Returns: The clipped result.
@inline(__always)
@inlinable
@available(iOS 9999, macOS 9999, tvOS 9999, watchOS 9999, *)
public static func limit<U>(_ vector: U,
limit: Double,
Expand Down Expand Up @@ -587,7 +585,7 @@ extension vDSP {
/// - Parameter limit: Limit.
/// - Parameter x: Value written to result.
/// - Parameter result: The clipped result.
@inline(__always)
@inlinable
@available(iOS 9999, macOS 9999, tvOS 9999, watchOS 9999, *)
public static func limit<U, V>(_ vector: U,
limit: Double,
Expand Down
8 changes: 4 additions & 4 deletions stdlib/public/Darwin/Accelerate/vDSP_ComplexConversion.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ extension vDSP {
///
/// - Parameter splitComplexVector: Source vector.
/// - Parameter interleavedComplexVector: Destination vector.
@inline(__always)
@inlinable
@available(iOS 9999, macOS 9999, tvOS 9999, watchOS 9999, *)
public static func convert(splitComplexVector: DSPSplitComplex,
toInterleavedComplexVector interleavedComplexVector: inout [DSPComplex]) {
Expand All @@ -32,7 +32,7 @@ extension vDSP {
///
/// - Parameter interleavedComplexVector: Source vector.
/// - Parameter splitComplexVector: Destination vector.
@inline(__always)
@inlinable
@available(iOS 9999, macOS 9999, tvOS 9999, watchOS 9999, *)
public static func convert(interleavedComplexVector: [DSPComplex],
toSplitComplexVector splitComplexVector: inout DSPSplitComplex) {
Expand All @@ -46,7 +46,7 @@ extension vDSP {
///
/// - Parameter splitComplexVector: Source vector.
/// - Parameter interleavedComplexVector: Destination vector.
@inline(__always)
@inlinable
@available(iOS 9999, macOS 9999, tvOS 9999, watchOS 9999, *)
public static func convert(splitComplexVector: DSPDoubleSplitComplex,
toInterleavedComplexVector interleavedComplexVector: inout [DSPDoubleComplex]) {
Expand All @@ -62,7 +62,7 @@ extension vDSP {
///
/// - Parameter interleavedComplexVector: Source vector.
/// - Parameter splitComplexVector: Destination vector.
@inline(__always)
@inlinable
@available(iOS 9999, macOS 9999, tvOS 9999, watchOS 9999, *)
public static func convert(interleavedComplexVector: [DSPDoubleComplex],
toSplitComplexVector splitComplexVector: inout DSPDoubleSplitComplex) {
Expand Down
Loading