diff options
| author |  mtklein <mtklein@google.com> | 2015-03-20 08:46:34 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-03-20 08:46:34 -0700 |
| commit | c3ce1d28a53e70f4faa71f9d5bbda605b0664830 (patch) | |
| tree | 110f773a3d051b93e0f3c907bb69f0a2562d0501 /src/core/SkUtilsArm.h | |
| parent | e57b5cab261a243dcbefa74c91c896c28959bf09 (diff) | |
Revert of Specialize Sk2d for ARM64 (patchset #3 id:40001 of https://codereview.chromium.org/1020963002/)
Reason for revert:
https://uberchromegw.corp.google.com/i/client.skia.compile/builders/Build-Mac10.7-Clang-Arm7-Debug-iOS/builds/2441/steps/build%20most/logs/stdio
https://uberchromegw.corp.google.com/i/client.skia.compile/builders/Build-Mac10.7-Clang-Arm7-Release-iOS/builds/2424/steps/build%20most/logs/stdio
https://uberchromegw.corp.google.com/i/client.skia.compile/builders/Build-Ubuntu-GCC-Arm64-Release-Android/builds/8/steps/build%20most/logs/stdio
Original issue's description:
> Specialize Sk2d for ARM64
>
> The implementation is nearly identical to Sk2f, with these changes:
> - float32x2_t -> float64x2_t
> - vfoo -> vfooq
> - one extra Newton's method step in sqrt().
>
> Also, generally fix NEON detection to be defined(SK_ARM_HAS_NEON).
> SK_ARM_HAS_NEON is not being set on ARM64 bots right now (nor does the compiler
> seem to set __ARM_NEON__), so this CL fixes everything up.
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/e57b5cab261a243dcbefa74c91c896c28959bf09
TBR=msarett@google.com,reed@google.com,mtklein@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1028523003
Diffstat (limited to 'src/core/SkUtilsArm.h')
| -rw-r--r-- | src/core/SkUtilsArm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/SkUtilsArm.h b/src/core/SkUtilsArm.h index 51ae7e4a95..f15648136c 100644 --- a/src/core/SkUtilsArm.h +++ b/src/core/SkUtilsArm.h @@ -21,9 +21,9 @@ #define SK_ARM_NEON_MODE_ALWAYS 1 #define SK_ARM_NEON_MODE_DYNAMIC 2 -#if defined(SK_ARM_HAS_OPTIONAL_NEON) +#if defined(SK_CPU_ARM32) && defined(SK_ARM_HAS_OPTIONAL_NEON) # define SK_ARM_NEON_MODE SK_ARM_NEON_MODE_DYNAMIC -#elif defined(SK_ARM_HAS_NEON) +#elif defined(SK_CPU_ARM32) && defined(SK_ARM_HAS_NEON) || defined(SK_CPU_ARM64) # define SK_ARM_NEON_MODE SK_ARM_NEON_MODE_ALWAYS #else # define SK_ARM_NEON_MODE SK_ARM_NEON_MODE_NONE |