diff options
| author |  mtklein <mtklein@chromium.org> | 2016-06-09 13:40:56 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-06-09 13:40:56 -0700 |
| commit | e18fa440e74e9af0324de0a1de9b6ffb0fe3c3d3 (patch) | |
| tree | a85d49a5185d38977dbcb2bb78fb683b50354dd6 /src/opts | |
| parent | b445a57e6c36cce86580b618701b5af708a6f271 (diff) | |
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
Review-Url: https://codereview.chromium.org/2045633002
Diffstat (limited to 'src/opts')
| -rw-r--r-- | src/opts/SkBlurImageFilter_opts.h | 4 | ||||
| -rw-r--r-- | src/opts/SkNx_neon.h | 2 | ||||
| -rw-r--r-- | src/opts/SkNx_sse.h | 1 | ||||
| -rw-r--r-- | src/opts/SkSwizzler_opts.h | 6 |
4 files changed, 13 insertions, 0 deletions
diff --git a/src/opts/SkBlurImageFilter_opts.h b/src/opts/SkBlurImageFilter_opts.h index 8d22391b5f..f62604ca08 100644 --- a/src/opts/SkBlurImageFilter_opts.h +++ b/src/opts/SkBlurImageFilter_opts.h @@ -11,6 +11,10 @@ #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 66f8074e40..063b99f89a 100644 --- a/src/opts/SkNx_neon.h +++ b/src/opts/SkNx_neon.h @@ -8,6 +8,8 @@ #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 1fc235d99b..0b22a5a3c6 100644 --- a/src/opts/SkNx_sse.h +++ b/src/opts/SkNx_sse.h @@ -9,6 +9,7 @@ #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 15eec3a355..a22e145020 100644 --- a/src/opts/SkSwizzler_opts.h +++ b/src/opts/SkSwizzler_opts.h @@ -10,6 +10,12 @@ #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) { |