Teach reassociate to commute FMul's and FAdd's in order to canonicalize the order...

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

diff --git a/lib/Transforms/Scalar/Reassociate.cpp b/lib/Transforms/Scalar/Reassociate.cpp
index cc98ba0f21c57b7accd22ae73586499c90f081f2..010f17aae0b6db428ffcd8a67a9b5800f9b7f5eb 100644 (file)
--- a/lib/Transforms/Scalar/Reassociate.cpp
+++ b/lib/Transforms/Scalar/Reassociate.cpp
@@ -1212,10 +1212,34 @@ void Reassociate::ReassociateInst(BasicBlock::iterator &BBI) {
       BI = NI;
     }
 
-  // Reject cases where it is pointless to do this.
-  if (!isa<BinaryOperator>(BI) || BI->getType()->isFloatingPointTy() ||
-      BI->getType()->isVectorTy())
-    return;  // Floating point ops are not associative.
+  // Floating point binary operators are not associative, but we can still
+  // commute (some) of them, to canonicalize the order of their operands.
+  // This can potentially expose more CSE opportunities, and makes writing
+  // other transformations simpler.
+  if (isa<BinaryOperator>(BI) &&
+      (BI->getType()->isFloatingPointTy() || BI->getType()->isVectorTy())) {
+    // FAdd and FMul can be commuted.
+    if (BI->getOpcode() != Instruction::FMul &&
+        BI->getOpcode() != Instruction::FAdd)
+      return;
+
+    Value *LHS = BI->getOperand(0);
+    Value *RHS = BI->getOperand(1);
+    unsigned LHSRank = getRank(LHS);
+    unsigned RHSRank = getRank(RHS);
+
+    // Sort the operands by rank.
+    if (RHSRank < LHSRank) {
+      BI->setOperand(0, RHS);
+      BI->setOperand(1, LHS);
+    }
+
+    return;
+  }
+
+  // Do not reassociate operations that we do not understand.
+  if (!isa<BinaryOperator>(BI))
+    return;
 
   // Do not reassociate boolean (i1) expressions.  We want to preserve the
   // original order of evaluation for short-circuited comparisons that

diff --git a/test/Transforms/Reassociate/fp-commute.ll b/test/Transforms/Reassociate/fp-commute.ll
new file mode 100644 (file)
index 0000000..5644f7c
--- /dev/null
+++ b/test/Transforms/Reassociate/fp-commute.ll
@@ -0,0 +1,16 @@
+; RUN: opt -reassociate -S < %s | FileCheck %s
+
+target triple = "armv7-apple-ios"
+
+; CHECK: test
+define float @test(float %x, float %y) {
+entry:
+; CHECK: fmul float %x, %y
+; CHECK: fmul float %x, %y
+  %0 = fmul float %x, %y
+  %1 = fmul float %y, %x
+  %2 = fsub float %0, %1
+  ret float %1
+}
+
+