Try ARMv7 and NEON for Daisy.

I think Daisy's color order problems are in non-NEON ARM assembly.
NEON might actually be fine.

BUG=skia:1843

Committed: https://skia.googlesource.com/skia/+/a121c0ee6b911dd7004c6054a8692d37084b6b3d

CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-Arm7-Debug-CrOS_Daisy-Trybot,Build-Ubuntu-GCC-Arm7-Debug-Android_Neon-Trybot,Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot,Build-Ubuntu-GCC-Arm64-Debug-Android-Trybot

Review URL: https://codereview.chromium.org/1054233002
This commit is contained in:
mtklein 2015-04-03 08:27:37 -07:00 committed by Commit bot
parent 80bd3ae9d7
commit ac813d8a12
2 changed files with 4 additions and 11 deletions

View File

@ -36,15 +36,9 @@
'-w',
'-fvisibility=hidden',
],
'conditions': [
['not arm_neon', {
'defines': [
# FIXME: Why is this needed? Without it, pngpriv.h sets it
# to 2 if __ARM_NEON is defined, but shouldn't __ARM_NEON
# not be defined since arm_neon is 0?
'PNG_ARM_NEON_OPT=0',
],
}],
'defines': [
# TODO: it'd be nice to enable PNG's NEON when possible.
'PNG_ARM_NEON_OPT=0',
],
'sources': [
'../third_party/externals/libpng/png.c',

View File

@ -34,8 +34,7 @@ setup_device() {
GENERIC_BOARD_TYPE="amd64-generic"
;;
daisy)
# TODO(mtklein): make this arm_version=7 arm_neon=1
DEFINES="${DEFINES} skia_arch_type=arm"
DEFINES="${DEFINES} skia_arch_type=arm arm_version=7 arm_neon=1"
# TODO(borenet): We have to define skia_warnings_as_errors=0 for the arm
# build, which throws lots of "mangling of va_list has changed" warnings.
DEFINES="${DEFINES} skia_warnings_as_errors=0"