[llvm] 7f48171 - [InstCombine] Regenerate test checks; NFC

Nikita Popov via llvm-commits llvm-commits at lists.llvm.org
Wed Jan 1 11:39:38 PST 2020


Author: Nikita Popov
Date: 2020-01-01T20:27:57+01:00
New Revision: 7f48171d2f7ac8840b936cb202780fb90bc665be

URL: https://github.com/llvm/llvm-project/commit/7f48171d2f7ac8840b936cb202780fb90bc665be
DIFF: https://github.com/llvm/llvm-project/commit/7f48171d2f7ac8840b936cb202780fb90bc665be.diff

LOG: [InstCombine] Regenerate test checks; NFC

Added: 
    

Modified: 
    llvm/test/Transforms/InstCombine/getelementptr.ll
    llvm/test/Transforms/InstCombine/pr26992.ll

Removed: 
    


################################################################################
diff  --git a/llvm/test/Transforms/InstCombine/getelementptr.ll b/llvm/test/Transforms/InstCombine/getelementptr.ll
index 531d9873f4db..146ed04cdfe9 100644
--- a/llvm/test/Transforms/InstCombine/getelementptr.ll
+++ b/llvm/test/Transforms/InstCombine/getelementptr.ll
@@ -1,3 +1,4 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
 ; RUN: opt < %s -instcombine -S | FileCheck %s
 
 target datalayout = "e-p:64:64-p1:16:16-p2:32:32:32-p3:64:64:64"
