[llvm-commits] [llvm] r159042 - in /llvm/trunk: test/CodeGen/ARM/fusedMAC.ll test/CodeGen/PowerPC/a2-fp-basic.ll test/CodeGen/PowerPC/fma.ll test/CodeGen/PowerPC/ppc440-fp-basic.ll tools/llc/llc.cpp

[Lang Hames]

Author: lhames
Date: Fri Jun 22 17:31:00 2012
New Revision: 159042

URL: http://llvm.org/viewvc/llvm-project?rev=159042&view=rev
Log:
Rename fp-op fusion option (yet again) for compatibility with GCC option.

Modified:
    llvm/trunk/test/CodeGen/ARM/fusedMAC.ll
    llvm/trunk/test/CodeGen/PowerPC/a2-fp-basic.ll
    llvm/trunk/test/CodeGen/PowerPC/fma.ll
    llvm/trunk/test/CodeGen/PowerPC/ppc440-fp-basic.ll
    llvm/trunk/tools/llc/llc.cpp

Modified: llvm/trunk/test/CodeGen/ARM/fusedMAC.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/fusedMAC.ll?rev=159042&r1=159041&r2=159042&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/fusedMAC.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/fusedMAC.ll Fri Jun 22 17:31:00 2012
@@ -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) {

Modified: llvm/trunk/test/CodeGen/PowerPC/a2-fp-basic.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/a2-fp-basic.ll?rev=159042&r1=159041&r2=159042&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/a2-fp-basic.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/a2-fp-basic.ll Fri Jun 22 17:31:00 2012
@@ -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 }
 

Modified: llvm/trunk/test/CodeGen/PowerPC/fma.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/fma.ll?rev=159042&r1=159041&r2=159042&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/fma.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/fma.ll Fri Jun 22 17:31:00 2012
@@ -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) {

Modified: llvm/trunk/test/CodeGen/PowerPC/ppc440-fp-basic.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/ppc440-fp-basic.ll?rev=159042&r1=159041&r2=159042&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/ppc440-fp-basic.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/ppc440-fp-basic.ll Fri Jun 22 17:31:00 2012
@@ -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 }
 

Modified: llvm/trunk/tools/llc/llc.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llc/llc.cpp?rev=159042&r1=159041&r2=159042&view=diff
==============================================================================
--- llvm/trunk/tools/llc/llc.cpp (original)
+++ llvm/trunk/tools/llc/llc.cpp Fri Jun 22 17:31:00 2012
@@ -195,15 +195,15 @@
     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));