From 60f2622c8b24844ac583fdeee63d570f0e7e2d1e Mon Sep 17 00:00:00 2001 From: Chinmay Garde Date: Tue, 26 Jul 2016 14:18:45 -0700 Subject: [PATCH] Compile in SIMD related files on x86 and arm64. Fixes iOS simulator/device builds. (#2826) * Compile in SIMD related file on SK_CPU_X86. Fixes iOS simulator builds. * Unconditionally enable SIMD use on arm64. --- skia/BUILD.gn | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/skia/BUILD.gn b/skia/BUILD.gn index 294ef214314..b1c6ea28afd 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -168,6 +168,11 @@ config("skia_library_config") { } } + if (current_cpu == "arm64") { + # All 64-bit ARM variants have NEON. + defines += [ "SK_ARM_HAS_NEON" ] + } + # Settings for text blitting, chosen to approximate the system browser. if (is_linux) { defines += [ @@ -514,19 +519,14 @@ source_set("skia_opts") { defines = [] if (current_cpu == "x86" || current_cpu == "x64") { - if (!is_ios) { - sources = gypi_skia_opts.sse2_sources + gypi_skia_opts.ssse3_sources + - gypi_skia_opts.sse41_sources + gypi_skia_opts.avx_sources + - [ - # Chrome-specific. - "ext/convolver_SSE2.cc", - "ext/convolver_SSE2.h", - ] - - cflags += [ "-msse4.1" ] - } else { - sources = gypi_skia_opts.none_sources - } + sources = gypi_skia_opts.sse2_sources + gypi_skia_opts.ssse3_sources + + gypi_skia_opts.sse41_sources + gypi_skia_opts.avx_sources + + [ + # Chrome-specific. + "ext/convolver_SSE2.cc", + "ext/convolver_SSE2.h", + ] + cflags += [ "-msse4.1" ] } else if (current_cpu == "arm") { # The assembly uses the frame pointer register (r7 in Thumb/r11 in # ARM), the compiler doesn't like that. @@ -548,7 +548,7 @@ source_set("skia_opts") { } } else if (current_cpu == "arm64") { # TODO(1841): NEON sources are not currently used on arm64. - sources = gypi_skia_opts.none_sources + sources = gypi_skia_opts.armv7_sources + gypi_skia_opts.neon_sources } else if (current_cpu == "mipsel") { cflags += [ "-fomit-frame-pointer" ]