@@ -14,61 +15,72 @@ target datalayout = "e-p:64:64-p1:16:16-p2:32:32:32-p3:64:64:64"
 
 ; Test noop elimination
 define i32* @test1(i32* %I) {
-        %A = getelementptr i32, i32* %I, i64 0
-        ret i32* %A
 ; CHECK-LABEL: @test1(
-; CHECK: ret i32* %I
+; CHECK-NEXT:    ret i32* [[I:%.*]]
+;
+  %A = getelementptr i32, i32* %I, i64 0
+  ret i32* %A
 }
 
 define i32 addrspace(1)* @test1_as1(i32 addrspace(1)* %I) {
+; CHECK-LABEL: @test1_as1(
+; CHECK-NEXT:    ret i32 addrspace(1)* [[I:%.*]]
+;
   %A = getelementptr i32, i32 addrspace(1)* %I, i64 0
   ret i32 addrspace(1)* %A
-; CHECK-LABEL: @test1_as1(
-; CHECK: ret i32 addrspace(1)* %I
 }
 
 ; Test noop elimination
 define i32* @test2(i32* %I) {
-        %A = getelementptr i32, i32* %I
-        ret i32* %A
 ; CHECK-LABEL: @test2(
-; CHECK: ret i32* %I
+; CHECK-NEXT:    ret i32* [[I:%.*]]
+;
+  %A = getelementptr i32, i32* %I
+  ret i32* %A
 }
 
 ; Test that two array indexing geps fold
 define i32* @test3(i32* %I) {
-        %A = getelementptr i32, i32* %I, i64 17
-        %B = getelementptr i32, i32* %A, i64 4
-        ret i32* %B
 ; CHECK-LABEL: @test3(
-; CHECK: getelementptr i32, i32* %I, i64 21
+; CHECK-NEXT:    [[B:%.*]] = getelementptr i32, i32* [[I:%.*]], i64 21
+; CHECK-NEXT:    ret i32* [[B]]
+;
+  %A = getelementptr i32, i32* %I, i64 17
+  %B = getelementptr i32, i32* %A, i64 4
+  ret i32* %B
 }
 
 ; Test that two getelementptr insts fold
 define i32* @test4({ i32 }* %I) {
-        %A = getelementptr { i32 }, { i32 }* %I, i64 1
-        %B = getelementptr { i32 }, { i32 }* %A, i64 0, i32 0
-        ret i32* %B
 ; CHECK-LABEL: @test4(
-; CHECK: getelementptr { i32 }, { i32 }* %I, i64 1, i32 0
+; CHECK-NEXT:    [[B:%.*]] = getelementptr { i32 }, { i32 }* [[I:%.*]], i64 1, i32 0
+; CHECK-NEXT:    ret i32* [[B]]
+;
+  %A = getelementptr { i32 }, { i32 }* %I, i64 1
+  %B = getelementptr { i32 }, { i32 }* %A, i64 0, i32 0
+  ret i32* %B
 }
 
 define void @test5(i8 %B) {
         ; This should be turned into a constexpr instead of being an instruction
-        %A = getelementptr [10 x i8], [10 x i8]* @Global, i64 0, i64 4
-        store i8 %B, i8* %A
-        ret void
 ; CHECK-LABEL: @test5(
-; CHECK: store i8 %B, i8* getelementptr inbounds ([10 x i8], [10 x i8]* @Global, i64 0, i64 4)
+; CHECK-NEXT:    store i8 [[B:%.*]], i8* getelementptr inbounds ([10 x i8], [10 x i8]* @Global, i64 0, i64 4), align 1
+; CHECK-NEXT:    ret void
+;
+  %A = getelementptr [10 x i8], [10 x i8]* @Global, i64 0, i64 4
+  store i8 %B, i8* %A
+  ret void
 }
 
 define void @test5_as1(i8 %B) {
         ; This should be turned into a constexpr instead of being an instruction
-        %A = getelementptr [10 x i8], [10 x i8] addrspace(1)* @Global_as1, i16 0, i16 4
-        store i8 %B, i8 addrspace(1)* %A
-        ret void
 ; CHECK-LABEL: @test5_as1(
-; CHECK: store i8 %B, i8 addrspace(1)* getelementptr inbounds ([10 x i8], [10 x i8] addrspace(1)* @Global_as1, i16 0, i16 4)
+; CHECK-NEXT:    store i8 [[B:%.*]], i8 addrspace(1)* getelementptr inbounds ([10 x i8], [10 x i8] addrspace(1)* @Global_as1, i16 0, i16 4), align 1
+; CHECK-NEXT:    ret void
+;
+  %A = getelementptr [10 x i8], [10 x i8] addrspace(1)* @Global_as1, i16 0, i16 4
+  store i8 %B, i8 addrspace(1)* %A
+  ret void
 }
 
 %as1_ptr_struct = type { i32 addrspace(1)* }
@@ -80,8 +92,9 @@ define void @test5_as1(i8 %B) {
 ; This should be turned into a constexpr instead of being an instruction
 define void @test_evaluate_gep_nested_as_ptrs(i32 addrspace(2)* %B) {
 ; CHECK-LABEL: @test_evaluate_gep_nested_as_ptrs(
-; CHECK-NEXT: store i32 addrspace(2)* %B, i32 addrspace(2)* addrspace(1)* getelementptr inbounds (%as2_ptr_struct, %as2_ptr_struct addrspace(1)* @global_as1_as2_ptr, i16 0, i32 0), align 8
-; CHECK-NEXT: ret void
+; CHECK-NEXT:    store i32 addrspace(2)* [[B:%.*]], i32 addrspace(2)* addrspace(1)* getelementptr inbounds (%as2_ptr_struct, [[AS2_PTR_STRUCT:%.*]] addrspace(1)* @global_as1_as2_ptr, i16 0, i32 0), align 8
+; CHECK-NEXT:    ret void
+;
   %A = getelementptr %as2_ptr_struct, %as2_ptr_struct addrspace(1)* @global_as1_as2_ptr, i16 0, i32 0
   store i32 addrspace(2)* %B, i32 addrspace(2)* addrspace(1)* %A
   ret void
@@ -91,61 +104,77 @@ define void @test_evaluate_gep_nested_as_ptrs(i32 addrspace(2)* %B) {
 
 define void @test_evaluate_gep_as_ptrs_array(i8 addrspace(2)* %B) {
 ; CHECK-LABEL: @test_evaluate_gep_as_ptrs_array(
-; CHECK-NEXT: store i8 addrspace(2)* %B, i8 addrspace(2)* addrspace(1)* getelementptr inbounds ([4 x i8 addrspace(2)*], [4 x i8 addrspace(2)*] addrspace(1)* @arst, i16 0, i16 2), align 4
+; CHECK-NEXT:    store i8 addrspace(2)* [[B:%.*]], i8 addrspace(2)* addrspace(1)* getelementptr inbounds ([4 x i8 addrspace(2)*], [4 x i8 addrspace(2)*] addrspace(1)* @arst, i16 0, i16 2), align 4
+; CHECK-NEXT:    ret void
+;
 
-; CHECK-NEXT: ret void
   %A = getelementptr [4 x i8 addrspace(2)*], [4 x i8 addrspace(2)*] addrspace(1)* @arst, i16 0, i16 2
   store i8 addrspace(2)* %B, i8 addrspace(2)* addrspace(1)* %A
   ret void
 }
 
 define i32* @test7(i32* %I, i64 %C, i64 %D) {
-        %A = getelementptr i32, i32* %I, i64 %C
-        %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-NEXT:    [[A:%.*]] = getelementptr i32, i32* [[I:%.*]], i64 [[C:%.*]]
+; CHECK-NEXT:    [[B:%.*]] = getelementptr i32, i32* [[A]], i64 [[D:%.*]]
+; CHECK-NEXT:    ret i32* [[B]]
+;
+  %A = getelementptr i32, i32* %I, i64 %C
+  %B = getelementptr i32, i32* %A, i64 %D
+  ret i32* %B
 }
 
 define i8* @test8([10 x i32]* %X) {
         ;; Fold into the cast.
-        %A = getelementptr [10 x i32], [10 x i32]* %X, i64 0, i64 0
-        %B = bitcast i32* %A to i8*
-        ret i8* %B
 ; CHECK-LABEL: @test8(
-; CHECK: bitcast [10 x i32]* %X to i8*
+; CHECK-NEXT:    [[B:%.*]] = bitcast [10 x i32]* [[X:%.*]] to i8*
+; CHECK-NEXT:    ret i8* [[B]]
+;
+  %A = getelementptr [10 x i32], [10 x i32]* %X, i64 0, i64 0
+  %B = bitcast i32* %A to i8*
+  ret i8* %B
 }
 
 define i32 @test9() {
-        %A = getelementptr { i32, double }, { i32, double }* null, i32 0, i32 1
-        %B = ptrtoint double* %A to i32
-        ret i32 %B
 ; CHECK-LABEL: @test9(
-; CHECK: ret i32 8
+; CHECK-NEXT:    ret i32 8
+;
+  %A = getelementptr { i32, double }, { i32, double }* null, i32 0, i32 1
+  %B = ptrtoint double* %A to i32
+  ret i32 %B
 }
 
 define i1 @test10({ i32, i32 }* %x, { i32, i32 }* %y) {
-        %tmp.1 = getelementptr { i32, i32 }, { i32, i32 }* %x, i32 0, i32 1
-        %tmp.3 = getelementptr { i32, i32 }, { i32, i32 }* %y, i32 0, i32 1
-        ;; seteq x, y
-        %tmp.4 = icmp eq i32* %tmp.1, %tmp.3
-        ret i1 %tmp.4
 ; CHECK-LABEL: @test10(
-; CHECK: icmp eq { i32, i32 }* %x, %y
+; CHECK-NEXT:    [[TMP_4:%.*]] = icmp eq { i32, i32 }* [[X:%.*]], [[Y:%.*]]
+; CHECK-NEXT:    ret i1 [[TMP_4]]
+;
+  %tmp.1 = getelementptr { i32, i32 }, { i32, i32 }* %x, i32 0, i32 1
+  %tmp.3 = getelementptr { i32, i32 }, { i32, i32 }* %y, i32 0, i32 1
+  ;; seteq x, y
+  %tmp.4 = icmp eq i32* %tmp.1, %tmp.3
+  ret i1 %tmp.4
 }
 
 define i1 @test11({ i32, i32 }* %X) {
-        %P = getelementptr { i32, i32 }, { i32, i32 }* %X, i32 0, i32 0
-        %Q = icmp eq i32* %P, null
-        ret i1 %Q
 ; CHECK-LABEL: @test11(
-; CHECK: icmp eq { i32, i32 }* %X, null
+; CHECK-NEXT:    [[Q:%.*]] = icmp eq { i32, i32 }* [[X:%.*]], null
+; CHECK-NEXT:    ret i1 [[Q]]
+;
+  %P = getelementptr { i32, i32 }, { i32, i32 }* %X, i32 0, i32 0
+  %Q = icmp eq i32* %P, null
+  ret i1 %Q
 }
 
 
 ; PR4748
 define i32 @test12(%struct.A* %a) {
+; CHECK-LABEL: @test12(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[G3:%.*]] = getelementptr [[STRUCT_A:%.*]], %struct.A* [[A:%.*]], i64 0, i32 1
+; CHECK-NEXT:    store i32 10, i32* [[G3]], align 4
+; CHECK-NEXT:    ret i32 10
+;
 entry:
   %g3 = getelementptr %struct.A, %struct.A* %a, i32 0, i32 1
   store i32 10, i32* %g3, align 4
@@ -157,27 +186,25 @@ entry:
   %g5 = getelementptr %struct.A, %struct.A* %new_a, i32 0, i32 1
   %a_a = load i32, i32* %g5, align 4
   ret i32 %a_a
-; CHECK-LABEL:      @test12(
-; CHECK:      getelementptr %struct.A, %struct.A* %a, i64 0, i32 1
-; CHECK-NEXT: store i32 10, i32* %g3
-; CHECK-NEXT: ret i32 10
 }
 
 
 ; PR2235
 %S = type { i32, [ 100 x i32] }
 define i1 @test13(i64 %X, %S* %P) {
-        %A = getelementptr inbounds %S, %S* %P, i32 0, i32 1, i64 %X
-        %B = getelementptr inbounds %S, %S* %P, i32 0, i32 0
-	%C = icmp eq i32* %A, %B
-	ret i1 %C
 ; CHECK-LABEL: @test13(
-; CHECK:    %C = icmp eq i64 %X, -1
+; CHECK-NEXT:    [[C:%.*]] = icmp eq i64 [[X:%.*]], -1
+; CHECK-NEXT:    ret i1 [[C]]
+;
+  %A = getelementptr inbounds %S, %S* %P, i32 0, i32 1, i64 %X
+  %B = getelementptr inbounds %S, %S* %P, i32 0, i32 0
+  %C = icmp eq i32* %A, %B
+  ret i1 %C
 }
 
 define <2 x i1> @test13_vector(<2 x i64> %X, <2 x %S*> %P) nounwind {
 ; CHECK-LABEL: @test13_vector(
-; CHECK-NEXT:    [[C:%.*]] = icmp eq <2 x i64> %X, <i64 -1, i64 -1>
+; CHECK-NEXT:    [[C:%.*]] = icmp eq <2 x i64> [[X:%.*]], <i64 -1, i64 -1>
 ; CHECK-NEXT:    ret <2 x i1> [[C]]
 ;
   %A = getelementptr inbounds %S, <2 x %S*> %P, <2 x i64> zeroinitializer, <2 x i32> <i32 1, i32 1>, <2 x i64> %X
@@ -217,8 +244,9 @@ define <2 x i1> @test13_vector3(i64 %X, <2 x %S*> %P) nounwind {
 
 define i1 @test13_as1(i16 %X, %S addrspace(1)* %P) {
 ; CHECK-LABEL: @test13_as1(
-; CHECK-NEXT:  %C = icmp eq i16 %X, -1
-; CHECK-NEXT: ret i1 %C
+; CHECK-NEXT:    [[C:%.*]] = icmp eq i16 [[X:%.*]], -1
+; CHECK-NEXT:    ret i1 [[C]]
+;
   %A = getelementptr inbounds %S, %S addrspace(1)* %P, i16 0, i32 1, i16 %X
   %B = getelementptr inbounds %S, %S addrspace(1)* %P, i16 0, i32 0
   %C = icmp eq i32 addrspace(1)* %A, %B
@@ -227,7 +255,7 @@ define i1 @test13_as1(i16 %X, %S addrspace(1)* %P) {
 
 define <2 x i1> @test13_vector_as1(<2 x i16> %X, <2 x %S addrspace(1)*> %P) {
 ; CHECK-LABEL: @test13_vector_as1(
-; CHECK-NEXT:    [[C:%.*]] = icmp eq <2 x i16> %X, <i16 -1, i16 -1>
+; CHECK-NEXT:    [[C:%.*]] = icmp eq <2 x i16> [[X:%.*]], <i16 -1, i16 -1>
 ; CHECK-NEXT:    ret <2 x i1> [[C]]
 ;
   %A = getelementptr inbounds %S, <2 x %S addrspace(1)*> %P, <2 x i16> <i16 0, i16 0>, <2 x i32> <i32 1, i32 1>, <2 x i16> %X
@@ -238,7 +266,9 @@ define <2 x i1> @test13_vector_as1(<2 x i16> %X, <2 x %S addrspace(1)*> %P) {
 
 define i1 @test13_i32(i32 %X, %S* %P) {
 ; CHECK-LABEL: @test13_i32(
-; CHECK: %C = icmp eq i32 %X, -1
+; CHECK-NEXT:    [[C:%.*]] = icmp eq i32 [[X:%.*]], -1
+; CHECK-NEXT:    ret i1 [[C]]
+;
   %A = getelementptr inbounds %S, %S* %P, i32 0, i32 1, i32 %X
   %B = getelementptr inbounds %S, %S* %P, i32 0, i32 0
   %C = icmp eq i32* %A, %B
@@ -247,7 +277,9 @@ define i1 @test13_i32(i32 %X, %S* %P) {
 
 define i1 @test13_i16(i16 %X, %S* %P) {
 ; CHECK-LABEL: @test13_i16(
-; CHECK: %C = icmp eq i16 %X, -1
+; CHECK-NEXT:    [[C:%.*]] = icmp eq i16 [[X:%.*]], -1
+; CHECK-NEXT:    ret i1 [[C]]
+;
   %A = getelementptr inbounds %S, %S* %P, i16 0, i32 1, i16 %X
   %B = getelementptr inbounds %S, %S* %P, i16 0, i32 0
   %C = icmp eq i32* %A, %B
@@ -256,7 +288,10 @@ define i1 @test13_i16(i16 %X, %S* %P) {
 
 define i1 @test13_i128(i128 %X, %S* %P) {
 ; CHECK-LABEL: @test13_i128(
-; CHECK: %C = icmp eq i64 %1, -1
+; CHECK-NEXT:    [[TMP1:%.*]] = trunc i128 [[X:%.*]] to i64
+; CHECK-NEXT:    [[C:%.*]] = icmp eq i64 [[TMP1]], -1
+; CHECK-NEXT:    ret i1 [[C]]
+;
   %A = getelementptr inbounds %S, %S* %P, i128 0, i32 1, i128 %X
   %B = getelementptr inbounds %S, %S* %P, i128 0, i32 0
   %C = icmp eq i32* %A, %B
@@ -265,56 +300,69 @@ define i1 @test13_i128(i128 %X, %S* %P) {
 
 
 @G = external global [3 x i8]
-define i8* @test14(i32 %Idx) {
-        %idx = zext i32 %Idx to i64
-        %tmp = getelementptr i8, i8* getelementptr ([3 x i8], [3 x i8]* @G, i32 0, i32 0), i64 %idx
-        ret i8* %tmp
+define i8* @test14(i32 %idx) {
 ; CHECK-LABEL: @test14(
-; CHECK: getelementptr [3 x i8], [3 x i8]* @G, i64 0, i64 %idx
+; CHECK-NEXT:    [[ZEXT:%.*]] = zext i32 [[IDX:%.*]] to i64
+; CHECK-NEXT:    [[TMP:%.*]] = getelementptr [3 x i8], [3 x i8]* @G, i64 0, i64 [[ZEXT]]
+; CHECK-NEXT:    ret i8* [[TMP]]
+;
+  %zext = zext i32 %idx to i64
+  %tmp = getelementptr i8, i8* getelementptr ([3 x i8], [3 x i8]* @G, i32 0, i32 0), i64 %zext
+  ret i8* %tmp
 }
 
 
 ; Test folding of constantexpr geps into normal geps.
 @Array = external global [40 x i32]
 define i32 *@test15(i64 %X) {
-        %A = getelementptr i32, i32* getelementptr ([40 x i32], [40 x i32]* @Array, i64 0, i64 0), i64 %X
-        ret i32* %A
 ; CHECK-LABEL: @test15(
-; CHECK: getelementptr [40 x i32], [40 x i32]* @Array, i64 0, i64 %X
+; CHECK-NEXT:    [[A:%.*]] = getelementptr [40 x i32], [40 x i32]* @Array, i64 0, i64 [[X:%.*]]
+; CHECK-NEXT:    ret i32* [[A]]
+;
+  %A = getelementptr i32, i32* getelementptr ([40 x i32], [40 x i32]* @Array, i64 0, i64 0), i64 %X
+  ret i32* %A
 }
 
 
 define i32* @test16(i32* %X, i32 %Idx) {
-        %R = getelementptr i32, i32* %X, i32 %Idx
-        ret i32* %R
 ; CHECK-LABEL: @test16(
-; CHECK: sext i32 %Idx to i64
+; CHECK-NEXT:    [[TMP1:%.*]] = sext i32 [[IDX:%.*]] to i64
+; CHECK-NEXT:    [[R:%.*]] = getelementptr i32, i32* [[X:%.*]], i64 [[TMP1]]
+; CHECK-NEXT:    ret i32* [[R]]
+;
+  %R = getelementptr i32, i32* %X, i32 %Idx
+  ret i32* %R
 }
 
 
 define i1 @test17(i16* %P, i32 %I, i32 %J) {
-        %X = getelementptr inbounds i16, i16* %P, i32 %I
-        %Y = getelementptr inbounds i16, i16* %P, i32 %J
-        %C = icmp ult i16* %X, %Y
-        ret i1 %C
 ; CHECK-LABEL: @test17(
-; CHECK: %C = icmp slt i32 %I, %J
+; CHECK-NEXT:    [[C:%.*]] = icmp slt i32 [[I:%.*]], [[J:%.*]]
+; CHECK-NEXT:    ret i1 [[C]]
+;
+  %X = getelementptr inbounds i16, i16* %P, i32 %I
+  %Y = getelementptr inbounds i16, i16* %P, i32 %J
+  %C = icmp ult i16* %X, %Y
+  ret i1 %C
 }
 
 define i1 @test18(i16* %P, i32 %I) {
-        %X = getelementptr inbounds i16, i16* %P, i32 %I
-        %C = icmp ult i16* %X, %P
-        ret i1 %C
 ; CHECK-LABEL: @test18(
-; CHECK: %C = icmp slt i32 %I, 0
+; CHECK-NEXT:    [[C:%.*]] = icmp slt i32 [[I:%.*]], 0
+; CHECK-NEXT:    ret i1 [[C]]
+;
+  %X = getelementptr inbounds i16, i16* %P, i32 %I
+  %C = icmp ult i16* %X, %P
+  ret i1 %C
 }
 
 ; Larger than the pointer size for a non-zero address space
 define i1 @test18_as1(i16 addrspace(1)* %P, i32 %I) {
 ; CHECK-LABEL: @test18_as1(
-; CHECK-NEXT: %1 = trunc i32 %I to i16
-; CHECK-NEXT: %C = icmp slt i16 %1, 0
-; CHECK-NEXT: ret i1 %C
+; CHECK-NEXT:    [[TMP1:%.*]] = trunc i32 [[I:%.*]] to i16
+; CHECK-NEXT:    [[C:%.*]] = icmp slt i16 [[TMP1]], 0
+; CHECK-NEXT:    ret i1 [[C]]
+;
   %X = getelementptr inbounds i16, i16 addrspace(1)* %P, i32 %I
   %C = icmp ult i16 addrspace(1)* %X, %P
   ret i1 %C
@@ -323,9 +371,10 @@ define i1 @test18_as1(i16 addrspace(1)* %P, i32 %I) {
 ; Smaller than the pointer size for a non-zero address space
 define i1 @test18_as1_i32(i16 addrspace(1)* %P, i32 %I) {
 ; CHECK-LABEL: @test18_as1_i32(
-; CHECK-NEXT: %1 = trunc i32 %I to i16
-; CHECK-NEXT: %C = icmp slt i16 %1, 0
-; CHECK-NEXT: ret i1 %C
+; CHECK-NEXT:    [[TMP1:%.*]] = trunc i32 [[I:%.*]] to i16
+; CHECK-NEXT:    [[C:%.*]] = icmp slt i16 [[TMP1]], 0
+; CHECK-NEXT:    ret i1 [[C]]
+;
   %X = getelementptr inbounds i16, i16 addrspace(1)* %P, i32 %I
   %C = icmp ult i16 addrspace(1)* %X, %P
   ret i1 %C
@@ -334,7 +383,9 @@ define i1 @test18_as1_i32(i16 addrspace(1)* %P, i32 %I) {
 ; Smaller than pointer size
 define i1 @test18_i16(i16* %P, i16 %I) {
 ; CHECK-LABEL: @test18_i16(
-; CHECK: %C = icmp slt i16 %I, 0
+; CHECK-NEXT:    [[C:%.*]] = icmp slt i16 [[I:%.*]], 0
+; CHECK-NEXT:    ret i1 [[C]]
+;
   %X = getelementptr inbounds i16, i16* %P, i16 %I
   %C = icmp ult i16* %X, %P
   ret i1 %C
@@ -343,7 +394,9 @@ define i1 @test18_i16(i16* %P, i16 %I) {
 ; Same as pointer size
 define i1 @test18_i64(i16* %P, i64 %I) {
 ; CHECK-LABEL: @test18_i64(
-; CHECK: %C = icmp slt i64 %I, 0
+; CHECK-NEXT:    [[C:%.*]] = icmp slt i64 [[I:%.*]], 0
+; CHECK-NEXT:    ret i1 [[C]]
+;
   %X = getelementptr inbounds i16, i16* %P, i64 %I
   %C = icmp ult i16* %X, %P
   ret i1 %C
@@ -352,49 +405,66 @@ define i1 @test18_i64(i16* %P, i64 %I) {
 ; Larger than the pointer size
 define i1 @test18_i128(i16* %P, i128 %I) {
 ; CHECK-LABEL: @test18_i128(
-; CHECK: %C = icmp slt i64 %1, 0
+; CHECK-NEXT:    [[TMP1:%.*]] = trunc i128 [[I:%.*]] to i64
+; CHECK-NEXT:    [[C:%.*]] = icmp slt i64 [[TMP1]], 0
+; CHECK-NEXT:    ret i1 [[C]]
+;
   %X = getelementptr inbounds i16, i16* %P, i128 %I
   %C = icmp ult i16* %X, %P
   ret i1 %C
 }
 
 define i32 @test19(i32* %P, i32 %A, i32 %B) {
-        %tmp.4 = getelementptr inbounds i32, i32* %P, i32 %A
-        %tmp.9 = getelementptr inbounds i32, i32* %P, i32 %B
-        %tmp.10 = icmp eq i32* %tmp.4, %tmp.9
-        %tmp.11 = zext i1 %tmp.10 to i32
-        ret i32 %tmp.11
 ; CHECK-LABEL: @test19(
-; CHECK: icmp eq i32 %A, %B
+; CHECK-NEXT:    [[TMP_10:%.*]] = icmp eq i32 [[A:%.*]], [[B:%.*]]
+; CHECK-NEXT:    [[TMP_11:%.*]] = zext i1 [[TMP_10]] to i32
+; CHECK-NEXT:    ret i32 [[TMP_11]]
+;
+  %tmp.4 = getelementptr inbounds i32, i32* %P, i32 %A
+  %tmp.9 = getelementptr inbounds i32, i32* %P, i32 %B
+  %tmp.10 = icmp eq i32* %tmp.4, %tmp.9
+  %tmp.11 = zext i1 %tmp.10 to i32
+  ret i32 %tmp.11
 }
 
 define i32 @test20(i32* %P, i32 %A, i32 %B) {
-        %tmp.4 = getelementptr inbounds i32, i32* %P, i32 %A
-        %tmp.6 = icmp eq i32* %tmp.4, %P
-        %tmp.7 = zext i1 %tmp.6 to i32
-        ret i32 %tmp.7
 ; CHECK-LABEL: @test20(
-; CHECK: icmp eq i32 %A, 0
+; CHECK-NEXT:    [[TMP_6:%.*]] = icmp eq i32 [[A:%.*]], 0
+; CHECK-NEXT:    [[TMP_7:%.*]] = zext i1 [[TMP_6]] to i32
+; CHECK-NEXT:    ret i32 [[TMP_7]]
+;
+  %tmp.4 = getelementptr inbounds i32, i32* %P, i32 %A
+  %tmp.6 = icmp eq i32* %tmp.4, %P
+  %tmp.7 = zext i1 %tmp.6 to i32
+  ret i32 %tmp.7
 }
 
 define i32 @test20_as1(i32 addrspace(1)* %P, i32 %A, i32 %B) {
+; CHECK-LABEL: @test20_as1(
+; CHECK-NEXT:    [[TMP1:%.*]] = trunc i32 [[A:%.*]] to i16
+; CHECK-NEXT:    [[TMP_6:%.*]] = icmp eq i16 [[TMP1]], 0
+; CHECK-NEXT:    [[TMP_7:%.*]] = zext i1 [[TMP_6]] to i32
+; CHECK-NEXT:    ret i32 [[TMP_7]]
+;
   %tmp.4 = getelementptr inbounds i32, i32 addrspace(1)* %P, i32 %A
   %tmp.6 = icmp eq i32 addrspace(1)* %tmp.4, %P
   %tmp.7 = zext i1 %tmp.6 to i32
   ret i32 %tmp.7
-; CHECK-LABEL: @test20_as1(
-; CHECK: icmp eq i16 %1, 0
 }
 
 
 define i32 @test21() {
-        %pbob1 = alloca %intstruct
-        %pbob2 = getelementptr %intstruct, %intstruct* %pbob1
-        %pbobel = getelementptr %intstruct, %intstruct* %pbob2, i64 0, i32 0
-        %rval = load i32, i32* %pbobel
-        ret i32 %rval
 ; CHECK-LABEL: @test21(
-; CHECK: getelementptr inbounds %intstruct, %intstruct* %pbob1, i64 0, i32 0
+; CHECK-NEXT:    [[PBOB1:%.*]] = alloca [[INTSTRUCT:%.*]], align 8
+; CHECK-NEXT:    [[PBOBEL:%.*]] = getelementptr inbounds [[INTSTRUCT]], %intstruct* [[PBOB1]], i64 0, i32 0
+; CHECK-NEXT:    [[RVAL:%.*]] = load i32, i32* [[PBOBEL]], align 8
+; CHECK-NEXT:    ret i32 [[RVAL]]
+;
+  %pbob1 = alloca %intstruct
+  %pbob2 = getelementptr %intstruct, %intstruct* %pbob1
+  %pbobel = getelementptr %intstruct, %intstruct* %pbob2, i64 0, i32 0
+  %rval = load i32, i32* %pbobel
+  ret i32 %rval
 }
 
 
@@ -402,36 +472,43 @@ define i32 @test21() {
 @B = global i32 2               ; <i32*> [#uses=1]
 
 define i1 @test22() {
-        %C = icmp ult i32* getelementptr (i32, i32* @A, i64 1),
-                           getelementptr (i32, i32* @B, i64 2)
-        ret i1 %C
 ; CHECK-LABEL: @test22(
-; CHECK: icmp ult (i32* getelementptr inbounds (i32, i32* @A, i64 1), i32* getelementptr (i32, i32* @B, i64 2))
+; CHECK-NEXT:    ret i1 icmp ult (i32* getelementptr inbounds (i32, i32* @A, i64 1), i32* getelementptr (i32, i32* @B, i64 2))
+;
+  %C = icmp ult i32* getelementptr (i32, i32* @A, i64 1),
+  getelementptr (i32, i32* @B, i64 2)
+  ret i1 %C
 }
 
 
 %X = type { [10 x i32], float }
 
 define i1 @test23() {
-        %A = getelementptr %X, %X* null, i64 0, i32 0, i64 0                ; <i32*> [#uses=1]
-        %B = icmp ne i32* %A, null              ; <i1> [#uses=1]
-        ret i1 %B
 ; CHECK-LABEL: @test23(
-; CHECK: ret i1 false
+; CHECK-NEXT:    ret i1 false
+;
+  %A = getelementptr %X, %X* null, i64 0, i32 0, i64 0                ; <i32*> [#uses=1]
+  %B = icmp ne i32* %A, null              ; <i1> [#uses=1]
+  ret i1 %B
 }
 
 define void @test25() {
-entry:
-        %tmp = getelementptr { i64, i64, i64, i64 }, { i64, i64, i64, i64 }* null, i32 0, i32 3         ; <i64*> [#uses=1]
-        %tmp.upgrd.1 = load i64, i64* %tmp           ; <i64> [#uses=1]
-        %tmp8.ui = load i64, i64* null               ; <i64> [#uses=1]
-        %tmp8 = bitcast i64 %tmp8.ui to i64             ; <i64> [#uses=1]
-        %tmp9 = and i64 %tmp8, %tmp.upgrd.1             ; <i64> [#uses=1]
-        %sext = trunc i64 %tmp9 to i32          ; <i32> [#uses=1]
-        %tmp27.i = sext i32 %sext to i64                ; <i64> [#uses=1]
-        tail call void @foo25( i32 0, i64 %tmp27.i )
-        unreachable
 ; CHECK-LABEL: @test25(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    store i64 undef, i64* null, align 536870912
+; CHECK-NEXT:    tail call void @foo25(i32 0, i64 0)
+; CHECK-NEXT:    unreachable
+;
+entry:
+  %tmp = getelementptr { i64, i64, i64, i64 }, { i64, i64, i64, i64 }* null, i32 0, i32 3         ; <i64*> [#uses=1]
+  %tmp.upgrd.1 = load i64, i64* %tmp           ; <i64> [#uses=1]
+  %tmp8.ui = load i64, i64* null               ; <i64> [#uses=1]
+  %tmp8 = bitcast i64 %tmp8.ui to i64             ; <i64> [#uses=1]
+  %tmp9 = and i64 %tmp8, %tmp.upgrd.1             ; <i64> [#uses=1]
+  %sext = trunc i64 %tmp9 to i32          ; <i32> [#uses=1]
+  %tmp27.i = sext i32 %sext to i64                ; <i64> [#uses=1]
+  tail call void @foo25( i32 0, i64 %tmp27.i )
+  unreachable
 }
 
 declare void @foo25(i32, i64)
@@ -439,12 +516,13 @@ declare void @foo25(i32, i64)
 
 ; PR1637
 define i1 @test26(i8* %arr) {
-        %X = getelementptr i8, i8* %arr, i32 1
-        %Y = getelementptr i8, i8* %arr, i32 1
-        %test = icmp uge i8* %X, %Y
-        ret i1 %test
 ; CHECK-LABEL: @test26(
-; CHECK: ret i1 true
+; CHECK-NEXT:    ret i1 true
+;
+  %X = getelementptr i8, i8* %arr, i32 1
+  %Y = getelementptr i8, i8* %arr, i32 1
+  %test = icmp uge i8* %X, %Y
+  ret i1 %test
 }
 
 	%struct.__large_struct = type { [100 x i64] }
@@ -453,21 +531,30 @@ define i1 @test26(i8* %arr) {
 	%struct.sigval_t = type { i8* }
 
 define i32 @test27(%struct.compat_siginfo* %to, %struct.siginfo_t* %from) {
-entry:
-	%from_addr = alloca %struct.siginfo_t*
-	%tmp344 = load %struct.siginfo_t*, %struct.siginfo_t** %from_addr, align 8
-	%tmp345 = getelementptr %struct.siginfo_t, %struct.siginfo_t* %tmp344, i32 0, i32 3
-	%tmp346 = getelementptr { { i32, i32, [0 x i8], %struct.sigval_t, i32 }, [88 x i8] }, { { i32, i32, [0 x i8], %struct.sigval_t, i32 }, [88 x i8] }* %tmp345, i32 0, i32 0
-	%tmp346347 = bitcast { i32, i32, [0 x i8], %struct.sigval_t, i32 }* %tmp346 to { i32, i32, %struct.sigval_t }*
-	%tmp348 = getelementptr { i32, i32, %struct.sigval_t }, { i32, i32, %struct.sigval_t }* %tmp346347, i32 0, i32 2
-	%tmp349 = getelementptr %struct.sigval_t, %struct.sigval_t* %tmp348, i32 0, i32 0
-	%tmp349350 = bitcast i8** %tmp349 to i32*
-	%tmp351 = load i32, i32* %tmp349350, align 8
-	%tmp360 = call i32 asm sideeffect "...",
-        "=r,ir,*m,i,0,~{dirflag},~{fpsr},~{flags}"( i32 %tmp351,
-         %struct.__large_struct* null, i32 -14, i32 0 )
-	unreachable
 ; CHECK-LABEL: @test27(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[FROM_ADDR:%.*]] = alloca %struct.siginfo_t*, align 8
+; CHECK-NEXT:    [[TMP344:%.*]] = load %struct.siginfo_t*, %struct.siginfo_t** [[FROM_ADDR]], align 8
+; CHECK-NEXT:    [[TMP349:%.*]] = getelementptr [[STRUCT_SIGINFO_T:%.*]], %struct.siginfo_t* [[TMP344]], i64 0, i32 3, i32 0, i32 3, i32 0
+; CHECK-NEXT:    [[TMP349350:%.*]] = bitcast i8** [[TMP349]] to i32*
+; CHECK-NEXT:    [[TMP351:%.*]] = load i32, i32* [[TMP349350]], align 8
+; CHECK-NEXT:    [[TMP360:%.*]] = call i32 asm sideeffect "...", "=r,ir,*m,i,0,~{dirflag},~{fpsr},~{flags}"(i32 [[TMP351]], %struct.__large_struct* null, i32 -14, i32 0) #0
+; CHECK-NEXT:    unreachable
+;
+entry:
+  %from_addr = alloca %struct.siginfo_t*
+  %tmp344 = load %struct.siginfo_t*, %struct.siginfo_t** %from_addr, align 8
+  %tmp345 = getelementptr %struct.siginfo_t, %struct.siginfo_t* %tmp344, i32 0, i32 3
+  %tmp346 = getelementptr { { i32, i32, [0 x i8], %struct.sigval_t, i32 }, [88 x i8] }, { { i32, i32, [0 x i8], %struct.sigval_t, i32 }, [88 x i8] }* %tmp345, i32 0, i32 0
+  %tmp346347 = bitcast { i32, i32, [0 x i8], %struct.sigval_t, i32 }* %tmp346 to { i32, i32, %struct.sigval_t }*
+  %tmp348 = getelementptr { i32, i32, %struct.sigval_t }, { i32, i32, %struct.sigval_t }* %tmp346347, i32 0, i32 2
+  %tmp349 = getelementptr %struct.sigval_t, %struct.sigval_t* %tmp348, i32 0, i32 0
+  %tmp349350 = bitcast i8** %tmp349 to i32*
+  %tmp351 = load i32, i32* %tmp349350, align 8
+  %tmp360 = call i32 asm sideeffect "...",
+  "=r,ir,*m,i,0,~{dirflag},~{fpsr},~{flags}"( i32 %tmp351,
+  %struct.__large_struct* null, i32 -14, i32 0 )
+  unreachable
 }
 
 ; PR1978
@@ -476,27 +563,42 @@ entry:
 @.str1 = internal constant [12 x i8] c"destroy %p\0A\00"
 
 define i32 @test28() nounwind  {
+; CHECK-LABEL: @test28(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[ORIENTATIONS:%.*]] = alloca [1 x [1 x %struct.x]], align 8
+; CHECK-NEXT:    [[TMP3:%.*]] = call i32 @puts(i8* nonnull dereferenceable(1) getelementptr inbounds ([6 x i8], [6 x i8]* @.str, i64 0, i64 0)) #0
+; CHECK-NEXT:    br label [[BB10:%.*]]
+; CHECK:       bb10:
+; CHECK-NEXT:    [[INDVAR:%.*]] = phi i32 [ 0, [[ENTRY:%.*]] ], [ [[INDVAR_NEXT:%.*]], [[BB10]] ]
+; CHECK-NEXT:    [[TMP12_REC:%.*]] = xor i32 [[INDVAR]], -1
+; CHECK-NEXT:    [[TMP0:%.*]] = sext i32 [[TMP12_REC]] to i64
+; CHECK-NEXT:    [[TMP12:%.*]] = getelementptr inbounds [1 x [1 x %struct.x]], [1 x [1 x %struct.x]]* [[ORIENTATIONS]], i64 1, i64 0, i64 [[TMP0]]
+; CHECK-NEXT:    [[TMP16:%.*]] = call i32 (i8*, ...) @printf(i8* nonnull dereferenceable(1) getelementptr inbounds ([12 x i8], [12 x i8]* @.str1, i64 0, i64 0), %struct.x* nonnull [[TMP12]]) #0
+; CHECK-NEXT:    [[TMP84:%.*]] = icmp eq i32 [[INDVAR]], 0
+; CHECK-NEXT:    [[INDVAR_NEXT]] = add i32 [[INDVAR]], 1
+; CHECK-NEXT:    br i1 [[TMP84]], label [[BB17:%.*]], label [[BB10]]
+; CHECK:       bb17:
+; CHECK-NEXT:    ret i32 0
+;
 entry:
-	%orientations = alloca [1 x [1 x %struct.x]]
-	%tmp3 = call i32 @puts( i8* getelementptr ([6 x i8], [6 x i8]* @.str, i32 0, i32 0) ) nounwind
-	%tmp45 = getelementptr inbounds [1 x [1 x %struct.x]], [1 x [1 x %struct.x]]* %orientations, i32 1, i32 0, i32 0
-	%orientations62 = getelementptr [1 x [1 x %struct.x]], [1 x [1 x %struct.x]]* %orientations, i32 0, i32 0, i32 0
-	br label %bb10
+  %orientations = alloca [1 x [1 x %struct.x]]
+  %tmp3 = call i32 @puts( i8* getelementptr ([6 x i8], [6 x i8]* @.str, i32 0, i32 0) ) nounwind
+  %tmp45 = getelementptr inbounds [1 x [1 x %struct.x]], [1 x [1 x %struct.x]]* %orientations, i32 1, i32 0, i32 0
+  %orientations62 = getelementptr [1 x [1 x %struct.x]], [1 x [1 x %struct.x]]* %orientations, i32 0, i32 0, i32 0
+  br label %bb10
 
 bb10:
-	%indvar = phi i32 [ 0, %entry ], [ %indvar.next, %bb10 ]
-	%tmp.0.reg2mem.0.rec = mul i32 %indvar, -1
-	%tmp12.rec = add i32 %tmp.0.reg2mem.0.rec, -1
-	%tmp12 = getelementptr inbounds %struct.x, %struct.x* %tmp45, i32 %tmp12.rec
-	%tmp16 = call i32 (i8*, ...) @printf( i8* nonnull dereferenceable(1) getelementptr ([12 x i8], [12 x i8]* @.str1, i32 0, i32 0), %struct.x* %tmp12 ) nounwind
-	%tmp84 = icmp eq %struct.x* %tmp12, %orientations62
-	%indvar.next = add i32 %indvar, 1
-	br i1 %tmp84, label %bb17, label %bb10
+  %indvar = phi i32 [ 0, %entry ], [ %indvar.next, %bb10 ]
+  %tmp.0.reg2mem.0.rec = mul i32 %indvar, -1
+  %tmp12.rec = add i32 %tmp.0.reg2mem.0.rec, -1
+  %tmp12 = getelementptr inbounds %struct.x, %struct.x* %tmp45, i32 %tmp12.rec
+  %tmp16 = call i32 (i8*, ...) @printf( i8* nonnull dereferenceable(1) getelementptr ([12 x i8], [12 x i8]* @.str1, i32 0, i32 0), %struct.x* %tmp12 ) nounwind
+  %tmp84 = icmp eq %struct.x* %tmp12, %orientations62
+  %indvar.next = add i32 %indvar, 1
+  br i1 %tmp84, label %bb17, label %bb10
 
 bb17:
-	ret i32 0
-; CHECK-LABEL: @test28(
-; CHECK: icmp eq i32 %indvar, 0
+  ret i32 0
 }
 
 declare i32 @puts(i8*)
@@ -509,36 +611,56 @@ declare i32 @printf(i8*, ...)
 ; rdar://6762290
 	%T = type <{ i64, i64, i64 }>
 define i32 @test29(i8* %start, i32 %X) nounwind {
+; CHECK-LABEL: @test29(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    store i64 undef, i64* null, align 536870912
+; CHECK-NEXT:    [[ADD_PTR:%.*]] = getelementptr i8, i8* [[START:%.*]], i64 undef
+; CHECK-NEXT:    [[TMP0:%.*]] = sext i32 [[X:%.*]] to i64
+; CHECK-NEXT:    [[ADD_PTR212:%.*]] = getelementptr i8, i8* [[START]], i64 [[TMP0]]
+; CHECK-NEXT:    [[CMP214:%.*]] = icmp ugt i8* [[ADD_PTR212]], [[ADD_PTR]]
+; CHECK-NEXT:    br i1 [[CMP214]], label [[IF_THEN216:%.*]], label [[IF_END363:%.*]]
+; CHECK:       if.then216:
+; CHECK-NEXT:    ret i32 1
+; CHECK:       if.end363:
+; CHECK-NEXT:    ret i32 0
+;
 entry:
-	%tmp3 = load i64, i64* null
-	%add.ptr = getelementptr i8, i8* %start, i64 %tmp3
-	%tmp158 = load i32, i32* null
-	%add.ptr159 = getelementptr %T, %T* null, i32 %tmp158
-	%add.ptr209 = getelementptr i8, i8* %start, i64 0
-	%add.ptr212 = getelementptr i8, i8* %add.ptr209, i32 %X
-	%cmp214 = icmp ugt i8* %add.ptr212, %add.ptr
-	br i1 %cmp214, label %if.then216, label %if.end363
+  %tmp3 = load i64, i64* null
+  %add.ptr = getelementptr i8, i8* %start, i64 %tmp3
+  %tmp158 = load i32, i32* null
+  %add.ptr159 = getelementptr %T, %T* null, i32 %tmp158
+  %add.ptr209 = getelementptr i8, i8* %start, i64 0
+  %add.ptr212 = getelementptr i8, i8* %add.ptr209, i32 %X
+  %cmp214 = icmp ugt i8* %add.ptr212, %add.ptr
+  br i1 %cmp214, label %if.then216, label %if.end363
 
 if.then216:
-	ret i32 1
+  ret i32 1
 
 if.end363:
-	ret i32 0
-; CHECK-LABEL: @test29(
+  ret i32 0
 }
 
 
 ; PR3694
 define i32 @test30(i32 %m, i32 %n) nounwind {
-entry:
-	%0 = alloca i32, i32 %n, align 4
-	%1 = bitcast i32* %0 to [0 x i32]*
-	call void @test30f(i32* %0) nounwind
-	%2 = getelementptr [0 x i32], [0 x i32]* %1, i32 0, i32 %m
-	%3 = load i32, i32* %2, align 4
-	ret i32 %3
 ; CHECK-LABEL: @test30(
-; CHECK: getelementptr i32
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[TMP0:%.*]] = zext i32 [[N:%.*]] to i64
+; CHECK-NEXT:    [[TMP1:%.*]] = alloca i32, i64 [[TMP0]], align 4
+; CHECK-NEXT:    call void @test30f(i32* nonnull [[TMP1]]) #0
+; CHECK-NEXT:    [[TMP2:%.*]] = sext i32 [[M:%.*]] to i64
+; CHECK-NEXT:    [[TMP3:%.*]] = getelementptr i32, i32* [[TMP1]], i64 [[TMP2]]
+; CHECK-NEXT:    [[TMP4:%.*]] = load i32, i32* [[TMP3]], align 4
+; CHECK-NEXT:    ret i32 [[TMP4]]
+;
+entry:
+  %0 = alloca i32, i32 %n, align 4
+  %1 = bitcast i32* %0 to [0 x i32]*
+  call void @test30f(i32* %0) nounwind
+  %2 = getelementptr [0 x i32], [0 x i32]* %1, i32 0, i32 %m
+  %3 = load i32, i32* %2, align 4
+  ret i32 %3
 }
 
 declare void @test30f(i32*)
@@ -546,30 +668,38 @@ declare void @test30f(i32*)
 
 
 define i1 @test31(i32* %A) {
-        %B = getelementptr i32, i32* %A, i32 1
-        %C = getelementptr i32, i32* %A, i64 1
-        %V = icmp eq i32* %B, %C
-        ret i1 %V
 ; CHECK-LABEL: @test31(
-; CHECK: ret i1 true
+; CHECK-NEXT:    ret i1 true
+;
+  %B = getelementptr i32, i32* %A, i32 1
+  %C = getelementptr i32, i32* %A, i64 1
+  %V = icmp eq i32* %B, %C
+  ret i1 %V
 }
 
 
 ; PR1345
 define i8* @test32(i8* %v) {
-	%A = alloca [4 x i8*], align 16
-	%B = getelementptr [4 x i8*], [4 x i8*]* %A, i32 0, i32 0
-	store i8* null, i8** %B
-	%C = bitcast [4 x i8*]* %A to { [16 x i8] }*
-	%D = getelementptr { [16 x i8] }, { [16 x i8] }* %C, i32 0, i32 0, i32 8
-	%E = bitcast i8* %D to i8**
-	store i8* %v, i8** %E
-	%F = getelementptr [4 x i8*], [4 x i8*]* %A, i32 0, i32 2
-	%G = load i8*, i8** %F
-	ret i8* %G
 ; CHECK-LABEL: @test32(
-; CHECK: %D = getelementptr inbounds [4 x i8*], [4 x i8*]* %A, i64 0, i64 1
-; CHECK: %F = getelementptr inbounds [4 x i8*], [4 x i8*]* %A, i64 0, i64 2
+; CHECK-NEXT:    [[A:%.*]] = alloca [4 x i8*], align 16
+; CHECK-NEXT:    [[B:%.*]] = getelementptr inbounds [4 x i8*], [4 x i8*]* [[A]], i64 0, i64 0
+; CHECK-NEXT:    store i8* null, i8** [[B]], align 16
+; CHECK-NEXT:    [[D:%.*]] = getelementptr inbounds [4 x i8*], [4 x i8*]* [[A]], i64 0, i64 1
+; CHECK-NEXT:    store i8* [[V:%.*]], i8** [[D]], align 8
+; CHECK-NEXT:    [[F:%.*]] = getelementptr inbounds [4 x i8*], [4 x i8*]* [[A]], i64 0, i64 2
+; CHECK-NEXT:    [[G:%.*]] = load i8*, i8** [[F]], align 16
+; CHECK-NEXT:    ret i8* [[G]]
+;
+  %A = alloca [4 x i8*], align 16
+  %B = getelementptr [4 x i8*], [4 x i8*]* %A, i32 0, i32 0
+  store i8* null, i8** %B
+  %C = bitcast [4 x i8*]* %A to { [16 x i8] }*
+  %D = getelementptr { [16 x i8] }, { [16 x i8] }* %C, i32 0, i32 0, i32 8
+  %E = bitcast i8* %D to i8**
+  store i8* %v, i8** %E
+  %F = getelementptr [4 x i8*], [4 x i8*]* %A, i32 0, i32 2
+  %G = load i8*, i8** %F
+  ret i8* %G
 }
 
 ; PR3290
@@ -578,7 +708,9 @@ define i8* @test32(i8* %v) {
 
 define i32* @test33(%struct.Key* %A) {
 ; CHECK-LABEL: @test33(
-; CHECK: getelementptr %struct.Key, %struct.Key* %A, i64 0, i32 0, i32 1
+; CHECK-NEXT:    [[TMP1:%.*]] = getelementptr [[STRUCT_KEY:%.*]], %struct.Key* [[A:%.*]], i64 0, i32 0, i32 1
+; CHECK-NEXT:    ret i32* [[TMP1]]
+;
   %B = bitcast %struct.Key* %A to %struct.anon*
   %C = getelementptr %struct.anon, %struct.anon* %B, i32 0, i32 2
   ret i32* %C
@@ -586,7 +718,9 @@ define i32* @test33(%struct.Key* %A) {
 
 define i32 addrspace(1)* @test33_as1(%struct.Key addrspace(1)* %A) {
 ; CHECK-LABEL: @test33_as1(
-; CHECK: getelementptr %struct.Key, %struct.Key addrspace(1)* %A, i16 0, i32 0, i32 1
+; CHECK-NEXT:    [[TMP1:%.*]] = getelementptr [[STRUCT_KEY:%.*]], [[STRUCT_KEY]] addrspace(1)* [[A:%.*]], i16 0, i32 0, i32 1
+; CHECK-NEXT:    ret i32 addrspace(1)* [[TMP1]]
+;
   %B = bitcast %struct.Key addrspace(1)* %A to %struct.anon addrspace(1)*
   %C = getelementptr %struct.anon, %struct.anon addrspace(1)* %B, i32 0, i32 2
   ret i32 addrspace(1)* %C
@@ -594,7 +728,9 @@ define i32 addrspace(1)* @test33_as1(%struct.Key addrspace(1)* %A) {
 
 define i32 addrspace(1)* @test33_array_as1([10 x i32] addrspace(1)* %A) {
 ; CHECK-LABEL: @test33_array_as1(
-; CHECK: getelementptr [10 x i32], [10 x i32] addrspace(1)* %A, i16 0, i16 2
+; CHECK-NEXT:    [[C:%.*]] = getelementptr [10 x i32], [10 x i32] addrspace(1)* [[A:%.*]], i16 0, i16 2
+; CHECK-NEXT:    ret i32 addrspace(1)* [[C]]
+;
   %B = bitcast [10 x i32] addrspace(1)* %A to [5 x i32] addrspace(1)*
   %C = getelementptr [5 x i32], [5 x i32] addrspace(1)* %B, i32 0, i32 2
   ret i32 addrspace(1)* %C
@@ -603,7 +739,9 @@ define i32 addrspace(1)* @test33_array_as1([10 x i32] addrspace(1)* %A) {
 ; Make sure the GEP indices use the right pointer sized integer
 define i32 addrspace(1)* @test33_array_struct_as1([10 x %struct.Key] addrspace(1)* %A) {
 ; CHECK-LABEL: @test33_array_struct_as1(
-; CHECK: getelementptr [10 x %struct.Key], [10 x %struct.Key] addrspace(1)* %A, i16 0, i16 1, i32 0, i32 0
+; CHECK-NEXT:    [[TMP1:%.*]] = getelementptr [10 x %struct.Key], [10 x %struct.Key] addrspace(1)* [[A:%.*]], i16 0, i16 1, i32 0, i32 0
+; CHECK-NEXT:    ret i32 addrspace(1)* [[TMP1]]
+;
   %B = bitcast [10 x %struct.Key] addrspace(1)* %A to [20 x i32] addrspace(1)*
   %C = getelementptr [20 x i32], [20 x i32] addrspace(1)* %B, i32 0, i32 2
   ret i32 addrspace(1)* %C
@@ -611,9 +749,10 @@ define i32 addrspace(1)* @test33_array_struct_as1([10 x %struct.Key] addrspace(1
 
 define i32 addrspace(1)* @test33_addrspacecast(%struct.Key* %A) {
 ; CHECK-LABEL: @test33_addrspacecast(
-; CHECK: %C = getelementptr %struct.Key, %struct.Key* %A, i64 0, i32 0, i32 1
-; CHECK-NEXT: addrspacecast i32* %C to i32 addrspace(1)*
-; CHECK-NEXT: ret
+; CHECK-NEXT:    [[C:%.*]] = getelementptr [[STRUCT_KEY:%.*]], %struct.Key* [[A:%.*]], i64 0, i32 0, i32 1
+; CHECK-NEXT:    [[TMP1:%.*]] = addrspacecast i32* [[C]] to i32 addrspace(1)*
+; CHECK-NEXT:    ret i32 addrspace(1)* [[TMP1]]
+;
   %B = addrspacecast %struct.Key* %A to %struct.anon addrspace(1)*
   %C = getelementptr %struct.anon, %struct.anon addrspace(1)* %B, i32 0, i32 2
   ret i32 addrspace(1)* %C
@@ -621,17 +760,19 @@ define i32 addrspace(1)* @test33_addrspacecast(%struct.Key* %A) {
 
 	%T2 = type { i8*, i8 }
 define i8* @test34(i8* %Val, i64 %V) nounwind {
+; CHECK-LABEL: @test34(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[C_CAST:%.*]] = inttoptr i64 [[V:%.*]] to i8*
+; CHECK-NEXT:    ret i8* [[C_CAST]]
+;
 entry:
-	%A = alloca %T2, align 8
-	%mrv_gep = bitcast %T2* %A to i64*
-	%B = getelementptr %T2, %T2* %A, i64 0, i32 0
+  %A = alloca %T2, align 8
+  %mrv_gep = bitcast %T2* %A to i64*
+  %B = getelementptr %T2, %T2* %A, i64 0, i32 0
 
-      	store i64 %V, i64* %mrv_gep
-	%C = load i8*, i8** %B, align 8
-	ret i8* %C
-; CHECK-LABEL: @test34(
-; CHECK: %[[C:.*]] = inttoptr i64 %V to i8*
-; CHECK: ret i8* %[[C]]
+  store i64 %V, i64* %mrv_gep
+  %C = load i8*, i8** %B, align 8
+  ret i8* %C
 }
 
 %t0 = type { i8*, [19 x i8] }
@@ -645,37 +786,43 @@ entry:
 ; Instcombine should be able to fold this getelementptr.
 
 define i32 @test35() nounwind {
+; CHECK-LABEL: @test35(
+; CHECK-NEXT:    [[TMP1:%.*]] = call i32 (i8*, ...) @printf(i8* nonnull dereferenceable(1) getelementptr inbounds ([17 x i8], [17 x i8]* @"\01LC8", i64 0, i64 0), i8* getelementptr inbounds (%t0, %t0* @s, i64 0, i32 1, i64 0)) #0
+; CHECK-NEXT:    ret i32 0
+;
   call i32 (i8*, ...) @printf(i8* getelementptr ([17 x i8], [17 x i8]* @"\01LC8", i32 0, i32 0),
-             i8* getelementptr (%t1, %t1* bitcast (%t0* @s to %t1*), i32 0, i32 1, i32 0)) nounwind
+  i8* getelementptr (%t1, %t1* bitcast (%t0* @s to %t1*), i32 0, i32 1, i32 0)) nounwind
   ret i32 0
-; CHECK-LABEL: @test35(
-; CHECK: call i32 (i8*, ...) @printf(i8*  nonnull dereferenceable(1) getelementptr inbounds ([17 x i8], [17 x i8]* @"\01LC8", i64 0, i64 0), i8* getelementptr inbounds (%t0, %t0* @s, i64 0, i32 1, i64 0)) [[$NUW:#[0-9]+]]
 }
 
 ; Don't treat signed offsets as unsigned.
 define i8* @test36() nounwind {
-  ret i8* getelementptr ([11 x i8], [11 x i8]* @array, i32 0, i64 -1)
 ; CHECK-LABEL: @test36(
-; CHECK: ret i8* getelementptr ([11 x i8], [11 x i8]* @array, i64 0, i64 -1)
+; CHECK-NEXT:    ret i8* getelementptr ([11 x i8], [11 x i8]* @array, i64 0, i64 -1)
+;
+  ret i8* getelementptr ([11 x i8], [11 x i8]* @array, i32 0, i64 -1)
 }
 
 ; Instcombine shouldn't assume that gep(A,0,1) != gep(A,1,0).
 @A37 = external constant [1 x i8]
 define i1 @test37() nounwind {
 ; CHECK-LABEL: @test37(
-; CHECK: ret i1 true
+; CHECK-NEXT:    ret i1 true
+;
   %t = icmp eq i8* getelementptr ([1 x i8], [1 x i8]* @A37, i64 0, i64 1),
-                   getelementptr ([1 x i8], [1 x i8]* @A37, i64 1, i64 0)
+  getelementptr ([1 x i8], [1 x i8]* @A37, i64 1, i64 0)
   ret i1 %t
 }
 
 ; Test index promotion
 define i32* @test38(i32* %I, i32 %n) {
-        %A = getelementptr i32, i32* %I, i32 %n
-        ret i32* %A
 ; CHECK-LABEL: @test38(
-; CHECK: = sext i32 %n to i64
-; CHECK: %A = getelementptr i32, i32* %I, i64 %
+; CHECK-NEXT:    [[TMP1:%.*]] = sext i32 [[N:%.*]] to i64
+; CHECK-NEXT:    [[A:%.*]] = getelementptr i32, i32* [[I:%.*]], i64 [[TMP1]]
+; CHECK-NEXT:    ret i32* [[A]]
+;
+  %A = getelementptr i32, i32* %I, i32 %n
+  ret i32* %A
 }
 
 ; Test that we don't duplicate work when the second gep is a "bitcast".
@@ -683,6 +830,14 @@ define i32* @test38(i32* %I, i32 %n) {
 declare void @pr10322_f2(%pr10322_t*)
 declare void @pr10322_f3(i8**)
 define void @pr10322_f1(%pr10322_t* %foo) {
+; CHECK-LABEL: @pr10322_f1(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[ARRAYIDX8:%.*]] = getelementptr inbounds [[PR10322_T:%.*]], %pr10322_t* [[FOO:%.*]], i64 2
+; CHECK-NEXT:    call void @pr10322_f2(%pr10322_t* nonnull [[ARRAYIDX8]]) #0
+; CHECK-NEXT:    [[TMP2:%.*]] = getelementptr inbounds [[PR10322_T]], %pr10322_t* [[ARRAYIDX8]], i64 0, i32 0
+; CHECK-NEXT:    call void @pr10322_f3(i8** nonnull [[TMP2]]) #0
+; CHECK-NEXT:    ret void
+;
 entry:
   %arrayidx8 = getelementptr inbounds %pr10322_t, %pr10322_t* %foo, i64 2
   call void @pr10322_f2(%pr10322_t* %arrayidx8) nounwind
@@ -690,8 +845,6 @@ entry:
   call void @pr10322_f3(i8** %tmp2) nounwind
   ret void
 
-; CHECK-LABEL: @pr10322_f1(
-; CHECK: %tmp2 = getelementptr inbounds %pr10322_t, %pr10322_t* %arrayidx8, i64 0, i32 0
 }
 
 ; Test that we combine the last two geps in this sequence, before we
@@ -700,14 +853,19 @@ entry:
 %three_gep_t2 = type {%three_gep_t}
 
 define void @three_gep_f(%three_gep_t2* %x) {
+; CHECK-LABEL: @three_gep_f(
+; CHECK-NEXT:    [[GEP1:%.*]] = getelementptr [[THREE_GEP_T2:%.*]], %three_gep_t2* [[X:%.*]], i64 2
+; CHECK-NEXT:    call void @three_gep_h(%three_gep_t2* [[GEP1]])
+; CHECK-NEXT:    [[GEP3:%.*]] = getelementptr [[THREE_GEP_T2]], %three_gep_t2* [[GEP1]], i64 0, i32 0, i32 0
+; CHECK-NEXT:    call void @three_gep_g(i32* [[GEP3]])
+; CHECK-NEXT:    ret void
+;
   %gep1 = getelementptr %three_gep_t2, %three_gep_t2* %x, i64 2
   call void @three_gep_h(%three_gep_t2* %gep1)
   %gep2 = getelementptr %three_gep_t2, %three_gep_t2* %gep1, i64 0, i32 0
   %gep3 = getelementptr %three_gep_t, %three_gep_t* %gep2, i64 0, i32 0
   call void @three_gep_g(i32* %gep3)
 
-; CHECK-LABEL: @three_gep_f(
-; CHECK: %gep3 = getelementptr %three_gep_t2, %three_gep_t2* %gep1, i64 0, i32 0, i32 0
   ret void
 }
 
@@ -718,6 +876,14 @@ declare void @three_gep_h(%three_gep_t2*)
 %struct.zot = type { i64, i8 }
 
 define void @test39(%struct.ham* %arg, i8 %arg1) nounwind {
+; CHECK-LABEL: @test39(
+; CHECK-NEXT:    [[TMP:%.*]] = getelementptr inbounds [[STRUCT_HAM:%.*]], %struct.ham* [[ARG:%.*]], i64 0, i32 2
+; CHECK-NEXT:    [[TMP1:%.*]] = bitcast %struct.zot** [[TMP]] to i8**
+; CHECK-NEXT:    [[TMP21:%.*]] = load i8*, i8** [[TMP1]], align 8
+; CHECK-NEXT:    [[TMP4:%.*]] = getelementptr inbounds i8, i8* [[TMP21]], i64 -8
+; CHECK-NEXT:    store i8 [[ARG1:%.*]], i8* [[TMP4]], align 8
+; CHECK-NEXT:    ret void
+;
   %tmp = getelementptr inbounds %struct.ham, %struct.ham* %arg, i64 0, i32 2
   %tmp2 = load %struct.zot*, %struct.zot** %tmp, align 8
   %tmp3 = bitcast %struct.zot* %tmp2 to i8*
@@ -725,25 +891,27 @@ define void @test39(%struct.ham* %arg, i8 %arg1) nounwind {
   store i8 %arg1, i8* %tmp4, align 8
   ret void
 
-; CHECK-LABEL: @test39(
-; CHECK: getelementptr inbounds %struct.ham, %struct.ham* %arg, i64 0, i32 2
-; CHECK: getelementptr inbounds i8, i8* %{{.+}}, i64 -8
 }
 
 define i1 @pr16483([1 x i8]* %a, [1 x i8]* %b) {
+; CHECK-LABEL: @pr16483(
+; CHECK-NEXT:    [[CMP:%.*]] = icmp ult [1 x i8]* [[A:%.*]], [[B:%.*]]
+; CHECK-NEXT:    ret i1 [[CMP]]
+;
   %c = getelementptr [1 x i8], [1 x i8]* %a, i32 0, i32 0
   %d = getelementptr [1 x i8], [1 x i8]* %b, i32 0, i32 0
   %cmp = icmp ult i8* %c, %d
   ret i1 %cmp
 
-; CHECK-LABEL: @pr16483(
-; CHECK-NEXT: icmp ult  [1 x i8]* %a, %b
 }
 
 define i8 @test_gep_bitcast_as1(i32 addrspace(1)* %arr, i16 %N) {
 ; CHECK-LABEL: @test_gep_bitcast_as1(
-; CHECK: getelementptr i32, i32 addrspace(1)* %arr, i16 %N
-; CHECK: bitcast
+; CHECK-NEXT:    [[T1:%.*]] = getelementptr i32, i32 addrspace(1)* [[ARR:%.*]], i16 [[N:%.*]]
+; CHECK-NEXT:    [[T:%.*]] = bitcast i32 addrspace(1)* [[T1]] to i8 addrspace(1)*
+; CHECK-NEXT:    [[X:%.*]] = load i8, i8 addrspace(1)* [[T]], align 1
+; CHECK-NEXT:    ret i8 [[X]]
+;
   %cast = bitcast i32 addrspace(1)* %arr to i8 addrspace(1)*
   %V = mul i16 %N, 4
   %t = getelementptr i8, i8 addrspace(1)* %cast, i16 %V
@@ -754,8 +922,12 @@ define i8 @test_gep_bitcast_as1(i32 addrspace(1)* %arr, i16 %N) {
 ; The element size of the array matches the element size of the pointer
 define i64 @test_gep_bitcast_array_same_size_element([100 x double]* %arr, i64 %N) {
 ; CHECK-LABEL: @test_gep_bitcast_array_same_size_element(
-; CHECK: getelementptr [100 x double], [100 x double]* %arr, i64 0, i64 %V
-; CHECK: bitcast
+; CHECK-NEXT:    [[V:%.*]] = shl i64 [[N:%.*]], 3
+; CHECK-NEXT:    [[T1:%.*]] = getelementptr [100 x double], [100 x double]* [[ARR:%.*]], i64 0, i64 [[V]]
+; CHECK-NEXT:    [[T:%.*]] = bitcast double* [[T1]] to i64*
+; CHECK-NEXT:    [[X:%.*]] = load i64, i64* [[T]], align 4
+; CHECK-NEXT:    ret i64 [[X]]
+;
   %cast = bitcast [100 x double]* %arr to i64*
   %V = mul i64 %N, 8
   %t = getelementptr i64, i64* %cast, i64 %V
@@ -766,10 +938,13 @@ define i64 @test_gep_bitcast_array_same_size_element([100 x double]* %arr, i64 %
 ; gep should be done in the original address space.
 define i64 @test_gep_bitcast_array_same_size_element_addrspacecast([100 x double]* %arr, i64 %N) {
 ; CHECK-LABEL: @test_gep_bitcast_array_same_size_element_addrspacecast(
-; CHECK: getelementptr [100 x double], [100 x double]* %arr, i64 0, i64 %V
-; CHECK-NEXT: bitcast double*
-; CHECK-NEXT: %t = addrspacecast i64*
-; CHECK: load i64, i64 addrspace(3)* %t
+; CHECK-NEXT:    [[V:%.*]] = shl i64 [[N:%.*]], 3
+; CHECK-NEXT:    [[T1:%.*]] = getelementptr [100 x double], [100 x double]* [[ARR:%.*]], i64 0, i64 [[V]]
+; CHECK-NEXT:    [[TMP1:%.*]] = bitcast double* [[T1]] to i64*
+; CHECK-NEXT:    [[T:%.*]] = addrspacecast i64* [[TMP1]] to i64 addrspace(3)*
+; CHECK-NEXT:    [[X:%.*]] = load i64, i64 addrspace(3)* [[T]], align 4
+; CHECK-NEXT:    ret i64 [[X]]
+;
   %cast = addrspacecast [100 x double]* %arr to i64 addrspace(3)*
   %V = mul i64 %N, 8
   %t = getelementptr i64, i64 addrspace(3)* %cast, i64 %V
@@ -780,8 +955,11 @@ define i64 @test_gep_bitcast_array_same_size_element_addrspacecast([100 x double
 ; The element size of the array is 
diff erent the element size of the pointer
 define i8 @test_gep_bitcast_array_
diff erent_size_element([100 x double]* %arr, i64 %N) {
 ; CHECK-LABEL: @test_gep_bitcast_array_
diff erent_size_element(
-; CHECK: getelementptr [100 x double], [100 x double]* %arr, i64 0, i64 %N
-; CHECK: bitcast
+; CHECK-NEXT:    [[T1:%.*]] = getelementptr [100 x double], [100 x double]* [[ARR:%.*]], i64 0, i64 [[N:%.*]]
+; CHECK-NEXT:    [[T:%.*]] = bitcast double* [[T1]] to i8*
+; CHECK-NEXT:    [[X:%.*]] = load i8, i8* [[T]], align 1
+; CHECK-NEXT:    ret i8 [[X]]
+;
   %cast = bitcast [100 x double]* %arr to i8*
   %V = mul i64 %N, 8
   %t = getelementptr i8, i8* %cast, i64 %V
@@ -791,8 +969,12 @@ define i8 @test_gep_bitcast_array_
diff erent_size_element([100 x double]* %arr, i
 
 define i64 @test_gep_bitcast_array_same_size_element_as1([100 x double] addrspace(1)* %arr, i16 %N) {
 ; CHECK-LABEL: @test_gep_bitcast_array_same_size_element_as1(
-; CHECK: getelementptr [100 x double], [100 x double] addrspace(1)* %arr, i16 0, i16 %V
-; CHECK: bitcast
+; CHECK-NEXT:    [[V:%.*]] = shl i16 [[N:%.*]], 3
+; CHECK-NEXT:    [[T1:%.*]] = getelementptr [100 x double], [100 x double] addrspace(1)* [[ARR:%.*]], i16 0, i16 [[V]]
+; CHECK-NEXT:    [[T:%.*]] = bitcast double addrspace(1)* [[T1]] to i64 addrspace(1)*
+; CHECK-NEXT:    [[X:%.*]] = load i64, i64 addrspace(1)* [[T]], align 4
+; CHECK-NEXT:    ret i64 [[X]]
+;
   %cast = bitcast [100 x double] addrspace(1)* %arr to i64 addrspace(1)*
   %V = mul i16 %N, 8
   %t = getelementptr i64, i64 addrspace(1)* %cast, i16 %V
@@ -802,8 +984,11 @@ define i64 @test_gep_bitcast_array_same_size_element_as1([100 x double] addrspac
 
 define i8 @test_gep_bitcast_array_
diff erent_size_element_as1([100 x double] addrspace(1)* %arr, i16 %N) {
 ; CHECK-LABEL: @test_gep_bitcast_array_
diff erent_size_element_as1(
-; CHECK: getelementptr [100 x double], [100 x double] addrspace(1)* %arr, i16 0, i16 %N
-; CHECK: bitcast
+; CHECK-NEXT:    [[T1:%.*]] = getelementptr [100 x double], [100 x double] addrspace(1)* [[ARR:%.*]], i16 0, i16 [[N:%.*]]
+; CHECK-NEXT:    [[T:%.*]] = bitcast double addrspace(1)* [[T1]] to i8 addrspace(1)*
+; CHECK-NEXT:    [[X:%.*]] = load i8, i8 addrspace(1)* [[T]], align 1
+; CHECK-NEXT:    ret i8 [[X]]
+;
   %cast = bitcast [100 x double] addrspace(1)* %arr to i8 addrspace(1)*
   %V = mul i16 %N, 8
   %t = getelementptr i8, i8 addrspace(1)* %cast, i16 %V
@@ -812,6 +997,9 @@ define i8 @test_gep_bitcast_array_
diff erent_size_element_as1([100 x double] addr
 }
 
 define i64 @test40() {
+; CHECK-LABEL: @test40(
+; CHECK-NEXT:    ret i64 8
+;
   %array = alloca [3 x i32], align 4
   %gep = getelementptr inbounds [3 x i32], [3 x i32]* %array, i64 0, i64 2
   %gepi8 = bitcast i32* %gep to i8*
@@ -821,11 +1009,12 @@ define i64 @test40() {
   %ret = ptrtoint i8* %gep2 to i64
   ret i64 %ret
 
-; CHECK-LABEL: @test40
-; CHECK-NEXT: ret i64 8
 }
 
 define i16 @test41([3 x i32] addrspace(1)* %array) {
+; CHECK-LABEL: @test41(
+; CHECK-NEXT:    ret i16 8
+;
   %gep = getelementptr inbounds [3 x i32], [3 x i32] addrspace(1)* %array, i16 0, i16 2
   %gepi8 = bitcast i32 addrspace(1)* %gep to i8 addrspace(1)*
   %p = ptrtoint [3 x i32] addrspace(1)* %array to i16
@@ -834,55 +1023,60 @@ define i16 @test41([3 x i32] addrspace(1)* %array) {
   %ret = ptrtoint i8 addrspace(1)* %gep2 to i16
   ret i16 %ret
 
-; CHECK-LABEL: @test41(
-; CHECK-NEXT: ret i16 8
 }
 
 define i8* @test42(i8* %c1, i8* %c2) {
+; CHECK-LABEL: @test42(
+; CHECK-NEXT:    [[PTRTOINT:%.*]] = ptrtoint i8* [[C1:%.*]] to i64
+; CHECK-NEXT:    [[TMP1:%.*]] = ptrtoint i8* [[C2:%.*]] to i64
+; CHECK-NEXT:    [[TMP2:%.*]] = sub i64 [[TMP1]], [[PTRTOINT]]
+; CHECK-NEXT:    [[GEP:%.*]] = inttoptr i64 [[TMP2]] to i8*
+; CHECK-NEXT:    ret i8* [[GEP]]
+;
   %ptrtoint = ptrtoint i8* %c1 to i64
   %sub = sub i64 0, %ptrtoint
   %gep = getelementptr inbounds i8, i8* %c2, i64 %sub
   ret i8* %gep
 
-; CHECK-LABEL: @test42(
-; CHECK-NEXT:  [[PTRTOINT1:%.*]] = ptrtoint i8* %c1 to i64
-; CHECK-NEXT:  [[PTRTOINT2:%.*]] = ptrtoint i8* %c2 to i64
-; CHECK-NEXT:  [[SUB:%.*]] = sub i64 [[PTRTOINT2]], [[PTRTOINT1]]
-; CHECK-NEXT:  [[INTTOPTR:%.*]] = inttoptr i64 [[SUB]] to i8*
-; CHECK-NEXT:  ret i8* [[INTTOPTR]]
 }
 
 define i16* @test43(i16* %c1, i16* %c2) {
+; CHECK-LABEL: @test43(
+; CHECK-NEXT:    [[PTRTOINT:%.*]] = ptrtoint i16* [[C1:%.*]] to i64
+; CHECK-NEXT:    [[TMP1:%.*]] = ptrtoint i16* [[C2:%.*]] to i64
+; CHECK-NEXT:    [[TMP2:%.*]] = sub i64 [[TMP1]], [[PTRTOINT]]
+; CHECK-NEXT:    [[GEP:%.*]] = inttoptr i64 [[TMP2]] to i16*
+; CHECK-NEXT:    ret i16* [[GEP]]
+;
   %ptrtoint = ptrtoint i16* %c1 to i64
   %sub = sub i64 0, %ptrtoint
   %shr = ashr i64 %sub, 1
   %gep = getelementptr inbounds i16, i16* %c2, i64 %shr
   ret i16* %gep
 
-; CHECK-LABEL: @test43(
-; CHECK-NEXT:  [[PTRTOINT1:%.*]] = ptrtoint i16* %c1 to i64
-; CHECK-NEXT:  [[PTRTOINT2:%.*]] = ptrtoint i16* %c2 to i64
-; CHECK-NEXT:  [[SUB:%.*]] = sub i64 [[PTRTOINT2]], [[PTRTOINT1]]
-; CHECK-NEXT:  [[INTTOPTR:%.*]] = inttoptr i64 [[SUB]] to i16*
-; CHECK-NEXT:  ret i16* [[INTTOPTR]]
 }
 
 define %struct.C* @test44(%struct.C* %c1, %struct.C* %c2) {
+; CHECK-LABEL: @test44(
+; CHECK-NEXT:    [[PTRTOINT:%.*]] = ptrtoint %struct.C* [[C1:%.*]] to i64
+; CHECK-NEXT:    [[TMP1:%.*]] = ptrtoint %struct.C* [[C2:%.*]] to i64
+; CHECK-NEXT:    [[TMP2:%.*]] = sub i64 [[TMP1]], [[PTRTOINT]]
+; CHECK-NEXT:    [[GEP:%.*]] = inttoptr i64 [[TMP2]] to %struct.C*
+; CHECK-NEXT:    ret %struct.C* [[GEP]]
+;
   %ptrtoint = ptrtoint %struct.C* %c1 to i64
   %sub = sub i64 0, %ptrtoint
   %shr = sdiv i64 %sub, 7
   %gep = getelementptr inbounds %struct.C, %struct.C* %c2, i64 %shr
   ret %struct.C* %gep
 
-; CHECK-LABEL: @test44(
-; CHECK-NEXT:  [[PTRTOINT1:%.*]] = ptrtoint %struct.C* %c1 to i64
-; CHECK-NEXT:  [[PTRTOINT2:%.*]] = ptrtoint %struct.C* %c2 to i64
-; CHECK-NEXT:  [[SUB:%.*]] = sub i64 [[PTRTOINT2]], [[PTRTOINT1]]
-; CHECK-NEXT:  [[INTTOPTR:%.*]] = inttoptr i64 [[SUB]] to %struct.C*
-; CHECK-NEXT:  ret %struct.C* [[INTTOPTR]]
 }
 
 define %struct.C* @test45(%struct.C* %c1, %struct.C** %c2) {
+; CHECK-LABEL: @test45(
+; CHECK-NEXT:    [[GEP:%.*]] = bitcast %struct.C** [[C2:%.*]] to %struct.C*
+; CHECK-NEXT:    ret %struct.C* [[GEP]]
+;
   %ptrtoint1 = ptrtoint %struct.C* %c1 to i64
   %ptrtoint2 = ptrtoint %struct.C** %c2 to i64
   %sub = sub i64 %ptrtoint2, %ptrtoint1 ; C2 - C1
@@ -890,57 +1084,62 @@ define %struct.C* @test45(%struct.C* %c1, %struct.C** %c2) {
   %gep = getelementptr inbounds %struct.C, %struct.C* %c1, i64 %shr ; C1 + (C2 - C1)
   ret %struct.C* %gep
 
-; CHECK-LABEL: @test45(
-; CHECK-NEXT:  [[BITCAST:%.*]] = bitcast %struct.C** %c2 to %struct.C*
-; CHECK-NEXT:  ret %struct.C* [[BITCAST]]
 }
 
 define %struct.C* @test46(%struct.C* %c1, %struct.C* %c2, i64 %N) {
+; CHECK-LABEL: @test46(
+; CHECK-NEXT:    [[PTRTOINT:%.*]] = ptrtoint %struct.C* [[C1:%.*]] to i64
+; CHECK-NEXT:    [[SUB:%.*]] = sub i64 0, [[PTRTOINT]]
+; CHECK-NEXT:    [[SDIV:%.*]] = sdiv i64 [[SUB]], [[N:%.*]]
+; CHECK-NEXT:    [[GEP:%.*]] = getelementptr inbounds [[STRUCT_C:%.*]], %struct.C* [[C2:%.*]], i64 [[SDIV]]
+; CHECK-NEXT:    ret %struct.C* [[GEP]]
+;
   %ptrtoint = ptrtoint %struct.C* %c1 to i64
   %sub = sub i64 0, %ptrtoint
   %sdiv = sdiv i64 %sub, %N
   %gep = getelementptr inbounds %struct.C, %struct.C* %c2, i64 %sdiv
   ret %struct.C* %gep
 
-; CHECK-LABEL: @test46(
-; CHECK-NEXT:  [[PTRTOINT:%.*]] = ptrtoint %struct.C* %c1 to i64
-; CHECK-NEXT:  [[SUB:%.*]] = sub i64 0, [[PTRTOINT]]
-; CHECK-NEXT:  [[SDIV:%.*]] = sdiv i64 [[SUB]], %N
-; CHECK-NEXT:  [[GEP:%.*]] = getelementptr inbounds %struct.C, %struct.C* %c2, i64 %sdiv
-; CHECK-NEXT:  ret %struct.C* [[GEP]]
 }
 
 define i32* @test47(i32* %I, i64 %C, i64 %D) {
+; CHECK-LABEL: @test47(
+; CHECK-NEXT:    [[B:%.*]] = getelementptr i32, i32* [[I:%.*]], i64 [[D:%.*]]
+; CHECK-NEXT:    ret i32* [[B]]
+;
   %sub = sub i64 %D, %C
   %A = getelementptr i32, i32* %I, i64 %C
   %B = getelementptr i32, i32* %A, i64 %sub
   ret i32* %B
-; CHECK-LABEL: @test47(
-; CHECK-NEXT: %B = getelementptr i32, i32* %I, i64 %D
 }
 
 define i32* @test48(i32* %I, i64 %C, i64 %D) {
+; CHECK-LABEL: @test48(
+; CHECK-NEXT:    [[B:%.*]] = getelementptr i32, i32* [[I:%.*]], i64 [[D:%.*]]
+; CHECK-NEXT:    ret i32* [[B]]
+;
   %sub = sub i64 %D, %C
   %A = getelementptr i32, i32* %I, i64 %sub
   %B = getelementptr i32, i32* %A, i64 %C
   ret i32* %B
-; CHECK-LABEL: @test48(
-; CHECK-NEXT: %B = getelementptr i32, i32* %I, i64 %D
 }
 
 define i32* @test49(i32* %I, i64 %C) {
+; CHECK-LABEL: @test49(
+; CHECK-NEXT:    [[B:%.*]] = getelementptr i32, i32* [[I:%.*]], i64 -1
+; CHECK-NEXT:    ret i32* [[B]]
+;
   %notC = xor i64 -1, %C
   %A = getelementptr i32, i32* %I, i64 %C
   %B = getelementptr i32, i32* %A, i64 %notC
   ret i32* %B
-; CHECK-LABEL: @test49(
-; CHECK-NEXT: %B = getelementptr i32, i32* %I, i64 -1
 }
 
 define i32 addrspace(1)* @ascast_0_gep(i32* %p) nounwind {
 ; CHECK-LABEL: @ascast_0_gep(
-; CHECK-NOT: getelementptr
-; CHECK: ret
+; CHECK-NEXT:    [[X:%.*]] = addrspacecast i32* [[P:%.*]] to i32 addrspace(1)*
+; CHECK-NEXT:    ret i32 addrspace(1)* [[X]]
+;
   %gep = getelementptr i32, i32* %p, i32 0
   %x = addrspacecast i32* %gep to i32 addrspace(1)*
   ret i32 addrspace(1)* %x
@@ -950,9 +1149,10 @@ define i32 addrspace(1)* @ascast_0_gep(i32* %p) nounwind {
 ; addrspacecast canonicalization.
 define i32 addrspace(1)* @ascast_0_0_gep([128 x i32]* %p) nounwind {
 ; CHECK-LABEL: @ascast_0_0_gep(
-; CHECK-NEXT: getelementptr [128 x i32]
-; CHECK-NEXT: addrspacecast i32*
-; CHECK-NEXT: ret i32 addrspace(1)*
+; CHECK-NEXT:    [[GEP:%.*]] = getelementptr [128 x i32], [128 x i32]* [[P:%.*]], i64 0, i64 0
+; CHECK-NEXT:    [[X:%.*]] = addrspacecast i32* [[GEP]] to i32 addrspace(1)*
+; CHECK-NEXT:    ret i32 addrspace(1)* [[X]]
+;
   %gep = getelementptr [128 x i32], [128 x i32]* %p, i32 0, i32 0
   %x = addrspacecast i32* %gep to i32 addrspace(1)*
   ret i32 addrspace(1)* %x
@@ -960,7 +1160,7 @@ define i32 addrspace(1)* @ascast_0_0_gep([128 x i32]* %p) nounwind {
 
 define <2 x i32*> @PR32414(i32** %ptr) {
 ; CHECK-LABEL: @PR32414(
-; CHECK-NEXT:    [[TMP0:%.*]] = bitcast i32** %ptr to i32*
+; CHECK-NEXT:    [[TMP0:%.*]] = bitcast i32** [[PTR:%.*]] to i32*
 ; CHECK-NEXT:    [[TMP1:%.*]] = getelementptr inbounds i32, i32* [[TMP0]], <2 x i64> <i64 0, i64 1>
 ; CHECK-NEXT:    ret <2 x i32*> [[TMP1]]
 ;
@@ -968,5 +1168,3 @@ define <2 x i32*> @PR32414(i32** %ptr) {
   %tmp1 = getelementptr inbounds i32, i32* %tmp0, <2 x i64> <i64 0, i64 1>
   ret <2 x i32*> %tmp1
 }
-
-; CHECK: attributes [[$NUW]] = { nounwind }

diff  --git a/llvm/test/Transforms/InstCombine/pr26992.ll b/llvm/test/Transforms/InstCombine/pr26992.ll
index e5bfb5c0e40a..3041bdfd7c4a 100644
--- a/llvm/test/Transforms/InstCombine/pr26992.ll
+++ b/llvm/test/Transforms/InstCombine/pr26992.ll
@@ -1,16 +1,37 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
 ; RUN: opt -instcombine -S < %s | FileCheck %s
 target triple = "x86_64-pc-windows-msvc"
 
 define i1 @test1(i8* %p) personality i32 (...)* @__CxxFrameHandler3 {
+; CHECK-LABEL: @test1(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[A:%.*]] = getelementptr i8, i8* [[P:%.*]], i64 1
+; CHECK-NEXT:    invoke void @may_throw()
+; CHECK-NEXT:    to label [[INVOKE_CONT:%.*]] unwind label [[CATCH_DISPATCH:%.*]]
+; CHECK:       invoke.cont:
+; CHECK-NEXT:    [[B:%.*]] = getelementptr inbounds i8, i8* [[P]], i64 2
+; CHECK-NEXT:    invoke void @may_throw()
+; CHECK-NEXT:    to label [[EXIT:%.*]] unwind label [[CATCH_DISPATCH]]
+; CHECK:       catch.dispatch:
+; CHECK-NEXT:    [[C:%.*]] = phi i8* [ [[B]], [[INVOKE_CONT]] ], [ [[A]], [[ENTRY:%.*]] ]
+; CHECK-NEXT:    [[TMP1:%.*]] = catchswitch within none [label %catch] unwind to caller
+; CHECK:       catch:
+; CHECK-NEXT:    [[TMP2:%.*]] = catchpad within [[TMP1]] [i8* null, i32 64, i8* null]
+; CHECK-NEXT:    catchret from [[TMP2]] to label [[EXIT]]
+; CHECK:       exit:
+; CHECK-NEXT:    [[D:%.*]] = phi i8* [ [[A]], [[INVOKE_CONT]] ], [ [[C]], [[CATCH:%.*]] ]
+; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i8* [[D]], [[A]]
+; CHECK-NEXT:    ret i1 [[CMP]]
+;
 entry:
   %a = getelementptr i8, i8* %p, i64 1
   invoke void @may_throw()
-          to label %invoke.cont unwind label %catch.dispatch
+  to label %invoke.cont unwind label %catch.dispatch
 
 invoke.cont:
   %b = getelementptr inbounds i8, i8* %a, i64 1
   invoke void @may_throw()
-          to label %exit unwind label %catch.dispatch
+  to label %exit unwind label %catch.dispatch
 
 catch.dispatch:
   %c = phi i8* [ %b, %invoke.cont ], [ %a, %entry ]
@@ -26,12 +47,6 @@ exit:
   ret i1 %cmp
 }
 
-; CHECK-LABEL: define i1 @test1(
-; CHECK:  %[[gep_a:.*]] = getelementptr i8, i8* %p, i64 1
-; CHECK:  %[[gep_b:.*]] = getelementptr inbounds i8, i8* %p, i64 2
-; CHECK:  phi i8* [ %[[gep_b]], {{.*}} ], [ %[[gep_a]], {{.*}} ]
-; CHECK:  %tmp1 = catchswitch within none [label %catch] unwind to caller
-
 declare void @may_throw()
 
 declare i32 @__CxxFrameHandler3(...)


        


More information about the llvm-commits mailing list