commit 1c62850dd20741201e34480ebced58dcd1bcb062
parent 4584021b6dd62c40d17f0ac7cd49da239e1675bd
Author: d.levin256@gmail.com <d.levin256@gmail.com>
Date: Fri, 26 Jan 2024 15:35:21 +0000
Arch tests: embed dsp sources
Diffstat:
3 files changed, 16 insertions(+), 167 deletions(-)
diff --git a/sources.cmake b/sources.cmake
@@ -3,7 +3,7 @@
# Use update-sources.py
set(
- KFR_SRC
+ KFR_HDR
${PROJECT_SOURCE_DIR}/include/kfr/all.hpp
${PROJECT_SOURCE_DIR}/include/kfr/base.hpp
${PROJECT_SOURCE_DIR}/include/kfr/cometa.hpp
@@ -152,7 +152,7 @@ set(
set(
- KFR_SIMD_SRC
+ KFR_SIMD_HDR
${PROJECT_SOURCE_DIR}/include/kfr/simd/abs.hpp
${PROJECT_SOURCE_DIR}/include/kfr/simd/clamp.hpp
${PROJECT_SOURCE_DIR}/include/kfr/simd/comparison.hpp
@@ -198,7 +198,7 @@ set(
set(
- KFR_MATH_SRC
+ KFR_MATH_HDR
${PROJECT_SOURCE_DIR}/include/kfr/math/asin_acos.hpp
${PROJECT_SOURCE_DIR}/include/kfr/math/atan.hpp
${PROJECT_SOURCE_DIR}/include/kfr/math/compiletime.hpp
@@ -224,7 +224,7 @@ set(
set(
- KFR_BASE_SRC
+ KFR_BASE_HDR
${PROJECT_SOURCE_DIR}/include/kfr/base/basic_expressions.hpp
${PROJECT_SOURCE_DIR}/include/kfr/base/conversion.hpp
${PROJECT_SOURCE_DIR}/include/kfr/base/endianness.hpp
@@ -251,7 +251,7 @@ set(
set(
- KFR_DSP_SRC
+ KFR_DSP_HDR
${PROJECT_SOURCE_DIR}/include/kfr/dsp/biquad.hpp
${PROJECT_SOURCE_DIR}/include/kfr/dsp/biquad_design.hpp
${PROJECT_SOURCE_DIR}/include/kfr/dsp/dcremove.hpp
@@ -274,7 +274,7 @@ set(
set(
- KFR_IO_SRC
+ KFR_IO_HDR
${PROJECT_SOURCE_DIR}/include/kfr/io/audiofile.hpp
${PROJECT_SOURCE_DIR}/include/kfr/io/file.hpp
${PROJECT_SOURCE_DIR}/include/kfr/io/python_plot.hpp
@@ -283,158 +283,9 @@ set(
set(
- KFR_RUNTIME_SRC
- ${PROJECT_SOURCE_DIR}/include/kfr/runtime/cpuid.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/runtime/cpuid_auto.hpp
-)
-
-
-set(
- KFR_SRC
- ${PROJECT_SOURCE_DIR}/include/kfr/all.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/base.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/cometa.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/dft.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/dsp.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/except.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/io.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/math.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/runtime.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/version.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/capi.h
- ${PROJECT_SOURCE_DIR}/include/kfr/cident.h
- ${PROJECT_SOURCE_DIR}/include/kfr/config.h
- ${PROJECT_SOURCE_DIR}/include/kfr/kfr.h
- ${PROJECT_SOURCE_DIR}/include/kfr/multiarch.h
- ${PROJECT_SOURCE_DIR}/include/kfr/base/basic_expressions.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/base/conversion.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/base/endianness.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/base/expression.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/base/filter.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/base/fraction.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/base/generators.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/base/handle.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/base/math_expressions.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/base/memory.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/base/npy.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/base/random.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/base/random_bits.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/base/reduce.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/base/shape.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/base/simd_expressions.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/base/small_buffer.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/base/state_holder.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/base/tensor.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/base/transpose.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/base/univector.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/base/impl/static_array.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/cometa/array.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/cometa/cstring.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/cometa/ctti.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/cometa/function.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/cometa/memory.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/cometa/named_arg.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/cometa/numeric.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/cometa/range.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/cometa/result.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/cometa/string.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/cometa/tuple.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/dft/cache.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/dft/convolution.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/dft/fft.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/dft/reference_dft.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/dsp/biquad.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/dsp/biquad_design.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/dsp/dcremove.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/dsp/delay.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/dsp/ebu.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/dsp/fir.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/dsp/fir_design.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/dsp/goertzel.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/dsp/iir_design.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/dsp/mixdown.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/dsp/oscillators.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/dsp/sample_rate_conversion.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/dsp/speaker.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/dsp/special.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/dsp/units.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/dsp/waveshaper.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/dsp/weighting.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/dsp/window.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/io/audiofile.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/io/file.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/io/python_plot.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/io/tostring.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/math/asin_acos.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/math/atan.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/math/compiletime.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/math/complex_math.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/math/gamma.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/math/hyperbolic.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/math/interpolation.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/math/log_exp.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/math/modzerobessel.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/math/sin_cos.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/math/sqrt.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/math/tan.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/math/impl/asin_acos.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/math/impl/atan.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/math/impl/gamma.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/math/impl/hyperbolic.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/math/impl/log_exp.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/math/impl/modzerobessel.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/math/impl/sin_cos.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/math/impl/sqrt.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/math/impl/tan.hpp
+ KFR_RUNTIME_HDR
${PROJECT_SOURCE_DIR}/include/kfr/runtime/cpuid.hpp
${PROJECT_SOURCE_DIR}/include/kfr/runtime/cpuid_auto.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/abs.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/clamp.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/comparison.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/complex.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/complex_type.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/constants.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/digitreverse.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/horizontal.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/logical.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/mask.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/min_max.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/operators.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/platform.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/read_write.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/round.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/saturation.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/select.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/shuffle.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/sort.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/types.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/vec.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/impl/abs.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/impl/backend.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/impl/backend_clang.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/impl/backend_generic.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/impl/basicoperators_clang.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/impl/basicoperators_complex.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/impl/basicoperators_generic.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/impl/clamp.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/impl/function.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/impl/logical.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/impl/min_max.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/impl/operators.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/impl/read_write.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/impl/round.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/impl/saturation.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/impl/select.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/impl/simd.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/impl/specialconstants.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/impl/specializations.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/simd/impl/intrinsics.h
- ${PROJECT_SOURCE_DIR}/include/kfr/testo/assert.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/testo/comparison.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/testo/console_colors.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/testo/double_double.hpp
- ${PROJECT_SOURCE_DIR}/include/kfr/testo/testo.hpp
)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -127,11 +127,11 @@ function (add_x86_test ARCH)
set(NAME ${ARCH})
add_executable(all_tests_${NAME} all_tests.cpp ${ALL_TESTS_CPP}
- ${KFR_IO_SRC})
+ ${KFR_IO_SRC} ${KFR_DSP_SRC})
if (KFR_ENABLE_DFT)
target_sources(all_tests_${NAME} PRIVATE ${KFR_DFT_SRC})
endif ()
- target_link_libraries(all_tests_${NAME} kfr kfr_dsp)
+ target_link_libraries(all_tests_${NAME} kfr)
target_set_arch(all_tests_${NAME} PRIVATE ${ARCH})
target_compile_definitions(all_tests_${NAME} PRIVATE KFR_NO_MAIN)
target_compile_definitions(all_tests_${NAME} PUBLIC KFR_ENABLE_FLAC=1)
diff --git a/update-sources.py b/update-sources.py
@@ -30,18 +30,16 @@ cmake = """
# Use update-sources.py
"""
-list_sources("KFR_SRC", "include", ['*.hpp', '*.h'])
-list_sources("KFR_SIMD_SRC", "include/kfr/simd", ['*.hpp', '*.h'])
-list_sources("KFR_MATH_SRC", "include/kfr/math", ['*.hpp', '*.h'])
-list_sources("KFR_BASE_SRC", "include/kfr/base", ['*.hpp', '*.h'])
-list_sources("KFR_DSP_SRC", "include/kfr/dsp", ['*.hpp', '*.h'])
-list_sources("KFR_IO_SRC", "include/kfr/io", ['*.hpp', '*.h'])
-list_sources("KFR_RUNTIME_SRC", "include/kfr/runtime", ['*.hpp', '*.h'])
-list_sources("KFR_SRC", "include", ['*.hpp', '*.h'])
+list_sources("KFR_HDR", "include", ['*.hpp', '*.h'])
+list_sources("KFR_SIMD_HDR", "include/kfr/simd", ['*.hpp', '*.h'])
+list_sources("KFR_MATH_HDR", "include/kfr/math", ['*.hpp', '*.h'])
+list_sources("KFR_BASE_HDR", "include/kfr/base", ['*.hpp', '*.h'])
+list_sources("KFR_DSP_HDR", "include/kfr/dsp", ['*.hpp', '*.h'])
+list_sources("KFR_IO_HDR", "include/kfr/io", ['*.hpp', '*.h'])
+list_sources("KFR_RUNTIME_HDR", "include/kfr/runtime", ['*.hpp', '*.h'])
list_sources("KFR_DFT_SRC", "src/dft", ['*.cpp'])
list_sources("KFR_DSP_SRC", "src/dsp", ['*.cpp'])
list_sources("KFR_IO_SRC", "src/io", ['*.cpp'])
-
list_sources("KFR_UNITTEST_SRC", "tests/unit", ['*.cpp'])
with open(os.path.join(os.path.dirname(os.path.realpath(__file__)), 'sources.cmake'), "w") as f:
