From 50bcb189f8785a599a3024d8eba4681c2e8ca37a Mon Sep 17 00:00:00 2001
From: mtklein <mtklein@google.com>
Date: Tue, 7 Jun 2016 16:46:39 -0700
Subject: [PATCH] Revert of Move immintrin/arm_neon includes to where they are
 used. (patchset #2 id:20001 of https://codereview.chromium.org/2045633002/ )

Reason for revert:
Appears to have broken the ARMv7 aspect of the Google3 roll in bizarre seemingly-unrelated ways.

Original issue's description:
> Move immintrin/arm_neon includes to where they are used.
>
> On my Mac (so, immintrin), this improves compile time, both wall and cpu,
> by about 16%.  To test I ran this on an SSD with files hot in their caches:
>
>   $ env CC=/usr/bin/clang CXX=/usr/bin/clang++ ./gyp_skia && \
>     ninja -C out/Release -t clean && \
>     time ninja -C out/Release
>
>   Before: 159 wall / 3367 cpu
>           159 wall / 3368 cpu
>
>   After:  137 wall / 2860 cpu
>           136 wall / 2863 cpu
>
> I also tried further refining immintrin down to emmintrin / tmmintrin / smmintrin etc.
> That made no signficant difference, so I've kept immintrin for its simplicity.
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2045633002
> CQ_EXTRA_TRYBOTS=client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot
>
> TBR=reed@google.com
> No public API changes.
>
> Committed: https://skia.googlesource.com/skia/+/12dfaaa53c23f3d03050bde8f64136ac1f44164a

TBR=herb@google.com,mtklein@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review-Url: https://codereview.chromium.org/2046213002
---
 include/core/SkTypes.h            | 6 ++++++
 include/private/SkFloatingPoint.h | 6 ------
 src/opts/SkBlurImageFilter_opts.h | 4 ----
 src/opts/SkNx_neon.h              | 2 --
 src/opts/SkNx_sse.h               | 1 -
 src/opts/SkSwizzler_opts.h        | 6 ------
 6 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h
index 4e95c69f32..a47225db11 100644
--- a/include/core/SkTypes.h
+++ b/include/core/SkTypes.h
@@ -14,6 +14,12 @@
 #include "SkPostConfig.h"
 #include <stddef.h>
 #include <stdint.h>
+
+#if defined(SK_ARM_HAS_NEON)
+    #include <arm_neon.h>
+#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2
+    #include <immintrin.h>
+#endif
 // IWYU pragma: end_exports
 
 #include <string.h>
diff --git a/include/private/SkFloatingPoint.h b/include/private/SkFloatingPoint.h
index a7aa50cf9f..6ed6144d18 100644
--- a/include/private/SkFloatingPoint.h
+++ b/include/private/SkFloatingPoint.h
@@ -15,12 +15,6 @@
 #include <math.h>
 #include <float.h>
 
-#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1
-    #include <xmmintrin.h>
-#elif defined(SK_ARM_HAS_NEON)
-    #include <arm_neon.h>
-#endif
-
 // For _POSIX_VERSION
 #if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
 #include <unistd.h>
diff --git a/src/opts/SkBlurImageFilter_opts.h b/src/opts/SkBlurImageFilter_opts.h
index f62604ca08..8d22391b5f 100644
--- a/src/opts/SkBlurImageFilter_opts.h
+++ b/src/opts/SkBlurImageFilter_opts.h
@@ -11,10 +11,6 @@
 #include "SkColorPriv.h"
 #include "SkTypes.h"
 
-#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2
-    #include <immintrin.h>
-#endif
-
 namespace SK_OPTS_NS {
 
 enum class BlurDirection { kX, kY };
diff --git a/src/opts/SkNx_neon.h b/src/opts/SkNx_neon.h
index 063b99f89a..66f8074e40 100644
--- a/src/opts/SkNx_neon.h
+++ b/src/opts/SkNx_neon.h
@@ -8,8 +8,6 @@
 #ifndef SkNx_neon_DEFINED
 #define SkNx_neon_DEFINED
 
-#include <arm_neon.h>
-
 #define SKNX_IS_FAST
 
 // ARMv8 has vrndmq_f32 to floor 4 floats.  Here we emulate it:
diff --git a/src/opts/SkNx_sse.h b/src/opts/SkNx_sse.h
index 0b22a5a3c6..1fc235d99b 100644
--- a/src/opts/SkNx_sse.h
+++ b/src/opts/SkNx_sse.h
@@ -9,7 +9,6 @@
 #define SkNx_sse_DEFINED
 
 #include "SkCpu.h"
-#include <immintrin.h>
 
 // This file may assume <= SSE2, but must check SK_CPU_SSE_LEVEL for anything more recent.
 // If you do, make sure this is in a static inline function... anywhere else risks violating ODR.
diff --git a/src/opts/SkSwizzler_opts.h b/src/opts/SkSwizzler_opts.h
index a22e145020..15eec3a355 100644
--- a/src/opts/SkSwizzler_opts.h
+++ b/src/opts/SkSwizzler_opts.h
@@ -10,12 +10,6 @@
 
 #include "SkColorPriv.h"
 
-#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSSE3
-    #include <immintrin.h>
-#elif defined(SK_ARM_HAS_NEON)
-    #include <arm_neon.h>
-#endif
-
 namespace SK_OPTS_NS {
 
 static void RGBA_to_rgbA_portable(uint32_t* dst, const void* vsrc, int count) {