[llvm-commits] [llvm] r129509 - /llvm/trunk/lib/Transforms/Scalar/ScalarReplAggregates.cpp
Mon P Wang
wangmp at apple.com
Thu Apr 14 01:04:01 PDT 2011
Author: wangmp
Date: Thu Apr 14 03:04:01 2011
New Revision: 129509
URL: http://llvm.org/viewvc/llvm-project?rev=129509&view=rev
Log:
Cleanup r129472 by using a utility routine as suggested by Eli.
Modified:
llvm/trunk/lib/Transforms/Scalar/ScalarReplAggregates.cpp
Modified: llvm/trunk/lib/Transforms/Scalar/ScalarReplAggregates.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/ScalarReplAggregates.cpp?rev=129509&r1=129508&r2=129509&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/ScalarReplAggregates.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/ScalarReplAggregates.cpp Thu Apr 14 03:04:01 2011
@@ -676,6 +676,37 @@
llvm_unreachable("Invalid type for a partial vector access of an alloca!");
}
+/// CreateShuffleVectorCast - Creates a shuffle vector to convert one vector
+/// to another vector of the same element type which has the same allocation
+/// size but different primitive sizes (e.g. <3 x i32> and <4 x i32>).
+static Value *CreateShuffleVectorCast(Value *FromVal, const Type *ToType,
+ IRBuilder<> &Builder) {
+ const Type *FromType = FromVal->getType();
+ const VectorType *FromVTy = dyn_cast<VectorType>(FromType);
+ const VectorType *ToVTy = dyn_cast<VectorType>(ToType);
+ assert(FromVTy && ToVTy &&
+ (ToVTy->getElementType() == FromVTy->getElementType()) &&
+ "Vectors must have the same element type");
+ LLVMContext &Context = FromVal->getContext();
+ Value *UnV = UndefValue::get(FromType);
+ unsigned numEltsFrom = FromVTy->getNumElements();
+ unsigned numEltsTo = ToVTy->getNumElements();
+
+ SmallVector<Constant*, 3> Args;
+ unsigned minNumElts = std::min(numEltsFrom, numEltsTo);
+ unsigned i;
+ for (i=0; i != minNumElts; ++i)
+ Args.push_back(ConstantInt::get(Type::getInt32Ty(Context), i));
+
+ if (i < numEltsTo) {
+ Constant* UnC = UndefValue::get(Type::getInt32Ty(Context));
+ for (; i != numEltsTo; ++i)
+ Args.push_back(UnC);
+ }
+ Constant *Mask = ConstantVector::get(Args);
+ return Builder.CreateShuffleVector(FromVal, UnV, Mask, "tmpV");
+}
+
/// ConvertScalar_ExtractValue - Extract a value of type ToType from an integer
/// or vector value FromVal, extracting the bits from the offset specified by
/// Offset. This returns the value, which is of type ToType.
@@ -699,35 +730,15 @@
if (const VectorType *VTy = dyn_cast<VectorType>(FromType)) {
unsigned ToTypeSize = TD.getTypeAllocSize(ToType);
if (ToTypeSize == AllocaSize) {
+ // If the two types have the same primitive size, use a bit cast.
+ // Otherwise, it is two vectors with the same element type that has
+ // the same allocation size but different number of elements so use
+ // a shuffle vector.
if (FromType->getPrimitiveSizeInBits() ==
ToType->getPrimitiveSizeInBits())
return Builder.CreateBitCast(FromVal, ToType, "tmp");
- else {
- // Vectors with the same element type can have the same allocation
- // size but different primitive sizes (e.g., <3 x i32> and <4 x i32>)
- // In this case, use a shuffle vector instead of a bit cast.
- const VectorType *ToVTy = dyn_cast<VectorType>(ToType);
- assert(ToVTy && (ToVTy->getElementType() == VTy->getElementType()) &&
- "Vectors must have the same element type");
- LLVMContext &Context = FromVal->getContext();
- Value *UnV = UndefValue::get(FromType);
- unsigned numEltsFrom = VTy->getNumElements();
- unsigned numEltsTo = ToVTy->getNumElements();
-
- SmallVector<Constant*, 3> Args;
- unsigned minNumElts = std::min(numEltsFrom, numEltsTo);
- unsigned i;
- for (i=0; i != minNumElts; ++i)
- Args.push_back(ConstantInt::get(Type::getInt32Ty(Context), i));
-
- if (i < numEltsTo) {
- Constant* UnC = UndefValue::get(Type::getInt32Ty(Context));
- for (; i != numEltsTo; ++i)
- Args.push_back(UnC);
- }
- Constant *Mask = ConstantVector::get(Args);
- return Builder.CreateShuffleVector(FromVal, UnV, Mask, "tmpV");
- }
+ else
+ return CreateShuffleVectorCast(FromVal, ToType, Builder);
}
if (ToType->isVectorTy()) {
@@ -868,34 +879,15 @@
// Changing the whole vector with memset or with an access of a different
// vector type?
if (ValSize == VecSize) {
+ // If the two types have the same primitive size, use a bit cast.
+ // Otherwise, it is two vectors with the same element type that has
+ // the same allocation size but different number of elements so use
+ // a shuffle vector.
if (VTy->getPrimitiveSizeInBits() ==
SV->getType()->getPrimitiveSizeInBits())
return Builder.CreateBitCast(SV, AllocaType, "tmp");
- else {
- // Vectors with the same element type can have the same allocation
- // size but different primitive sizes (e.g., <3 x i32> and <4 x i32>)
- // In this case, use a shuffle vector instead of a bit cast.
- const VectorType *SVVTy = dyn_cast<VectorType>(SV->getType());
- assert(SVVTy && (SVVTy->getElementType() == VTy->getElementType()) &&
- "Vectors must have the same element type");
- Value *UnV = UndefValue::get(SVVTy);
- unsigned numEltsFrom = SVVTy->getNumElements();
- unsigned numEltsTo = VTy->getNumElements();
-
- SmallVector<Constant*, 3> Args;
- unsigned minNumElts = std::min(numEltsFrom, numEltsTo);
- unsigned i;
- for (i=0; i != minNumElts; ++i)
- Args.push_back(ConstantInt::get(Type::getInt32Ty(Context), i));
-
- if (i < numEltsTo) {
- Constant* UnC = UndefValue::get(Type::getInt32Ty(Context));
- for (; i != numEltsTo; ++i)
- Args.push_back(UnC);
- }
- Constant *Mask = ConstantVector::get(Args);
- return Builder.CreateShuffleVector(SV, UnV, Mask, "tmpV");
- }
+ else
+ return CreateShuffleVectorCast(SV, VTy, Builder);
}
if (SV->getType()->isVectorTy() && isPowerOf2_64(VecSize / ValSize)) {
More information about the llvm-commits
mailing list