generate_gypi.sh: --disable-avx and --only-config flags

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.
 #
-# For example:
-# $ ./generate_gypi.sh
+# Usage:
+# $ ./generate_gypi.sh [--disable-avx] [--only-configs]
 #
-# And this will update all the .gypi, .gni and config files needed.
+# The following optional flags are supported:
+# --disable-avx : AVX+AVX2 support is disabled.
+# --only-configs: Excludes generation of GN and GYP files (i.e. only
+#                 configuration headers are generated).
 #
 # !!! It's highly recommended to install yasm before running this script.
 
 export LC_ALL=C
 BASE_DIR=$(pwd)
 LIBVPX_SRC_DIR="source/libvpx"
 LIBVPX_CONFIG_DIR="source/config"
 

[Johann, 2015/09/14 17:24:04]

maybe unset DISABLE_AVX?

[kjellander_chromium, 2015/09/14 18:38:21]

Done.

+for i in "$@"
+do
+case $i in
+  --disable-avx)
+  DISABLE_AVX=true

[Johann, 2015/09/14 17:24:04]

DISABLE_AVX="--disable-avx --disable-avx2"

[kjellander_chromium, 2015/09/14 18:38:21]

Done.

+  shift
+  ;;
+  --only-configs)
+  ONLY_CONFIGS=true
+  shift
+  ;;
+  *)
+  # Unknown option.

[Johann, 2015/09/14 17:24:04]

fail/error on unknown option

[kjellander_chromium, 2015/09/14 18:38:21]

Good idea, done.

+  ;;
+esac
+done
+
 # Print license header.
 # $1 - Output base name
 function write_license {
   echo "# This file is generated. Do not edit." >> $1
   echo "# Copyright (c) 2014 The Chromium Authors. All rights reserved." >> $1
   echo "# Use of this source code is governed by a BSD-style license that can be" >> $1
   echo "# found in the LICENSE file." >> $1
   echo "" >> $1
 }
 
@@ skipping 78 matching lines @@
   echo "        ['clang==0 and use_lto==1', {" >> "$2"
   echo "          'cflags!': [" >> "$2"
   echo "            '-flto'," >> "$2"
   echo "            '-ffat-lto-objects'," >> "$2"
   echo "          ]," >> "$2"
   echo "        }]," >> "$2"
   echo "      ]," >> "$2"
   fi
   echo "      'cflags': [ '-m$4', ]," >> "$2"
   echo "      'xcode_settings': { 'OTHER_CFLAGS': [ '-m$4' ] }," >> "$2"
-  if [[ $4 == avx2 ]]; then
+if [[ ! $DISABLE_AVX && $4 == avx2 ]]; then

[Johann, 2015/09/14 17:24:03]

-nz or -ne or whatever "not set"

[kjellander_chromium, 2015/09/14 18:38:21]

Done.

   echo "      'msvs_settings': {" >> "$2"
   echo "        'VCCLCompilerTool': {" >> "$2"
   echo "          'EnableEnhancedInstructionSet': '5', # /arch:AVX2" >> "$2"
   echo "        }," >> "$2"
   echo "      }," >> "$2"
   elif [[ $4 == ssse3 || $4 == sse4.1 ]]; then
   echo "      'conditions': [" >> "$2"
   echo "        ['OS==\"win\" and clang==1', {" >> "$2"
   echo "          # cl.exe's /arch flag doesn't have a setting for SSSE3/4, and cl.exe" >> "$2"
   echo "          # doesn't need it for intrinsics. clang-cl does need it, though." >> "$2"
