From b9611d726684f1e3683d240a92ba32a5ce272d54 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Thu, 17 Sep 2015 22:20:14 -0700
Subject: [PATCH] configure: Report the SSE and AVX list like AVX512

Change-Id: I42e7ef1a481840699a8dffff1404fade9e7ac923
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
---
 configure                        | 15 ++++++++++++---
 tools/configure/configureapp.cpp | 18 +++++++++++-------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/configure b/configure
index 1b333d757f3..7002d3d1bbf 100755
--- a/configure
+++ b/configure
@@ -4409,9 +4409,11 @@ else
 fi
 
 # detect sse2 support
+CFG_SSE_LIST=
 if [ "${CFG_SSE2}" = "auto" ]; then
     if compileTest common/sse2 "sse2"; then
        CFG_SSE2=yes
+       CFG_SSE_LIST=SSE2
     else
        CFG_SSE2=no
     fi
@@ -4424,6 +4426,7 @@ fi
 if [ "${CFG_SSE3}" = "auto" ]; then
     if compileTest common/sse3 "sse3"; then
        CFG_SSE3=yes
+       CFG_SSE_LIST="$CFG_SSE_LIST SSE3"
     else
        CFG_SSE3=no
     fi
@@ -4436,6 +4439,7 @@ fi
 if [ "${CFG_SSSE3}" = "auto" ]; then
     if compileTest common/ssse3 "ssse3"; then
        CFG_SSSE3=yes
+       CFG_SSE_LIST="$CFG_SSE_LIST SSSE3"
     else
        CFG_SSSE3=no
     fi
@@ -4448,6 +4452,7 @@ fi
 if [ "${CFG_SSE4_1}" = "auto" ]; then
     if compileTest common/sse4_1 "sse4_1"; then
        CFG_SSE4_1=yes
+       CFG_SSE_LIST="$CFG_SSE_LIST SSE4.1"
     else
        CFG_SSE4_1=no
     fi
@@ -4460,12 +4465,14 @@ fi
 if [ "${CFG_SSE4_2}" = "auto" ]; then
     if compileTest common/sse4_2 "sse4_2"; then
        CFG_SSE4_2=yes
+       CFG_SSE_LIST="$CFG_SSE_LIST SSE4.2"
     else
        CFG_SSE4_2=no
     fi
 fi
 
 # detect avx support
+CFG_AVX_LIST=
 if [ "${CFG_SSE4_2}" = "no" ]; then
     CFG_AVX=no
 fi
@@ -4483,11 +4490,13 @@ if [ "${CFG_AVX}" = "auto" ]; then
                        ;;
                    *)
                        CFG_AVX=yes
+                       CFG_AVX_LIST=AVX
                        ;;
                esac
                ;;
            *)
                CFG_AVX=yes
+               CFG_AVX_LIST=AVX
                ;;
        esac
     else
@@ -4502,6 +4511,7 @@ fi
 if [ "${CFG_AVX2}" = "auto" ]; then
     if compileTest common/avx2 "avx2"; then
        CFG_AVX2=yes
+       CFG_AVX_LIST="$CFG_AVX_LIST AVX2"
     else
        CFG_AVX2=no
     fi
@@ -7204,9 +7214,8 @@ echo "  Using new DTAGS ........ $CFG_ENABLE_NEW_DTAGS"
 echo "  Using PCH .............. $CFG_PRECOMPILE"
 echo "  Target compiler supports:"
 if [ "$CFG_ARCH" = "i386" -o "$CFG_ARCH" = "x86_64" ]; then
-    echo "    SSE2/SSE3/SSSE3 ...... ${CFG_SSE2}/${CFG_SSE3}/${CFG_SSSE3}"
-    echo "    SSE4.1/SSE4.2 ........ ${CFG_SSE4_1}/${CFG_SSE4_2}"
-    echo "    AVX/AVX2 ............. ${CFG_AVX}/${CFG_AVX2}"
+    echo "    SSE .................. ${CFG_SSE_LIST:-<none>}"
+    echo "    AVX .................. ${CFG_AVX_LIST:-<none>}"
     echo "    AVX512 ............... ${CFG_AVX512_UPPER:-<none>}"
 elif [ "$CFG_ARCH" = "arm" ]; then
     echo "    Neon ................. ${CFG_NEON}"
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index d98c905c64f..8bfe751c27f 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3856,13 +3856,17 @@ void Configure::displayConfig()
     sout << "Link Time Code Generation..." << dictionary[ "LTCG" ] << endl;
     sout << "Accessibility support......." << dictionary[ "ACCESSIBILITY" ] << endl;
     sout << "RTTI support................" << dictionary[ "RTTI" ] << endl;
-    sout << "SSE2 support................" << dictionary[ "SSE2" ] << endl;
-    sout << "SSE3 support................" << dictionary[ "SSE3" ] << endl;
-    sout << "SSSE3 support..............." << dictionary[ "SSSE3" ] << endl;
-    sout << "SSE4.1 support.............." << dictionary[ "SSE4_1" ] << endl;
-    sout << "SSE4.2 support.............." << dictionary[ "SSE4_2" ] << endl;
-    sout << "AVX support................." << dictionary[ "AVX" ] << endl;
-    sout << "AVX2 support................" << dictionary[ "AVX2" ] << endl;
+    sout << "SSE support................."
+         << (dictionary[ "SSE2" ] == "no" ? "<none>" : "SSE2")
+         << (dictionary[ "SSE3" ] == "no" ? "" : " SSE3")
+         << (dictionary[ "SSSE3" ] == "no" ? "" : " SSSE3")
+         << (dictionary[ "SSE4_1" ] == "no" ? "" : " SSE4.1")
+         << (dictionary[ "SSE4_2" ] == "no" ? "" : " SSE4.2")
+         << endl;
+    sout << "AVX support................."
+         << (dictionary[ "AVX" ] == "no" ? "<none>" : "AVX")
+         << (dictionary[ "AVX2" ] == "no" ? "" : " AVX2")
+         << endl;
     sout << "AVX512 support.............."
          << (dictionary[ "AVX512" ].isEmpty() ? QString("<none>") : dictionary[ "AVX512" ].toUpper()) << endl;
     sout << "NEON support................" << dictionary[ "NEON" ] << endl;