update OpenAL-Soft to 1.24.3.

This commit is contained in:
Sasha Szpakowski
2025-05-03 12:51:37 -03:00
parent 375c6f88cd
commit 5e4f3241ac
322 changed files with 54386 additions and 12885 deletions
+122 -123
View File
@@ -1,95 +1,59 @@
#ifndef PHASE_SHIFTER_H
#define PHASE_SHIFTER_H
#ifdef HAVE_SSE_INTRINSICS
#include "config_simd.h"
#if HAVE_SSE_INTRINSICS
#include <xmmintrin.h>
#elif defined(HAVE_NEON)
#elif HAVE_NEON
#include <arm_neon.h>
#endif
#include <array>
#include <complex>
#include <cmath>
#include <cstddef>
#include <limits>
#include <vector>
#include "alcomplex.h"
#include "alnumbers.h"
#include "alspan.h"
#include "opthelpers.h"
struct NoInit { };
/* Implements a wide-band +90 degree phase-shift. Note that this should be
* given one sample less of a delay (FilterSize/2 - 1) compared to the direct
* signal delay (FilterSize/2) to properly align.
*/
template<std::size_t FilterSize>
struct PhaseShifterT {
struct SIMDALIGN PhaseShifterT {
static_assert(FilterSize >= 16, "FilterSize needs to be at least 16");
static_assert((FilterSize&(FilterSize-1)) == 0, "FilterSize needs to be power-of-two");
alignas(16) std::array<float,FilterSize/2> mCoeffs{};
/* Some notes on this filter construction.
*
* A wide-band phase-shift filter needs a delay to maintain linearity. A
* dirac impulse in the center of a time-domain buffer represents a filter
* passing all frequencies through as-is with a pure delay. Converting that
* to the frequency domain, adjusting the phase of each frequency bin by
* +90 degrees, then converting back to the time domain, results in a FIR
* filter that applies a +90 degree wide-band phase-shift.
*
* A particularly notable aspect of the time-domain filter response is that
* every other coefficient is 0. This allows doubling the effective size of
* the filter, by storing only the non-0 coefficients and double-stepping
* over the input to apply it.
*
* Additionally, the resulting filter is independent of the sample rate.
* The same filter can be applied regardless of the device's sample rate
* and achieve the same effect.
*/
PhaseShifterT()
{
using complex_d = std::complex<double>;
constexpr std::size_t fft_size{FilterSize};
constexpr std::size_t half_size{fft_size / 2};
auto fftBuffer = std::vector<complex_d>(fft_size, complex_d{});
fftBuffer[half_size] = 1.0;
forward_fft(al::span{fftBuffer});
fftBuffer[0] *= std::numeric_limits<double>::epsilon();
for(std::size_t i{1};i < half_size;++i)
fftBuffer[i] = complex_d{-fftBuffer[i].imag(), fftBuffer[i].real()};
fftBuffer[half_size] *= std::numeric_limits<double>::epsilon();
for(std::size_t i{half_size+1};i < fft_size;++i)
fftBuffer[i] = std::conj(fftBuffer[fft_size - i]);
inverse_fft(al::span{fftBuffer});
auto fftiter = fftBuffer.data() + fft_size - 1;
for(float &coeff : mCoeffs)
/* Every other coefficient is 0, so we only need to calculate and store
* the non-0 terms and double-step over the input to apply it. The
* calculated coefficients are in reverse to make applying in the time-
* domain more efficient.
*/
for(std::size_t i{0};i < FilterSize/2;++i)
{
coeff = static_cast<float>(fftiter->real() / double{fft_size});
fftiter -= 2;
const auto k = static_cast<int>(i*2 + 1) - int{FilterSize/2};
/* Calculate the Blackman window value for this coefficient. */
const auto w = 2.0*al::numbers::pi/double{FilterSize} * static_cast<double>(i*2 + 1);
const auto window = 0.3635819 - 0.4891775*std::cos(w) + 0.1365995*std::cos(2.0*w)
- 0.0106411*std::cos(3.0*w);
const auto pk = al::numbers::pi * static_cast<double>(k);
mCoeffs[i] = static_cast<float>(window * (1.0-std::cos(pk)) / pk);
}
}
PhaseShifterT(NoInit) { }
void process(al::span<float> dst, const float *RESTRICT src) const;
void process(const al::span<float> dst, const al::span<const float> src) const;
private:
#if defined(HAVE_NEON)
static auto unpacklo(float32x4_t a, float32x4_t b)
{
float32x2x2_t result{vzip_f32(vget_low_f32(a), vget_low_f32(b))};
return vcombine_f32(result.val[0], result.val[1]);
}
static auto unpackhi(float32x4_t a, float32x4_t b)
{
float32x2x2_t result{vzip_f32(vget_high_f32(a), vget_high_f32(b))};
return vcombine_f32(result.val[0], result.val[1]);
}
#if HAVE_NEON
static auto load4(float32_t a, float32_t b, float32_t c, float32_t d)
{
float32x4_t ret{vmovq_n_f32(a)};
@@ -98,106 +62,141 @@ private:
ret = vsetq_lane_f32(d, ret, 3);
return ret;
}
static void vtranspose4(float32x4_t &x0, float32x4_t &x1, float32x4_t &x2, float32x4_t &x3)
{
float32x4x2_t t0_{vzipq_f32(x0, x2)};
float32x4x2_t t1_{vzipq_f32(x1, x3)};
float32x4x2_t u0_{vzipq_f32(t0_.val[0], t1_.val[0])};
float32x4x2_t u1_{vzipq_f32(t0_.val[1], t1_.val[1])};
x0 = u0_.val[0];
x1 = u0_.val[1];
x2 = u1_.val[0];
x3 = u1_.val[1];
}
#endif
};
template<std::size_t S>
inline void PhaseShifterT<S>::process(al::span<float> dst, const float *RESTRICT src) const
NOINLINE inline
void PhaseShifterT<S>::process(const al::span<float> dst, const al::span<const float> src) const
{
#ifdef HAVE_SSE_INTRINSICS
if(std::size_t todo{dst.size()>>1})
auto in = src.begin();
#if HAVE_SSE_INTRINSICS
if(const std::size_t todo{dst.size()>>2})
{
auto *out = reinterpret_cast<__m64*>(dst.data());
do {
__m128 r04{_mm_setzero_ps()};
__m128 r14{_mm_setzero_ps()};
auto out = al::span{reinterpret_cast<__m128*>(dst.data()), todo};
std::generate(out.begin(), out.end(), [&in,this]
{
__m128 r0{_mm_setzero_ps()};
__m128 r1{_mm_setzero_ps()};
__m128 r2{_mm_setzero_ps()};
__m128 r3{_mm_setzero_ps()};
for(std::size_t j{0};j < mCoeffs.size();j+=4)
{
const __m128 coeffs{_mm_load_ps(&mCoeffs[j])};
const __m128 s0{_mm_loadu_ps(&src[j*2])};
const __m128 s1{_mm_loadu_ps(&src[j*2 + 4])};
const __m128 s0{_mm_loadu_ps(&in[j*2])};
const __m128 s1{_mm_loadu_ps(&in[j*2 + 4])};
const __m128 s2{_mm_movehl_ps(_mm_movelh_ps(s1, s1), s0)};
const __m128 s3{_mm_loadh_pi(_mm_movehl_ps(s1, s1),
reinterpret_cast<const __m64*>(&in[j*2 + 8]))};
__m128 s{_mm_shuffle_ps(s0, s1, _MM_SHUFFLE(2, 0, 2, 0))};
r04 = _mm_add_ps(r04, _mm_mul_ps(s, coeffs));
r0 = _mm_add_ps(r0, _mm_mul_ps(s, coeffs));
s = _mm_shuffle_ps(s0, s1, _MM_SHUFFLE(3, 1, 3, 1));
r14 = _mm_add_ps(r14, _mm_mul_ps(s, coeffs));
r1 = _mm_add_ps(r1, _mm_mul_ps(s, coeffs));
s = _mm_shuffle_ps(s2, s3, _MM_SHUFFLE(2, 0, 2, 0));
r2 = _mm_add_ps(r2, _mm_mul_ps(s, coeffs));
s = _mm_shuffle_ps(s2, s3, _MM_SHUFFLE(3, 1, 3, 1));
r3 = _mm_add_ps(r3, _mm_mul_ps(s, coeffs));
}
src += 2;
in += 4;
__m128 r4{_mm_add_ps(_mm_unpackhi_ps(r04, r14), _mm_unpacklo_ps(r04, r14))};
r4 = _mm_add_ps(r4, _mm_movehl_ps(r4, r4));
_mm_storel_pi(out, r4);
++out;
} while(--todo);
_MM_TRANSPOSE4_PS(r0, r1, r2, r3);
return _mm_add_ps(_mm_add_ps(r0, r1), _mm_add_ps(r2, r3));
});
}
if((dst.size()&1))
if(const std::size_t todo{dst.size()&3})
{
__m128 r4{_mm_setzero_ps()};
for(std::size_t j{0};j < mCoeffs.size();j+=4)
auto out = dst.last(todo);
std::generate(out.begin(), out.end(), [&in,this]
{
const __m128 coeffs{_mm_load_ps(&mCoeffs[j])};
const __m128 s{_mm_setr_ps(src[j*2], src[j*2 + 2], src[j*2 + 4], src[j*2 + 6])};
r4 = _mm_add_ps(r4, _mm_mul_ps(s, coeffs));
}
r4 = _mm_add_ps(r4, _mm_shuffle_ps(r4, r4, _MM_SHUFFLE(0, 1, 2, 3)));
r4 = _mm_add_ps(r4, _mm_movehl_ps(r4, r4));
dst.back() = _mm_cvtss_f32(r4);
__m128 r4{_mm_setzero_ps()};
for(std::size_t j{0};j < mCoeffs.size();j+=4)
{
const __m128 coeffs{_mm_load_ps(&mCoeffs[j])};
const __m128 s{_mm_setr_ps(in[j*2], in[j*2 + 2], in[j*2 + 4], in[j*2 + 6])};
r4 = _mm_add_ps(r4, _mm_mul_ps(s, coeffs));
}
++in;
r4 = _mm_add_ps(r4, _mm_shuffle_ps(r4, r4, _MM_SHUFFLE(0, 1, 2, 3)));
r4 = _mm_add_ps(r4, _mm_movehl_ps(r4, r4));
return _mm_cvtss_f32(r4);
});
}
#elif defined(HAVE_NEON)
#elif HAVE_NEON
std::size_t pos{0};
if(std::size_t todo{dst.size()>>1})
if(const std::size_t todo{dst.size()>>2})
{
do {
float32x4_t r04{vdupq_n_f32(0.0f)};
float32x4_t r14{vdupq_n_f32(0.0f)};
auto out = al::span{reinterpret_cast<float32x4_t*>(dst.data()), todo};
std::generate(out.begin(), out.end(), [&in,this]
{
float32x4_t r0{vdupq_n_f32(0.0f)};
float32x4_t r1{vdupq_n_f32(0.0f)};
float32x4_t r2{vdupq_n_f32(0.0f)};
float32x4_t r3{vdupq_n_f32(0.0f)};
for(std::size_t j{0};j < mCoeffs.size();j+=4)
{
const float32x4_t coeffs{vld1q_f32(&mCoeffs[j])};
const float32x4_t s0{vld1q_f32(&src[j*2])};
const float32x4_t s1{vld1q_f32(&src[j*2 + 4])};
const float32x4x2_t values{vuzpq_f32(s0, s1)};
const float32x4_t s0{vld1q_f32(&in[j*2])};
const float32x4_t s1{vld1q_f32(&in[j*2 + 4])};
const float32x4_t s2{vcombine_f32(vget_high_f32(s0), vget_low_f32(s1))};
const float32x4_t s3{vcombine_f32(vget_high_f32(s1), vld1_f32(&in[j*2 + 8]))};
const float32x4x2_t values0{vuzpq_f32(s0, s1)};
const float32x4x2_t values1{vuzpq_f32(s2, s3)};
r04 = vmlaq_f32(r04, values.val[0], coeffs);
r14 = vmlaq_f32(r14, values.val[1], coeffs);
r0 = vmlaq_f32(r0, values0.val[0], coeffs);
r1 = vmlaq_f32(r1, values0.val[1], coeffs);
r2 = vmlaq_f32(r2, values1.val[0], coeffs);
r3 = vmlaq_f32(r3, values1.val[1], coeffs);
}
src += 2;
in += 4;
float32x4_t r4{vaddq_f32(unpackhi(r04, r14), unpacklo(r04, r14))};
float32x2_t r2{vadd_f32(vget_low_f32(r4), vget_high_f32(r4))};
vst1_f32(&dst[pos], r2);
pos += 2;
} while(--todo);
vtranspose4(r0, r1, r2, r3);
return vaddq_f32(vaddq_f32(r0, r1), vaddq_f32(r2, r3));
});
}
if((dst.size()&1))
if(const std::size_t todo{dst.size()&3})
{
float32x4_t r4{vdupq_n_f32(0.0f)};
for(std::size_t j{0};j < mCoeffs.size();j+=4)
auto out = dst.last(todo);
std::generate(out.begin(), out.end(), [&in,this]
{
const float32x4_t coeffs{vld1q_f32(&mCoeffs[j])};
const float32x4_t s{load4(src[j*2], src[j*2 + 2], src[j*2 + 4], src[j*2 + 6])};
r4 = vmlaq_f32(r4, s, coeffs);
}
r4 = vaddq_f32(r4, vrev64q_f32(r4));
dst[pos] = vget_lane_f32(vadd_f32(vget_low_f32(r4), vget_high_f32(r4)), 0);
float32x4_t r4{vdupq_n_f32(0.0f)};
for(std::size_t j{0};j < mCoeffs.size();j+=4)
{
const float32x4_t coeffs{vld1q_f32(&mCoeffs[j])};
const float32x4_t s{load4(in[j*2], in[j*2 + 2], in[j*2 + 4], in[j*2 + 6])};
r4 = vmlaq_f32(r4, s, coeffs);
}
++in;
r4 = vaddq_f32(r4, vrev64q_f32(r4));
return vget_lane_f32(vadd_f32(vget_low_f32(r4), vget_high_f32(r4)), 0);
});
}
#else
for(float &output : dst)
std::generate(dst.begin(), dst.end(), [&in,this]
{
float ret{0.0f};
for(std::size_t j{0};j < mCoeffs.size();++j)
ret += src[j*2] * mCoeffs[j];
output = ret;
++src;
}
ret += in[j*2] * mCoeffs[j];
++in;
return ret;
});
#endif
}