From 6fbd79e4bfe43853dc3ef3bbdb70e4b15822242e Mon Sep 17 00:00:00 2001 From: mtklein Date: Thu, 30 Jul 2015 07:03:20 -0700 Subject: Revert of Optimize RGB16 blitH functions with NEON for ARM platform. (patchset #2 id:20001 of https://codereview.chromium.org/1229673008/) Reason for revert: This doesn't draw correctly, e.g. our GM test named dashcubics. Good: https://gold.skia.org/img/images/0f7e8e226379afbad8a700e0a80fd8f1.png Bad: https://gold.skia.org/img/images/56ce15fc67436065a3db4b8ee31f13ae.png Original issue's description: > Optimize RGB16 blitH functions with NEON for ARM platform. > > Here are some performance resultsi on Nexus 9: > SkRGB16BlitterBlitH_neon: > +--------+-----------+ > |height | C/NEON | > +--------+-----------+ > |1 | 0.888531 | > +--------+-----------+ > |8 | 1.231800 | > +--------+-----------+ > |18 | 1.073327 | > +--------+-----------+ > |32 | 1.136991 | > +--------+-----------+ > |76 | 1.174638 | > +--------+-----------+ > |85 | 1.188551 | > +--------+-----------+ > |120 | 1.180261 | > +--------+-----------+ > |128 | 1.183726 | > +--------+-----------+ > |512 | 1.220806 | > +--------+-----------+ > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/6c72d5740231f47c664a8e765a8df05cd124c88c TBR=djsollen@google.com,caryclark@google.com,reed@google.com,bero@linaro.com,yang.zhang@linaro.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1268513003 --- src/core/SkBlitter_RGB16.cpp | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'src/core/SkBlitter_RGB16.cpp') diff --git a/src/core/SkBlitter_RGB16.cpp b/src/core/SkBlitter_RGB16.cpp index b481b27b57..8caf908312 100644 --- a/src/core/SkBlitter_RGB16.cpp +++ b/src/core/SkBlitter_RGB16.cpp @@ -27,10 +27,6 @@ extern void SkRGB16BlitterBlitV_neon(uint16_t* device, size_t deviceRB, unsigned scale, uint32_t src32); -extern void SkRGB16BlitterBlitH_neon(uint16_t* device, - int width, - unsigned scale, - uint32_t src32); #else // if we don't have neon, then our black blitter is worth the extra code #define USE_BLACK_BLITTER @@ -342,14 +338,10 @@ void SkRGB16_Opaque_Blitter::blitAntiH(int x, int y, uint32_t src32 = srcExpanded * scale5; scale5 = 32 - scale5; // now we can use it on the device int n = count; -#if SK_ARM_NEON_IS_ALWAYS && defined(SK_CPU_LENDIAN) - SkRGB16BlitterBlitH_neon(device, n, scale5, src32); -#else do { uint32_t dst32 = SkExpand_rgb_16(*device) * scale5; *device++ = SkCompact_rgb_16((src32 + dst32) >> 5); } while (--n != 0); -#endif goto DONE; } } @@ -609,14 +601,10 @@ void SkRGB16_Blitter::blitAntiH(int x, int y, unsigned scale5 = SkAlpha255To256(aa) * scale >> (8 + 3); uint32_t src32 = srcExpanded * scale5; scale5 = 32 - scale5; -#if SK_ARM_NEON_IS_ALWAYS && defined(SK_CPU_LENDIAN) - SkRGB16BlitterBlitH_neon(device, count, scale5, src32); -#else do { uint32_t dst32 = SkExpand_rgb_16(*device) * scale5; *device++ = SkCompact_rgb_16((src32 + dst32) >> 5); } while (--count != 0); -#endif continue; } device += count; -- cgit v1.2.3