[llvm-commits] CVS: llvm/lib/Transforms/Scalar/InstructionCombining.cpp

[Chris Lattner]

Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.283 -> 1.284
---
Log message:

This optimization makes MANY phi nodes that all have the same incoming value.
If this happens, detect it early instead of relying on instcombine to notice
it later.  This can be a big speedup, because PHI nodes can have many 
incoming values.


---
Diffs of the changes:  (+23 -7)

Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.283 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.284
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.283	Sun Nov 14 13:13:23 2004
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Sun Nov 14 13:29:34 2004
@@ -3456,21 +3456,37 @@
   PHINode *NewPN = new PHINode(FirstInst->getOperand(0)->getType(),
                                PN.getName()+".in");
   NewPN->op_reserve(PN.getNumOperands());
-  InsertNewInstBefore(NewPN, PN);
+
+  Value *InVal = FirstInst->getOperand(0);
+  NewPN->addIncoming(InVal, PN.getIncomingBlock(0));
 
   // Add all operands to the new PHI.
-  for (unsigned i = 0, e = PN.getNumIncomingValues(); i != e; ++i)
-    NewPN->addIncoming(cast<Instruction>(PN.getIncomingValue(i))->getOperand(0),
-                       PN.getIncomingBlock(i));
+  for (unsigned i = 1, e = PN.getNumIncomingValues(); i != e; ++i) {
+    Value *NewInVal = cast<Instruction>(PN.getIncomingValue(i))->getOperand(0);
+    if (NewInVal != InVal)
+      InVal = 0;
+    NewPN->addIncoming(NewInVal, PN.getIncomingBlock(i));
+  }
+
+  Value *PhiVal;
+  if (InVal) {
+    // The new PHI unions all of the same values together.  This is really
+    // common, so we handle it intelligently here for compile-time speed.
+    PhiVal = InVal;
+    delete NewPN;
+  } else {
+    InsertNewInstBefore(NewPN, PN);
+    PhiVal = NewPN;
+  }
   
   // Insert and return the new operation.
   if (isa<CastInst>(FirstInst))
-    return new CastInst(NewPN, PN.getType());
+    return new CastInst(PhiVal, PN.getType());
   else if (BinaryOperator *BinOp = dyn_cast<BinaryOperator>(FirstInst))
-    return BinaryOperator::create(BinOp->getOpcode(), NewPN, ConstantOp);
+    return BinaryOperator::create(BinOp->getOpcode(), PhiVal, ConstantOp);
   else
     return new ShiftInst(cast<ShiftInst>(FirstInst)->getOpcode(),
-                         NewPN, ConstantOp);
+                         PhiVal, ConstantOp);
 }
 
 // PHINode simplification