commit 76c6398490be3984e7a1aa022ccc30475a080d17 parent 940f5d9c26ef2a724a5faf4f421470ca6ef72564 Author: [email protected] <[email protected]> Date: Fri, 14 Oct 2022 11:01:42 +0100 Merge master Diffstat:
180 files changed, 357 insertions(+), 283 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2016 D Levin (http://www.kfrlib.com) +# Copyright (C) 2016-2022 Fractalium Ltd (http://www.kfrlib.com) # This file is part of KFR # # KFR is free software: you can redistribute it and/or modify diff --git a/azure-pipelines.yml b/azure-pipelines.yml @@ -220,14 +220,14 @@ jobs: xcode10: XCODE_VER: 10.3 pool: - vmImage: 'macOS-10.14' + vmImage: 'macOS-10.15' steps: - bash: | set -e - curl -o "$(Agent.TempDirectory)/sde.tar.bz2" -L $(SDE_URL_MACOS2) + curl -o "$(Agent.TempDirectory)/sde.tar.xz" -L $(SDE_URL_MACOS3) mkdir -p "$(Agent.TempDirectory)/sde-bin" - tar -C "$(Agent.TempDirectory)/sde-bin" -xjf "$(Agent.TempDirectory)/sde.tar.bz2" --strip 1 + tar -C "$(Agent.TempDirectory)/sde-bin" -xJf "$(Agent.TempDirectory)/sde.tar.xz" --strip 1 export PATH=$PATH:$(Agent.TempDirectory)/sde-bin sde64 -help || true @@ -266,7 +266,7 @@ jobs: - job: Android_ARMv7_Clang_Release timeoutInMinutes: 180 pool: - vmImage: 'vs2017-win2016' + vmImage: 'windows-2019' steps: - script: | choco install ninja @@ -280,7 +280,7 @@ jobs: - job: Android_AArch64_Clang_Release timeoutInMinutes: 180 pool: - vmImage: 'vs2017-win2016' + vmImage: 'windows-2019' steps: - script: | choco install ninja @@ -294,7 +294,7 @@ jobs: - job: Windows_MinGW_x86_Clang13_Release timeoutInMinutes: 180 pool: - vmImage: 'vs2017-win2016' + vmImage: 'windows-2019' steps: - script: | choco uninstall mingw @@ -309,7 +309,7 @@ jobs: - job: Windows_MinGW_x86_64_Clang13_Release timeoutInMinutes: 180 pool: - vmImage: 'vs2017-win2016' + vmImage: 'windows-2019' steps: - script: | choco uninstall mingw @@ -321,10 +321,10 @@ jobs: call C:\tools\msys64\msys2_shell.cmd -defterm -mingw64 -no-start -full-path -here -c "pacman -S --noconfirm mingw64/mingw-w64-x86_64-ninja" call C:\tools\msys64\msys2_shell.cmd -defterm -mingw64 -no-start -full-path -here -c "ci/run.sh build-release -DCMAKE_CXX_COMPILER=""C:/Program Files/LLVM/bin/clang++.exe"" -DCPU_ARCH=avx -DCMAKE_CXX_FLAGS=--target=x86_64-w64-windows-gnu -DCMAKE_BUILD_TYPE=Release" -- job: Windows_MSVC_x86_64_AVX512_MSVC2017_Release +- job: Windows_MSVC_x86_64_AVX512_MSVC2019_Release timeoutInMinutes: 180 pool: - vmImage: 'vs2017-win2016' + vmImage: 'windows-2019' steps: - script: | choco uninstall mingw @@ -333,7 +333,7 @@ jobs: curl -o "$(Agent.TempDirectory)/sde.zip" -L $(SDE_URL_WINDOWS) "C:\Program Files\7-Zip\7z.exe" x -oC:\sde "$(Agent.TempDirectory)/sde.zip" - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat" + call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" set PATH=%PATH:C:\tools\mingw64\bin;=% set PATH=%PATH:C:\Program Files\Git\mingw64\bin;=% set PATH=%PATH:C:\Program Files\LLVM\bin;=% @@ -341,38 +341,38 @@ jobs: set PATH=C:\sde;%PATH% ci\run.cmd build-release -DARCH_TESTS=ON -DUSE_SDE=ON -DCPU_ARCH=avx512 -DENABLE_DFT=OFF -DCMAKE_BUILD_TYPE=Release -- job: Windows_MSVC_x86_AVX512_MSVC2017_Release - timeoutInMinutes: 180 - pool: - vmImage: 'vs2017-win2016' - steps: - - script: | - choco uninstall mingw - choco install ninja - - curl -o "$(Agent.TempDirectory)/sde.zip" -L $(SDE_URL_WINDOWS) - "C:\Program Files\7-Zip\7z.exe" x -oC:\sde "$(Agent.TempDirectory)/sde.zip" - - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars32.bat" - set PATH=%PATH:C:\tools\mingw64\bin;=% - set PATH=%PATH:C:\Program Files\Git\mingw64\bin;=% - set PATH=%PATH:C:\Program Files\LLVM\bin;=% - set PATH=%PATH:C:\Strawberry\c\bin;=% - set PATH=C:\sde;%PATH% - ci\run.cmd build-release -DARCH_TESTS=OFF -DUSE_SDE=ON -DCPU_ARCH=avx512 -DENABLE_DFT=OFF -DCMAKE_BUILD_TYPE=Release - -- job: Windows_MSVC2019_x86_64_Release - timeoutInMinutes: 180 - pool: - vmImage: 'windows-2019' - steps: - - script: | - choco uninstall mingw - choco install ninja - - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - set PATH=%PATH:C:\tools\mingw64\bin;=% - set PATH=%PATH:C:\Program Files\Git\mingw64\bin;=% - set PATH=%PATH:C:\Program Files\LLVM\bin;=% - set PATH=%PATH:C:\Strawberry\c\bin;=% - ci\run.cmd build-release -DARCH_TESTS=OFF -DCPU_ARCH=detect -DENABLE_DFT=OFF -DCMAKE_BUILD_TYPE=Release +# - job: Windows_MSVC_x86_AVX512_MSVC2019_Release +# timeoutInMinutes: 180 +# pool: +# vmImage: 'windows-2019' +# steps: +# - script: | +# choco uninstall mingw +# choco install ninja + +# curl -o "$(Agent.TempDirectory)/sde.zip" -L $(SDE_URL_WINDOWS) +# "C:\Program Files\7-Zip\7z.exe" x -oC:\sde "$(Agent.TempDirectory)/sde.zip" + +# call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars32.bat" +# set PATH=%PATH:C:\tools\mingw64\bin;=% +# set PATH=%PATH:C:\Program Files\Git\mingw64\bin;=% +# set PATH=%PATH:C:\Program Files\LLVM\bin;=% +# set PATH=%PATH:C:\Strawberry\c\bin;=% +# set PATH=C:\sde;%PATH% +# ci\run.cmd build-release -DARCH_TESTS=OFF -DUSE_SDE=ON -DCPU_ARCH=avx512 -DENABLE_DFT=OFF -DCMAKE_BUILD_TYPE=Release + +# - job: Windows_MSVC2022_x86_64_Release +# timeoutInMinutes: 180 +# pool: +# vmImage: 'windows-2022' +# steps: +# - script: | +# choco uninstall mingw +# choco install ninja + +# call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" +# set PATH=%PATH:C:\tools\mingw64\bin;=% +# set PATH=%PATH:C:\Program Files\Git\mingw64\bin;=% +# set PATH=%PATH:C:\Program Files\LLVM\bin;=% +# set PATH=%PATH:C:\Strawberry\c\bin;=% +# ci\run.cmd build-release -DARCH_TESTS=OFF -DCPU_ARCH=detect -DENABLE_DFT=OFF -DCMAKE_BUILD_TYPE=Release diff --git a/capi/CMakeLists.txt b/capi/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2016 D Levin (http://www.kfrlib.com) +# Copyright (C) 2016-2022 Fractalium Ltd (http://www.kfrlib.com) # This file is part of KFR # # KFR is free software: you can redistribute it and/or modify diff --git a/capi/capi.cpp b/capi/capi.cpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2016 D Levin (http://www.kfrlib.com) +# Copyright (C) 2016-2022 Fractalium Ltd (http://www.kfrlib.com) # This file is part of KFR # # KFR is free software: you can redistribute it and/or modify diff --git a/examples/biquads.cpp b/examples/biquads.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ diff --git a/examples/ccv.cpp b/examples/ccv.cpp @@ -1,6 +1,6 @@ /* * ccv, part of KFR (https://www.kfr.dev) - * Copyright (C) 2019 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ diff --git a/examples/dft.cpp b/examples/dft.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ diff --git a/examples/fir.cpp b/examples/fir.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ diff --git a/examples/iir.cpp b/examples/iir.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ diff --git a/examples/sample_rate_conversion.cpp b/examples/sample_rate_conversion.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ diff --git a/examples/window.cpp b/examples/window.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ diff --git a/include/kfr/all.hpp b/include/kfr/all.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/base.hpp b/include/kfr/base.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/base/basic_expressions.hpp b/include/kfr/base/basic_expressions.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/base/conversion.hpp b/include/kfr/base/conversion.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/base/expression.hpp b/include/kfr/base/expression.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/base/filter.hpp b/include/kfr/base/filter.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/base/fraction.hpp b/include/kfr/base/fraction.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/base/generators.hpp b/include/kfr/base/generators.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/base/memory.hpp b/include/kfr/base/memory.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/base/pointer.hpp b/include/kfr/base/pointer.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/base/random.hpp b/include/kfr/base/random.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/base/reduce.hpp b/include/kfr/base/reduce.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/base/small_buffer.hpp b/include/kfr/base/small_buffer.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/base/univector.hpp b/include/kfr/base/univector.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/capi.h b/include/kfr/capi.h @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dft.hpp b/include/kfr/dft.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dft/cache.hpp b/include/kfr/dft/cache.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dft/convolution.hpp b/include/kfr/dft/convolution.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dft/data/bitrev.hpp b/include/kfr/dft/data/bitrev.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dft/data/sincos.hpp b/include/kfr/dft/data/sincos.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dft/fft.hpp b/include/kfr/dft/fft.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dft/impl/bitrev.hpp b/include/kfr/dft/impl/bitrev.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dft/impl/convolution-impl.cpp b/include/kfr/dft/impl/convolution-impl.cpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dft/impl/dft-fft.hpp b/include/kfr/dft/impl/dft-fft.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dft/impl/dft-impl-f32.cpp b/include/kfr/dft/impl/dft-impl-f32.cpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dft/impl/dft-impl-f64.cpp b/include/kfr/dft/impl/dft-impl-f64.cpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dft/impl/dft-impl.hpp b/include/kfr/dft/impl/dft-impl.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dft/impl/dft-templates.hpp b/include/kfr/dft/impl/dft-templates.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dft/impl/fft-impl-f32.cpp b/include/kfr/dft/impl/fft-impl-f32.cpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dft/impl/fft-impl-f64.cpp b/include/kfr/dft/impl/fft-impl-f64.cpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dft/impl/fft-impl.hpp b/include/kfr/dft/impl/fft-impl.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dft/impl/fft-templates.hpp b/include/kfr/dft/impl/fft-templates.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dft/impl/ft.hpp b/include/kfr/dft/impl/ft.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify @@ -362,13 +362,13 @@ KFR_INTRINSIC void cscatter(complex<T>* base, size_t stride, const cvec<T, N>& v template <size_t groupsize = 1, typename T, size_t N, typename IT> KFR_INTRINSIC vec<T, N * 2 * groupsize> cgather(const complex<T>* base, const vec<IT, N>& offset) { - return gather_helper<2 * groupsize>(ptr_cast<T>(base), offset, csizeseq_t<N>()); + return internal::gather_helper<2 * groupsize>(ptr_cast<T>(base), offset, csizeseq_t<N>()); } template <size_t groupsize = 1, typename T, size_t N, typename IT> KFR_INTRINSIC void cscatter(complex<T>* base, const vec<IT, N>& offset, vec<T, N * 2 * groupsize> value) { - return scatter_helper<2 * groupsize>(ptr_cast<T>(base), offset, value, csizeseq_t<N>()); + return internal::scatter_helper<2 * groupsize>(ptr_cast<T>(base), offset, value, csizeseq_t<N>()); } template <typename T> diff --git a/include/kfr/dft/reference_dft.hpp b/include/kfr/dft/reference_dft.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dsp.hpp b/include/kfr/dsp.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dsp/biquad.hpp b/include/kfr/dsp/biquad.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dsp/biquad_design.hpp b/include/kfr/dsp/biquad_design.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dsp/dcremove.hpp b/include/kfr/dsp/dcremove.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dsp/delay.hpp b/include/kfr/dsp/delay.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dsp/ebu.hpp b/include/kfr/dsp/ebu.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dsp/fir.hpp b/include/kfr/dsp/fir.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dsp/fir_design.hpp b/include/kfr/dsp/fir_design.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dsp/fracdelay.hpp b/include/kfr/dsp/fracdelay.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dsp/goertzel.hpp b/include/kfr/dsp/goertzel.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dsp/iir_design.hpp b/include/kfr/dsp/iir_design.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dsp/mixdown.hpp b/include/kfr/dsp/mixdown.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dsp/oscillators.hpp b/include/kfr/dsp/oscillators.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dsp/sample_rate_conversion.hpp b/include/kfr/dsp/sample_rate_conversion.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dsp/speaker.hpp b/include/kfr/dsp/speaker.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dsp/special.hpp b/include/kfr/dsp/special.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dsp/state_holder.hpp b/include/kfr/dsp/state_holder.hpp @@ -3,7 +3,7 @@ */ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ #pragma once diff --git a/include/kfr/dsp/units.hpp b/include/kfr/dsp/units.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dsp/waveshaper.hpp b/include/kfr/dsp/waveshaper.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dsp/weighting.hpp b/include/kfr/dsp/weighting.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/dsp/window.hpp b/include/kfr/dsp/window.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/graphics.hpp b/include/kfr/graphics.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/graphics/color.hpp b/include/kfr/graphics/color.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify @@ -45,7 +45,17 @@ struct color constexpr color(int) = delete; constexpr explicit color(T grey, T alpha = maximum) : v(grey, grey, grey, alpha) {} constexpr color(T r, T g, T b, T a = maximum) : v(r, g, b, a) {} +#if defined(_MSC_VER) && !defined(__clang__) + // MSVC Internal Compiler Error workaround + constexpr color(const color& value) : v(value.v) {} + constexpr color& operator=(const color& value) + { + v = value.v; + return *this; + } +#else constexpr color(const color&) = default; +#endif constexpr color(const vec<T, 4>& v) : v(v) {} constexpr color(const vec<T, 3>& v, T a = maximum) : v(concat(v, vec<T, 1>(a))) {} constexpr color(const vec<T, 4>& v, T a) : v(concat(slice<0, 3>(v), vec<T, 1>(a))) {} @@ -105,7 +115,8 @@ struct color constexpr bool operator==(const color& c) const { return all(v == c.v); } constexpr bool operator!=(const color& c) const { return !(*this == c); } - union { + union + { struct { T r; diff --git a/include/kfr/graphics/geometry.hpp b/include/kfr/graphics/geometry.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/graphics/scaled.hpp b/include/kfr/graphics/scaled.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/io.hpp b/include/kfr/io.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/io/audiofile.hpp b/include/kfr/io/audiofile.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/io/file.hpp b/include/kfr/io/file.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/io/impl/audiofile-impl.cpp b/include/kfr/io/impl/audiofile-impl.cpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/io/python_plot.hpp b/include/kfr/io/python_plot.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/io/tostring.hpp b/include/kfr/io/tostring.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/math.hpp b/include/kfr/math.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/math/asin_acos.hpp b/include/kfr/math/asin_acos.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/math/atan.hpp b/include/kfr/math/atan.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/math/compiletime.hpp b/include/kfr/math/compiletime.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/math/complex_math.hpp b/include/kfr/math/complex_math.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/math/gamma.hpp b/include/kfr/math/gamma.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/math/hyperbolic.hpp b/include/kfr/math/hyperbolic.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/math/impl/asin_acos.hpp b/include/kfr/math/impl/asin_acos.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/math/impl/atan.hpp b/include/kfr/math/impl/atan.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/math/impl/gamma.hpp b/include/kfr/math/impl/gamma.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/math/impl/hyperbolic.hpp b/include/kfr/math/impl/hyperbolic.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/math/impl/log_exp.hpp b/include/kfr/math/impl/log_exp.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/math/impl/modzerobessel.hpp b/include/kfr/math/impl/modzerobessel.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/math/impl/sin_cos.hpp b/include/kfr/math/impl/sin_cos.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/math/impl/sqrt.hpp b/include/kfr/math/impl/sqrt.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/math/impl/tan.hpp b/include/kfr/math/impl/tan.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/math/interpolation.hpp b/include/kfr/math/interpolation.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/math/log_exp.hpp b/include/kfr/math/log_exp.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/math/modzerobessel.hpp b/include/kfr/math/modzerobessel.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/math/sin_cos.hpp b/include/kfr/math/sin_cos.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/math/sqrt.hpp b/include/kfr/math/sqrt.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/math/tan.hpp b/include/kfr/math/tan.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/runtime.hpp b/include/kfr/runtime.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/runtime/cpuid.hpp b/include/kfr/runtime/cpuid.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/runtime/cpuid_auto.hpp b/include/kfr/runtime/cpuid_auto.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd.hpp b/include/kfr/simd.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/abs.hpp b/include/kfr/simd/abs.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/clamp.hpp b/include/kfr/simd/clamp.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/comparison.hpp b/include/kfr/simd/comparison.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/complex.hpp b/include/kfr/simd/complex.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/constants.hpp b/include/kfr/simd/constants.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/digitreverse.hpp b/include/kfr/simd/digitreverse.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/horizontal.hpp b/include/kfr/simd/horizontal.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/impl/abs.hpp b/include/kfr/simd/impl/abs.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/impl/backend.hpp b/include/kfr/simd/impl/backend.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/impl/backend_clang.hpp b/include/kfr/simd/impl/backend_clang.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/impl/backend_generic.hpp b/include/kfr/simd/impl/backend_generic.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify @@ -124,18 +124,35 @@ struct simd_small_array<f32, 2, f64> using packed_type = f64; #ifdef _MSC_VER - KFR_INTRINSIC constexpr simd_small_array() CMT_NOEXCEPT = default; + KFR_MEM_INTRINSIC constexpr simd_small_array() CMT_NOEXCEPT = default; #else - KFR_INTRINSIC simd_small_array() CMT_NOEXCEPT {} + KFR_MEM_INTRINSIC simd_small_array() CMT_NOEXCEPT {} +#endif + +#ifdef _MSC_VER + // MSVC Internal Compiler Error workaround + KFR_MEM_INTRINSIC constexpr simd_small_array(const simd_small_array& v) CMT_NOEXCEPT : whole(v.whole) {} + KFR_MEM_INTRINSIC constexpr simd_small_array(simd_small_array&& v) CMT_NOEXCEPT : whole(v.whole) {} + KFR_MEM_INTRINSIC constexpr simd_small_array& operator=(const simd_small_array& v) CMT_NOEXCEPT + { + whole = v.whole; + return *this; + } + KFR_MEM_INTRINSIC constexpr simd_small_array& operator=(simd_small_array&& v) CMT_NOEXCEPT + { + whole = v.whole; + return *this; + } #endif - KFR_INTRINSIC constexpr simd_small_array(f64 whole) CMT_NOEXCEPT : whole(whole) {} + KFR_MEM_INTRINSIC constexpr simd_small_array(f64 whole) CMT_NOEXCEPT : whole(whole) {} - KFR_INTRINSIC simd_small_array(f32 x, f32 y) CMT_NOEXCEPT + KFR_MEM_INTRINSIC simd_small_array(f32 x, f32 y) CMT_NOEXCEPT { #ifdef _MSC_VER #ifdef CMT_ARCH_SSE2 - whole = _mm_cvtsd_f64(_mm_castps_pd(_mm_setr_ps(x, y, x, y))); + // whole = _mm_cvtsd_f64(_mm_castps_pd(_mm_setr_ps(x, y, x, y))); + whole = _mm_cvtsd_f64(_mm_castps_pd(_mm_unpacklo_ps(_mm_set_ss(x), _mm_set_ss(y)))); #else union { @@ -164,7 +181,7 @@ struct simd_small_array<f32, 2, f64> #endif } - KFR_INTRINSIC static constexpr simd_small_array from(f64 whole) CMT_NOEXCEPT { return { whole }; } + KFR_MEM_INTRINSIC static constexpr simd_small_array from(f64 whole) CMT_NOEXCEPT { return { whole }; } }; template <typename T> @@ -438,7 +455,7 @@ KFR_INTRINSIC __m128 KFR_swap_ps(__m128 x) { return _mm_shuffle_ps(x, x, _MM_SHU #ifndef KFR_f32x2_array // KFR_INTRIN_SHUFFLE_CONCAT(f32, 2, _mm_castpd_ps(_mm_setr_pd(x.whole, y.whole))) -KFR_INTRIN_SHUFFLE_SWAP(f32, 2, _mm_cvtsd_f64(_mm_castps_pd(KFR_swap_ps(_mm_castpd_ps(_mm_set_sd(x.whole)))))) +KFR_INTRIN_SHUFFLE_SWAP(f32, 2, _mm_cvtsd_f64(_mm_castps_pd(KFR_swap_ps(_mm_castpd_ps(_mm_set1_pd(x.whole)))))) #else KFR_INTRIN_SHUFFLE_CONCAT(f32, 2, _mm_setr_ps(x.low, x.high, y.low, y.high)) KFR_INTRIN_SHUFFLE_SWAP(f32, 2, simd<f32, 2>(x.high, x.low)) diff --git a/include/kfr/simd/impl/basicoperators_clang.hpp b/include/kfr/simd/impl/basicoperators_clang.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/impl/basicoperators_generic.hpp b/include/kfr/simd/impl/basicoperators_generic.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/impl/clamp.hpp b/include/kfr/simd/impl/clamp.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/impl/function.hpp b/include/kfr/simd/impl/function.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/impl/logical.hpp b/include/kfr/simd/impl/logical.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/impl/min_max.hpp b/include/kfr/simd/impl/min_max.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/impl/operators.hpp b/include/kfr/simd/impl/operators.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/impl/read_write.hpp b/include/kfr/simd/impl/read_write.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/impl/round.hpp b/include/kfr/simd/impl/round.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/impl/saturation.hpp b/include/kfr/simd/impl/saturation.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/impl/select.hpp b/include/kfr/simd/impl/select.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/impl/simd.hpp b/include/kfr/simd/impl/simd.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/impl/specialconstants.hpp b/include/kfr/simd/impl/specialconstants.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/impl/specializations.i b/include/kfr/simd/impl/specializations.i @@ -1,5 +1,5 @@ /** - * Copyright (C) 2016 D Levin (http://www.kfrlib.com) + * Copyright (C) 2016-2022 Fractalium Ltd (http://www.kfrlib.com) * This file is part of KFR * * KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/logical.hpp b/include/kfr/simd/logical.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/mask.hpp b/include/kfr/simd/mask.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/min_max.hpp b/include/kfr/simd/min_max.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/operators.hpp b/include/kfr/simd/operators.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/platform.hpp b/include/kfr/simd/platform.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/read_write.hpp b/include/kfr/simd/read_write.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify @@ -109,16 +109,19 @@ KFR_INTRINSIC vec<T, Nout> gather_stride(const T* base) return internal::gather_stride<Nout, Stride>(base, csizeseq<Nout>); } +namespace internal +{ template <size_t groupsize, typename T, size_t N, typename IT, size_t... Indices> KFR_INTRINSIC vec<T, N * groupsize> gather_helper(const T* base, const vec<IT, N>& offset, csizes_t<Indices...>) { return concat(read<groupsize>(base + groupsize * offset[Indices])...); } +} template <size_t groupsize = 1, typename T, size_t N, typename IT> KFR_INTRINSIC vec<T, N * groupsize> gather(const T* base, const vec<IT, N>& offset) { - return gather_helper<groupsize>(base, offset, csizeseq<N>); + return internal::gather_helper<groupsize>(base, offset, csizeseq<N>); } namespace internal diff --git a/include/kfr/simd/round.hpp b/include/kfr/simd/round.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/saturation.hpp b/include/kfr/simd/saturation.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/select.hpp b/include/kfr/simd/select.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/shuffle.hpp b/include/kfr/simd/shuffle.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/sort.hpp b/include/kfr/simd/sort.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/types.hpp b/include/kfr/simd/types.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/include/kfr/simd/vec.hpp b/include/kfr/simd/vec.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify @@ -223,12 +223,35 @@ struct alignas(internal::vec_alignment<T, N_>) vec KFR_MEM_INTRINSIC vec(const simd_type& simd) CMT_NOEXCEPT : v(simd) {} // default KFR_MEM_INTRINSIC constexpr vec() CMT_NOEXCEPT {} + +#if defined(_MSC_VER) && !defined (__clang__) + // MSVC Internal Compiler Error workaround + // copy + KFR_MEM_INTRINSIC constexpr vec(const vec& value) CMT_NOEXCEPT : v(value.v) {} + // move + KFR_MEM_INTRINSIC constexpr vec(vec&& value) CMT_NOEXCEPT : v(value.v) {} + // assignment + KFR_MEM_INTRINSIC constexpr vec& operator=(const vec& value) CMT_NOEXCEPT + { + v = value.v; + return *this; + } + // assignment + KFR_MEM_INTRINSIC constexpr vec& operator=(vec&& value) CMT_NOEXCEPT + { + v = value.v; + return *this; + } +#else // copy - KFR_MEM_INTRINSIC constexpr vec(const vec& value) CMT_NOEXCEPT = default; + KFR_MEM_INTRINSIC constexpr vec(const vec&) CMT_NOEXCEPT = default; // move KFR_MEM_INTRINSIC constexpr vec(vec&&) CMT_NOEXCEPT = default; // assignment KFR_MEM_INTRINSIC constexpr vec& operator=(const vec&) CMT_NOEXCEPT = default; + // assignment + KFR_MEM_INTRINSIC constexpr vec& operator=(vec&&) CMT_NOEXCEPT = default; +#endif // from scalar template <typename U, KFR_ENABLE_IF(is_convertible<U, value_type>&& compound_type_traits<T>::is_scalar)> @@ -1201,23 +1224,25 @@ vec<T, N> test_enumerate(vec_shape<T, N>, csizes_t<indices...>, double start = 0 template <int Cat, typename Fn, typename RefFn, typename IsApplicable = fn_return_constant<bool, true>> void test_function1(cint_t<Cat> cat, Fn&& fn, RefFn&& reffn, IsApplicable&& isapplicable = IsApplicable{}) { - testo::matrix(named("value") = special_values(), named("type") = test_catogories::types(cat), - [&](special_value value, auto type) - { - using T = typename decltype(type)::type; - if (isapplicable(ctype<T>, value)) - { - const T x(value); - CHECK(is_same<decltype(fn(x)), typename compound_type_traits<T>::template rebind< - decltype(reffn(std::declval<subtype<T>>()))>>); - const auto fn_x = fn(x); - const auto ref_x = apply(reffn, x); - ::testo::active_test()->check(testo::deep_is_equal(ref_x, fn_x), - as_string(fn_x, " == ", ref_x), - "fn(x) == apply(reffn, x)"); - // CHECK(fn(x) == apply(reffn, x)); - } - }); + testo::matrix( + named("value") = special_values(), named("type") = test_catogories::types(cat), + [&](special_value value, auto type) { + using T = typename decltype(type)::type; + if (isapplicable(ctype<T>, value)) + { + const T x(value); +#if !defined(_MSC_VER) || defined(__clang__) + // Supress ICE in MSVC + using RefFnTy = decltype(std::declval<RefFn>()(std::declval<subtype<T>>())); + CHECK(is_same<decltype(fn(x)), typename compound_type_traits<T>::template rebind<RefFnTy>>); +#endif + const auto fn_x = fn(x); + const auto ref_x = apply(reffn, x); + ::testo::active_test()->check(testo::deep_is_equal(ref_x, fn_x), + as_string(fn_x, " == ", ref_x), "fn(x) == apply(reffn, x)"); + // CHECK(fn(x) == apply(reffn, x)); + } + }); testo::matrix(named("type") = test_catogories::types(cint<Cat & ~1>), [&](auto type) diff --git a/include/kfr/version.hpp b/include/kfr/version.hpp @@ -2,7 +2,7 @@ * @{ */ /* - Copyright (C) 2016 D Levin (https://www.kfrlib.com) + Copyright (C) 2016-2022 Fractalium Ltd (https://www.kfrlib.com) This file is part of KFR KFR is free software: you can redistribute it and/or modify diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2016 D Levin (http://www.kfrlib.com) +# Copyright (C) 2016-2022 Fractalium Ltd (http://www.kfrlib.com) # This file is part of KFR # # KFR is free software: you can redistribute it and/or modify @@ -117,7 +117,8 @@ endif () find_package(MPFR) find_package(GMP) -if (MPFR_FOUND AND GMP_FOUND) +if (MPFR_FOUND AND GMP_FOUND AND KFR_REGENERATE_TESTS) + message(STATUS "MPFR is found") add_executable(generate_data generate_data.cpp) target_link_libraries(generate_data kfr) target_include_directories(generate_data PRIVATE ${MPFR_INCLUDE_DIR} @@ -268,4 +269,4 @@ if (NOT KFR_SKIP_TESTS) endif () add_executable(tensor_test tensor_test.cpp unit/base/tensor.cpp) -target_link_libraries(tensor_test kfr use_arch) -\ No newline at end of file +target_link_libraries(tensor_test kfr use_arch) diff --git a/tests/all_tests.cpp b/tests/all_tests.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ diff --git a/tests/asm_test.cpp b/tests/asm_test.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ diff --git a/tests/base_test.cpp b/tests/base_test.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ diff --git a/tests/complex_test.cpp b/tests/complex_test.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ diff --git a/tests/dft_test.cpp b/tests/dft_test.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ diff --git a/tests/dsp_test.cpp b/tests/dsp_test.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ @@ -240,7 +240,7 @@ TEST(ebu_lra_1_2_3_and_4) TEST(note_to_hertz) { - testo::eplison_scope<void> eps(1000); + testo::eplison_scope<void> eps(2000); CHECK(kfr::note_to_hertz(60) == fbase(261.6255653005986346778499935233)); CHECK(kfr::note_to_hertz(pack(60)) == pack(fbase(261.6255653005986346778499935233))); diff --git a/tests/expression_test.cpp b/tests/expression_test.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ diff --git a/tests/generate_data.cpp b/tests/generate_data.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ #define _USE_MATH_DEFINES diff --git a/tests/intrinsic_test.cpp b/tests/intrinsic_test.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ diff --git a/tests/io_test.cpp b/tests/io_test.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ diff --git a/tests/multiarch.cpp b/tests/multiarch.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ diff --git a/tests/multiarch_fir_avx.cpp b/tests/multiarch_fir_avx.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ diff --git a/tests/multiarch_fir_sse2.cpp b/tests/multiarch_fir_sse2.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ diff --git a/tests/numeric_tests.hpp b/tests/numeric_tests.hpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ diff --git a/tests/unit/base/conversion.cpp b/tests/unit/base/conversion.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ diff --git a/tests/unit/base/fraction.cpp b/tests/unit/base/fraction.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ diff --git a/tests/unit/base/random.cpp b/tests/unit/base/random.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ diff --git a/tests/unit/base/reduce.cpp b/tests/unit/base/reduce.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ diff --git a/tests/unit/graphics/color.cpp b/tests/unit/graphics/color.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ diff --git a/tests/unit/graphics/geometry.cpp b/tests/unit/graphics/geometry.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ diff --git a/tests/unit/math/asin_acos.cpp b/tests/unit/math/asin_acos.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ #include "../../numeric_tests.hpp" diff --git a/tests/unit/math/atan.cpp b/tests/unit/math/atan.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ diff --git a/tests/unit/math/hyperbolic.cpp b/tests/unit/math/hyperbolic.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ diff --git a/tests/unit/math/log_exp.cpp b/tests/unit/math/log_exp.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ #include "../../numeric_tests.hpp" diff --git a/tests/unit/math/sin_cos.cpp b/tests/unit/math/sin_cos.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ #include "../../numeric_tests.hpp" diff --git a/tests/unit/math/tan.cpp b/tests/unit/math/tan.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ #include "../../numeric_tests.hpp" diff --git a/tests/unit/simd/abs.cpp b/tests/unit/simd/abs.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ diff --git a/tests/unit/simd/complex.cpp b/tests/unit/simd/complex.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ diff --git a/tests/unit/simd/min_max.cpp b/tests/unit/simd/min_max.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ diff --git a/tests/unit/simd/operators.cpp b/tests/unit/simd/operators.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ diff --git a/tests/unit/simd/round.cpp b/tests/unit/simd/round.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ diff --git a/tests/unit/simd/select.cpp b/tests/unit/simd/select.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ diff --git a/tests/unit/simd/shuffle.cpp b/tests/unit/simd/shuffle.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ diff --git a/tests/unit/simd/vec.cpp b/tests/unit/simd/vec.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ @@ -90,72 +90,90 @@ TEST(cast) test_function1( test_catogories::all, [](auto x) { return kfr::innercast<u8>(x); }, [](auto x) -> u8 { return static_cast<u8>(x); }, - [](auto t, special_value x) { return is_in_range_of<u8>(x.get<subtype<typename decltype(t)::type>>()); }); + [](auto t, special_value x) + { return is_in_range_of<u8>(x.get<subtype<typename decltype(t)::type>>()); }); s.text = ("target_type = i8"); test_function1( test_catogories::all, [](auto x) { return kfr::innercast<i8>(x); }, [](auto x) -> i8 { return static_cast<i8>(x); }, - [](auto t, special_value x) { return is_in_range_of<i8>(x.get<subtype<typename decltype(t)::type>>()); }); + [](auto t, special_value x) + { return is_in_range_of<i8>(x.get<subtype<typename decltype(t)::type>>()); }); s.text = ("target_type = u16"); test_function1( test_catogories::all, [](auto x) { return kfr::innercast<u16>(x); }, [](auto x) -> u16 { return static_cast<u16>(x); }, - [](auto t, special_value x) { return is_in_range_of<u16>(x.get<subtype<typename decltype(t)::type>>()); }); + [](auto t, special_value x) + { return is_in_range_of<u16>(x.get<subtype<typename decltype(t)::type>>()); }); s.text = ("target_type = i16"); test_function1( test_catogories::all, [](auto x) { return kfr::innercast<i16>(x); }, [](auto x) -> i16 { return static_cast<i16>(x); }, - [](auto t, special_value x) { return is_in_range_of<i16>(x.get<subtype<typename decltype(t)::type>>()); }); + [](auto t, special_value x) + { return is_in_range_of<i16>(x.get<subtype<typename decltype(t)::type>>()); }); s.text = ("target_type = u32"); test_function1( test_catogories::all, [](auto x) { return kfr::innercast<u32>(x); }, [](auto x) -> u32 { return static_cast<u32>(x); }, - [](auto t, special_value x) { return is_in_range_of<u32>(x.get<subtype<typename decltype(t)::type>>()); }); + [](auto t, special_value x) + { return is_in_range_of<u32>(x.get<subtype<typename decltype(t)::type>>()); }); s.text = ("target_type = i32"); test_function1( test_catogories::all, [](auto x) { return kfr::innercast<i32>(x); }, [](auto x) -> i32 { return static_cast<i32>(x); }, - [](auto t, special_value x) { return is_in_range_of<i32>(x.get<subtype<typename decltype(t)::type>>()); }); + [](auto t, special_value x) + { return is_in_range_of<i32>(x.get<subtype<typename decltype(t)::type>>()); }); s.text = ("target_type = u64"); test_function1( test_catogories::all, [](auto x) { return kfr::innercast<u64>(x); }, [](auto x) -> u64 { return static_cast<u64>(x); }, - [](auto t, special_value x) { return is_in_range_of<u64>(x.get<subtype<typename decltype(t)::type>>()); }); + [](auto t, special_value x) + { return is_in_range_of<u64>(x.get<subtype<typename decltype(t)::type>>()); }); s.text = ("target_type = i64"); test_function1( test_catogories::all, [](auto x) { return kfr::innercast<i64>(x); }, [](auto x) -> i64 { return static_cast<i64>(x); }, - [](auto t, special_value x) { return is_in_range_of<i64>(x.get<subtype<typename decltype(t)::type>>()); }); + [](auto t, special_value x) + { return is_in_range_of<i64>(x.get<subtype<typename decltype(t)::type>>()); }); s.text = ("target_type = f32"); test_function1( test_catogories::all, [](auto x) { return kfr::innercast<f32>(x); }, [](auto x) -> f32 { return static_cast<f32>(x); }, - [](auto t, special_value x) { return is_in_range_of<f32>(x.get<subtype<typename decltype(t)::type>>()); }); + [](auto t, special_value x) + { return is_in_range_of<f32>(x.get<subtype<typename decltype(t)::type>>()); }); s.text = ("target_type = f64"); test_function1( test_catogories::all, [](auto x) { return kfr::innercast<f64>(x); }, [](auto x) -> f64 { return static_cast<f64>(x); }, - [](auto t, special_value x) { return is_in_range_of<f64>(x.get<subtype<typename decltype(t)::type>>()); }); + [](auto t, special_value x) + { return is_in_range_of<f64>(x.get<subtype<typename decltype(t)::type>>()); }); } TEST(unaligned_read) { - testo::matrix(named("type") = numeric_vector_types<vec>, [](auto type) { - using T = typename decltype(type)::type; - using Tsub = subtype<T>; - constexpr static size_t N = T::size(); - Tsub data[N * 2]; - for (size_t i = 0; i < arraysize(data); i++) - { - data[i] = static_cast<Tsub>(i); - } - - for (size_t i = 0; i < N; i++) - { - testo::scope sc(as_string("i = ", i)); - CHECK(read<N, false>(data + i) == (enumerate<Tsub, N>() + static_cast<Tsub>(i))); - } - }); + testo::matrix(named("type") = numeric_vector_types<vec>, + [](auto type) + { + using T = typename decltype(type)::type; +#if defined(_MSC_VER) && !defined(__clang__) + // workaround for MSVC + using Tsub = typename T::value_type; +#else + using Tsub = subtype<T>; +#endif + + constexpr static size_t N = T::size(); + Tsub data[N * 2]; + for (size_t i = 0; i < arraysize(data); i++) + { + data[i] = static_cast<Tsub>(i); + } + + for (size_t i = 0; i < N; i++) + { + testo::scope sc(as_string("i = ", i)); + CHECK(read<N, false>(data + i) == (enumerate<Tsub, N>() + static_cast<Tsub>(i))); + } + }); } TEST(mask_broadcast) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2016 D Levin (http://www.kfrlib.com) +# Copyright (C) 2016-2022 Fractalium Ltd (http://www.kfrlib.com) # This file is part of KFR # # KFR is free software: you can redistribute it and/or modify diff --git a/tools/ebu_test.cpp b/tools/ebu_test.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */ diff --git a/tools/sample_rate_converter.cpp b/tools/sample_rate_converter.cpp @@ -1,6 +1,6 @@ /** * KFR (http://kfrlib.com) - * Copyright (C) 2016 D Levin + * Copyright (C) 2016-2022 Fractalium Ltd * See LICENSE.txt for details */