Bug 1540760 - Enable neon for libyuv for aarch64; r=jya
authorDan Minor <dminor@mozilla.com>
Wed, 01 May 2019 15:04:49 +0000
changeset 531303 cd666f0befca97073d92bf1c46f39ead6eff3646
parent 531302 f1bc4fcd152e66e858c3a1d0b0afd30a78e9474b
child 531304 a338bdcb894fbfbc4412e9f8efefc54667cd32a6
push id11265
push userffxbld-merge
push dateMon, 13 May 2019 10:53:39 +0000
treeherdermozilla-beta@77e0fe8dbdd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjya
bugs1540760
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1540760 - Enable neon for libyuv for aarch64; r=jya Differential Revision: https://phabricator.services.mozilla.com/D27786
media/libyuv/aarch64-windows-noneon.patch
media/libyuv/libyuv/libyuv.gyp
media/libyuv/update.py
deleted file mode 100644
--- a/media/libyuv/aarch64-windows-noneon.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/media/libyuv/libyuv/libyuv.gyp b/media/libyuv/libyuv/libyuv.gyp
-index 776510b..51ab531 100644
---- a/media/libyuv/libyuv/libyuv.gyp
-+++ b/media/libyuv/libyuv/libyuv.gyp
-@@ -33,7 +33,8 @@
-     'build_msa': 0,
-     'conditions': [
-        ['(target_arch == "armv7" or target_arch == "armv7s" or \
--       (target_arch == "arm" and arm_version >= 7) or target_arch == "arm64")\
-+       (target_arch == "arm" and arm_version >= 7) or \
-+       (OS != "win" and target_arch == "arm64")) \
-        and (arm_neon == 1 or arm_neon_optional == 1)', {
-          'build_neon': 1,
-        }],
--- a/media/libyuv/libyuv/libyuv.gyp
+++ b/media/libyuv/libyuv/libyuv.gyp
@@ -28,18 +28,17 @@
     'use_lto%': 0,
     'yuv_disable_asm%': 0,
     'yuv_disable_avx2%': 0,
     'mips_msa%': 0,  # Default to msa off.
     'build_neon': 0,
     'build_msa': 0,
     'conditions': [
        ['(target_arch == "armv7" or target_arch == "armv7s" or \
-       (target_arch == "arm" and arm_version >= 7) or \
-       (OS != "win" and target_arch == "arm64")) \
+       (target_arch == "arm" and arm_version >= 7) or target_arch == "arm64")\
        and (arm_neon == 1 or arm_neon_optional == 1)', {
          'build_neon': 1,
        }],
        ['(target_arch == "mipsel" or target_arch == "mips64el")\
        and (mips_msa == 1)',
        {
          'build_msa': 1,
        }],
--- a/media/libyuv/update.py
+++ b/media/libyuv/update.py
@@ -47,18 +47,16 @@ def apply_patches(base):
         # fix build errors
         'fix_build_errors.patch',
         # make mjpeg printfs optional at build time
         'make_mjpeg_printfs_optional.patch',
         # allow disabling of inline ASM and AVX2 code
         'allow_disabling_asm_avx2.patch',
         # add H444ToARGB() variant
         'add_H444ToARGB.patch',
-        # avoid selecting neon codepaths on AArch64 Windows
-        'aarch64-windows-noneon.patch',
         # fix the x86 mingw-clang build
         'bug_1491848.patch',
     ]
 
     for patch in patches:
         print('\nApplying patch %s' % patch)
         with open(os.path.join(base, patch)) as f:
             Popen(["patch", "-p3"], stdin=f, cwd=base).wait()