From: Lang Hames <lhames@gmail.com>
Date: Fri, 22 Jun 2012 22:31:00 +0000 (+0000)
Subject: Rename fp-op fusion option (yet again) for compatibility with GCC option.
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=59d454959f36681dc1d68109012edc4cb019f351;p=oota-llvm.git

Rename fp-op fusion option (yet again) for compatibility with GCC option.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@159042 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/test/CodeGen/ARM/fusedMAC.ll b/test/CodeGen/ARM/fusedMAC.ll
index 725dd274e37..d35330c09f5 100644
--- a/test/CodeGen/ARM/fusedMAC.ll
+++ b/test/CodeGen/ARM/fusedMAC.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -mtriple=armv7-eabi -mattr=+neon,+vfp4 -fuse-fp-ops=fast | FileCheck %s
+; RUN: llc < %s -mtriple=armv7-eabi -mattr=+neon,+vfp4 -fp-contract=fast | FileCheck %s
 ; Check generated fused MAC and MLS.
 
 define double @fusedMACTest1(double %d1, double %d2, double %d3) {
diff --git a/test/CodeGen/PowerPC/a2-fp-basic.ll b/test/CodeGen/PowerPC/a2-fp-basic.ll
index a4370fa452a..de3aa7c3176 100644
--- a/test/CodeGen/PowerPC/a2-fp-basic.ll
+++ b/test/CodeGen/PowerPC/a2-fp-basic.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=ppc64 -mcpu=a2 -fuse-fp-ops=fast | FileCheck %s
+; RUN: llc < %s -march=ppc64 -mcpu=a2 -fp-contract=fast | FileCheck %s
 
 %0 = type { double, double }
 
diff --git a/test/CodeGen/PowerPC/fma.ll b/test/CodeGen/PowerPC/fma.ll
index 4e05c279b79..48d9eb93c31 100644
--- a/test/CodeGen/PowerPC/fma.ll
+++ b/test/CodeGen/PowerPC/fma.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=ppc32 -fuse-fp-ops=fast | \
+; RUN: llc < %s -march=ppc32 -fp-contract=fast | \
 ; RUN:   egrep {fn?madd|fn?msub} | count 8
 
 define double @test_FMADD1(double %A, double %B, double %C) {
diff --git a/test/CodeGen/PowerPC/ppc440-fp-basic.ll b/test/CodeGen/PowerPC/ppc440-fp-basic.ll
index 6884570a8aa..77b726c5ae3 100644
--- a/test/CodeGen/PowerPC/ppc440-fp-basic.ll
+++ b/test/CodeGen/PowerPC/ppc440-fp-basic.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=ppc32 -mcpu=440 -fuse-fp-ops=fast | FileCheck %s
+; RUN: llc < %s -march=ppc32 -mcpu=440 -fp-contract=fast | FileCheck %s
 
 %0 = type { double, double }
 
diff --git a/tools/llc/llc.cpp b/tools/llc/llc.cpp
index e08bad93b07..44f83e1b307 100644
--- a/tools/llc/llc.cpp
+++ b/tools/llc/llc.cpp
@@ -195,15 +195,15 @@ FloatABIForCalls("float-abi",
     clEnumValEnd));
 
 static cl::opt<llvm::FPOpFusion::FPOpFusionMode>
-FuseFPOps("fuse-fp-ops",
+FuseFPOps("fp-contract",
   cl::desc("Enable aggresive formation of fused FP ops"),
   cl::init(FPOpFusion::Standard),
   cl::values(
     clEnumValN(FPOpFusion::Fast, "fast",
                "Fuse FP ops whenever profitable"),
-    clEnumValN(FPOpFusion::Standard, "standard",
+    clEnumValN(FPOpFusion::Standard, "on",
                "Only fuse 'blessed' FP ops."),
-    clEnumValN(FPOpFusion::Strict, "strict",
+    clEnumValN(FPOpFusion::Strict, "off",
                "Only fuse FP ops when the result won't be effected."),
     clEnumValEnd));