Fix arm/LTO build by moving neon asm files to intrinsics target.

generate_gypi.sh

 #!/bin/bash -e
 #
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This script is used to generate .gypi, .gni files and files in the
 # config/platform directories needed to build libvpx.
 # Every time libvpx source code is updated just run this script.
 #
@@ skipping 85 matching lines @@
   echo "        'source/config/<(OS_CATEGORY)/<(target_arch_full)'," >> "$2"
   echo "        '<(libvpx_source)'," >> "$2"
   echo "      ]," >> "$2"
   echo "      'sources': [" >> "$2"
   for f in $sources_list
   do
     echo "        '<(libvpx_source)/$f'," >> $2
   done
   echo "      ]," >> "$2"
   if [[ $4 == fpu=neon ]]; then
+  echo "      'includes': [ 'ads2gas.gypi' ]," >> "$2"
   echo "      'cflags!': [ '-mfpu=vfpv3-d16' ]," >> "$2"
   echo "      'conditions': [" >> $2
   echo "        # Disable LTO in neon targets due to compiler bug" >> "$2"
   echo "        # crbug.com/408997" >> "$2"
   echo "        ['use_lto==1', {" >> "$2"
   echo "          'cflags!': [" >> "$2"
   echo "            '-flto'," >> "$2"
   echo "            '-ffat-lto-objects'," >> "$2"
   echo "          ]," >> "$2"
   echo "        }]," >> "$2"
@@ skipping 32 matching lines @@
 function write_intrinsics_gypi {
   declare -a file_list=("${!1}")
 
   local mmx_sources=$(echo "$file_list" | grep '_mmx\.c$')
   local sse2_sources=$(echo "$file_list" | grep '_sse2\.c$')
   local sse3_sources=$(echo "$file_list" | grep '_sse3\.c$')
   local ssse3_sources=$(echo "$file_list" | grep '_ssse3\.c$')
   local sse4_1_sources=$(echo "$file_list" | grep '_sse4\.c$')
   local avx_sources=$(echo "$file_list" | grep '_avx\.c$')
   local avx2_sources=$(echo "$file_list" | grep '_avx2\.c$')
-  local neon_sources=$(echo "$file_list" | grep '_neon\.c$')
+  local neon_sources=$(echo "$file_list" | grep '_neon\.c$\|\.asm$')

[Johann, 2015/04/15 15:38:45]

while *most* of the neon code is named neon_asm.asm, some of it is still
neon.asm. we can change that, it's just more intermediate steps before fixing.
alternatively, if this would search for 'neon' anywhere in the file name + .asm
extension, that would potentially simplify things.

or the neon asm could be broken out to it's own target. i'm not sure if the
assembler will get the cflag for mfpu=neon, or if it specifically needs the one
targeted at the assembler.

[pcc1, 2015/04/15 18:50:33]

Makes sense, but this regex just grabs the asm files out of the list that was
already computed by convert_srcs_to_project_files below. I've updated the regex
there.
The compiler driver will pass the -mfpu=neon flag to the assembler.

 
   # Intrinsic functions and files are in flux. We can selectively generate them
   # but we can not selectively include them in libvpx.gyp. Throw some errors
   # when new targets are needed.
 
   rm -rf "$2"
   write_license "$2"
   write_gypi_header "$2"
 
   echo "  'targets': [" >> "$2"
@@ skipping 54 matching lines @@
   # The actual ARM files end in .asm. We have rules to translate them to .S
   source_list=$(echo "$source_list" | sed s/\.asm\.s$/.asm/)
 
   # Select all x86 files ending with .c
   local intrinsic_list=$(echo "$source_list" | \
     egrep 'vp[89]/(encoder|decoder|common)/x86/'  | \
     egrep '(mmx|sse2|sse3|ssse3|sse4|avx|avx2).c$')
 
   # Select all neon files ending in C but only when building in RTCD mode
   if [ "libvpx_srcs_arm_neon_cpu_detect" == "$2" ]; then
-    # Select all arm neon files ending in _neon.c
+    # Select all arm neon files ending in _neon.c and all asm files.
+    # The asm files need to be included in the intrinsics target because
+    # they need the -mfpu=neon flag.

[Johann, 2015/04/15 15:38:45]

is it sufficient to give them -mfpu=neon or do they require -Wa,-mfpu=neon?

[pcc1, 2015/04/15 18:50:33]

The former. The compiler driver will pass the -mfpu=neon flag to the assembler.

     # the pattern may need to be updated if vpx_scale gets intrinics
     local intrinsic_list=$(echo "$source_list" | \
-      egrep 'vp[89]/(encoder|decoder|common)/arm/neon/'  | \
-      egrep '_neon.c$')
+      egrep 'vp[89]/(encoder|decoder|common)/arm/neon/.*_neon.c$|.asm$')
   fi
 
   # Remove these files from the main list.
   source_list=$(comm -23 <(echo "$source_list") <(echo "$intrinsic_list"))
 
   local x86_list=$(echo "$source_list" | egrep '/x86/')
 
   write_gypi source_list "$BASE_DIR/$2.gypi"
 
   # All the files are in a single "element." Check if the first element has
@@ skipping 18 matching lines @@
     write_gni assembly_sources $2_assembly "$BASE_DIR/libvpx_srcs.gni"
     write_gni mmx_sources $2_mmx "$BASE_DIR/libvpx_srcs.gni"
     write_gni sse2_sources $2_sse2 "$BASE_DIR/libvpx_srcs.gni"
     write_gni sse3_sources $2_sse3 "$BASE_DIR/libvpx_srcs.gni"
     write_gni ssse3_sources $2_ssse3 "$BASE_DIR/libvpx_srcs.gni"
     write_gni sse4_1_sources $2_sse4_1 "$BASE_DIR/libvpx_srcs.gni"
     write_gni avx_sources $2_avx "$BASE_DIR/libvpx_srcs.gni"
     write_gni avx2_sources $2_avx2 "$BASE_DIR/libvpx_srcs.gni"
   else
     local c_sources=$(echo "$source_list" | egrep '.(c|h)$')
-    local assembly_sources=$(echo "$source_list" | egrep '.asm$')
+    local assembly_sources=$(echo -e "$source_list\n$intrinsic_list" | \
+      egrep '.asm$')
     local neon_sources=$(echo "$intrinsic_list" | grep '_neon\.c$')
     write_gni c_sources $2 "$BASE_DIR/libvpx_srcs.gni"
     write_gni assembly_sources $2_assembly "$BASE_DIR/libvpx_srcs.gni"
     if [ 0 -ne ${#neon_sources} ]; then
       write_gni neon_sources $2_neon "$BASE_DIR/libvpx_srcs.gni"
     fi
   fi
 }
 
 # Clean files from previous make.
@@ skipping 228 matching lines @@
 make_clean
 make libvpx_srcs.txt target=libs $config > /dev/null
 convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_generic
 
 echo "Remove temporary directory."
 cd $BASE_DIR
 rm -rf $TEMP_DIR
 
 # TODO(fgalligan): Is "--disable-fast-unaligned" needed on mipsel?
 # TODO(fgalligan): Can we turn on "--enable-realtime-only" for mipsel?