aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Mike Klein <mtklein@chromium.org>2016-09-29 11:26:37 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-09-29 15:52:46 +0000
commit8e6791fb9a79c38228339ffc5c75d73b58893fa8 (patch)
treed659c5c58d39bb374cd2f68e0043517d0f2adadd
parent1e114f136895a41397483f4454cf6ce0af1206cd (diff)
Disable FP contraction on -Fast bot.
It's more annoying than helpful to have GCC turn mul,add into fma. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2780 CQ_INCLUDE_TRYBOTS=master.client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast-Trybot Change-Id: I63f4615f73aed112f10f6cb516d899b820918298 Reviewed-on: https://skia-review.googlesource.com/2780 Commit-Queue: Cary Clark <caryclark@google.com> Reviewed-by: Cary Clark <caryclark@google.com>
-rw-r--r--infra/bots/recipe_modules/flavor/gn_flavor.py3
-rw-r--r--infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json2
2 files changed, 3 insertions, 2 deletions
diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py
index 185ef7e38c..44131eb3ce 100644
--- a/infra/bots/recipe_modules/flavor/gn_flavor.py
+++ b/infra/bots/recipe_modules/flavor/gn_flavor.py
@@ -64,7 +64,8 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils):
cc, cxx = 'gcc', 'g++'
if extra_config == 'Fast':
- extra_cflags.extend(['-march=native', '-fomit-frame-pointer', '-O3'])
+ extra_cflags.extend(['-march=native', '-fomit-frame-pointer', '-O3',
+ '-ffp-contract=off'])
if extra_config.startswith('SK'):
extra_cflags.append('-D' + extra_config)
if extra_config == 'MSAN':
diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json
index 4a9f3624e2..2880ae25bf 100644
--- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json
+++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json
@@ -134,7 +134,7 @@
"gn",
"gen",
"[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Fast/Release",
- "--args=cc=\"gcc\" cxx=\"g++\" extra_cflags=\"-march=native -fomit-frame-pointer -O3\" is_debug=false"
+ "--args=cc=\"gcc\" cxx=\"g++\" extra_cflags=\"-march=native -fomit-frame-pointer -O3 -ffp-contract=off\" is_debug=false"
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {