diff options
| -rw-r--r-- | include/llvm/IRBuilder.h | 16 | ||||
| -rw-r--r-- | lib/Transforms/Scalar/SROA.cpp | 13 | ||||
| -rw-r--r-- | lib/Transforms/Vectorize/LoopVectorize.cpp | 13 |
3 files changed, 18 insertions, 24 deletions
diff --git a/include/llvm/IRBuilder.h b/include/llvm/IRBuilder.h index 75aa8e76f8..c4c2fb9282 100644 --- a/include/llvm/IRBuilder.h +++ b/include/llvm/IRBuilder.h @@ -1367,6 +1367,22 @@ public: ConstantExpr::getSizeOf(ArgType->getElementType()), Name); } + + /// CreateVectorSplat - Return a vector value that contains \arg V broadcasted + /// to \p NumElts elements. + Value *CreateVectorSplat(unsigned NumElts, Value *V, const Twine &Name = "") { + assert(NumElts > 0 && "Cannot splat to an empty vector!"); + + // First insert it into an undef vector so we can shuffle it. + Type *I32Ty = getInt32Ty(); + Value *Undef = UndefValue::get(VectorType::get(V->getType(), NumElts)); + V = CreateInsertElement(Undef, V, ConstantInt::get(I32Ty, 0), + Name + ".splatinsert"); + + // Shuffle the value across the desired number of elements. + Value *Zeros = ConstantAggregateZero::get(VectorType::get(I32Ty, NumElts)); + return CreateShuffleVector(V, Undef, Zeros, Name + ".splat"); + } }; } diff --git a/lib/Transforms/Scalar/SROA.cpp b/lib/Transforms/Scalar/SROA.cpp index 05401fe1b3..4a20d69b91 100644 --- a/lib/Transforms/Scalar/SROA.cpp +++ b/lib/Transforms/Scalar/SROA.cpp @@ -2660,18 +2660,7 @@ private: /// \brief Compute a vector splat for a given element value. Value *getVectorSplat(IRBuilder<> &IRB, Value *V, unsigned NumElements) { - assert(NumElements > 0 && "Cannot splat to an empty vector."); - - // First insert it into a one-element vector so we can shuffle it. It is - // really silly that LLVM's IR requires this in order to form a splat. - Value *Undef = UndefValue::get(VectorType::get(V->getType(), 1)); - V = IRB.CreateInsertElement(Undef, V, IRB.getInt32(0), - getName(".splatinsert")); - - // Shuffle the value across the desired number of elements. - SmallVector<Constant*, 8> Mask(NumElements, IRB.getInt32(0)); - V = IRB.CreateShuffleVector(V, Undef, ConstantVector::get(Mask), - getName(".splat")); + V = IRB.CreateVectorSplat(NumElements, V, NamePrefix); DEBUG(dbgs() << " splat: " << *V << "\n"); return V; } diff --git a/lib/Transforms/Vectorize/LoopVectorize.cpp b/lib/Transforms/Vectorize/LoopVectorize.cpp index adf90818aa..aadc134313 100644 --- a/lib/Transforms/Vectorize/LoopVectorize.cpp +++ b/lib/Transforms/Vectorize/LoopVectorize.cpp @@ -150,11 +150,6 @@ LoopVectorizationLegality::RuntimePointerCheck::insert(ScalarEvolution *SE, } Value *InnerLoopVectorizer::getBroadcastInstrs(Value *V) { - // Create the types. - LLVMContext &C = V->getContext(); - Type *VTy = VectorType::get(V->getType(), VF); - Type *I32 = IntegerType::getInt32Ty(C); - // Save the current insertion location. Instruction *Loc = Builder.GetInsertPoint(); @@ -167,14 +162,8 @@ Value *InnerLoopVectorizer::getBroadcastInstrs(Value *V) { if (Invariant) Builder.SetInsertPoint(LoopVectorPreHeader->getTerminator()); - Constant *Zero = ConstantInt::get(I32, 0); - Value *Zeros = ConstantAggregateZero::get(VectorType::get(I32, VF)); - Value *UndefVal = UndefValue::get(VTy); - // Insert the value into a new vector. - Value *SingleElem = Builder.CreateInsertElement(UndefVal, V, Zero); // Broadcast the scalar into all locations in the vector. - Value *Shuf = Builder.CreateShuffleVector(SingleElem, UndefVal, Zeros, - "broadcast"); + Value *Shuf = Builder.CreateVectorSplat(VF, V, "broadcast"); // Restore the builder insertion point. if (Invariant) |