Author: tstellar Date: Mon May 30 15:42:50 2016 New Revision: 271230 URL: http://llvm.org/viewvc/llvm-project?rev=271230&view=rev Log: Merging r261139:
------------------------------------------------------------------------ r261139 | deadalnix | 2016-02-17 11:21:28 -0800 (Wed, 17 Feb 2016) | 10 lines Fix load alignement when unpacking aggregates structs Summary: Store and loads unpacked by instcombine do not always have the right alignement. This explicitely compute the alignement and set it. Reviewers: dblaikie, majnemer, reames, hfinkel, joker.eph Subscribers: llvm-commits Differential Revision: http://reviews.llvm.org/D17326 ------------------------------------------------------------------------ Modified: llvm/branches/release_38/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp llvm/branches/release_38/test/Transforms/InstCombine/unpack-fca.ll Modified: llvm/branches/release_38/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_38/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp?rev=271230&r1=271229&r2=271230&view=diff ============================================================================== --- llvm/branches/release_38/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp (original) +++ llvm/branches/release_38/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp Mon May 30 15:42:50 2016 @@ -523,16 +523,17 @@ static Instruction *unpackLoadToAggregat if (!T->isAggregateType()) return nullptr; + auto Name = LI.getName(); assert(LI.getAlignment() && "Alignment must be set at this point"); if (auto *ST = dyn_cast<StructType>(T)) { // If the struct only have one element, we unpack. - unsigned Count = ST->getNumElements(); - if (Count == 1) { + auto NumElements = ST->getNumElements(); + if (NumElements == 1) { LoadInst *NewLoad = combineLoadToNewType(IC, LI, ST->getTypeAtIndex(0U), ".unpack"); return IC.ReplaceInstUsesWith(LI, IC.Builder->CreateInsertValue( - UndefValue::get(T), NewLoad, 0, LI.getName())); + UndefValue::get(T), NewLoad, 0, Name)); } // We don't want to break loads with padding here as we'd loose @@ -542,23 +543,29 @@ static Instruction *unpackLoadToAggregat if (SL->hasPadding()) return nullptr; - auto Name = LI.getName(); + auto Align = LI.getAlignment(); + if (!Align) + Align = DL.getABITypeAlignment(ST); + SmallString<16> LoadName = Name; LoadName += ".unpack"; SmallString<16> EltName = Name; EltName += ".elt"; + auto *Addr = LI.getPointerOperand(); - Value *V = UndefValue::get(T); - auto *IdxType = Type::getInt32Ty(ST->getContext()); + auto *IdxType = Type::getInt32Ty(T->getContext()); auto *Zero = ConstantInt::get(IdxType, 0); - for (unsigned i = 0; i < Count; i++) { + + Value *V = UndefValue::get(T); + for (unsigned i = 0; i < NumElements; i++) { Value *Indices[2] = { Zero, ConstantInt::get(IdxType, i), }; - auto *Ptr = IC.Builder->CreateInBoundsGEP(ST, Addr, makeArrayRef(Indices), EltName); - auto *L = IC.Builder->CreateAlignedLoad(Ptr, LI.getAlignment(), - LoadName); + auto *Ptr = IC.Builder->CreateInBoundsGEP(ST, Addr, + makeArrayRef(Indices), EltName); + auto EltAlign = MinAlign(Align, SL->getElementOffset(i)); + auto *L = IC.Builder->CreateAlignedLoad(Ptr, EltAlign, LoadName); V = IC.Builder->CreateInsertValue(V, L, i); } @@ -950,11 +957,16 @@ static bool unpackStoreToAggregate(InstC if (SL->hasPadding()) return false; + auto Align = SI.getAlignment(); + if (!Align) + Align = DL.getABITypeAlignment(ST); + SmallString<16> EltName = V->getName(); EltName += ".elt"; auto *Addr = SI.getPointerOperand(); SmallString<16> AddrName = Addr->getName(); AddrName += ".repack"; + auto *IdxType = Type::getInt32Ty(ST->getContext()); auto *Zero = ConstantInt::get(IdxType, 0); for (unsigned i = 0; i < Count; i++) { @@ -962,9 +974,11 @@ static bool unpackStoreToAggregate(InstC Zero, ConstantInt::get(IdxType, i), }; - auto *Ptr = IC.Builder->CreateInBoundsGEP(ST, Addr, makeArrayRef(Indices), AddrName); + auto *Ptr = IC.Builder->CreateInBoundsGEP(ST, Addr, + makeArrayRef(Indices), AddrName); auto *Val = IC.Builder->CreateExtractValue(V, i, EltName); - IC.Builder->CreateStore(Val, Ptr); + auto EltAlign = MinAlign(Align, SL->getElementOffset(i)); + IC.Builder->CreateAlignedStore(Val, Ptr, EltAlign); } return true; Modified: llvm/branches/release_38/test/Transforms/InstCombine/unpack-fca.ll URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_38/test/Transforms/InstCombine/unpack-fca.ll?rev=271230&r1=271229&r2=271230&view=diff ============================================================================== --- llvm/branches/release_38/test/Transforms/InstCombine/unpack-fca.ll (original) +++ llvm/branches/release_38/test/Transforms/InstCombine/unpack-fca.ll Mon May 30 15:42:50 2016 @@ -151,3 +151,30 @@ define i32 @packed_alignment(%struct.S* %v = extractvalue %struct.T %tv, 1 ret i32 %v } + +%struct.U = type {i8, i8, i8, i8, i8, i8, i8, i8, i64} + +define void @check_alignment(%struct.U* %u, %struct.U* %v) { +; CHECK-LABEL: check_alignment +; CHECK: load i8, i8* {{.*}}, align 8 +; CHECK: load i8, i8* {{.*}}, align 1 +; CHECK: load i8, i8* {{.*}}, align 2 +; CHECK: load i8, i8* {{.*}}, align 1 +; CHECK: load i8, i8* {{.*}}, align 4 +; CHECK: load i8, i8* {{.*}}, align 1 +; CHECK: load i8, i8* {{.*}}, align 2 +; CHECK: load i8, i8* {{.*}}, align 1 +; CHECK: load i64, i64* {{.*}}, align 8 +; CHECK: store i8 {{.*}}, i8* {{.*}}, align 8 +; CHECK: store i8 {{.*}}, i8* {{.*}}, align 1 +; CHECK: store i8 {{.*}}, i8* {{.*}}, align 2 +; CHECK: store i8 {{.*}}, i8* {{.*}}, align 1 +; CHECK: store i8 {{.*}}, i8* {{.*}}, align 4 +; CHECK: store i8 {{.*}}, i8* {{.*}}, align 1 +; CHECK: store i8 {{.*}}, i8* {{.*}}, align 2 +; CHECK: store i8 {{.*}}, i8* {{.*}}, align 1 +; CHECK: store i64 {{.*}}, i64* {{.*}}, align 8 + %1 = load %struct.U, %struct.U* %u + store %struct.U %1, %struct.U* %v + ret void +} _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
