[llvm-commits] [llvm] r157708 - in /llvm/trunk: lib/CodeGen/SelectionDAG/DAGCombiner.cpp test/CodeGen/ARM/fusedMAC.ll

[Owen Anderson]

Author: resistor
Date: Wed May 30 13:54:50 2012
New Revision: 157708

URL: http://llvm.org/viewvc/llvm-project?rev=157708&view=rev
Log:
Switch the canonical FMA term operand order to match both the comment I wrote and the usual LLVM convention.

Modified:
    llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
    llvm/trunk/test/CodeGen/ARM/fusedMAC.ll

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp?rev=157708&r1=157707&r2=157708&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Wed May 30 13:54:50 2012
@@ -5771,7 +5771,7 @@
     return DAG.getNode(ISD::FADD, N->getDebugLoc(), VT, N0, N2);
 
   // Canonicalize (fma c, x, y) -> (fma x, c, y)
-  if (!N0CFP && N1CFP)
+  if (N0CFP && !N1CFP)
     return DAG.getNode(ISD::FMA, N->getDebugLoc(), VT, N1, N0, N2);
 
   return SDValue();

Modified: llvm/trunk/test/CodeGen/ARM/fusedMAC.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/fusedMAC.ll?rev=157708&r1=157707&r2=157708&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/fusedMAC.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/fusedMAC.ll Wed May 30 13:54:50 2012
@@ -192,7 +192,7 @@
 define float @test_fma_canonicalize(float %a, float %b) nounwind {
 ; CHECK: test_fma_canonicalize
 ; CHECK: vmov.f32 s0
-; CHECK: vfma.f32 s2, s0, s1
+; CHECK: vfma.f32 s2, s1, s0
   %ret = call float @llvm.fma.f32(float 2.0, float %a, float %b)
   ret float %ret
 }