[llvm] r351619 - Revert "Reapply "[CGP] Check for existing inttotpr before creating new one""

[Roman Tereshin via llvm-commits]

Author: rtereshin
Date: Fri Jan 18 17:53:26 2019
New Revision: 351619

URL: http://llvm.org/viewvc/llvm-project?rev=351619&view=rev
Log:
Revert "Reapply "[CGP] Check for existing inttotpr before creating new one""

This reverts commit r351618.

Compiler RT + ASAN tests are failing for PowerPC. Not sure
how would I reproduce these on macOS, so reverting (again)
until I do.

Removed:
    llvm/trunk/test/Transforms/CodeGenPrepare/X86/sink-addrmode-cse-inttoptrs.ll
Modified:
    llvm/trunk/lib/CodeGen/CodeGenPrepare.cpp

Modified: llvm/trunk/lib/CodeGen/CodeGenPrepare.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/CodeGenPrepare.cpp?rev=351619&r1=351618&r2=351619&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/CodeGenPrepare.cpp (original)
+++ llvm/trunk/lib/CodeGen/CodeGenPrepare.cpp Fri Jan 18 17:53:26 2019
@@ -4664,26 +4664,13 @@ bool CodeGenPrepare::optimizeMemoryInst(
     // will look through it and provide only the integer value. In that case,
     // use it here.
     if (!DL->isNonIntegralPointerType(Addr->getType())) {
-      const auto getResultPtr = [MemoryInst, Addr,
-                                 &Builder](Value *Reg) -> Value * {
-        BasicBlock *BB = MemoryInst->getParent();
-        for (User *U : Reg->users())
-          if (auto *I2P = dyn_cast<IntToPtrInst>(U))
-            if (I2P->getType() == Addr->getType() && I2P->getParent() == BB) {
-              if (isa<Instruction>(Reg) &&
-                  cast<Instruction>(Reg)->getParent() == BB)
-                I2P->moveAfter(cast<Instruction>(Reg));
-              else
-                I2P->moveBefore(BB->getFirstNonPHI());
-              return I2P;
-            }
-        return Builder.CreateIntToPtr(Reg, Addr->getType(), "sunkaddr");
-      };
       if (!ResultPtr && AddrMode.BaseReg) {
-        ResultPtr = getResultPtr(AddrMode.BaseReg);
+        ResultPtr = Builder.CreateIntToPtr(AddrMode.BaseReg, Addr->getType(),
+                                           "sunkaddr");
         AddrMode.BaseReg = nullptr;
       } else if (!ResultPtr && AddrMode.Scale == 1) {
-        ResultPtr = getResultPtr(AddrMode.ScaledReg);
+        ResultPtr = Builder.CreateIntToPtr(AddrMode.ScaledReg, Addr->getType(),
+                                           "sunkaddr");
         AddrMode.Scale = 0;
       }
     }

Removed: llvm/trunk/test/Transforms/CodeGenPrepare/X86/sink-addrmode-cse-inttoptrs.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/CodeGenPrepare/X86/sink-addrmode-cse-inttoptrs.ll?rev=351618&view=auto
==============================================================================
--- llvm/trunk/test/Transforms/CodeGenPrepare/X86/sink-addrmode-cse-inttoptrs.ll (original)
+++ llvm/trunk/test/Transforms/CodeGenPrepare/X86/sink-addrmode-cse-inttoptrs.ll (removed)
@@ -1,64 +0,0 @@
-; RUN: opt -mtriple=x86_64-- -codegenprepare                        %s -S -o - | FileCheck %s --check-prefixes=CGP,COMMON
-; RUN: opt -mtriple=x86_64-- -codegenprepare -load-store-vectorizer %s -S -o - | FileCheck %s --check-prefixes=LSV,COMMON
-
-; Make sure CodeGenPrepare doesn't emit multiple inttoptr instructions
-; of the same integer value while sinking address computations, but
-; rather CSEs them on the fly: excessive inttoptr's confuse SCEV
-; into thinking that related pointers have nothing to do with each other.
-;
-; Triggering this problem involves having just right addressing modes,
-; and verifying that the motivating pass (LoadStoreVectorizer) is able
-; to benefit from it - just right LSV-policies. Hence the atypical combination
-; of the target and datalayout / address spaces in this test.
-
-target datalayout = "p1:32:32:32"
-
-define void @test1(i32 %tmp, i32 %off) {
-; COMMON-LABEL: @test1
-; CGP:     = inttoptr
-; CGP-NOT: = inttoptr
-; LSV:     = load <2 x float>
-; LSV:     = load <2 x float>
-entry:
-  %tmp1 = inttoptr i32 %tmp to float addrspace(1)*
-  %arrayidx.i.7 = getelementptr inbounds float, float addrspace(1)* %tmp1, i32 %off
-  %add20.i.7 = add i32 %off, 1
-  %arrayidx22.i.7 = getelementptr inbounds float, float addrspace(1)* %tmp1, i32 %add20.i.7
-  br label %for.body
-
-for.body:
-  %tmp8 = phi float [ undef, %entry ], [ %tmp62, %for.body ]
-  %tmp28 = load float, float addrspace(1)* %arrayidx.i.7
-  %tmp29 = load float, float addrspace(1)* %arrayidx22.i.7
-  %arrayidx.i321.7 = getelementptr inbounds float, float addrspace(1)* %tmp1, i32 0
-  %tmp43 = load float, float addrspace(1)* %arrayidx.i321.7
-  %arrayidx22.i327.7 = getelementptr inbounds float, float addrspace(1)* %tmp1, i32 1
-  %tmp44 = load float, float addrspace(1)* %arrayidx22.i327.7
-  %tmp62 = tail call fast float @foo(float %tmp8, float %tmp44, float %tmp43, float %tmp29, float %tmp28)
-  br label %for.body
-}
-
-define void @test2(i64 %a, i64 %b, i64 %c) {
-; COMMON-LABEL: @test2
-; CGP:    loop:
-; CGP-NEXT: %mul =
-; CGP-NEXT: = inttoptr i64 %mul
-; CGP-NOT:  = inttoptr
-; LSV:      store <2 x i64>
-entry:
-  %mul.neg.i630 = add nsw i64 %a, -16
-  br label %loop
-
-loop:
-  %mul = mul nsw i64 %b, -16
-  %sub.i631 = add nsw i64 %mul.neg.i630, %mul
-  %tmp = inttoptr i64 %sub.i631 to i8*
-  %tmp1 = inttoptr i64 %sub.i631 to i64*
-  store i64 %c, i64* %tmp1, align 16
-  %arrayidx172 = getelementptr inbounds i8, i8* %tmp, i64 8
-  %tmp2 = bitcast i8* %arrayidx172 to i64*
-  store i64 42, i64* %tmp2, align 8
-  br label %loop
-}
-
-declare float @foo(float, float, float, float, float)