2 files changed, 19 insertions, 5 deletions
diff --git a/lib/Transforms/Scalar/InstructionCombining.cpp b/lib/Transforms/Scalar/InstructionCombining.cpp
index a398884..1a87868 100644
--- a/lib/Transforms/Scalar/InstructionCombining.cpp
+++ b/lib/Transforms/Scalar/InstructionCombining.cpp
@@ -2292,14 +2292,22 @@ static Instruction *AssociativeOpt(BinaryOperator &Root, const Functor &F) {
 
 namespace {
 
-// AddRHS - Implements: X + X --> X << 1
+// AddRHS - Implements: X + X --> X << 1 and X + X --> X * 2 for vectors
 struct AddRHS {
   Value *RHS;
   AddRHS(Value *rhs) : RHS(rhs) {}
   bool shouldApply(Value *LHS) const { return LHS == RHS; }
   Instruction *apply(BinaryOperator &Add) const {
-    return BinaryOperator::CreateShl(Add.getOperand(0),
-                                  ConstantInt::get(Add.getType(), 1));
+    if (Add.getType()->getTypeID() == Type::VectorTyID) {
+      const VectorType *VTy = cast<VectorType>(Add.getType());
+      ConstantInt *CI = ConstantInt::get(VTy->getElementType(), 2);
+      std::vector<Constant*> Elts(VTy->getNumElements(), CI);
+      return BinaryOperator::CreateMul(Add.getOperand(0),
+                                       ConstantVector::get(Elts));
+    } else {
+      return BinaryOperator::CreateShl(Add.getOperand(0),
+                                       ConstantInt::get(Add.getType(), 1));
+    }
   }
 };
 
@@ -2627,8 +2635,8 @@ Instruction *InstCombiner::visitAdd(BinaryOperator &I) {
     }
   }
 
-  // X + X --> X << 1
-  if (I.getType()->isInteger() && I.getType() != Type::Int1Ty) {
+  // X + X --> X << 1 and X + X --> X * 2 for vectors
+  if (I.getType()->isIntOrIntVector() && I.getType() != Type::Int1Ty) {
     if (Instruction *Result = AssociativeOpt(I, AddRHS(RHS))) return Result;
 
     if (Instruction *RHSI = dyn_cast<Instruction>(RHS)) {
diff --git a/test/Transforms/InstCombine/2008-05-22-FoldAddIVec.ll b/test/Transforms/InstCombine/2008-05-22-FoldAddIVec.ll
new file mode 100644
index 0000000..8bdf9bb
--- /dev/null
+++ b/test/Transforms/InstCombine/2008-05-22-FoldAddIVec.ll
@@ -0,0 +1,6 @@
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep mul
+
+define <3 x i8> @f(<3 x i8> %i) {
+  %A = add <3 x i8> %i, %i
+  ret <3 x i8> %A
+}