[llvm-commits] [llvm] r63659 - in /llvm/trunk: lib/Transforms/Scalar/ScalarReplAggregates.cpp test/Transforms/ScalarRepl/sroa-fca.ll
Chris Lattner
sabre at nondot.org
Tue Feb 3 13:08:45 PST 2009
Author: lattner
Date: Tue Feb 3 15:08:45 2009
New Revision: 63659
URL: http://llvm.org/viewvc/llvm-project?rev=63659&view=rev
Log:
teach "convert from scalar" to handle loads of fca's.
Modified:
llvm/trunk/lib/Transforms/Scalar/ScalarReplAggregates.cpp
llvm/trunk/test/Transforms/ScalarRepl/sroa-fca.ll
Modified: llvm/trunk/lib/Transforms/Scalar/ScalarReplAggregates.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/ScalarReplAggregates.cpp?rev=63659&r1=63658&r2=63659&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/ScalarReplAggregates.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/ScalarReplAggregates.cpp Tue Feb 3 15:08:45 2009
@@ -1423,6 +1423,31 @@
V = Builder.CreateBitCast(V, ToType, "tmp");
return V;
}
+
+ // If ToType is a first class aggregate, extract out each of the pieces and
+ // use insertvalue's to form the FCA.
+ if (const StructType *ST = dyn_cast<StructType>(ToType)) {
+ const StructLayout &Layout = *TD->getStructLayout(ST);
+ Value *Res = UndefValue::get(ST);
+ for (unsigned i = 0, e = ST->getNumElements(); i != e; ++i) {
+ Value *Elt = ConvertScalar_ExtractValue(FromVal, ST->getElementType(i),
+ Offset+Layout.getElementOffset(i),
+ Builder);
+ Res = Builder.CreateInsertValue(Res, Elt, i, "tmp");
+ }
+ return Res;
+ }
+
+ if (const ArrayType *AT = dyn_cast<ArrayType>(ToType)) {
+ uint64_t EltSize = TD->getTypePaddedSizeInBits(AT->getElementType());
+ Value *Res = UndefValue::get(AT);
+ for (unsigned i = 0, e = AT->getNumElements(); i != e; ++i) {
+ Value *Elt = ConvertScalar_ExtractValue(FromVal, AT->getElementType(),
+ Offset+i*EltSize, Builder);
+ Res = Builder.CreateInsertValue(Res, Elt, i, "tmp");
+ }
+ return Res;
+ }
// Otherwise, this must be a union that was converted to an integer value.
const IntegerType *NTy = cast<IntegerType>(FromVal->getType());
@@ -1444,9 +1469,11 @@
// We do this to support (f.e.) loads off the end of a structure where
// only some bits are used.
if (ShAmt > 0 && (unsigned)ShAmt < NTy->getBitWidth())
- FromVal = Builder.CreateLShr(FromVal, ConstantInt::get(FromVal->getType(), ShAmt), "tmp");
+ FromVal = Builder.CreateLShr(FromVal, ConstantInt::get(FromVal->getType(),
+ ShAmt), "tmp");
else if (ShAmt < 0 && (unsigned)-ShAmt < NTy->getBitWidth())
- FromVal = Builder.CreateShl(FromVal, ConstantInt::get(FromVal->getType(), -ShAmt), "tmp");
+ FromVal = Builder.CreateShl(FromVal, ConstantInt::get(FromVal->getType(),
+ -ShAmt), "tmp");
// Finally, unconditionally truncate the integer to the right width.
unsigned LIBitWidth = TD->getTypeSizeInBits(ToType);
Modified: llvm/trunk/test/Transforms/ScalarRepl/sroa-fca.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ScalarRepl/sroa-fca.ll?rev=63659&r1=63658&r2=63659&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/ScalarRepl/sroa-fca.ll (original)
+++ llvm/trunk/test/Transforms/ScalarRepl/sroa-fca.ll Tue Feb 3 15:08:45 2009
@@ -10,3 +10,12 @@
ret i64 %Q
}
+define {i32,i32} @test2(i64 %A) {
+ %X = alloca i64
+ %Y = bitcast i64* %X to {i32,i32}*
+ store i64 %A, i64* %X
+
+ %Q = load {i32,i32}* %Y
+ ret {i32,i32} %Q
+}
+
More information about the llvm-commits
mailing list