diff --git a/benchmarks/BM_mean.cpp b/benchmarks/BM_mean.cpp new file mode 100644 index 00000000..12fc22ce --- /dev/null +++ b/benchmarks/BM_mean.cpp @@ -0,0 +1,90 @@ +// Copyright (c) 2019, Paul Ferrand +// All rights reserved. + +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are met: + +// 1. Redistributions of source code must retain the above copyright notice, this +// list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright notice, +// this list of conditions and the following disclaimer in the documentation +// and/or other materials provided with the distribution. + +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#include "../sfizz/SIMDHelpers.h" +#include +#include +#include +#include +#include +#include + +class MeanArray : public benchmark::Fixture { +public: + void SetUp(const ::benchmark::State& state) + { + std::random_device rd {}; + std::mt19937 gen { rd() }; + std::uniform_real_distribution dist { 0, 1 }; + input = std::vector(state.range(0)); + std::generate(input.begin(), input.end(), [&]() { return dist(gen); }); + } + + void TearDown(const ::benchmark::State& state [[maybe_unused]]) + { + } + + std::vector input; +}; + +BENCHMARK_DEFINE_F(MeanArray, Scalar) +(benchmark::State& state) +{ + for (auto _ : state) { + auto result = mean(input); + benchmark::DoNotOptimize(result); + } +} + +BENCHMARK_DEFINE_F(MeanArray, SIMD) +(benchmark::State& state) +{ + for (auto _ : state) { + auto result = mean(input); + benchmark::DoNotOptimize(result); + } +} + +BENCHMARK_DEFINE_F(MeanArray, Scalar_Unaligned) +(benchmark::State& state) +{ + for (auto _ : state) { + auto result = mean(absl::MakeSpan(input).subspan(1)); + benchmark::DoNotOptimize(result); + } +} + +BENCHMARK_DEFINE_F(MeanArray, SIMD_Unaligned) +(benchmark::State& state) +{ + for (auto _ : state) { + auto result = mean(absl::MakeSpan(input).subspan(1)); + benchmark::DoNotOptimize(result); + } +} + +BENCHMARK_REGISTER_F(MeanArray, Scalar)->RangeMultiplier(4)->Range(1 << 2, 1 << 12); +BENCHMARK_REGISTER_F(MeanArray, SIMD)->RangeMultiplier(4)->Range(1 << 2, 1 << 12); +BENCHMARK_REGISTER_F(MeanArray, Scalar_Unaligned)->RangeMultiplier(4)->Range(1 << 2, 1 << 12); +BENCHMARK_REGISTER_F(MeanArray, SIMD_Unaligned)->RangeMultiplier(4)->Range(1 << 2, 1 << 12); +BENCHMARK_MAIN(); \ No newline at end of file diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt index c480f66e..c0df472f 100644 --- a/benchmarks/CMakeLists.txt +++ b/benchmarks/CMakeLists.txt @@ -69,11 +69,15 @@ target_link_libraries(bm_copy benchmark absl::span absl::algorithm) add_executable(bm_pan BM_pan.cpp ${SFIZZ_SIMD_SOURCES}) target_link_libraries(bm_pan benchmark absl::span absl::algorithm) +add_executable(bm_mean BM_mean.cpp ${SFIZZ_SIMD_SOURCES}) +target_link_libraries(bm_mean benchmark absl::span absl::algorithm) + add_custom_target(sfizz_benchmarks) add_dependencies(sfizz_benchmarks bm_opf_high_vs_low bm_write bm_read + bm_mean bm_fill bm_mathfuns bm_gain diff --git a/sfizz/Config.h b/sfizz/Config.h index f7e1f7ca..5b471b70 100644 --- a/sfizz/Config.h +++ b/sfizz/Config.h @@ -59,4 +59,5 @@ namespace SIMDConfig { constexpr bool multiplyAdd { false }; constexpr bool copy { false }; constexpr bool pan { true }; + constexpr bool mean { true }; } \ No newline at end of file diff --git a/sfizz/SIMDDummy.cpp b/sfizz/SIMDDummy.cpp index ab1770f7..76fdee1c 100644 --- a/sfizz/SIMDDummy.cpp +++ b/sfizz/SIMDDummy.cpp @@ -130,4 +130,10 @@ template <> void pan(absl::Span panEnvelope, absl::Span leftBuffer, absl::Span rightBuffer) noexcept { pan(panEnvelope, leftBuffer, rightBuffer); +} + +template <> +float mean(absl::Span vector) noexcept +{ + return mean(vector); } \ No newline at end of file diff --git a/sfizz/SIMDHelpers.h b/sfizz/SIMDHelpers.h index ff728a35..bec081b7 100644 --- a/sfizz/SIMDHelpers.h +++ b/sfizz/SIMDHelpers.h @@ -412,4 +412,21 @@ void pan(absl::Span panEnvelope, absl::Span leftBuffer, absl::Span -void pan(absl::Span panEnvelope, absl::Span leftBuffer, absl::Span rightBuffer) noexcept; \ No newline at end of file +void pan(absl::Span panEnvelope, absl::Span leftBuffer, absl::Span rightBuffer) noexcept; + +template +T mean(absl::Span vector) noexcept +{ + T result { 0.0 }; + if (vector.size() == 0) + return result; + + auto* value = vector.begin(); + while (value < vector.end()) + result += *value++; + + return result / static_cast(vector.size()); +} + +template <> +float mean(absl::Span vector) noexcept; \ No newline at end of file diff --git a/sfizz/SIMDSSE.cpp b/sfizz/SIMDSSE.cpp index 889d7db0..a65b604f 100644 --- a/sfizz/SIMDSSE.cpp +++ b/sfizz/SIMDSSE.cpp @@ -600,4 +600,36 @@ void pan(absl::Span panEnvelope, absl::Span lef while (pan < sentinel) snippetPan(pan, left, right); +} + +template <> +float mean(absl::Span vector) noexcept +{ + float result { 0.0 }; + if (vector.size() == 0) + return result; + + auto* value = vector.begin(); + auto* sentinel = vector.end(); + const auto* lastAligned = prevAligned(sentinel); + + while (unaligned(value)) + result += *value++; + + auto mmValues = _mm_setzero_ps(); + while(value < lastAligned) { + mmValues = _mm_add_ps(mmValues, _mm_load_ps(value)); + value += TypeAlignment; + } + + std::array sseResult; + _mm_store_ps(sseResult.data(), mmValues); + + for (auto sseValue: sseResult) + result += sseValue; + + while (value < sentinel) + result += *value++; + + return result / static_cast(vector.size()); } \ No newline at end of file diff --git a/tests/SIMDHelpersT.cpp b/tests/SIMDHelpersT.cpp index 0a58e7d5..7b21fffb 100644 --- a/tests/SIMDHelpersT.cpp +++ b/tests/SIMDHelpersT.cpp @@ -684,3 +684,17 @@ TEST_CASE("[Helpers] copy (SIMD vs scalar)") add(input, absl::MakeSpan(outputSIMD)); REQUIRE(approxEqual(outputScalar, outputSIMD)); } + +TEST_CASE("[Helpers] Mean") +{ + std::array input { 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f, 10.0f }; + REQUIRE(mean(input) == 5.5f); + REQUIRE(mean(input) == 5.5f); +} + +TEST_CASE("[Helpers] Mean (SIMD vs scalar)") +{ + std::vector input(bigBufferSize); + absl::c_iota(input, 0.0); + REQUIRE(mean(input) == mean(input)); +} \ No newline at end of file