diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 951195d..2622657 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -688,16 +688,16 @@ build-windows-x86-gcc: - windows artifacts: paths: - - ./build_windows_x86_gcc_nointr/bin/run-tests - - ./build_windows_x86_gcc_sse2/bin/run-tests - - ./build_windows_x86_gcc_sse3/bin/run-tests - - ./build_windows_x86_gcc_ssse3/bin/run-tests - - ./build_windows_x86_gcc_sse4_1/bin/run-tests - - ./build_windows_x86_gcc_sse4_2/bin/run-tests - - ./build_windows_x86_gcc_avx/bin/run-tests - - ./build_windows_x86_gcc_avx2/bin/run-tests - - ./build_windows_x86_gcc_avx2_fma/bin/run-tests - # - ./build_windows_x86_gcc_avx512f/bin/run-tests + - ./build_windows_x86_gcc_nointr/bin/run-tests.exe + - ./build_windows_x86_gcc_sse2/bin/run-tests.exe + - ./build_windows_x86_gcc_sse3/bin/run-tests.exe + - ./build_windows_x86_gcc_ssse3/bin/run-tests.exe + - ./build_windows_x86_gcc_sse4_1/bin/run-tests.exe + - ./build_windows_x86_gcc_sse4_2/bin/run-tests.exe + - ./build_windows_x86_gcc_avx/bin/run-tests.exe + - ./build_windows_x86_gcc_avx2/bin/run-tests.exe + - ./build_windows_x86_gcc_avx2_fma/bin/run-tests.exe + # - ./build_windows_x86_gcc_avx512f/bin/run-tests.exe script: - ./ci/build-windows-x86-gcc.bat @@ -716,16 +716,16 @@ build-windows-x86-msvc: - windows artifacts: paths: - - ./build_windows_x86_msvc_nointr/bin/run-tests - - ./build_windows_x86_msvc_sse2/bin/run-tests - - ./build_windows_x86_msvc_sse3/bin/run-tests - - ./build_windows_x86_msvc_ssse3/bin/run-tests - - ./build_windows_x86_msvc_sse4_1/bin/run-tests - - ./build_windows_x86_msvc_sse4_2/bin/run-tests - - ./build_windows_x86_msvc_avx/bin/run-tests - - ./build_windows_x86_msvc_avx2/bin/run-tests - - ./build_windows_x86_msvc_avx2_fma/bin/run-tests - # - ./build_windows_x86_msvc_avx512f/bin/run-tests + - ./build_windows_x86_msvc_nointr/bin/run-tests.exe + - ./build_windows_x86_msvc_sse2/bin/run-tests.exe + - ./build_windows_x86_msvc_sse3/bin/run-tests.exe + - ./build_windows_x86_msvc_ssse3/bin/run-tests.exe + - ./build_windows_x86_msvc_sse4_1/bin/run-tests.exe + - ./build_windows_x86_msvc_sse4_2/bin/run-tests.exe + - ./build_windows_x86_msvc_avx/bin/run-tests.exe + - ./build_windows_x86_msvc_avx2/bin/run-tests.exe + - ./build_windows_x86_msvc_avx2_fma/bin/run-tests.exe + # - ./build_windows_x86_msvc_avx512f/bin/run-tests.exe script: - ./ci/build-windows-x86-msvc.bat diff --git a/CMakeLists.txt b/CMakeLists.txt index 6be7ed3..d21ea01 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -110,22 +110,22 @@ add_custom_target(uninstall if (MIPP_TESTS_EXE) # Generate the source files list file (GLOB_RECURSE MIPP_SRCS_TEST ${CMAKE_CURRENT_SOURCE_DIR}/tests/src/*) - add_executable(run_tests ${MIPP_SRCS_TEST}) - set_target_properties(run_tests PROPERTIES OUTPUT_NAME run-tests POSITION_INDEPENDENT_CODE ON) # set -fpie + add_executable(tests_exe ${MIPP_SRCS_TEST}) + set_target_properties(tests_exe PROPERTIES OUTPUT_NAME run-tests POSITION_INDEPENDENT_CODE ON) # set -fpie # include MIPP headers - target_include_directories(run_tests PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include/") + target_include_directories(tests_exe PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include/") - # include Catch2 header - target_include_directories(run_tests PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/tests/lib/Catch2/include/") + # include Catch2 header + target_include_directories(tests_exe PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/tests/lib/Catch2/include/") # If MIPP was compiled as static library then link argainst it if (MIPP_STATIC_LIB) - target_link_libraries(run_tests PUBLIC mipp) + target_link_libraries(tests_exe PUBLIC mipp) endif() enable_testing() - add_test(NAME mipp::test COMMAND run_tests) + add_test(NAME mipp::test COMMAND tests_exe) endif() # ----------------------------------------------------------------------------- diff --git a/TODO.md b/TODO.md index f152bb7..4ab8cb6 100644 --- a/TODO.md +++ b/TODO.md @@ -1,5 +1,6 @@ # TODO +- [ ] Fix and improve GitHub actions - [ ] Create a docker image with "Intel Software Development Emulator" to enable AVX-512 instructions emulation on the runners that does not support native AVX-512 diff --git a/ci/build-coverage-linux-armv7-gcc.sh b/ci/build-coverage-linux-armv7-gcc.sh index 78af14c..b7be095 100755 --- a/ci/build-coverage-linux-armv7-gcc.sh +++ b/ci/build-coverage-linux-armv7-gcc.sh @@ -14,7 +14,7 @@ function gen_coverage_info { ./bin/run-tests cd .. # rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi - lcov --capture --directory $build/CMakeFiles/run_tests.dir/tests/src/ --output-file code_coverage_files/$build.info + lcov --capture --directory $build/CMakeFiles/tests_exe.dir/tests/src/ --output-file code_coverage_files/$build.info # rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi lcov --remove code_coverage_files/$build.info "*/usr*" "*lib/*" "*/tests/src*" --output-file code_coverage_files/$build.info # rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi diff --git a/ci/build-coverage-linux-armv8-gcc.sh b/ci/build-coverage-linux-armv8-gcc.sh index 2533319..45b3971 100755 --- a/ci/build-coverage-linux-armv8-gcc.sh +++ b/ci/build-coverage-linux-armv8-gcc.sh @@ -29,7 +29,7 @@ function gen_coverage_info { fi cd .. # rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi - lcov --capture --directory $build/CMakeFiles/run_tests.dir/tests/src/ --output-file code_coverage_files/$build.info + lcov --capture --directory $build/CMakeFiles/tests_exe.dir/tests/src/ --output-file code_coverage_files/$build.info # rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi lcov --remove code_coverage_files/$build.info "*/usr*" "*lib/*" "*/tests/src*" --output-file code_coverage_files/$build.info # rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi diff --git a/ci/build-coverage-linux-x86-gcc.sh b/ci/build-coverage-linux-x86-gcc.sh index cc1b629..a3f3f10 100755 --- a/ci/build-coverage-linux-x86-gcc.sh +++ b/ci/build-coverage-linux-x86-gcc.sh @@ -33,7 +33,7 @@ function gen_coverage_info { fi cd .. # rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi - lcov --capture --directory $build/CMakeFiles/run_tests.dir/tests/src/ --output-file code_coverage_files/$build.info + lcov --capture --directory $build/CMakeFiles/tests_exe.dir/tests/src/ --output-file code_coverage_files/$build.info # rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi lcov --remove code_coverage_files/$build.info "*/usr*" "*lib/*" "*/tests/src*" --output-file code_coverage_files/$build.info # rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi diff --git a/ci/build-windows-x86-msvc.bat b/ci/build-windows-x86-msvc.bat index 40ef558..c0da7f0 100755 --- a/ci/build-windows-x86-msvc.bat +++ b/ci/build-windows-x86-msvc.bat @@ -24,7 +24,7 @@ set build=%~1% set params=%~2% mkdir %build% cd %build% -cmake .. -G"Visual Studio 15 2017 Win64" -DCMAKE_CXX_FLAGS="-D_CRT_SECURE_NO_DEPRECATE /EHsc /MP%THREADS% %params%" -DMIPP_STATIC_LIB=OFF +cmake .. -G"Visual Studio 15 2017 Win64" -DCMAKE_CXX_FLAGS="-D_CRT_SECURE_NO_DEPRECATE /EHsc /MP%THREADS% %params%" -DMIPP_STATIC_LIB=OFF -DMIPP_EXAMPLES_EXE=OFF if %ERRORLEVEL% neq 0 exit %ERRORLEVEL% rem devenv /build Release MIPP.sln msbuild MIPP.sln /t:Build /p:Configuration=Release diff --git a/examples/sorting.cpp b/examples/sorting.cpp index 53a51ea..3ad3d2d 100644 --- a/examples/sorting.cpp +++ b/examples/sorting.cpp @@ -2,6 +2,7 @@ #include #include #include +#include #include diff --git a/include/mipp_impl_AVX.hxx b/include/mipp_impl_AVX.hxx index b22e595..9921597 100644 --- a/include/mipp_impl_AVX.hxx +++ b/include/mipp_impl_AVX.hxx @@ -1,6 +1,4 @@ #include "mipp.h" -#include -#include #if defined(MIPP_STATIC_LIB) extern int32_t vcompress_LUT32x8_AVX[256][8]; // 8 x 32-bit for _mm_permutevar_epi32