From 971f22222e70454d27427ea782c5834be78c3f7b Mon Sep 17 00:00:00 2001 From: Christophe Date: Wed, 20 Dec 2023 23:02:34 +0100 Subject: [PATCH] C.I. Fix timeout --- .github/workflows/ci.yml | 18 ++++++++++++++++++ test/CMakeLists.txt | 2 +- test/perf/perf_matrix_div.cpp | 2 +- test/perf/perf_matrix_inverse.cpp | 2 +- test/perf/perf_matrix_mul.cpp | 2 +- test/perf/perf_matrix_mul_vector.cpp | 2 +- test/perf/perf_matrix_transpose.cpp | 2 +- test/perf/perf_vector_mul_matrix.cpp | 2 +- 8 files changed, 25 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 02f10579..8587728d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,6 +24,8 @@ jobs: - run: echo "🍏 This job's status is ${{ job.status }}." - name: CMake Version run: cmake --version + - run: cmake -S. -B ./build_auto + - run: cmake -S. -B ./build_unknown -DGLM_DISABLE_AUTO_DETECTION=ON - run: cmake -S. -B ./build_pure_std -DGLM_TEST_FORCE_PURE=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON - run: cmake -S. -B ./build_pure_ext -DGLM_TEST_FORCE_PURE=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON - run: cmake -S. -B ./build_sse2_std -DGLM_TEST_ENABLE_SIMD_SSE2=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON @@ -32,6 +34,8 @@ jobs: - run: cmake -S. -B ./build_avx1_ext -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON - run: cmake -S. -B ./build_avx2_std -DGLM_TEST_ENABLE_SIMD_AVX2=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON - run: cmake -S. -B ./build_avx2_ext -DGLM_TEST_ENABLE_SIMD_AVX2=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON + - run: cmake --build ./build_auto --config ${{matrix.config}} + - run: cmake --build ./build_unknown --config ${{matrix.config}} - run: cmake --build ./build_pure_std --config ${{matrix.config}} - run: cmake --build ./build_pure_ext --config ${{matrix.config}} - run: cmake --build ./build_sse2_std --config ${{matrix.config}} @@ -40,6 +44,8 @@ jobs: - run: cmake --build ./build_avx1_ext --config ${{matrix.config}} - run: cmake --build ./build_avx2_std --config ${{matrix.config}} - run: cmake --build ./build_avx2_ext --config ${{matrix.config}} + - run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_auto + - run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_unknown - run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_pure_std - run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_pure_ext - run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_sse2_std @@ -72,6 +78,8 @@ jobs: run: gcc --version - name: CMake Version run: cmake --version + - run: cmake -S. -B ./build_auto + - run: cmake -S. -B ./build_unknown -DGLM_DISABLE_AUTO_DETECTION=ON - run: cmake -S. -B ./build_pure_std -DGLM_TEST_FORCE_PURE=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON - run: cmake -S. -B ./build_pure_ext -DGLM_TEST_FORCE_PURE=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON - run: cmake -S. -B ./build_sse2_std -DGLM_TEST_ENABLE_SIMD_SSE2=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON @@ -80,6 +88,8 @@ jobs: - run: cmake -S. -B ./build_avx1_ext -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON - run: cmake -S. -B ./build_avx2_std -DGLM_TEST_ENABLE_SIMD_AVX2=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON - run: cmake -S. -B ./build_avx2_ext -DGLM_TEST_ENABLE_SIMD_AVX2=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON + - run: cmake --build ./build_auto --config ${{matrix.config}} + - run: cmake --build ./build_unknown --config ${{matrix.config}} - run: cmake --build ./build_pure_std --config ${{matrix.config}} - run: cmake --build ./build_pure_ext --config ${{matrix.config}} - run: cmake --build ./build_sse2_std --config ${{matrix.config}} @@ -88,6 +98,8 @@ jobs: - run: cmake --build ./build_avx1_ext --config ${{matrix.config}} - run: cmake --build ./build_avx2_std --config ${{matrix.config}} - run: cmake --build ./build_avx2_ext --config ${{matrix.config}} + - run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_auto + - run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_unknown - run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_pure_std - run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_pure_ext - run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_sse2_std @@ -120,6 +132,8 @@ jobs: run: cmake --version - name: Clang Version run: clang --version + - run: cmake -S. -B ./build_auto + - run: cmake -S. -B ./build_unknown -DGLM_DISABLE_AUTO_DETECTION=ON - run: cmake -S. -B ./build_pure_std -DGLM_TEST_FORCE_PURE=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON - run: cmake -S. -B ./build_pure_ext -DGLM_TEST_FORCE_PURE=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON - run: cmake -S. -B ./build_sse2_std -DGLM_TEST_ENABLE_SIMD_SSE2=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON @@ -128,6 +142,8 @@ jobs: - run: cmake -S. -B ./build_avx1_ext -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON - run: cmake -S. -B ./build_avx2_std -DGLM_TEST_ENABLE_SIMD_AVX2=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON - run: cmake -S. -B ./build_avx2_ext -DGLM_TEST_ENABLE_SIMD_AVX2=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON + - run: cmake --build ./build_auto --config ${{matrix.config}} + - run: cmake --build ./build_unknown --config ${{matrix.config}} - run: cmake --build ./build_pure_std --config ${{matrix.config}} - run: cmake --build ./build_pure_ext --config ${{matrix.config}} - run: cmake --build ./build_sse2_std --config ${{matrix.config}} @@ -136,6 +152,8 @@ jobs: - run: cmake --build ./build_avx1_ext --config ${{matrix.config}} - run: cmake --build ./build_avx2_std --config ${{matrix.config}} - run: cmake --build ./build_avx2_ext --config ${{matrix.config}} + - run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_auto + - run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_unknown - run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_pure_std - run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_pure_ext - run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_sse2_std diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 1e327afe..ebdaa048 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -47,7 +47,7 @@ endif() option(GLM_TEST_ENABLE_LANG_EXTENSIONS "Enable language extensions" OFF) -option(GLM_DISABLE_AUTO_DETECTION "Enable language extensions" OFF) +option(GLM_DISABLE_AUTO_DETECTION "Disable platform, compiler, arch and C++ language detection" OFF) if(GLM_DISABLE_AUTO_DETECTION) add_definitions(-DGLM_FORCE_PLATFORM_UNKNOWN -DGLM_FORCE_COMPILER_UNKNOWN -DGLM_FORCE_ARCH_UNKNOWN -DGLM_FORCE_CXX_UNKNOWN) diff --git a/test/perf/perf_matrix_div.cpp b/test/perf/perf_matrix_div.cpp index 630188d5..77f7e7a1 100644 --- a/test/perf/perf_matrix_div.cpp +++ b/test/perf/perf_matrix_div.cpp @@ -118,7 +118,7 @@ static int comp_mat4_div_mat4(std::size_t Samples) int main() { - std::size_t const Samples = 100000; + std::size_t const Samples = 1000; int Error = 0; diff --git a/test/perf/perf_matrix_inverse.cpp b/test/perf/perf_matrix_inverse.cpp index 1a989ae9..c2ab4bfa 100644 --- a/test/perf/perf_matrix_inverse.cpp +++ b/test/perf/perf_matrix_inverse.cpp @@ -115,7 +115,7 @@ static int comp_mat4_inverse(std::size_t Samples) int main() { - std::size_t const Samples = 100000; + std::size_t const Samples = 1000; int Error = 0; diff --git a/test/perf/perf_matrix_mul.cpp b/test/perf/perf_matrix_mul.cpp index d6b1f104..41e1a920 100644 --- a/test/perf/perf_matrix_mul.cpp +++ b/test/perf/perf_matrix_mul.cpp @@ -119,7 +119,7 @@ static int comp_mat4_mul_mat4(std::size_t Samples) int main() { - std::size_t const Samples = 100000; + std::size_t const Samples = 1000; int Error = 0; diff --git a/test/perf/perf_matrix_mul_vector.cpp b/test/perf/perf_matrix_mul_vector.cpp index 8e555f81..89a77703 100644 --- a/test/perf/perf_matrix_mul_vector.cpp +++ b/test/perf/perf_matrix_mul_vector.cpp @@ -119,7 +119,7 @@ static int comp_mat4_mul_vec4(std::size_t Samples) int main() { - std::size_t const Samples = 100000; + std::size_t const Samples = 1000; int Error = 0; diff --git a/test/perf/perf_matrix_transpose.cpp b/test/perf/perf_matrix_transpose.cpp index 2fdc782a..98760bdc 100644 --- a/test/perf/perf_matrix_transpose.cpp +++ b/test/perf/perf_matrix_transpose.cpp @@ -115,7 +115,7 @@ static int comp_mat4_transpose(std::size_t Samples) int main() { - std::size_t const Samples = 100000; + std::size_t const Samples = 1000; int Error = 0; diff --git a/test/perf/perf_vector_mul_matrix.cpp b/test/perf/perf_vector_mul_matrix.cpp index 20991df8..9f59f81c 100644 --- a/test/perf/perf_vector_mul_matrix.cpp +++ b/test/perf/perf_vector_mul_matrix.cpp @@ -119,7 +119,7 @@ static int comp_vec4_mul_mat4(std::size_t Samples) int main() { - std::size_t const Samples = 100000; + std::size_t const Samples = 1000; int Error = 0;