From: mtklein Date: Fri, 18 Mar 2016 15:10:31 +0000 (-0700) Subject: Clean up SSSE3 and SSE4 stubs. X-Git-Tag: submit/tizen/20180928.044319~129^2~1419 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2b1b40e11afc41452b4d2f74cdebb1b6e6f7cc96;p=platform%2Fupstream%2FlibSkiaSharp.git Clean up SSSE3 and SSE4 stubs. We added these stubs to work around OpenBSD's old compiler, which had support for SSE2 but not SSSE3 or SSE4. We now already have other unstubbed files that require SSSE3 and SSE4 compiler support. All the compilers we support have SSSE3 and SSE4 support, and all the way up to at least AVX2. (Requiring C++11 has had some nice ripple effects...) And, is already auto-included for these files, so no need for smmintrin or tmmintrin. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1810183003 CQ_EXTRA_TRYBOTS=client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot Review URL: https://codereview.chromium.org/1810183003 --- diff --git a/src/opts/SkBitmapProcState_opts_SSSE3.cpp b/src/opts/SkBitmapProcState_opts_SSSE3.cpp index 17d7da931a..07b3171c6a 100644 --- a/src/opts/SkBitmapProcState_opts_SSSE3.cpp +++ b/src/opts/SkBitmapProcState_opts_SSSE3.cpp @@ -10,14 +10,6 @@ #include "SkPaint.h" #include "SkUtils.h" -/* With the exception of the compilers that don't support it, we always build the - * SSSE3 functions and enable the caller to determine SSSE3 support. However for - * compilers that do not support SSSE3 we provide a stub implementation. - */ -#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSSE3 - -#include // SSSE3 - // adding anonymous namespace seemed to force gcc to inline directly the // instantiation, instead of creating the functions // S32_generic_D32_filter_DX_SSSE3 and @@ -731,31 +723,3 @@ void S32_alpha_D32_filter_DXDY_SSSE3(const SkBitmapProcState& s, int count, uint32_t* colors) { S32_generic_D32_filter_DXDY_SSSE3(s, xy, count, colors); } - -#else // SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSSE3 - -void S32_opaque_D32_filter_DX_SSSE3(const SkBitmapProcState& s, - const uint32_t* xy, - int count, uint32_t* colors) { - sk_throw(); -} - -void S32_alpha_D32_filter_DX_SSSE3(const SkBitmapProcState& s, - const uint32_t* xy, - int count, uint32_t* colors) { - sk_throw(); -} - -void S32_opaque_D32_filter_DXDY_SSSE3(const SkBitmapProcState& s, - const uint32_t* xy, - int count, uint32_t* colors) { - sk_throw(); -} - -void S32_alpha_D32_filter_DXDY_SSSE3(const SkBitmapProcState& s, - const uint32_t* xy, - int count, uint32_t* colors) { - sk_throw(); -} - -#endif diff --git a/src/opts/SkBlitRow_opts_SSE4.cpp b/src/opts/SkBlitRow_opts_SSE4.cpp index e5d880904e..7afb1e78e8 100644 --- a/src/opts/SkBlitRow_opts_SSE4.cpp +++ b/src/opts/SkBlitRow_opts_SSE4.cpp @@ -6,17 +6,6 @@ */ #include "SkBlitRow_opts_SSE4.h" - -// Some compilers can't compile SSSE3 or SSE4 intrinsics. We give them stub methods. -// The stubs should never be called, so we make them crash just to confirm that. -#if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSE41 -void S32A_Opaque_BlitRow32_SSE4(SkPMColor* SK_RESTRICT, const SkPMColor* SK_RESTRICT, int, U8CPU) { - sk_throw(); -} - -#else - -#include // SSE4.1 intrinsics #include "SkColorPriv.h" #include "SkColor_opts_SSE2.h" #include "SkMSAN.h" @@ -70,5 +59,3 @@ void S32A_Opaque_BlitRow32_SSE4(SkPMColor* SK_RESTRICT dst, } } } - -#endif