From 94916fbbc7865c6fe23a57d6edc48c6daf93dda8 Mon Sep 17 00:00:00 2001 From: George Wright Date: Fri, 18 May 2012 14:16:08 -0400 Subject: [PATCH 06/10] Bug 755869 - [9] Re-apply bug 751814 - Various Skia fixes for ARM without EDSP and ARMv6+ r=mattwoodrow --- gfx/skia/include/core/SkMath.h | 5 +-- gfx/skia/include/core/SkPostConfig.h | 45 ++++++++++++++++++++++ gfx/skia/src/opts/SkBitmapProcState_opts_arm.cpp | 6 +- gfx/skia/src/opts/SkBlitRow_opts_arm.cpp | 9 ++++ 4 files changed, 58 insertions(+), 7 deletions(-) diff --git a/gfx/skia/include/core/SkMath.h b/gfx/skia/include/core/SkMath.h index 5889103..7a4b707 100644 --- a/gfx/skia/include/core/SkMath.h +++ b/gfx/skia/include/core/SkMath.h @@ -153,10 +153,7 @@ static inline bool SkIsPow2(int value) { With this requirement, we can generate faster instructions on some architectures. */ -#if defined(__arm__) \ - && !defined(__thumb__) \ - && !defined(__ARM_ARCH_4T__) \ - && !defined(__ARM_ARCH_5T__) +#ifdef SK_ARM_HAS_EDSP static inline int32_t SkMulS16(S16CPU x, S16CPU y) { SkASSERT((int16_t)x == x); SkASSERT((int16_t)y == y); diff --git a/gfx/skia/include/core/SkPostConfig.h b/gfx/skia/include/core/SkPostConfig.h index 041fe2a..03105e4 100644 --- a/gfx/skia/include/core/SkPostConfig.h +++ b/gfx/skia/include/core/SkPostConfig.h @@ -311,3 +311,48 @@ #ifndef SK_ALLOW_STATIC_GLOBAL_INITIALIZERS #define SK_ALLOW_STATIC_GLOBAL_INITIALIZERS 1 #endif + +////////////////////////////////////////////////////////////////////// +// ARM defines + +#if defined(__GNUC__) && defined(__arm__) + +# define SK_ARM_ARCH 3 + +# if defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__) \ + || defined(_ARM_ARCH_4) +# undef SK_ARM_ARCH +# define SK_ARM_ARCH 4 +# endif + +# if defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) \ + || defined(__ARM_ARCH_5E__) || defined(__ARM_ARCH_5TE__) \ + || defined(__ARM_ARCH_5TEJ__) || defined(_ARM_ARCH_5) +# undef SK_ARM_ARCH +# define SK_ARM_ARCH 5 +# endif + +# if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \ + || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) \ + || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) \ + || defined(__ARM_ARCH_6M__) || defined(_ARM_ARCH_6) +# undef SK_ARM_ARCH +# define SK_ARM_ARCH 6 +# endif + +# if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \ + || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) \ + || defined(__ARM_ARCH_7EM__) || defined(_ARM_ARCH_7) +# undef SK_ARM_ARCH +# define SK_ARM_ARCH 7 +# endif + +# undef SK_ARM_HAS_EDSP +# if defined(__thumb2__) && (SK_ARM_ARCH >= 6) \ + || !defined(__thumb__) \ + && ((SK_ARM_ARCH > 5) || defined(__ARM_ARCH_5E__) \ + || defined(__ARM_ARCH_5TE__) || defined(__ARM_ARCH_5TEJ__)) +# define SK_ARM_HAS_EDSP 1 +# endif + +#endif diff --git a/gfx/skia/src/opts/SkBitmapProcState_opts_arm.cpp b/gfx/skia/src/opts/SkBitmapProcState_opts_arm.cpp index 20d62e1..deb1bfe 100644 --- a/gfx/skia/src/opts/SkBitmapProcState_opts_arm.cpp +++ b/gfx/skia/src/opts/SkBitmapProcState_opts_arm.cpp @@ -11,7 +11,7 @@ #include "SkColorPriv.h" #include "SkUtils.h" -#if __ARM_ARCH__ >= 6 && !defined(SK_CPU_BENDIAN) +#if SK_ARM_ARCH >= 6 && !defined(SK_CPU_BENDIAN) void SI8_D16_nofilter_DX_arm( const SkBitmapProcState& s, const uint32_t* SK_RESTRICT xy, @@ -182,7 +182,7 @@ void SI8_opaque_D32_nofilter_DX_arm(const SkBitmapProcState& s, s.fBitmap->getColorTable()->unlockColors(false); } -#endif //__ARM_ARCH__ >= 6 && !defined(SK_CPU_BENDIAN) +#endif // SK_ARM_ARCH >= 6 && !defined(SK_CPU_BENDIAN) /////////////////////////////////////////////////////////////////////////////// @@ -200,7 +200,7 @@ void SkBitmapProcState::platformProcs() { switch (fBitmap->config()) { case SkBitmap::kIndex8_Config: -#if __ARM_ARCH__ >= 6 && !defined(SK_CPU_BENDIAN) +#if SK_ARM_ARCH >= 6 && !defined(SK_CPU_BENDIAN) if (justDx && !doFilter) { #if 0 /* crashing on android device */ fSampleProc16 = SI8_D16_nofilter_DX_arm; diff --git a/gfx/skia/src/opts/SkBlitRow_opts_arm.cpp b/gfx/skia/src/opts/SkBlitRow_opts_arm.cpp index 2490371..c928888 100644 --- a/gfx/skia/src/opts/SkBlitRow_opts_arm.cpp +++ b/gfx/skia/src/opts/SkBlitRow_opts_arm.cpp @@ -675,8 +675,13 @@ static void __attribute((noinline,optimize("-fomit-frame-pointer"))) S32A_Blend_ /* dst1_scale and dst2_scale*/ "lsr r9, r5, #24 \n\t" /* src >> 24 */ "lsr r10, r6, #24 \n\t" /* src >> 24 */ +#ifdef SK_ARM_HAS_EDSP "smulbb r9, r9, %[alpha] \n\t" /* r9 = SkMulS16 r9 with src_scale */ "smulbb r10, r10, %[alpha] \n\t" /* r10 = SkMulS16 r10 with src_scale */ +#else + "mul r9, r9, %[alpha] \n\t" /* r9 = SkMulS16 r9 with src_scale */ + "mul r10, r10, %[alpha] \n\t" /* r10 = SkMulS16 r10 with src_scale */ +#endif "lsr r9, r9, #8 \n\t" /* r9 >> 8 */ "lsr r10, r10, #8 \n\t" /* r10 >> 8 */ "rsb r9, r9, #256 \n\t" /* dst1_scale = r9 = 255 - r9 + 1 */ @@ -745,7 +750,11 @@ static void __attribute((noinline,optimize("-fomit-frame-pointer"))) S32A_Blend_ "lsr r6, r5, #24 \n\t" /* src >> 24 */ "and r8, r12, r5, lsr #8 \n\t" /* ag = r8 = r5 masked by r12 lsr by #8 */ +#ifdef SK_ARM_HAS_EDSP "smulbb r6, r6, %[alpha] \n\t" /* r6 = SkMulS16 with src_scale */ +#else + "mul r6, r6, %[alpha] \n\t" /* r6 = SkMulS16 with src_scale */ +#endif "and r9, r12, r5 \n\t" /* rb = r9 = r5 masked by r12 */ "lsr r6, r6, #8 \n\t" /* r6 >> 8 */ "mul r8, r8, %[alpha] \n\t" /* ag = r8 times scale */ -- 1.7.5.4