[llvm] r235453 - Revert r235451 since it is attached to a wrong Differential Revision. Sorry.

[Wei Mi]

Author: wmi
Date: Tue Apr 21 17:56:09 2015
New Revision: 235453

URL: http://llvm.org/viewvc/llvm-project?rev=235453&view=rev
Log:
Revert r235451 since it is attached to a wrong Differential Revision. Sorry.

Added:
    llvm/trunk/test/Transforms/InstCombine/descale-zero.ll
      - copied unchanged from r235450, llvm/trunk/test/Transforms/InstCombine/descale-zero.ll
Removed:
    llvm/trunk/test/Transforms/InstCombine/gep-merge.ll
Modified:
    llvm/trunk/lib/Transforms/InstCombine/InstructionCombining.cpp
    llvm/trunk/test/Transforms/InstCombine/getelementptr.ll

Modified: llvm/trunk/lib/Transforms/InstCombine/InstructionCombining.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstructionCombining.cpp?rev=235453&r1=235452&r2=235453&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/InstCombine/InstructionCombining.cpp (original)
+++ llvm/trunk/lib/Transforms/InstCombine/InstructionCombining.cpp Tue Apr 21 17:56:09 2015
@@ -1467,11 +1467,6 @@ Instruction *InstCombiner::visitGetEleme
         // normalized.
         if (SO1->getType() != GO1->getType())
           return nullptr;
-        // Only do the combine when GO1 and SO1 are both constants. Only in
-        // this case, we are sure the cost after the merge is never more than
-        // that before the merge.
-        if (!isa<Constant>(GO1) || !isa<Constant>(SO1))
-          return nullptr;
         Sum = Builder->CreateAdd(SO1, GO1, PtrOp->getName()+".sum");
       }
 

Removed: llvm/trunk/test/Transforms/InstCombine/gep-merge.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/gep-merge.ll?rev=235452&view=auto
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/gep-merge.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/gep-merge.ll (removed)
@@ -1,48 +0,0 @@
-; This test makes sure that gep(gep ...) merge doesn't come into effect.
-; RUN: opt < %s -instcombine -S | FileCheck %s
-
-; Make sure there are no geps being merged.
-; CHECK-LABEL: @fn3(
-; CHECK: getelementptr
-; CHECK: getelementptr
-; CHECK: getelementptr
-
- at _ZN2cv1aE = global i8* zeroinitializer, align 8
-declare i32 @fn1() #2
-declare i32 @fn2() #2
-
-; Function Attrs: uwtable
-define linkonce_odr i32 @fn3() {
-entry:
-  %call = call i32 @fn1()
-  %call1 = call i32 @fn2()
-  %0 = load i8*, i8** @_ZN2cv1aE, align 8
-  %idx.ext2 = sext i32 %call1 to i64
-  %add.ptr3 = getelementptr inbounds i8, i8* %0, i64 %idx.ext2
-  br label %for.cond5
-
-for.cond5:
-  %total1 = phi i32 [ 0, %entry ], [ %total2, %for.body7 ]
-  %x.1 = phi i32 [ 0, %entry ], [ %inc, %for.body7 ]
-  %cmp6 = icmp slt i32 %x.1, %call
-  br i1 %cmp6, label %for.body7, label %for.cond34
-
-for.body7:                                        ; preds = %for.cond5
-  %mul = mul nsw i32 %x.1, 2
-  %idxprom = sext i32 %mul to i64
-  %arrayidx = getelementptr inbounds i8, i8* %add.ptr3, i64 %idxprom
-  %1 = load i8, i8* %arrayidx, align 1
-  %conv = zext i8 %1 to i32
-  %sub = sub nsw i32 %mul, 1
-  %idxprom10 = sext i32 %sub to i64
-  %arrayidx11 = getelementptr inbounds i8, i8* %add.ptr3, i64 %idxprom10
-  %2 = load i8, i8* %arrayidx11, align 1
-  %conv2 = zext i8 %2 to i32
-  %add1 = add nsw i32 %conv, %conv2
-  %total2 = add nsw i32 %total1, %add1
-  %inc = add nsw i32 %x.1, 1
-  br label %for.cond5
-
-for.cond34:
-  ret i32 %total1
-}

Modified: llvm/trunk/test/Transforms/InstCombine/getelementptr.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/getelementptr.ll?rev=235453&r1=235452&r2=235453&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/getelementptr.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/getelementptr.ll Tue Apr 21 17:56:09 2015
@@ -104,8 +104,8 @@ define i32* @test7(i32* %I, i64 %C, i64
         %B = getelementptr i32, i32* %A, i64 %D
         ret i32* %B
 ; CHECK-LABEL: @test7(
-; CHECK: %A = getelementptr i32, i32* %I, i64 %C
-; CHECK: %B = getelementptr i32, i32* %A, i64 %D
+; CHECK: %A.sum = add i64 %C, %D
+; CHECK: getelementptr i32, i32* %I, i64 %A.sum
 }
 
 define i8* @test8([10 x i32]* %X) {