From d1a585ebf1a33f17a54405c5309a5ad5a154add9 Mon Sep 17 00:00:00 2001
From: christophe-lunarg <christophe@lunarg.com>
Date: Thu, 10 Dec 2020 09:45:00 +0100
Subject: [PATCH] C.I. No more SIMD instruction build on GCC

---
 .travis.yml | 85 ++++++++++++++++++-----------------------------------
 1 file changed, 28 insertions(+), 57 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 157b9c38..23dd3f4a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -177,6 +177,23 @@ matrix:
       env:
         - MATRIX_EVAL="INFO=C++17-avx-debug"
 
+    - os: osx
+      osx_image: xcode12.2
+      script:
+        - cmake --version
+        - mkdir ./build_avx2_17_debug
+        - cd ./build_avx2_17_debug
+        - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_17=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_AVX2=ON ..
+        - cmake --build . --parallel 4
+        - ctest --parallel 4 --output-on-failure
+        - cd $TRAVIS_BUILD_DIR
+        - mkdir ./build_test_cmake
+        - cd ./build_test_cmake
+        - cmake -DCMAKE_CXX_COMPILER=$COMPILER $TRAVIS_BUILD_DIR/test/cmake/ -Dglm_DIR=$TRAVIS_BUILD_DIR/cmake/glm/
+        - cmake --build . --parallel 4
+      env:
+        - MATRIX_EVAL="INFO=C++17-avx2-debug"
+
     - os: linux
       dist: Xenial
       addons:
@@ -232,7 +249,7 @@ matrix:
           packages:
             - g++-4.9
       env:
-        - MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9 && INFO=C++98-pure-ms"
+        - MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9 && INFO=C++98-pure-release-ms"
       script:
         - cmake --version
         - mkdir ./build_pure_ms_release
@@ -278,7 +295,7 @@ matrix:
           packages:
             - g++-5
       env:
-         - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5 && INFO=C++11-pure-ms"
+         - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5 && INFO=C++11-pure-release-ms"
       script:
         - cmake --version
         - mkdir ./build_pure_ms_release
@@ -292,29 +309,6 @@ matrix:
         - cmake -DCMAKE_CXX_COMPILER=$COMPILER $TRAVIS_BUILD_DIR/test/cmake/ -Dglm_DIR=$TRAVIS_BUILD_DIR/cmake/glm/
         - cmake --build . --parallel
 
-    - os: linux
-      dist: Xenial
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-5
-      env:
-         - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5 && INFO=C++11-sse3-release"
-      script:
-        - cmake --version
-        - mkdir ./build_sse3_ms_release
-        - cd ./build_sse3_ms_release
-        - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_SSE3=ON ..
-        - cmake --build . --parallel
-        - ctest --parallel 4 --output-on-failure
-        - cd $TRAVIS_BUILD_DIR
-        - mkdir ./build_test_cmake
-        - cd ./build_test_cmake
-        - cmake -DCMAKE_CXX_COMPILER=$COMPILER $TRAVIS_BUILD_DIR/test/cmake/ -Dglm_DIR=$TRAVIS_BUILD_DIR/cmake/glm/
-        - cmake --build . --parallel
-
     - os: linux
       dist: bionic
       addons:
@@ -347,7 +341,7 @@ matrix:
           packages:
             - g++-6
       env:
-         - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6 && INFO=C++14-pure-ms"
+         - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6 && INFO=C++14-pure-release-ms"
       script:
         - cmake --version
         - mkdir ./build_pure_ms_release
@@ -393,35 +387,12 @@ matrix:
           packages:
             - g++-7
       env:
-        - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7 && INFO=C++17-sse2-release"
+        - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7 && INFO=C++17-pure-debug"
       script:
         - cmake --version
-        - mkdir ./build_sse2_17_release
-        - cd ./build_sse2_17_release
-        - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_17=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_SSE2=ON ..
-        - cmake -E time cmake --build . --parallel
-        - ctest --parallel 4 --output-on-failure
-        - cd $TRAVIS_BUILD_DIR
-        - mkdir ./build_test_cmake
-        - cd ./build_test_cmake
-        - cmake -DCMAKE_CXX_COMPILER=$COMPILER $TRAVIS_BUILD_DIR/test/cmake/ -Dglm_DIR=$TRAVIS_BUILD_DIR/cmake/glm/
-        - cmake --build . --parallel
-
-    - os: linux
-      dist: bionic
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-7
-      env:
-        - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7 && INFO=C++17-sse3-debug"
-      script:
-        - cmake --version
-        - mkdir ./build_sse3_17_debug
-        - cd ./build_sse3_17_debug
-        - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_17=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_SSE3=ON ..
+        - mkdir ./build_pure_17_debug
+        - cd ./build_pure_17_debug
+        - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_17=ON -DGLM_TEST_FORCE_PURE=ON ..
         - cmake -E time cmake --build . --parallel
         - ctest --parallel 4 --output-on-failure
         - cd $TRAVIS_BUILD_DIR
@@ -439,12 +410,12 @@ matrix:
           packages:
             - g++-7
       env:
-        - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7 && INFO=C++17-avx2-debug"
+        - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7 && INFO=C++17-pure-debug-ms"
       script:
         - cmake --version
-        - mkdir ./build_avx2_17_debug
-        - cd ./build_avx2_17_debug
-        - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_17=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_AVX2=ON ..
+        - mkdir ./build_pure_17_debug_ms
+        - cd ./build_pure_17_debug_ms
+        - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_17=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_FORCE_PURE=ON ..
         - cmake -E time cmake --build . --parallel
         - ctest --parallel 4 --output-on-failure
         - cd $TRAVIS_BUILD_DIR