kfr

Fast, modern C++ DSP framework, FFT, Sample Rate Conversion, FIR/IIR/Biquad Filters (SSE, AVX, AVX-512, ARM NEON)
Log | Files | Refs | README

commit febb7dcc1a7dc73daa9aa56661a56b826220e807
parent ee3c70f6c57b5208841876b29d57bbc7a17edebc
Author: d.levin256@gmail.com <d.levin256@gmail.com>
Date:   Tue,  3 Dec 2019 20:56:07 +0000

Code formatting, fix include

Diffstat:
Mdocs/cxxdox.yml | 1+
Minclude/kfr/base/generators.hpp | 3++-
Minclude/kfr/base/memory.hpp | 1+
Minclude/kfr/base/pointer.hpp | 6++----
Minclude/kfr/base/random.hpp | 2++
Minclude/kfr/cident.h | 14+++++++-------
Minclude/kfr/dft/fft.hpp | 6++----
Minclude/kfr/testo/double_double.hpp | 1+
Mtests/generate_data.cpp | 2+-
9 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/docs/cxxdox.yml b/docs/cxxdox.yml @@ -16,6 +16,7 @@ clang: arguments: - '-DKFR_ENABLE_FLAC=1' - '-DCMT_FORCE_GENERIC_CPU=1' + - '-std=gnu++17' input_directory: ../include/kfr diff --git a/include/kfr/base/generators.hpp b/include/kfr/base/generators.hpp @@ -48,7 +48,8 @@ struct generator : input_expression constexpr static bool is_incremental = true; template <typename U, size_t N> - friend KFR_INTRINSIC vec<U, N> get_elements(const generator& self, cinput_t, size_t index, vec_shape<U, N> t) + friend KFR_INTRINSIC vec<U, N> get_elements(const generator& self, cinput_t, size_t index, + vec_shape<U, N> t) { return self.generate(t); } diff --git a/include/kfr/base/memory.hpp b/include/kfr/base/memory.hpp @@ -26,3 +26,4 @@ #pragma once #include "../cometa/memory.hpp" +#include "../simd/types.hpp" diff --git a/include/kfr/base/pointer.hpp b/include/kfr/base/pointer.hpp @@ -125,12 +125,10 @@ struct expression_resource_impl : expression_resource expression_resource_impl(E&& e) CMT_NOEXCEPT : e(std::move(e)) {} virtual ~expression_resource_impl() {} virtual void* instance() override final { return &e; } + public: #ifdef __cpp_aligned_new - static void operator delete (void* p, std::align_val_t al) noexcept - { - details::aligned_release(p); - } + static void operator delete(void* p, std::align_val_t al) noexcept { details::aligned_release(p); } #endif private: diff --git a/include/kfr/base/random.hpp b/include/kfr/base/random.hpp @@ -24,10 +24,12 @@ See https://www.kfrlib.com for details. */ #pragma once + #include "../simd/impl/function.hpp" #include "../simd/operators.hpp" #include "../simd/shuffle.hpp" #include "../simd/vec.hpp" +#include <functional> #ifdef CMT_ARCH_ARM #define KFR_DISABLE_READCYCLECOUNTER diff --git a/include/kfr/cident.h b/include/kfr/cident.h @@ -743,19 +743,19 @@ extern char* gets(char* __s); switch (cpu) \ { \ case cpu_t::avx512: \ - CMT_IF_ENABLED_AVX512(return avx512::__VA_ARGS__;) \ + CMT_IF_ENABLED_AVX512(return avx512::__VA_ARGS__;) \ case cpu_t::avx2: \ - CMT_IF_ENABLED_AVX2(return avx2::__VA_ARGS__;) \ + CMT_IF_ENABLED_AVX2(return avx2::__VA_ARGS__;) \ case cpu_t::avx: \ - CMT_IF_ENABLED_AVX(return avx::__VA_ARGS__;) \ + CMT_IF_ENABLED_AVX(return avx::__VA_ARGS__;) \ case cpu_t::sse41: \ - CMT_IF_ENABLED_SSE41(return sse41::__VA_ARGS__;) \ + CMT_IF_ENABLED_SSE41(return sse41::__VA_ARGS__;) \ case cpu_t::ssse3: \ - CMT_IF_ENABLED_SSSE3(return ssse3::__VA_ARGS__;) \ + CMT_IF_ENABLED_SSSE3(return ssse3::__VA_ARGS__;) \ case cpu_t::sse3: \ - CMT_IF_ENABLED_SSE3(return sse3::__VA_ARGS__;) \ + CMT_IF_ENABLED_SSE3(return sse3::__VA_ARGS__;) \ case cpu_t::sse2: \ - CMT_IF_ENABLED_SSE2(return sse2::__VA_ARGS__;) \ + CMT_IF_ENABLED_SSE2(return sse2::__VA_ARGS__;) \ default: \ return {}; \ } diff --git a/include/kfr/dft/fft.hpp b/include/kfr/dft/fft.hpp @@ -159,8 +159,7 @@ struct dft_plan case cpu_t::sse3: CMT_IF_ENABLED_SSE3(sse3::dft_initialize(*this); break;) default: - CMT_IF_ENABLED_SSE2(sse2::dft_initialize(*this); break;) - ; + CMT_IF_ENABLED_SSE2(sse2::dft_initialize(*this); break;); } } #endif @@ -324,8 +323,7 @@ struct dft_plan_real : dft_plan<T> case cpu_t::sse3: CMT_IF_ENABLED_SSE3(sse3::dft_real_initialize(*this); break;) default: - CMT_IF_ENABLED_SSE2(sse2::dft_real_initialize(*this); break;) - ; + CMT_IF_ENABLED_SSE2(sse2::dft_real_initialize(*this); break;); } } #endif diff --git a/include/kfr/testo/double_double.hpp b/include/kfr/testo/double_double.hpp @@ -2,6 +2,7 @@ #include <algorithm> #include <bitset> +#include <climits> #include <cmath> #include <cstring> diff --git a/tests/generate_data.cpp b/tests/generate_data.cpp @@ -86,7 +86,7 @@ int main() { using num = mpfr::number; mpfr::scoped_precision prec(512); - + generate_test( cint<1>, "sin", [](const num& x) { return mpfr::sin(x); }, 0, M_PI * 2); generate_test(