Improved x86 SSE build and run-time checks.

include/core/SkPreConfig.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkPreConfig_DEFINED
@@ skipping 105 matching lines @@
  *  SK_CPU_SSE_LEVEL
  *
  *  If defined, SK_CPU_SSE_LEVEL should be set to the highest supported level.
  *  On non-intel CPU this should be undefined.
  */
 
 #define SK_CPU_SSE_LEVEL_SSE1     10
 #define SK_CPU_SSE_LEVEL_SSE2     20
 #define SK_CPU_SSE_LEVEL_SSE3     30
 #define SK_CPU_SSE_LEVEL_SSSE3    31
+#define SK_CPU_SSE_LEVEL_SSE41    41
+#define SK_CPU_SSE_LEVEL_SSE42    42
 
 // Are we in GCC?
 #ifndef SK_CPU_SSE_LEVEL
     // These checks must be done in descending order to ensure we set the highest
     // available SSE level.
-    #if defined(__SSSE3__)
+    #if defined(__SSE4_2__)
+        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSE42
+    #elif defined(__SSE4_1__)
+        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSE41
+    #elif defined(__SSSE3__)
         #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSSE3
     #elif defined(__SSE3__)
         #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSE3
     #elif defined(__SSE2__)
         #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSE2
     #endif
 #endif
 
 // Are we in VisualStudio?
 #ifndef SK_CPU_SSE_LEVEL

[mtklein, 2014/05/08 16:55:08]

Am I thinking right that this means this block isn't working now?

[henrik.smiding, 2014/05/09 08:30:29]

It's probably working as intended when building 32-bit. But unlike gcc, visual
studio doesn't seem to implicitly set the _M_IX86_FP to 'SSE2' when building for
64-bit. I'll add a check for 64-bit.

     // These checks must be done in descending order to ensure we set the highest
     // available SSE level.
     #if defined (_M_IX86_FP)
         #if _M_IX86_FP >= 2
             #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSE2
         #elif _M_IX86_FP == 1
             #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSE1
         #endif
     #endif
 #endif
@@ skipping 95 matching lines @@
  *
  * NOTE: Clang/ARM (r161757) does not support the 'optimize' attribute.
  */
 #if SK_HAS_ATTRIBUTE(optimize)
 #   define SK_ATTRIBUTE_OPTIMIZE_O1 __attribute__((optimize("O1")))
 #else
 #   define SK_ATTRIBUTE_OPTIMIZE_O1 /* nothing */
 #endif
 
 #endif