@@ skipping 44 matching lines @@
     #write_target_definition sse3_sources[@] "$2" libvpx_intrinsics_sse3 sse3
     echo "ERROR: Uncomment sse3 sections in libvpx.gyp"
     exit 1
   fi
   if [ 0 -ne ${#ssse3_sources} ]; then
     write_target_definition ssse3_sources[@] "$2" libvpx_intrinsics_ssse3 ssse3
   fi
   if [ 0 -ne ${#sse4_1_sources} ]; then
     write_target_definition sse4_1_sources[@] "$2" libvpx_intrinsics_sse4_1 sse4.1
   fi
-  if [ 0 -ne ${#avx_sources} ]; then
+  if [[ ! $DISABLE_AVX && 0 -ne ${#avx_sources} ]]; then
     #write_target_definition avx_sources[@] "$2" libvpx_intrinsics_avx avx
     echo "ERROR: Uncomment avx sections in libvpx.gyp"
     exit 1
   fi
-  if [ 0 -ne ${#avx2_sources} ]; then
+  if [[ ! $DISABLE_AVX && 0 -ne ${#avx2_sources} ]]; then
     write_target_definition avx2_sources[@] "$2" libvpx_intrinsics_avx2 avx2
   fi
 
   # arm neon
   if [ 0 -ne ${#neon_sources} ]; then
     write_target_definition neon_sources[@] "$2" libvpx_intrinsics_neon fpu=neon
   fi
 
   echo "  ]," >> "$2"
 
@@ skipping 58 matching lines @@
     local avx_sources=$(echo "$intrinsic_list" | grep '_avx\.c$')
     local avx2_sources=$(echo "$intrinsic_list" | grep '_avx2\.c$')
 
     write_gni c_sources $2 "$BASE_DIR/libvpx_srcs.gni"
     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"
+    if [[ ! $DISABLE_AVX ]]; then
+      write_gni avx_sources $2_avx "$BASE_DIR/libvpx_srcs.gni"
+      write_gni avx2_sources $2_avx2 "$BASE_DIR/libvpx_srcs.gni"
+    fi
   else
     local c_sources=$(echo "$source_list" | egrep '.(c|h)$')
     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
@@ skipping 52 matching lines @@
     print_config_basic $1 > $BASE_DIR/$TEMP_DIR/libvpx.config
   else
     $BASE_DIR/lint_config.sh -p \
       -h $BASE_DIR/$LIBVPX_CONFIG_DIR/$1/vpx_config.h \
       -a $BASE_DIR/$LIBVPX_CONFIG_DIR/$1/vpx_config.asm \
       -o $BASE_DIR/$TEMP_DIR/libvpx.config
   fi
 
   $BASE_DIR/$LIBVPX_SRC_DIR/build/make/rtcd.pl \
     --arch=$2 \
     --sym=vp8_rtcd \

[Johann, 2015/09/14 17:24:04]

add a line like

--sym=vp8_rtcd $DISABLE_AVX \

[kjellander_chromium, 2015/09/14 18:38:21]

Done.

     --config=$BASE_DIR/$TEMP_DIR/libvpx.config \
     $BASE_DIR/$LIBVPX_SRC_DIR/vp8/common/rtcd_defs.pl \
     > $BASE_DIR/$LIBVPX_CONFIG_DIR/$1/vp8_rtcd.h
 
   $BASE_DIR/$LIBVPX_SRC_DIR/build/make/rtcd.pl \
     --arch=$2 \
     --sym=vp9_rtcd \

[Johann, 2015/09/14 17:24:04]

need to do it for all the rtcd targets

[kjellander_chromium, 2015/09/14 18:38:20]

Done.

     --config=$BASE_DIR/$TEMP_DIR/libvpx.config \
     $BASE_DIR/$LIBVPX_SRC_DIR/vp9/common/vp9_rtcd_defs.pl \
     > $BASE_DIR/$LIBVPX_CONFIG_DIR/$1/vp9_rtcd.h
 
   $BASE_DIR/$LIBVPX_SRC_DIR/build/make/rtcd.pl \
     --arch=$2 \
     --sym=vpx_scale_rtcd \
     --config=$BASE_DIR/$TEMP_DIR/libvpx.config \
     $BASE_DIR/$LIBVPX_SRC_DIR/vpx_scale/vpx_scale_rtcd.pl \
     > $BASE_DIR/$LIBVPX_CONFIG_DIR/$1/vpx_scale_rtcd.h
 
   $BASE_DIR/$LIBVPX_SRC_DIR/build/make/rtcd.pl \
     --arch=$2 \
     --sym=vpx_dsp_rtcd \
     --config=$BASE_DIR/$TEMP_DIR/libvpx.config \
     $BASE_DIR/$LIBVPX_SRC_DIR/vpx_dsp/vpx_dsp_rtcd_defs.pl \
     > $BASE_DIR/$LIBVPX_CONFIG_DIR/$1/vpx_dsp_rtcd.h
 
   rm -rf $BASE_DIR/$TEMP_DIR/libvpx.config
 }
 
 # Generate Config files. "--enable-external-build" must be set to skip
 # detection of capabilities on specific targets.
 # $1 - Header file directory.
 # $2 - Config command line.
 function gen_config_files {
   ./configure $2 > /dev/null
 
-  # Disable HAVE_UNISTD_H as it causes vp8 to try to detect how many cpus 
+  # Disable HAVE_UNISTD_H as it causes vp8 to try to detect how many cpus
   # available, which doesn't work from iniside a sandbox on linux.
   ( echo '/HAVE_UNISTD_H/s/[01]/0/' ; echo 'w' ; echo 'q' ) | ed -s vpx_config.h
 
   # Generate vpx_config.asm. Do not create one for mips.
   if [[ "$1" != *mipsel && "$1" != *mips64el ]]; then
     if [[ "$1" == *x64* ]] || [[ "$1" == *ia32* ]]; then
       egrep "#define [A-Z0-9_]+ [01]" vpx_config.h | awk '{print "%define " $2 " " $3}' > vpx_config.asm
     else
       egrep "#define [A-Z0-9_]+ [01]" vpx_config.h | awk '{print $2 " EQU " $3}' | perl $BASE_DIR/$LIBVPX_SRC_DIR/build/make/ads2gas.pl > vpx_config.asm
     fi
   fi
 
   cp vpx_config.* $BASE_DIR/$LIBVPX_CONFIG_DIR/$1
   make_clean
   rm -rf vpx_config.*
 }
 
 echo "Create temporary directory."
 TEMP_DIR="$LIBVPX_SRC_DIR.temp"
 rm -rf $TEMP_DIR
 cp -R $LIBVPX_SRC_DIR $TEMP_DIR
 cd $TEMP_DIR
 
 echo "Generate config files."
 all_platforms="--enable-external-build --enable-postproc --disable-install-srcs --enable-multi-res-encoding --enable-temporal-denoising --disable-unit-tests --disable-install-docs --disable-examples --enable-vp9-temporal-denoising --enable-vp9-postproc --size-limit=16384x16384"

[Johann, 2015/09/14 17:24:04]

add DISABLE_AVX to this line

[kjellander_chromium, 2015/09/14 18:38:20]

Done.

+if [[ $DISABLE_AVX ]]; then
+  all_platforms="${all_platforms} --disable-avx --disable-avx2"
+fi
 gen_config_files linux/ia32 "--target=x86-linux-gcc --disable-ccache --enable-pic --enable-realtime-only ${all_platforms}"
 gen_config_files linux/x64 "--target=x86_64-linux-gcc --disable-ccache --enable-pic --enable-realtime-only ${all_platforms}"
 gen_config_files linux/arm "--target=armv6-linux-gcc --enable-pic --enable-realtime-only --disable-install-bins --disable-install-libs --disable-edsp ${all_platforms}"
 gen_config_files linux/arm-neon "--target=armv7-linux-gcc --enable-pic --enable-realtime-only --disable-edsp ${all_platforms}"
 gen_config_files linux/arm-neon-cpu-detect "--target=armv7-linux-gcc --enable-pic --enable-realtime-only --enable-runtime-cpu-detect --disable-edsp ${all_platforms}"
 gen_config_files linux/arm64 "--force-target=armv8-linux-gcc --enable-pic --enable-realtime-only --disable-edsp ${all_platforms}"
 gen_config_files linux/mipsel "--target=mips32-linux-gcc ${all_platforms}"
 gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}"
 gen_config_files linux/generic "--target=generic-gnu --enable-pic --enable-realtime-only ${all_platforms}"
 gen_config_files win/ia32 "--target=x86-win32-vs12 --enable-realtime-only ${all_platforms}"
@@ skipping 40 matching lines @@
 gen_rtcd_header win/ia32 x86
 gen_rtcd_header win/x64 x86_64
 gen_rtcd_header mac/ia32 x86
 gen_rtcd_header mac/x64 x86_64
 gen_rtcd_header nacl nacl
 
 echo "Prepare Makefile."
 ./configure --target=generic-gnu > /dev/null
 make_clean
 
-# Remove existing .gni file.
-rm -rf $BASE_DIR/libvpx_srcs.gni
-write_license $BASE_DIR/libvpx_srcs.gni
+if [[ ! $ONLY_CONFIGS ]]; then
+  # Remove existing .gni file.
+  rm -rf $BASE_DIR/libvpx_srcs.gni
+  write_license $BASE_DIR/libvpx_srcs.gni
 
-echo "Generate X86 source list."
-config=$(print_config linux/ia32)
-make_clean
-make libvpx_srcs.txt target=libs $config > /dev/null
-convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_x86
+  echo "Generate X86 source list."
+  config=$(print_config linux/ia32)
+  make_clean
+  make libvpx_srcs.txt target=libs $config > /dev/null
+  convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_x86
 
-# Copy vpx_version.h. The file should be the same for all platforms.
-cp vpx_version.h $BASE_DIR/$LIBVPX_CONFIG_DIR
+  # Copy vpx_version.h. The file should be the same for all platforms.
+  cp vpx_version.h $BASE_DIR/$LIBVPX_CONFIG_DIR
 
-echo "Generate X86_64 source list."
-config=$(print_config linux/x64)
-make_clean
-make libvpx_srcs.txt target=libs $config > /dev/null
-convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_x86_64
+  echo "Generate X86_64 source list."
+  config=$(print_config linux/x64)
+  make_clean
+  make libvpx_srcs.txt target=libs $config > /dev/null
+  convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_x86_64
 
-echo "Generate ARM source list."
-config=$(print_config linux/arm)
-make_clean
-make libvpx_srcs.txt target=libs $config > /dev/null
-convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_arm
+  echo "Generate ARM source list."
+  config=$(print_config linux/arm)
+  make_clean
+  make libvpx_srcs.txt target=libs $config > /dev/null
+  convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_arm
 
-echo "Generate ARM NEON source list."
-config=$(print_config linux/arm-neon)
-make_clean
-make libvpx_srcs.txt target=libs $config > /dev/null
-convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_arm_neon
+  echo "Generate ARM NEON source list."
+  config=$(print_config linux/arm-neon)
+  make_clean
+  make libvpx_srcs.txt target=libs $config > /dev/null
+  convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_arm_neon
 
-echo "Generate ARM NEON CPU DETECT source list."
-config=$(print_config linux/arm-neon-cpu-detect)
-make_clean
-make libvpx_srcs.txt target=libs $config > /dev/null
-convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_arm_neon_cpu_detect
+  echo "Generate ARM NEON CPU DETECT source list."
+  config=$(print_config linux/arm-neon-cpu-detect)
+  make_clean
+  make libvpx_srcs.txt target=libs $config > /dev/null
+  convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_arm_neon_cpu_detect
 
-echo "Generate ARM64 source list."
-config=$(print_config linux/arm64)
-make_clean
-make libvpx_srcs.txt target=libs $config > /dev/null
-convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_arm64
+  echo "Generate ARM64 source list."
+  config=$(print_config linux/arm64)
+  make_clean
+  make libvpx_srcs.txt target=libs $config > /dev/null
+  convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_arm64
 
-echo "Generate MIPS source list."
-config=$(print_config_basic linux/mipsel)
-make_clean
-make libvpx_srcs.txt target=libs $config > /dev/null
-convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_mips
+  echo "Generate MIPS source list."
+  config=$(print_config_basic linux/mipsel)
+  make_clean
+  make libvpx_srcs.txt target=libs $config > /dev/null
+  convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_mips
 
-echo "MIPS64 source list is identical to MIPS source list. No need to generate it."
+  echo "MIPS64 source list is identical to MIPS source list. No need to generate it."
 
-echo "Generate NaCl source list."
-config=$(print_config_basic nacl)
-make_clean
-make libvpx_srcs.txt target=libs $config > /dev/null
-convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_nacl
+  echo "Generate NaCl source list."
+  config=$(print_config_basic nacl)
+  make_clean
+  make libvpx_srcs.txt target=libs $config > /dev/null
+  convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_nacl
 
-echo "Generate GENERIC source list."
-config=$(print_config_basic linux/generic)
-make_clean
-make libvpx_srcs.txt target=libs $config > /dev/null
-convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_generic
+  echo "Generate GENERIC source list."
+  config=$(print_config_basic linux/generic)
+  make_clean
+  make libvpx_srcs.txt target=libs $config > /dev/null
+  convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_generic
+fi
 
 echo "Remove temporary directory."
 cd $BASE_DIR
 rm -rf $TEMP_DIR
 
 # TODO(fgalligan): Can we turn on "--enable-realtime-only" for mipsel?