[llvm] r212073 - AArch64: Actually do address type promotion

[Duncan P. N. Exon Smith]

I've temporarily disabled the pass in r212189 (it was effectively
disabled for a few months until r212073 and r212075).

> On 2014-Jul-02, at 10:01, Duncan P. N. Exon Smith <dexonsmith at apple.com> wrote:
> 
> Thanks for the heads up.  Looking now.
> 
>> On 2014-Jul-01, at 20:09, Chad Rosier <mcrosier at codeaurora.org> wrote:
>> 
>> Duncan,
>> Please take a look at PR20188 when you have a moment.
>> http://llvm.org/bugs/show_bug.cgi?id=20188
>> 
>> Chad
>> 
>>> Author: dexonsmith
>>> Date: Mon Jun 30 18:42:14 2014
>>> New Revision: 212073
>>> 
>>> URL: http://llvm.org/viewvc/llvm-project?rev=212073&view=rev
>>> Log:
>>> AArch64: Actually do address type promotion
>>> 
>>> AArch64AddressTypePromotion was doing nothing because it was using the
>>> old semantics of `Use` and `uses()`, when it really wanted to get at the
>>> `users()`.
>>> 
>>> Added:
>>>   llvm/trunk/test/CodeGen/AArch64/aarch64-address-type-promotion.ll
>>> Modified:
>>>   llvm/trunk/lib/Target/AArch64/AArch64AddressTypePromotion.cpp
>>> 
>>> Modified: llvm/trunk/lib/Target/AArch64/AArch64AddressTypePromotion.cpp
>>> URL:
>>> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AArch64/AArch64AddressTypePromotion.cpp?rev=212073&r1=212072&r2=212073&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/lib/Target/AArch64/AArch64AddressTypePromotion.cpp
>>> (original)
>>> +++ llvm/trunk/lib/Target/AArch64/AArch64AddressTypePromotion.cpp Mon Jun
>>> 30 18:42:14 2014
>>> @@ -214,8 +214,8 @@ AArch64AddressTypePromotion::shouldConsi
>>>  if (SExt->getType() != ConsideredSExtType)
>>>    return false;
>>> 
>>> -  for (const Use &U : SExt->uses()) {
>>> -    if (isa<GetElementPtrInst>(*U))
>>> +  for (const User *U : SExt->users()) {
>>> +    if (isa<GetElementPtrInst>(U))
>>>      return true;
>>>  }
>>> 
>>> @@ -436,7 +436,7 @@ void AArch64AddressTypePromotion::analyz
>>> 
>>>      bool insert = false;
>>>      // #1.
>>> -      for (const Use &U : SExt->uses()) {
>>> +      for (const User *U : SExt->users()) {
>>>        const Instruction *Inst = dyn_cast<GetElementPtrInst>(U);
>>>        if (Inst && Inst->getNumOperands() > 2) {
>>>          DEBUG(dbgs() << "Interesting use in GetElementPtrInst\n" <<
>>> *Inst
>>> 
>>> Added: llvm/trunk/test/CodeGen/AArch64/aarch64-address-type-promotion.ll
>>> URL:
>>> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/AArch64/aarch64-address-type-promotion.ll?rev=212073&view=auto
>>> ==============================================================================
>>> --- llvm/trunk/test/CodeGen/AArch64/aarch64-address-type-promotion.ll
>>> (added)
>>> +++ llvm/trunk/test/CodeGen/AArch64/aarch64-address-type-promotion.ll Mon
>>> Jun 30 18:42:14 2014
>>> @@ -0,0 +1,28 @@
>>> +; RUN: llc < %s -o - | FileCheck %s
>>> +
>>> +target datalayout =
>>> "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-n32:64"
>>> +target triple = "arm64-apple-macosx10.9"
>>> +
>>> +; Check that sexts get promoted above adds.
>>> +define void @foo(i32* nocapture %a, i32 %i) {
>>> +entry:
>>> +; CHECK-LABEL: _foo:
>>> +; CHECK: add
>>> +; CHECK-NEXT: ldp
>>> +; CHECK-NEXT: add
>>> +; CHECK-NEXT: str
>>> +; CHECK-NEXT: ret
>>> +  %add = add nsw i32 %i, 1
>>> +  %idxprom = sext i32 %add to i64
>>> +  %arrayidx = getelementptr inbounds i32* %a, i64 %idxprom
>>> +  %0 = load i32* %arrayidx, align 4
>>> +  %add1 = add nsw i32 %i, 2
>>> +  %idxprom2 = sext i32 %add1 to i64
>>> +  %arrayidx3 = getelementptr inbounds i32* %a, i64 %idxprom2
>>> +  %1 = load i32* %arrayidx3, align 4
>>> +  %add4 = add nsw i32 %1, %0
>>> +  %idxprom5 = sext i32 %i to i64
>>> +  %arrayidx6 = getelementptr inbounds i32* %a, i64 %idxprom5
>>> +  store i32 %add4, i32* %arrayidx6, align 4
>>> +  ret void
>>> +}
>>> 
>>> 
>>> _______________________________________________
>>> llvm-commits mailing list
>>> llvm-commits at cs.uiuc.edu
>>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>>> 
>> 
>> 
>