From dc41f276d8a7c6c870aebe6123b25e3de4a32545 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Thu, 16 Apr 2020 01:47:33 -0700 Subject: Get rid of the specialized MixRow_ methods --- alc/alu.h | 3 --- alc/effects/reverb.cpp | 59 +++++++++++++++++++++++++++++++++--------------- alc/mixer/defs.h | 3 --- alc/mixer/mixer_c.cpp | 24 -------------------- alc/mixer/mixer_neon.cpp | 31 ------------------------- alc/mixer/mixer_sse.cpp | 31 ------------------------- alc/voice.cpp | 15 ------------ 7 files changed, 41 insertions(+), 125 deletions(-) (limited to 'alc') diff --git a/alc/alu.h b/alc/alu.h index b78a3222..7587a9b2 100644 --- a/alc/alu.h +++ b/alc/alu.h @@ -21,14 +21,11 @@ struct ALeffectslot; using MixerFunc = void(*)(const al::span InSamples, const al::span OutBuffer, float *CurrentGains, const float *TargetGains, const size_t Counter, const size_t OutPos); -using RowMixerFunc = void(*)(const al::span OutBuffer, const al::span Gains, - const float *InSamples, const size_t InStride); using HrtfDirectMixerFunc = void(*)(FloatBufferLine &LeftOut, FloatBufferLine &RightOut, const al::span InSamples, float2 *AccumSamples, DirectHrtfState *State, const size_t BufferSize); extern MixerFunc MixSamples; -extern RowMixerFunc MixRowSamples; #define GAIN_MIX_MAX 1000.0f /* +60dB */ diff --git a/alc/effects/reverb.cpp b/alc/effects/reverb.cpp index 6602d183..b328a790 100644 --- a/alc/effects/reverb.cpp +++ b/alc/effects/reverb.cpp @@ -82,7 +82,7 @@ constexpr float MODULATION_DEPTH_COEFF{0.05f}; * tetrahedron, but it's close enough. Should the model be extended to 8-lines * in the future, true opposites can be used. */ -alignas(16) constexpr float B2A[NUM_LINES][MAX_AMBI_CHANNELS]{ +alignas(16) constexpr float B2A[NUM_LINES][NUM_LINES]{ { 0.288675134595f, 0.288675134595f, 0.288675134595f, 0.288675134595f }, { 0.288675134595f, -0.288675134595f, -0.288675134595f, 0.288675134595f }, { 0.288675134595f, 0.288675134595f, -0.288675134595f, -0.288675134595f }, @@ -443,26 +443,43 @@ struct ReverbState final : public EffectState { std::array,2> mAmbiSplitter; + static void DoMixRow(const al::span OutBuffer, const al::span Gains, + const float *InSamples, const size_t InStride) + { + std::fill(OutBuffer.begin(), OutBuffer.end(), 0.0f); + for(const float gain : Gains) + { + const float *RESTRICT input{al::assume_aligned<16>(InSamples)}; + InSamples += InStride; + + if(!(std::fabs(gain) > GAIN_SILENCE_THRESHOLD)) + continue; + + for(float &sample : OutBuffer) + { + sample += *input * gain; + ++input; + } + } + } + + void MixOutPlain(const al::span samplesOut, const size_t counter, const size_t offset, const size_t todo) { ASSUME(todo > 0); /* Convert back to B-Format, and mix the results to output. */ - const al::span tmpspan{mTempLine.data(), todo}; + const al::span tmpspan{al::assume_aligned<16>(mTempLine.data()), todo}; for(size_t c{0u};c < NUM_LINES;c++) { - std::fill(tmpspan.begin(), tmpspan.end(), 0.0f); - MixRowSamples(tmpspan, {A2B[c], NUM_LINES}, mEarlySamples[0].data(), - mEarlySamples[0].size()); + DoMixRow(tmpspan, A2B[c], mEarlySamples[0].data(), mEarlySamples[0].size()); MixSamples(tmpspan, samplesOut, mEarly.CurrentGain[c], mEarly.PanGain[c], counter, offset); } for(size_t c{0u};c < NUM_LINES;c++) { - std::fill(tmpspan.begin(), tmpspan.end(), 0.0f); - MixRowSamples(tmpspan, {A2B[c], NUM_LINES}, mLateSamples[0].data(), - mLateSamples[0].size()); + DoMixRow(tmpspan, A2B[c], mLateSamples[0].data(), mLateSamples[0].size()); MixSamples(tmpspan, samplesOut, mLate.CurrentGain[c], mLate.PanGain[c], counter, offset); } @@ -473,12 +490,10 @@ struct ReverbState final : public EffectState { { ASSUME(todo > 0); - const al::span tmpspan{mTempLine.data(), todo}; + const al::span tmpspan{al::assume_aligned<16>(mTempLine.data()), todo}; for(size_t c{0u};c < NUM_LINES;c++) { - std::fill(tmpspan.begin(), tmpspan.end(), 0.0f); - MixRowSamples(tmpspan, {A2B[c], NUM_LINES}, mEarlySamples[0].data(), - mEarlySamples[0].size()); + DoMixRow(tmpspan, A2B[c], mEarlySamples[0].data(), mEarlySamples[0].size()); /* Apply scaling to the B-Format's HF response to "upsample" it to * higher-order output. @@ -491,9 +506,7 @@ struct ReverbState final : public EffectState { } for(size_t c{0u};c < NUM_LINES;c++) { - std::fill(tmpspan.begin(), tmpspan.end(), 0.0f); - MixRowSamples(tmpspan, {A2B[c], NUM_LINES}, mLateSamples[0].data(), - mLateSamples[0].size()); + DoMixRow(tmpspan, A2B[c], mLateSamples[0].data(), mLateSamples[0].size()); const float hfscale{(c==0) ? mOrderScales[0] : mOrderScales[1]}; mAmbiSplitter[1][c].applyHfScale(tmpspan, hfscale); @@ -1589,12 +1602,22 @@ void ReverbState::process(const size_t samplesToDo, const al::span 0); /* Convert B-Format to A-Format for processing. */ - const size_t numInput{samplesIn.size()}; - const al::span tmpspan{mTempLine.data(), samplesToDo}; + const size_t numInput{minz(samplesIn.size(), NUM_LINES)}; + const al::span tmpspan{al::assume_aligned<16>(mTempLine.data()), samplesToDo}; for(size_t c{0u};c < NUM_LINES;c++) { std::fill(tmpspan.begin(), tmpspan.end(), 0.0f); - MixRowSamples(tmpspan, {B2A[c], numInput}, samplesIn[0].data(), samplesIn[0].size()); + for(size_t i{0};i < numInput;++i) + { + const float gain{B2A[c][i]}; + const float *RESTRICT input{al::assume_aligned<16>(samplesIn[i].data())}; + + for(float &sample : tmpspan) + { + sample += *input * gain; + ++input; + } + } /* Band-pass the incoming samples and feed the initial delay line. */ mFilter[c].Lp.process(tmpspan, tmpspan.begin()); diff --git a/alc/mixer/defs.h b/alc/mixer/defs.h index 6e270fb4..0f3a0f3d 100644 --- a/alc/mixer/defs.h +++ b/alc/mixer/defs.h @@ -18,9 +18,6 @@ const float *Resample_(const InterpState *state, const float *RESTRICT src, ALui template void Mix_(const al::span InSamples, const al::span OutBuffer, float *CurrentGains, const float *TargetGains, const size_t Counter, const size_t OutPos); -template -void MixRow_(const al::span OutBuffer, const al::span Gains, - const float *InSamples, const size_t InStride); template void MixHrtf_(const float *InSamples, float2 *AccumSamples, const ALuint IrSize, diff --git a/alc/mixer/mixer_c.cpp b/alc/mixer/mixer_c.cpp index 716f2c4d..9858a4b4 100644 --- a/alc/mixer/mixer_c.cpp +++ b/alc/mixer/mixer_c.cpp @@ -196,27 +196,3 @@ void Mix_(const al::span InSamples, const al::span -void MixRow_(const al::span OutBuffer, const al::span Gains, - const float *InSamples, const size_t InStride) -{ - for(const float gain : Gains) - { - const float *RESTRICT input{InSamples}; - InSamples += InStride; - - if(!(std::fabs(gain) > GAIN_SILENCE_THRESHOLD)) - continue; - - auto do_mix = [gain](const float cur, const float src) noexcept -> float - { return cur + src*gain; }; - std::transform(OutBuffer.begin(), OutBuffer.end(), input, OutBuffer.begin(), do_mix); - } -} diff --git a/alc/mixer/mixer_neon.cpp b/alc/mixer/mixer_neon.cpp index 760ac58e..ee5b11a2 100644 --- a/alc/mixer/mixer_neon.cpp +++ b/alc/mixer/mixer_neon.cpp @@ -296,34 +296,3 @@ void Mix_(const al::span InSamples, const al::span -void MixRow_(const al::span OutBuffer, const al::span Gains, - const float *InSamples, const size_t InStride) -{ - for(const float gain : Gains) - { - const float *RESTRICT input{InSamples}; - InSamples += InStride; - - if(!(std::fabs(gain) > GAIN_SILENCE_THRESHOLD)) - continue; - - auto out_iter = OutBuffer.begin(); - if(size_t todo{OutBuffer.size() >> 2}) - { - const float32x4_t gain4{vdupq_n_f32(gain)}; - do { - const float32x4_t val4 = vld1q_f32(input); - float32x4_t dry4 = vld1q_f32(out_iter); - dry4 = vmlaq_f32(dry4, val4, gain4); - vst1q_f32(out_iter, dry4); - out_iter += 4; input += 4; - } while(--todo); - } - - auto do_mix = [gain](const float cur, const float src) noexcept -> float - { return cur + src*gain; }; - std::transform(out_iter, OutBuffer.end(), input, out_iter, do_mix); - } -} diff --git a/alc/mixer/mixer_sse.cpp b/alc/mixer/mixer_sse.cpp index 3ec14541..db60776d 100644 --- a/alc/mixer/mixer_sse.cpp +++ b/alc/mixer/mixer_sse.cpp @@ -268,34 +268,3 @@ void Mix_(const al::span InSamples, const al::span -void MixRow_(const al::span OutBuffer, const al::span Gains, - const float *InSamples, const size_t InStride) -{ - for(const float gain : Gains) - { - const float *RESTRICT input{InSamples}; - InSamples += InStride; - - if(!(std::fabs(gain) > GAIN_SILENCE_THRESHOLD)) - continue; - - auto out_iter = OutBuffer.begin(); - if(size_t todo{OutBuffer.size() >> 2}) - { - const __m128 gain4 = _mm_set1_ps(gain); - do { - const __m128 val4{_mm_load_ps(input)}; - __m128 dry4{_mm_load_ps(out_iter)}; - dry4 = _mm_add_ps(dry4, _mm_mul_ps(val4, gain4)); - _mm_store_ps(out_iter, dry4); - out_iter += 4; input += 4; - } while(--todo); - } - - auto do_mix = [gain](const float cur, const float src) noexcept -> float - { return cur + src*gain; }; - std::transform(out_iter, OutBuffer.end(), input, out_iter, do_mix); - } -} diff --git a/alc/voice.cpp b/alc/voice.cpp index 1f8523c5..6e16f586 100644 --- a/alc/voice.cpp +++ b/alc/voice.cpp @@ -81,7 +81,6 @@ static_assert((INT_MAX>>FRACTIONBITS)/MAX_PITCH > BUFFERSIZE, Resampler ResamplerDefault{Resampler::Linear}; MixerFunc MixSamples{Mix_}; -RowMixerFunc MixRowSamples{MixRow_}; namespace { @@ -107,19 +106,6 @@ inline MixerFunc SelectMixer() return Mix_; } -inline RowMixerFunc SelectRowMixer() -{ -#ifdef HAVE_NEON - if((CPUCapFlags&CPU_CAP_NEON)) - return MixRow_; -#endif -#ifdef HAVE_SSE - if((CPUCapFlags&CPU_CAP_SSE)) - return MixRow_; -#endif - return MixRow_; -} - inline HrtfMixerFunc SelectHrtfMixer() { #ifdef HAVE_NEON @@ -189,7 +175,6 @@ void aluInitMixer() } MixSamples = SelectMixer(); - MixRowSamples = SelectRowMixer(); MixHrtfBlendSamples = SelectHrtfBlendMixer(); MixHrtfSamples = SelectHrtfMixer(); } -- cgit v1.2.3