diff --git a/llvm/test/Transforms/InstSimplify/compare.ll b/llvm/test/Transforms/InstSimplify/compare.ll
index 570239eaf0c6e..c23fab8e91c2d 100644
--- a/llvm/test/Transforms/InstSimplify/compare.ll
+++ b/llvm/test/Transforms/InstSimplify/compare.ll
@@ -1,43 +1,48 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
 ; RUN: opt < %s -instsimplify -S | FileCheck %s
 target datalayout = "p:32:32-p1:64:64"
 
 define i1 @ptrtoint() {
 ; CHECK-LABEL: @ptrtoint(
+; CHECK-NEXT:    ret i1 false
+;
   %a = alloca i8
   %tmp = ptrtoint i8* %a to i32
   %r = icmp eq i32 %tmp, 0
   ret i1 %r
-; CHECK: ret i1 false
 }
 
 define i1 @bitcast() {
 ; CHECK-LABEL: @bitcast(
+; CHECK-NEXT:    ret i1 false
+;
   %a = alloca i32
   %b = alloca i64
   %x = bitcast i32* %a to i8*
   %y = bitcast i64* %b to i8*
   %cmp = icmp eq i8* %x, %y
   ret i1 %cmp
-; CHECK-NEXT: ret i1 false
 }
 
 define i1 @gep() {
 ; CHECK-LABEL: @gep(
+; CHECK-NEXT:    ret i1 false
+;
   %a = alloca [3 x i8], align 8
   %x = getelementptr inbounds [3 x i8], [3 x i8]* %a, i32 0, i32 0
   %cmp = icmp eq i8* %x, null
   ret i1 %cmp
-; CHECK-NEXT: ret i1 false
 }
 
 define i1 @gep2() {
 ; CHECK-LABEL: @gep2(
+; CHECK-NEXT:    ret i1 true
+;
   %a = alloca [3 x i8], align 8
   %x = getelementptr inbounds [3 x i8], [3 x i8]* %a, i32 0, i32 0
   %y = getelementptr inbounds [3 x i8], [3 x i8]* %a, i32 0, i32 0
   %cmp = icmp eq i8* %x, %y
   ret i1 %cmp
-; CHECK-NEXT: ret i1 true
 }
 
 ; PR11238
@@ -47,22 +52,24 @@ define i1 @gep2() {
 
 define i1 @gep3() {
 ; CHECK-LABEL: @gep3(
+; CHECK-NEXT:    ret i1 false
+;
   %x = alloca %gept, align 8
   %a = getelementptr %gept, %gept* %x, i64 0, i32 0
   %b = getelementptr %gept, %gept* %x, i64 0, i32 1
   %equal = icmp eq i32* %a, %b
   ret i1 %equal
-; CHECK-NEXT: ret i1 false
 }
 
 define i1 @gep4() {
 ; CHECK-LABEL: @gep4(
+; CHECK-NEXT:    ret i1 false
+;
   %x = alloca %gept, align 8
   %a = getelementptr %gept, %gept* @gepy, i64 0, i32 0
   %b = getelementptr %gept, %gept* @gepy, i64 0, i32 1
   %equal = icmp eq i32* %a, %b
   ret i1 %equal
-; CHECK-NEXT: ret i1 false
 }
 
 @a = common global [1 x i32] zeroinitializer, align 4
@@ -78,46 +85,56 @@ define i1 @PR31262() {
 
 define i1 @gep5() {
 ; CHECK-LABEL: @gep5(
+; CHECK-NEXT:    ret i1 false
+;
   %x = alloca %gept, align 8
   %a = getelementptr inbounds %gept, %gept* %x, i64 0, i32 1
   %b = getelementptr %gept, %gept* @gepy, i64 0, i32 0
   %equal = icmp eq i32* %a, %b
   ret i1 %equal
-; CHECK-NEXT: ret i1 false
 }
 
 define i1 @gep6(%gept* %x) {
 ; Same as @gep3 but potentially null.
 ; CHECK-LABEL: @gep6(
+; CHECK-NEXT:    ret i1 false
+;
   %a = getelementptr %gept, %gept* %x, i64 0, i32 0
   %b = getelementptr %gept, %gept* %x, i64 0, i32 1
   %equal = icmp eq i32* %a, %b
   ret i1 %equal
-; CHECK-NEXT: ret i1 false
 }
 
 define i1 @gep7(%gept* %x) {
 ; CHECK-LABEL: @gep7(
+; CHECK-NEXT:    [[A:%.*]] = getelementptr [[GEPT:%.*]], %gept* [[X:%.*]], i64 0, i32 0
+; CHECK-NEXT:    [[EQUAL:%.*]] = icmp eq i32* [[A]], getelementptr (%gept, %gept* @gepz, i32 0, i32 0)
+; CHECK-NEXT:    ret i1 [[EQUAL]]
+;
   %a = getelementptr %gept, %gept* %x, i64 0, i32 0
   %b = getelementptr %gept, %gept* @gepz, i64 0, i32 0
   %equal = icmp eq i32* %a, %b
   ret i1 %equal
-; CHECK: ret i1 %equal
 }
 
 define i1 @gep8(%gept* %x) {
 ; CHECK-LABEL: @gep8(
+; CHECK-NEXT:    [[A:%.*]] = getelementptr [[GEPT:%.*]], %gept* [[X:%.*]], i32 1
+; CHECK-NEXT:    [[B:%.*]] = getelementptr [[GEPT]], %gept* [[X]], i32 -1
+; CHECK-NEXT:    [[EQUAL:%.*]] = icmp ugt %gept* [[A]], [[B]]
+; CHECK-NEXT:    ret i1 [[EQUAL]]
+;
   %a = getelementptr %gept, %gept* %x, i32 1
   %b = getelementptr %gept, %gept* %x, i32 -1
   %equal = icmp ugt %gept* %a, %b
   ret i1 %equal
-; CHECK: ret i1 %equal
 }
 
 define i1 @gep9(i8* %ptr) {
 ; CHECK-LABEL: @gep9(
-; CHECK-NOT: ret
-; CHECK: ret i1 true
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    ret i1 true
+;
 
 entry:
   %first1 = getelementptr inbounds i8, i8* %ptr, i32 0
@@ -136,8 +153,9 @@ entry:
 
 define i1 @gep10(i8* %ptr) {
 ; CHECK-LABEL: @gep10(
-; CHECK-NOT: ret
-; CHECK: ret i1 true
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    ret i1 true
+;
 
 entry:
   %first1 = getelementptr inbounds i8, i8* %ptr, i32 -2
@@ -152,8 +170,9 @@ entry:
 
 define i1 @gep11(i8* %ptr) {
 ; CHECK-LABEL: @gep11(
-; CHECK-NOT: ret
-; CHECK: ret i1 true
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    ret i1 true
+;
 
 entry:
   %first1 = getelementptr inbounds i8, i8* %ptr, i32 -2
@@ -165,8 +184,13 @@ entry:
 
 define i1 @gep12(i8* %ptr) {
 ; CHECK-LABEL: @gep12(
-; CHECK-NOT: ret
-; CHECK: ret i1 %cmp
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[FIRST1:%.*]] = getelementptr inbounds i8, i8* [[PTR:%.*]], i32 -2
+; CHECK-NEXT:    [[LAST1:%.*]] = getelementptr inbounds i8, i8* [[PTR]], i32 48
+; CHECK-NEXT:    [[LAST2:%.*]] = getelementptr inbounds i8, i8* [[LAST1]], i32 -6
+; CHECK-NEXT:    [[CMP:%.*]] = icmp slt i8* [[FIRST1]], [[LAST2]]
+; CHECK-NEXT:    ret i1 [[CMP]]
+;
 
 entry:
   %first1 = getelementptr inbounds i8, i8* %ptr, i32 -2
@@ -178,19 +202,21 @@ entry:
 
 define i1 @gep13(i8* %ptr) {
 ; CHECK-LABEL: @gep13(
+; CHECK-NEXT:    ret i1 false
+;
 ; We can prove this GEP is non-null because it is inbounds.
   %x = getelementptr inbounds i8, i8* %ptr, i32 1
   %cmp = icmp eq i8* %x, null
   ret i1 %cmp
-; CHECK-NEXT: ret i1 false
 }
 
 define i1 @gep13_no_null_opt(i8* %ptr) #0 {
 ; We can't prove this GEP is non-null.
 ; CHECK-LABEL: @gep13_no_null_opt(
-; CHECK: getelementptr
-; CHECK: icmp
-; CHECK: ret
+; CHECK-NEXT:    [[X:%.*]] = getelementptr inbounds i8, i8* [[PTR:%.*]], i32 1
+; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i8* [[X]], null
+; CHECK-NEXT:    ret i1 [[CMP]]
+;
   %x = getelementptr inbounds i8, i8* %ptr, i32 1
   %cmp = icmp eq i8* %x, null
   ret i1 %cmp
@@ -198,30 +224,35 @@ define i1 @gep13_no_null_opt(i8* %ptr) #0 {
 
 define i1 @gep14({ {}, i8 }* %ptr) {
 ; CHECK-LABEL: @gep14(
+; CHECK-NEXT:    [[X:%.*]] = getelementptr inbounds { {}, i8 }, { {}, i8 }* [[PTR:%.*]], i32 0, i32 1
+; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i8* [[X]], null
+; CHECK-NEXT:    ret i1 [[CMP]]
+;
 ; We can't simplify this because the offset of one in the GEP actually doesn't
 ; move the pointer.
   %x = getelementptr inbounds { {}, i8 }, { {}, i8 }* %ptr, i32 0, i32 1
   %cmp = icmp eq i8* %x, null
   ret i1 %cmp
-; CHECK-NOT: ret i1 false
 }
 
 define i1 @gep15({ {}, [4 x {i8, i8}]}* %ptr, i32 %y) {
 ; CHECK-LABEL: @gep15(
+; CHECK-NEXT:    ret i1 false
+;
 ; We can prove this GEP is non-null even though there is a user value, as we
 ; would necessarily violate inbounds on one side or the other.
   %x = getelementptr inbounds { {}, [4 x {i8, i8}]}, { {}, [4 x {i8, i8}]}* %ptr, i32 0, i32 1, i32 %y, i32 1
   %cmp = icmp eq i8* %x, null
   ret i1 %cmp
-; CHECK-NEXT: ret i1 false
 }
 
 define i1 @gep15_no_null_opt({ {}, [4 x {i8, i8}]}* %ptr, i32 %y) #0 {
 ; We can't prove this GEP is non-null.
 ; CHECK-LABEL: @gep15_no_null_opt(
-; CHECK: getelementptr
-; CHECK: icmp
-; CHECK: ret
+; CHECK-NEXT:    [[X:%.*]] = getelementptr inbounds { {}, [4 x { i8, i8 }] }, { {}, [4 x { i8, i8 }] }* [[PTR:%.*]], i32 0, i32 1, i32 [[Y:%.*]], i32 1
+; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i8* [[X]], null
+; CHECK-NEXT:    ret i1 [[CMP]]
+;
   %x = getelementptr inbounds { {}, [4 x {i8, i8}]}, { {}, [4 x {i8, i8}]}* %ptr, i32 0, i32 1, i32 %y, i32 1
   %cmp = icmp eq i8* %x, null
   ret i1 %cmp
@@ -229,21 +260,25 @@ define i1 @gep15_no_null_opt({ {}, [4 x {i8, i8}]}* %ptr, i32 %y) #0 {
 
 define i1 @gep16(i8* %ptr, i32 %a) {
 ; CHECK-LABEL: @gep16(
+; CHECK-NEXT:    ret i1 false
+;
 ; We can prove this GEP is non-null because it is inbounds and because we know
 ; %b is non-zero even though we don't know its value.
   %b = or i32 %a, 1
   %x = getelementptr inbounds i8, i8* %ptr, i32 %b
   %cmp = icmp eq i8* %x, null
   ret i1 %cmp
-; CHECK-NEXT: ret i1 false
 }
 
 define i1 @gep16_no_null_opt(i8* %ptr, i32 %a) #0 {
 ; We can't prove this GEP is non-null.
 ; CHECK-LABEL: @gep16_no_null_opt(
+; CHECK-NEXT:    [[B:%.*]] = or i32 [[A:%.*]], 1
+; CHECK-NEXT:    [[X:%.*]] = getelementptr inbounds i8, i8* [[PTR:%.*]], i32 [[B]]
+; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i8* [[X]], null
+; CHECK-NEXT:    ret i1 [[CMP]]
+;
 ; CHECK getelementptr inbounds i8, i8* %ptr, i32 %b
-; CHECK: %cmp = icmp eq i8* %x, null
-; CHECK-NEXT: ret i1 %cmp
   %b = or i32 %a, 1
   %x = getelementptr inbounds i8, i8* %ptr, i32 %b
   %cmp = icmp eq i8* %x, null
@@ -252,6 +287,8 @@ define i1 @gep16_no_null_opt(i8* %ptr, i32 %a) #0 {
 
 define i1 @gep17() {
 ; CHECK-LABEL: @gep17(
+; CHECK-NEXT:    ret i1 true
+;
   %alloca = alloca i32, align 4
   %bc = bitcast i32* %alloca to [4 x i8]*
   %gep1 = getelementptr inbounds i32, i32* %alloca, i32 1
@@ -260,135 +297,152 @@ define i1 @gep17() {
   %pti2 = ptrtoint i8* %gep2 to i32
   %cmp = icmp ugt i32 %pti1, %pti2
   ret i1 %cmp
-; CHECK-NEXT: ret i1 true
 }
 
 define i1 @zext(i32 %x) {
 ; CHECK-LABEL: @zext(
+; CHECK-NEXT:    ret i1 true
+;
   %e1 = zext i32 %x to i64
   %e2 = zext i32 %x to i64
   %r = icmp eq i64 %e1, %e2
   ret i1 %r
-; CHECK: ret i1 true
 }
 
 define i1 @zext2(i1 %x) {
 ; CHECK-LABEL: @zext2(
+; CHECK-NEXT:    ret i1 [[X:%.*]]
+;
   %e = zext i1 %x to i32
   %c = icmp ne i32 %e, 0
   ret i1 %c
-; CHECK: ret i1 %x
 }
 
 define i1 @zext3() {
 ; CHECK-LABEL: @zext3(
+; CHECK-NEXT:    ret i1 true
+;
   %e = zext i1 1 to i32
   %c = icmp ne i32 %e, 0
   ret i1 %c
-; CHECK: ret i1 true
 }
 
 define i1 @sext(i32 %x) {
 ; CHECK-LABEL: @sext(
+; CHECK-NEXT:    ret i1 true
+;
   %e1 = sext i32 %x to i64
   %e2 = sext i32 %x to i64
   %r = icmp eq i64 %e1, %e2
   ret i1 %r
-; CHECK: ret i1 true
 }
 
 define i1 @sext2(i1 %x) {
 ; CHECK-LABEL: @sext2(
+; CHECK-NEXT:    ret i1 [[X:%.*]]
+;
   %e = sext i1 %x to i32
   %c = icmp ne i32 %e, 0
   ret i1 %c
-; CHECK: ret i1 %x
 }
 
 define i1 @sext3() {
 ; CHECK-LABEL: @sext3(
+; CHECK-NEXT:    ret i1 true
+;
   %e = sext i1 1 to i32
   %c = icmp ne i32 %e, 0
   ret i1 %c
-; CHECK: ret i1 true
 }
 
 define i1 @add(i32 %x, i32 %y) {
 ; CHECK-LABEL: @add(
+; CHECK-NEXT:    ret i1 false
+;
   %l = lshr i32 %x, 1
   %q = lshr i32 %y, 1
   %r = or i32 %q, 1
   %s = add i32 %l, %r
   %c = icmp eq i32 %s, 0
   ret i1 %c
-; CHECK: ret i1 false
 }
 
 define i1 @add2(i8 %x, i8 %y) {
 ; CHECK-LABEL: @add2(
+; CHECK-NEXT:    ret i1 false
+;
   %l = or i8 %x, 128
   %r = or i8 %y, 129
   %s = add i8 %l, %r
   %c = icmp eq i8 %s, 0
   ret i1 %c
-; CHECK: ret i1 false
 }
 
 define i1 @add3(i8 %x, i8 %y) {
 ; CHECK-LABEL: @add3(
+; CHECK-NEXT:    [[L:%.*]] = zext i8 [[X:%.*]] to i32
+; CHECK-NEXT:    [[R:%.*]] = zext i8 [[Y:%.*]] to i32
+; CHECK-NEXT:    [[S:%.*]] = add i32 [[L]], [[R]]
+; CHECK-NEXT:    [[C:%.*]] = icmp eq i32 [[S]], 0
+; CHECK-NEXT:    ret i1 [[C]]
+;
   %l = zext i8 %x to i32
   %r = zext i8 %y to i32
   %s = add i32 %l, %r
   %c = icmp eq i32 %s, 0
   ret i1 %c
-; CHECK: ret i1 %c
 }
 
 define i1 @add4(i32 %x, i32 %y) {
 ; CHECK-LABEL: @add4(
+; CHECK-NEXT:    ret i1 true
+;
   %z = add nsw i32 %y, 1
   %s1 = add nsw i32 %x, %y
   %s2 = add nsw i32 %x, %z
   %c = icmp slt i32 %s1, %s2
   ret i1 %c
-; CHECK: ret i1 true
 }
 
 define i1 @add5(i32 %x, i32 %y) {
 ; CHECK-LABEL: @add5(
+; CHECK-NEXT:    ret i1 true
+;
   %z = add nuw i32 %y, 1
   %s1 = add nuw i32 %x, %z
   %s2 = add nuw i32 %x, %y
   %c = icmp ugt i32 %s1, %s2
   ret i1 %c
-; CHECK: ret i1 true
 }
 
 define i1 @add6(i64 %A, i64 %B) {
 ; CHECK-LABEL: @add6(
+; CHECK-NEXT:    ret i1 true
+;
   %s1 = add i64 %A, %B
   %s2 = add i64 %B, %A
   %cmp = icmp eq i64 %s1, %s2
   ret i1 %cmp
-; CHECK: ret i1 true
 }
 
 define i1 @addpowtwo(i32 %x, i32 %y) {
 ; CHECK-LABEL: @addpowtwo(
+; CHECK-NEXT:    ret i1 false
+;
   %l = lshr i32 %x, 1
   %r = shl i32 1, %y
   %s = add i32 %l, %r
   %c = icmp eq i32 %s, 0
   ret i1 %c
-; CHECK: ret i1 false
 }
 
 define i1 @or(i32 %x) {
 ; CHECK-LABEL: @or(
+; CHECK-NEXT:    ret i1 false
+;
   %o = or i32 %x, 1
   %c = icmp eq i32 %o, 0
   ret i1 %c
-; CHECK: ret i1 false
 }
 
 ; Do not simplify if we cannot guarantee that the ConstantExpr is a non-zero
@@ -396,202 +450,237 @@ define i1 @or(i32 %x) {
 @GV = common global i32* null
 define i1 @or_constexp(i32 %x) {
 ; CHECK-LABEL: @or_constexp(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[O:%.*]] = or i32 [[X:%.*]], and (i32 ptrtoint (i32** @GV to i32), i32 32)
+; CHECK-NEXT:    [[C:%.*]] = icmp eq i32 [[O]], 0
+; CHECK-NEXT:    ret i1 [[C]]
+;
 entry:
   %0 = and i32 ptrtoint (i32** @GV to i32), 32
   %o = or i32 %x, %0
   %c = icmp eq i32 %o, 0
   ret i1 %c
-; CHECK: or
-; CHECK-NEXT: icmp eq
-; CHECK-NOT: ret i1 false
 }
 
 define i1 @shl1(i32 %x) {
 ; CHECK-LABEL: @shl1(
+; CHECK-NEXT:    ret i1 false
+;
   %s = shl i32 1, %x
   %c = icmp eq i32 %s, 0
   ret i1 %c
-; CHECK: ret i1 false
 }
 
 define i1 @shl3(i32 %X) {
-; CHECK: @shl3
+; CHECK-LABEL: @shl3(
+; CHECK-NEXT:    ret i1 false
+;
   %sub = shl nuw i32 4, %X
   %cmp = icmp eq i32 %sub, 31
   ret i1 %cmp
-; CHECK-NEXT: ret i1 false
 }
 
 define i1 @lshr1(i32 %x) {
 ; CHECK-LABEL: @lshr1(
+; CHECK-NEXT:    ret i1 false
+;
   %s = lshr i32 -1, %x
   %c = icmp eq i32 %s, 0
   ret i1 %c
-; CHECK: ret i1 false
 }
 
 define i1 @lshr3(i32 %x) {
 ; CHECK-LABEL: @lshr3(
+; CHECK-NEXT:    ret i1 true
+;
   %s = lshr i32 %x, %x
   %c = icmp eq i32 %s, 0
   ret i1 %c
-; CHECK: ret i1 true
 }
 
 define i1 @lshr4(i32 %X, i32 %Y) {
 ; CHECK-LABEL: @lshr4(
+; CHECK-NEXT:    ret i1 true
+;
   %A = lshr i32 %X, %Y
   %C = icmp ule i32 %A, %X
   ret i1 %C
-; CHECK: ret i1 true
 }
 
 define i1 @lshr5(i32 %X, i32 %Y) {
 ; CHECK-LABEL: @lshr5(
+; CHECK-NEXT:    ret i1 false
+;
   %A = lshr i32 %X, %Y
   %C = icmp ugt i32 %A, %X
   ret i1 %C
-; CHECK: ret i1 false
 }
 
 define i1 @lshr6(i32 %X, i32 %Y) {
 ; CHECK-LABEL: @lshr6(
+; CHECK-NEXT:    ret i1 false
+;
   %A = lshr i32 %X, %Y
   %C = icmp ult i32 %X, %A
   ret i1 %C
-; CHECK: ret i1 false
 }
 
 define i1 @lshr7(i32 %X, i32 %Y) {
 ; CHECK-LABEL: @lshr7(
+; CHECK-NEXT:    ret i1 true
+;
   %A = lshr i32 %X, %Y
   %C = icmp uge i32 %X, %A
   ret i1 %C
-; CHECK: ret i1 true
 }
 
 define i1 @ashr1(i32 %x) {
 ; CHECK-LABEL: @ashr1(
+; CHECK-NEXT:    ret i1 false
+;
   %s = ashr i32 -1, %x
   %c = icmp eq i32 %s, 0
   ret i1 %c
-; CHECK: ret i1 false
 }
 
 define i1 @ashr3(i32 %x) {
 ; CHECK-LABEL: @ashr3(
+; CHECK-NEXT:    ret i1 true
+;
   %s = ashr i32 %x, %x
   %c = icmp eq i32 %s, 0
   ret i1 %c
-; CHECK: ret i1 true
 }
 
 define i1 @select1(i1 %cond) {
 ; CHECK-LABEL: @select1(
+; CHECK-NEXT:    ret i1 [[COND:%.*]]
+;
   %s = select i1 %cond, i32 1, i32 0
   %c = icmp eq i32 %s, 1
   ret i1 %c
-; CHECK: ret i1 %cond
 }
 
 define i1 @select2(i1 %cond) {
 ; CHECK-LABEL: @select2(
+; CHECK-NEXT:    ret i1 [[COND:%.*]]
+;
   %x = zext i1 %cond to i32
   %s = select i1 %cond, i32 %x, i32 0
   %c = icmp ne i32 %s, 0
   ret i1 %c
-; CHECK: ret i1 %cond
 }
 
 define i1 @select3(i1 %cond) {
 ; CHECK-LABEL: @select3(
+; CHECK-NEXT:    ret i1 [[COND:%.*]]
+;
   %x = zext i1 %cond to i32
   %s = select i1 %cond, i32 1, i32 %x
   %c = icmp ne i32 %s, 0
   ret i1 %c
-; CHECK: ret i1 %cond
 }
 
 define i1 @select4(i1 %cond) {
 ; CHECK-LABEL: @select4(
+; CHECK-NEXT:    ret i1 [[COND:%.*]]
+;
   %invert = xor i1 %cond, 1
   %s = select i1 %invert, i32 0, i32 1
   %c = icmp ne i32 %s, 0
   ret i1 %c
-; CHECK: ret i1 %cond
 }
 
 define i1 @select5(i32 %x) {
 ; CHECK-LABEL: @select5(
+; CHECK-NEXT:    ret i1 false
+;
   %c = icmp eq i32 %x, 0
   %s = select i1 %c, i32 1, i32 %x
   %c2 = icmp eq i32 %s, 0
   ret i1 %c2
-; CHECK: ret i1 false
 }
 
 define i1 @select6(i32 %x) {
 ; CHECK-LABEL: @select6(
+; CHECK-NEXT:    [[C:%.*]] = icmp sgt i32 [[X:%.*]], 0
+; CHECK-NEXT:    [[S:%.*]] = select i1 [[C]], i32 [[X]], i32 4
+; CHECK-NEXT:    [[C2:%.*]] = icmp eq i32 [[S]], 0
+; CHECK-NEXT:    ret i1 [[C2]]
+;
   %c = icmp sgt i32 %x, 0
   %s = select i1 %c, i32 %x, i32 4
   %c2 = icmp eq i32 %s, 0
   ret i1 %c2
-; CHECK: ret i1 %c2
 }
 
 define i1 @urem1(i32 %X, i32 %Y) {
 ; CHECK-LABEL: @urem1(
+; CHECK-NEXT:    ret i1 true
+;
   %A = urem i32 %X, %Y
   %B = icmp ult i32 %A, %Y
   ret i1 %B
-; CHECK: ret i1 true
 }
 
 define i1 @urem2(i32 %X, i32 %Y) {
 ; CHECK-LABEL: @urem2(
+; CHECK-NEXT:    ret i1 false
+;
   %A = urem i32 %X, %Y
   %B = icmp eq i32 %A, %Y
   ret i1 %B
-; CHECK: ret i1 false
 }
 
 define i1 @urem4(i32 %X) {
 ; CHECK-LABEL: @urem4(
+; CHECK-NEXT:    [[A:%.*]] = urem i32 [[X:%.*]], 15
+; CHECK-NEXT:    [[B:%.*]] = icmp ult i32 [[A]], 10
+; CHECK-NEXT:    ret i1 [[B]]
+;
   %A = urem i32 %X, 15
   %B = icmp ult i32 %A, 10
   ret i1 %B
-; CHECK: ret i1 %B
 }
 
 define i1 @urem5(i16 %X, i32 %Y) {
 ; CHECK-LABEL: @urem5(
+; CHECK-NEXT:    [[A:%.*]] = zext i16 [[X:%.*]] to i32
+; CHECK-NEXT:    [[B:%.*]] = urem i32 [[A]], [[Y:%.*]]
+; CHECK-NEXT:    [[C:%.*]] = icmp slt i32 [[B]], [[Y]]
+; CHECK-NEXT:    ret i1 [[C]]
+;
   %A = zext i16 %X to i32
   %B = urem i32 %A, %Y
   %C = icmp slt i32 %B, %Y
   ret i1 %C
-; CHECK-NOT: ret i1 true
 }
 
 define i1 @urem6(i32 %X, i32 %Y) {
 ; CHECK-LABEL: @urem6(
+; CHECK-NEXT:    ret i1 true
+;
   %A = urem i32 %X, %Y
   %B = icmp ugt i32 %Y, %A
   ret i1 %B
-; CHECK: ret i1 true
 }
 
 define i1 @urem7(i32 %X) {
 ; CHECK-LABEL: @urem7(
+; CHECK-NEXT:    [[A:%.*]] = urem i32 1, [[X:%.*]]
+; CHECK-NEXT:    [[B:%.*]] = icmp sgt i32 [[A]], [[X]]
+; CHECK-NEXT:    ret i1 [[B]]
+;
   %A = urem i32 1, %X
   %B = icmp sgt i32 %A, %X
   ret i1 %B
-; CHECK-NOT: ret i1 false
 }
 
 ; PR9343 #15
-; CHECK-LABEL: @srem2(
-; CHECK: ret i1 false
 define i1 @srem2(i16 %X, i32 %Y) {
+; CHECK-LABEL: @srem2(
+; CHECK-NEXT:    ret i1 false
+;
   %A = zext i16 %X to i32
   %B = add nsw i32 %A, 1
   %C = srem i32 %B, %Y
@@ -599,9 +688,10 @@ define i1 @srem2(i16 %X, i32 %Y) {
   ret i1 %D
 }
 
-; CHECK-LABEL: @srem3(
-; CHECK-NEXT: ret i1 false
 define i1 @srem3(i16 %X, i32 %Y) {
+; CHECK-LABEL: @srem3(
+; CHECK-NEXT:    ret i1 false
+;
   %A = zext i16 %X to i32
   %B = or i32 2147483648, %A
   %C = sub nsw i32 1, %B
@@ -636,8 +726,8 @@ define i1 @sdiv_exact_equality(i32 %Z) {
 
 define i1 @sdiv_exact_not_equality(i32 %Z) {
 ; CHECK-LABEL: @sdiv_exact_not_equality(
-; CHECK-NEXT:    [[A:%.*]] = sdiv exact i32 10, %Z
-; CHECK-NEXT:    [[B:%.*]] = sdiv exact i32 20, %Z
+; CHECK-NEXT:    [[A:%.*]] = sdiv exact i32 10, [[Z:%.*]]
+; CHECK-NEXT:    [[B:%.*]] = sdiv exact i32 20, [[Z]]
 ; CHECK-NEXT:    [[C:%.*]] = icmp ult i32 [[A]], [[B]]
 ; CHECK-NEXT:    ret i1 [[C]]
 ;
@@ -649,87 +739,104 @@ define i1 @sdiv_exact_not_equality(i32 %Z) {
 
 define i1 @udiv3(i32 %X, i32 %Y) {
 ; CHECK-LABEL: @udiv3(
+; CHECK-NEXT:    ret i1 false
+;
   %A = udiv i32 %X, %Y
   %C = icmp ugt i32 %A, %X
   ret i1 %C
-; CHECK: ret i1 false
 }
 
 define i1 @udiv4(i32 %X, i32 %Y) {
 ; CHECK-LABEL: @udiv4(
+; CHECK-NEXT:    ret i1 true
+;
   %A = udiv i32 %X, %Y
   %C = icmp ule i32 %A, %X
   ret i1 %C
-; CHECK: ret i1 true
 }
 
 ; PR11340
 define i1 @udiv6(i32 %X) nounwind {
 ; CHECK-LABEL: @udiv6(
+; CHECK-NEXT:    [[A:%.*]] = udiv i32 1, [[X:%.*]]
+; CHECK-NEXT:    [[C:%.*]] = icmp eq i32 [[A]], 0
+; CHECK-NEXT:    ret i1 [[C]]
+;
   %A = udiv i32 1, %X
   %C = icmp eq i32 %A, 0
   ret i1 %C
-; CHECK: ret i1 %C
 }
 
 define i1 @udiv7(i32 %X, i32 %Y) {
 ; CHECK-LABEL: @udiv7(
+; CHECK-NEXT:    ret i1 false
+;
   %A = udiv i32 %X, %Y
   %C = icmp ult i32 %X, %A
   ret i1 %C
-; CHECK: ret i1 false
 }
 
 define i1 @udiv8(i32 %X, i32 %Y) {
 ; CHECK-LABEL: @udiv8(
+; CHECK-NEXT:    ret i1 true
+;
   %A = udiv i32 %X, %Y
   %C = icmp uge i32 %X, %A
   ret i1 %C
-; CHECK: ret i1 true
 }
 
 define i1 @mul1(i32 %X) {
 ; CHECK-LABEL: @mul1(
+; CHECK-NEXT:    ret i1 false
+;
 ; Square of a non-zero number is non-zero if there is no overflow.
   %Y = or i32 %X, 1
   %M = mul nuw i32 %Y, %Y
   %C = icmp eq i32 %M, 0
   ret i1 %C
-; CHECK: ret i1 false
 }
 
 define i1 @mul2(i32 %X) {
 ; CHECK-LABEL: @mul2(
+; CHECK-NEXT:    ret i1 true
+;
 ; Square of a non-zero number is positive if there is no signed overflow.
   %Y = or i32 %X, 1
   %M = mul nsw i32 %Y, %Y
   %C = icmp sgt i32 %M, 0
   ret i1 %C
-; CHECK: ret i1 true
 }
 
 define i1 @mul3(i32 %X, i32 %Y) {
 ; CHECK-LABEL: @mul3(
+; CHECK-NEXT:    ret i1 true
+;
 ; Product of non-negative numbers is non-negative if there is no signed overflow.
   %XX = mul nsw i32 %X, %X
   %YY = mul nsw i32 %Y, %Y
   %M = mul nsw i32 %XX, %YY
   %C = icmp sge i32 %M, 0
   ret i1 %C
-; CHECK: ret i1 true
 }
 
 define <2 x i1> @vectorselect1(<2 x i1> %cond) {
 ; CHECK-LABEL: @vectorselect1(
+; CHECK-NEXT:    ret <2 x i1> [[COND:%.*]]
+;
   %invert = xor <2 x i1> %cond, <i1 1, i1 1>
   %s = select <2 x i1> %invert, <2 x i32> <i32 0, i32 0>, <2 x i32> <i32 1, i32 1>
   %c = icmp ne <2 x i32> %s, <i32 0, i32 0>
   ret <2 x i1> %c
-; CHECK: ret <2 x i1> %cond
 }
 
 ; PR11948
 define <2 x i1> @vectorselectcrash(i32 %arg1) {
+; CHECK-LABEL: @vectorselectcrash(
+; CHECK-NEXT:    [[TOBOOL40:%.*]] = icmp ne i32 [[ARG1:%.*]], 0
+; CHECK-NEXT:    [[COND43:%.*]] = select i1 [[TOBOOL40]], <2 x i16> <i16 -5, i16 66>, <2 x i16> <i16 46, i16 1>
+; CHECK-NEXT:    [[CMP45:%.*]] = icmp ugt <2 x i16> [[COND43]], <i16 73, i16 21>
+; CHECK-NEXT:    ret <2 x i1> [[CMP45]]
+;
   %tobool40 = icmp ne i32 %arg1, 0
   %cond43 = select i1 %tobool40, <2 x i16> <i16 -5, i16 66>, <2 x i16> <i16 46, i16 1>
   %cmp45 = icmp ugt <2 x i16> %cond43, <i16 73, i16 21>
@@ -738,20 +845,22 @@ define <2 x i1> @vectorselectcrash(i32 %arg1) {
 
 ; PR12013
 define i1 @alloca_compare(i64 %idx) {
+; CHECK-LABEL: @alloca_compare(
+; CHECK-NEXT:    ret i1 false
+;
   %sv = alloca { i32, i32, [124 x i32] }
   %1 = getelementptr inbounds { i32, i32, [124 x i32] }, { i32, i32, [124 x i32] }* %sv, i32 0, i32 2, i64 %idx
   %2 = icmp eq i32* %1, null
   ret i1 %2
-  ; CHECK: alloca_compare
-  ; CHECK: ret i1 false
 }
 
 define i1 @alloca_compare_no_null_opt(i64 %idx) #0 {
-; CHECK-LABEL: alloca_compare_no_null_opt(
-; CHECK: %sv = alloca { i32, i32, [124 x i32] }
-; CHECK: %cmp = getelementptr inbounds { i32, i32, [124 x i32] }, { i32, i32, [124 x i32] }* %sv, i32 0, i32 2, i64 %idx
-; CHECK: %X = icmp eq i32* %cmp, null
-; CHECK: ret i1 %X
+; CHECK-LABEL: @alloca_compare_no_null_opt(
+; CHECK-NEXT:    [[SV:%.*]] = alloca { i32, i32, [124 x i32] }
+; CHECK-NEXT:    [[CMP:%.*]] = getelementptr inbounds { i32, i32, [124 x i32] }, { i32, i32, [124 x i32] }* [[SV]], i32 0, i32 2, i64 [[IDX:%.*]]
+; CHECK-NEXT:    [[X:%.*]] = icmp eq i32* [[CMP]], null
+; CHECK-NEXT:    ret i1 [[X]]
+;
   %sv = alloca { i32, i32, [124 x i32] }
   %cmp = getelementptr inbounds { i32, i32, [124 x i32] }, { i32, i32, [124 x i32] }* %sv, i32 0, i32 2, i64 %idx
   %X = icmp eq i32* %cmp, null
@@ -759,6 +868,13 @@ define i1 @alloca_compare_no_null_opt(i64 %idx) #0 {
 }
 ; PR12075
 define i1 @infinite_gep() {
+; CHECK-LABEL: @infinite_gep(
+; CHECK-NEXT:    ret i1 true
+; CHECK:       unreachableblock:
+; CHECK-NEXT:    [[X:%.*]] = getelementptr i32, i32* [[X]], i32 1
+; CHECK-NEXT:    [[Y:%.*]] = icmp eq i32* [[X]], null
+; CHECK-NEXT:    ret i1 [[Y]]
+;
   ret i1 1
 
 unreachableblock:
@@ -773,21 +889,27 @@ unreachableblock:
 ; There are no restrictions against guessing an object's address and comparing.
 
 define i1 @alloca_argument_compare(i64* %arg) {
+; CHECK-LABEL: @alloca_argument_compare(
+; CHECK-NEXT:    [[ALLOC:%.*]] = alloca i64
+; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i64* [[ARG:%.*]], [[ALLOC]]
+; CHECK-NEXT:    ret i1 [[CMP]]
+;
   %alloc = alloca i64
   %cmp = icmp eq i64* %arg, %alloc
   ret i1 %cmp
-  ; CHECK: alloca_argument_compare
-  ; CHECK: ret i1 %cmp
 }
 
 ; As above, but with the operands reversed.
 
 define i1 @alloca_argument_compare_swapped(i64* %arg) {
+; CHECK-LABEL: @alloca_argument_compare_swapped(
+; CHECK-NEXT:    [[ALLOC:%.*]] = alloca i64
+; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i64* [[ALLOC]], [[ARG:%.*]]
+; CHECK-NEXT:    ret i1 [[CMP]]
+;
   %alloc = alloca i64
   %cmp = icmp eq i64* %alloc, %arg
   ret i1 %cmp
-  ; CHECK: alloca_argument_compare_swapped
-  ; CHECK: ret i1 %cmp
 }
 
 ; Don't assume that a noalias argument isn't equal to a global variable's
@@ -796,30 +918,34 @@ define i1 @alloca_argument_compare_swapped(i64* %arg) {
 
 @y = external global i32
 define zeroext i1 @external_compare(i32* noalias %x) {
+; CHECK-LABEL: @external_compare(
+; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i32* [[X:%.*]], @y
+; CHECK-NEXT:    ret i1 [[CMP]]
+;
   %cmp = icmp eq i32* %x, @y
   ret i1 %cmp
-  ; CHECK: external_compare
-  ; CHECK: ret i1 %cmp
 }
 
 define i1 @alloca_gep(i64 %a, i64 %b) {
 ; CHECK-LABEL: @alloca_gep(
+; CHECK-NEXT:    ret i1 false
+;
 ; We can prove this GEP is non-null because it is inbounds and the pointer
 ; is non-null.
   %strs = alloca [1000 x [1001 x i8]], align 16
   %x = getelementptr inbounds [1000 x [1001 x i8]], [1000 x [1001 x i8]]* %strs, i64 0, i64 %a, i64 %b
   %cmp = icmp eq i8* %x, null
   ret i1 %cmp
-; CHECK-NEXT: ret i1 false
 }
 
 define i1 @alloca_gep_no_null_opt(i64 %a, i64 %b) #0 {
 ; CHECK-LABEL: @alloca_gep_no_null_opt(
+; CHECK-NEXT:    [[STRS:%.*]] = alloca [1000 x [1001 x i8]], align 16
+; CHECK-NEXT:    [[X:%.*]] = getelementptr inbounds [1000 x [1001 x i8]], [1000 x [1001 x i8]]* [[STRS]], i64 0, i64 [[A:%.*]], i64 [[B:%.*]]
+; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i8* [[X]], null
+; CHECK-NEXT:    ret i1 [[CMP]]
+;
 ; We can't prove this GEP is non-null.
-; CHECK: alloca
-; CHECK: getelementptr
-; CHECK: icmp
-; CHECK: ret
   %strs = alloca [1000 x [1001 x i8]], align 16
   %x = getelementptr inbounds [1000 x [1001 x i8]], [1000 x [1001 x i8]]* %strs, i64 0, i64 %a, i64 %b
   %cmp = icmp eq i8* %x, null
@@ -828,6 +954,8 @@ define i1 @alloca_gep_no_null_opt(i64 %a, i64 %b) #0 {
 
 define i1 @non_inbounds_gep_compare(i64* %a) {
 ; CHECK-LABEL: @non_inbounds_gep_compare(
+; CHECK-NEXT:    ret i1 true
+;
 ; Equality compares with non-inbounds GEPs can be folded.
   %x = getelementptr i64, i64* %a, i64 42
   %y = getelementptr inbounds i64, i64* %x, i64 -42
@@ -835,181 +963,204 @@ define i1 @non_inbounds_gep_compare(i64* %a) {
   %w = getelementptr inbounds i64, i64* %z, i64 42
   %cmp = icmp eq i64* %y, %w
   ret i1 %cmp
-; CHECK-NEXT: ret i1 true
 }
 
 define i1 @non_inbounds_gep_compare2(i64* %a) {
 ; CHECK-LABEL: @non_inbounds_gep_compare2(
+; CHECK-NEXT:    ret i1 true
+;
 ; Equality compares with non-inbounds GEPs can be folded.
   %x = getelementptr i64, i64* %a, i64 4294967297
   %y = getelementptr i64, i64* %a, i64 1
   %cmp = icmp eq i64* %y, %y
   ret i1 %cmp
-; CHECK-NEXT: ret i1 true
 }
 
 define i1 @compare_always_true_slt(i16 %a) {
+; CHECK-LABEL: @compare_always_true_slt(
+; CHECK-NEXT:    ret i1 true
+;
   %1 = zext i16 %a to i32
   %2 = sub nsw i32 0, %1
   %3 = icmp slt i32 %2, 1
   ret i1 %3
 
-; CHECK-LABEL: @compare_always_true_slt
-; CHECK-NEXT: ret i1 true
 }
 
 define i1 @compare_always_true_sle(i16 %a) {
+; CHECK-LABEL: @compare_always_true_sle(
+; CHECK-NEXT:    ret i1 true
+;
   %1 = zext i16 %a to i32
   %2 = sub nsw i32 0, %1
   %3 = icmp sle i32 %2, 0
   ret i1 %3
 
-; CHECK-LABEL: @compare_always_true_sle
-; CHECK-NEXT: ret i1 true
 }
 
 define i1 @compare_always_false_sgt(i16 %a) {
+; CHECK-LABEL: @compare_always_false_sgt(
+; CHECK-NEXT:    ret i1 false
+;
   %1 = zext i16 %a to i32
   %2 = sub nsw i32 0, %1
   %3 = icmp sgt i32 %2, 0
   ret i1 %3
 
-; CHECK-LABEL: @compare_always_false_sgt
-; CHECK-NEXT: ret i1 false
 }
 
 define i1 @compare_always_false_sge(i16 %a) {
+; CHECK-LABEL: @compare_always_false_sge(
+; CHECK-NEXT:    ret i1 false
+;
   %1 = zext i16 %a to i32
   %2 = sub nsw i32 0, %1
   %3 = icmp sge i32 %2, 1
   ret i1 %3
 
-; CHECK-LABEL: @compare_always_false_sge
-; CHECK-NEXT: ret i1 false
 }
 
 define i1 @compare_always_false_eq(i16 %a) {
+; CHECK-LABEL: @compare_always_false_eq(
+; CHECK-NEXT:    ret i1 false
+;
   %1 = zext i16 %a to i32
   %2 = sub nsw i32 0, %1
   %3 = icmp eq i32 %2, 1
   ret i1 %3
 
-; CHECK-LABEL: @compare_always_false_eq
-; CHECK-NEXT: ret i1 false
 }
 
 define i1 @compare_always_false_ne(i16 %a) {
+; CHECK-LABEL: @compare_always_false_ne(
+; CHECK-NEXT:    ret i1 true
+;
   %1 = zext i16 %a to i32
   %2 = sub nsw i32 0, %1
   %3 = icmp ne i32 %2, 1
   ret i1 %3
 
-; CHECK-LABEL: @compare_always_false_ne
-; CHECK-NEXT: ret i1 true
 }
 
 define i1 @lshr_ugt_false(i32 %a) {
+; CHECK-LABEL: @lshr_ugt_false(
+; CHECK-NEXT:    ret i1 false
+;
   %shr = lshr i32 1, %a
   %cmp = icmp ugt i32 %shr, 1
   ret i1 %cmp
-; CHECK-LABEL: @lshr_ugt_false
-; CHECK-NEXT: ret i1 false
 }
 
 define i1 @nonnull_arg(i32* nonnull %i) {
+; CHECK-LABEL: @nonnull_arg(
+; CHECK-NEXT:    ret i1 false
+;
   %cmp = icmp eq i32* %i, null
   ret i1 %cmp
-; CHECK-LABEL: @nonnull_arg
-; CHECK: ret i1 false
 }
 
 define i1 @nonnull_arg_no_null_opt(i32* nonnull %i) #0 {
+; CHECK-LABEL: @nonnull_arg_no_null_opt(
+; CHECK-NEXT:    ret i1 false
+;
   %cmp = icmp eq i32* %i, null
   ret i1 %cmp
-; CHECK-LABEL: @nonnull_arg_no_null_opt
-; CHECK: ret i1 false
 }
 
 define i1 @nonnull_deref_arg(i32* dereferenceable(4) %i) {
+; CHECK-LABEL: @nonnull_deref_arg(
+; CHECK-NEXT:    ret i1 false
+;
   %cmp = icmp eq i32* %i, null
   ret i1 %cmp
-; CHECK-LABEL: @nonnull_deref_arg
-; CHECK: ret i1 false
 }
 
 define i1 @nonnull_deref_arg_no_null_opt(i32* dereferenceable(4) %i) #0 {
+; CHECK-LABEL: @nonnull_deref_arg_no_null_opt(
+; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i32* [[I:%.*]], null
+; CHECK-NEXT:    ret i1 [[CMP]]
+;
   %cmp = icmp eq i32* %i, null
   ret i1 %cmp
-; CHECK-LABEL: @nonnull_deref_arg_no_null_opt
-; CHECK-NEXT: icmp
-; CHECK: ret
 }
 define i1 @nonnull_deref_as_arg(i32 addrspace(1)* dereferenceable(4) %i) {
+; CHECK-LABEL: @nonnull_deref_as_arg(
+; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i32 addrspace(1)* [[I:%.*]], null
+; CHECK-NEXT:    ret i1 [[CMP]]
+;
   %cmp = icmp eq i32 addrspace(1)* %i, null
   ret i1 %cmp
-; CHECK-LABEL: @nonnull_deref_as_arg
-; CHECK: icmp
-; CHECK: ret
 }
 
 declare nonnull i32* @returns_nonnull_helper()
 define i1 @returns_nonnull() {
+; CHECK-LABEL: @returns_nonnull(
+; CHECK-NEXT:    [[CALL:%.*]] = call nonnull i32* @returns_nonnull_helper()
+; CHECK-NEXT:    ret i1 false
+;
   %call = call nonnull i32* @returns_nonnull_helper()
   %cmp = icmp eq i32* %call, null
   ret i1 %cmp
-; CHECK-LABEL: @returns_nonnull
-; CHECK: ret i1 false
 }
 
 declare dereferenceable(4) i32* @returns_nonnull_deref_helper()
 define i1 @returns_nonnull_deref() {
+; CHECK-LABEL: @returns_nonnull_deref(
+; CHECK-NEXT:    [[CALL:%.*]] = call dereferenceable(4) i32* @returns_nonnull_deref_helper()
+; CHECK-NEXT:    ret i1 false
+;
   %call = call dereferenceable(4) i32* @returns_nonnull_deref_helper()
   %cmp = icmp eq i32* %call, null
   ret i1 %cmp
-; CHECK-LABEL: @returns_nonnull_deref
-; CHECK: ret i1 false
 }
 
 define i1 @returns_nonnull_deref_no_null_opt () #0 {
+; CHECK-LABEL: @returns_nonnull_deref_no_null_opt(
+; CHECK-NEXT:    [[CALL:%.*]] = call dereferenceable(4) i32* @returns_nonnull_deref_helper()
+; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i32* [[CALL]], null
+; CHECK-NEXT:    ret i1 [[CMP]]
+;
   %call = call dereferenceable(4) i32* @returns_nonnull_deref_helper()
   %cmp = icmp eq i32* %call, null
   ret i1 %cmp
-; CHECK-LABEL: @returns_nonnull_deref_no_null_opt
-; CHECK: icmp
-; CHECK: ret
 }
 
 declare dereferenceable(4) i32 addrspace(1)* @returns_nonnull_deref_as_helper()
 define i1 @returns_nonnull_as_deref() {
+; CHECK-LABEL: @returns_nonnull_as_deref(
+; CHECK-NEXT:    [[CALL:%.*]] = call dereferenceable(4) i32 addrspace(1)* @returns_nonnull_deref_as_helper()
+; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i32 addrspace(1)* [[CALL]], null
+; CHECK-NEXT:    ret i1 [[CMP]]
+;
   %call = call dereferenceable(4) i32 addrspace(1)* @returns_nonnull_deref_as_helper()
   %cmp = icmp eq i32 addrspace(1)* %call, null
   ret i1 %cmp
-; CHECK-LABEL: @returns_nonnull_as_deref
-; CHECK: icmp
-; CHECK: ret
 }
 
 define i1 @nonnull_load(i32** %addr) {
+; CHECK-LABEL: @nonnull_load(
+; CHECK-NEXT:    ret i1 false
+;
   %ptr = load i32*, i32** %addr, !nonnull !{}
   %cmp = icmp eq i32* %ptr, null
   ret i1 %cmp
-; CHECK-LABEL: @nonnull_load
-; CHECK: ret i1 false
 }
 
 define i1 @nonnull_load_as_outer(i32* addrspace(1)* %addr) {
+; CHECK-LABEL: @nonnull_load_as_outer(
+; CHECK-NEXT:    ret i1 false
+;
   %ptr = load i32*, i32* addrspace(1)* %addr, !nonnull !{}
   %cmp = icmp eq i32* %ptr, null
   ret i1 %cmp
-; CHECK-LABEL: @nonnull_load_as_outer
-; CHECK: ret i1 false
 }
 define i1 @nonnull_load_as_inner(i32 addrspace(1)** %addr) {
+; CHECK-LABEL: @nonnull_load_as_inner(
+; CHECK-NEXT:    ret i1 false
+;
   %ptr = load i32 addrspace(1)*, i32 addrspace(1)** %addr, !nonnull !{}
   %cmp = icmp eq i32 addrspace(1)* %ptr, null
   ret i1 %cmp
-; CHECK-LABEL: @nonnull_load_as_inner
-; CHECK: ret i1 false
 }
 
 ; If a bit is known to be zero for A and known to be one for B,
@@ -1051,39 +1202,45 @@ define <2 x i1> @icmp_ne_const_vec(<2 x i32> %a) {
 }
 
 define i1 @icmp_sdiv_int_min(i32 %a) {
+; CHECK-LABEL: @icmp_sdiv_int_min(
+; CHECK-NEXT:    [[DIV:%.*]] = sdiv i32 -2147483648, [[A:%.*]]
+; CHECK-NEXT:    [[CMP:%.*]] = icmp ne i32 [[DIV]], -1073741824
+; CHECK-NEXT:    ret i1 [[CMP]]
+;
   %div = sdiv i32 -2147483648, %a
   %cmp = icmp ne i32 %div, -1073741824
   ret i1 %cmp
 
-; CHECK-LABEL: @icmp_sdiv_int_min
-; CHECK-NEXT: [[DIV:%.*]] = sdiv i32 -2147483648, %a
-; CHECK-NEXT: [[CMP:%.*]] = icmp ne i32 [[DIV]], -1073741824
-; CHECK-NEXT: ret i1 [[CMP]]
 }
 
 define i1 @icmp_sdiv_pr20288(i64 %a) {
-   %div = sdiv i64 %a, -8589934592
-   %cmp = icmp ne i64 %div, 1073741824
-   ret i1 %cmp
+; CHECK-LABEL: @icmp_sdiv_pr20288(
+; CHECK-NEXT:    [[DIV:%.*]] = sdiv i64 [[A:%.*]], -8589934592
+; CHECK-NEXT:    [[CMP:%.*]] = icmp ne i64 [[DIV]], 1073741824
+; CHECK-NEXT:    ret i1 [[CMP]]
+;
+  %div = sdiv i64 %a, -8589934592
+  %cmp = icmp ne i64 %div, 1073741824
+  ret i1 %cmp
 
-; CHECK-LABEL: @icmp_sdiv_pr20288
-; CHECK-NEXT: [[DIV:%.*]] = sdiv i64 %a, -8589934592
-; CHECK-NEXT: [[CMP:%.*]] = icmp ne i64 [[DIV]], 1073741824
-; CHECK-NEXT: ret i1 [[CMP]]
 }
 
 define i1 @icmp_sdiv_neg1(i64 %a) {
- %div = sdiv i64 %a, -1
- %cmp = icmp ne i64 %div, 1073741824
- ret i1 %cmp
+; CHECK-LABEL: @icmp_sdiv_neg1(
+; CHECK-NEXT:    [[DIV:%.*]] = sdiv i64 [[A:%.*]], -1
+; CHECK-NEXT:    [[CMP:%.*]] = icmp ne i64 [[DIV]], 1073741824
+; CHECK-NEXT:    ret i1 [[CMP]]
+;
+  %div = sdiv i64 %a, -1
+  %cmp = icmp ne i64 %div, 1073741824
+  ret i1 %cmp
 
-; CHECK-LABEL: @icmp_sdiv_neg1
-; CHECK-NEXT: [[DIV:%.*]] = sdiv i64 %a, -1
-; CHECK-NEXT: [[CMP:%.*]] = icmp ne i64 [[DIV]], 1073741824
-; CHECK-NEXT: ret i1 [[CMP]]
 }
 
 define i1 @icmp_known_bits(i4 %x, i4 %y) {
+; CHECK-LABEL: @icmp_known_bits(
+; CHECK-NEXT:    ret i1 false
+;
   %and1 = and i4 %y, -7
   %and2 = and i4 %x, -7
   %or1 = or i4 %and1, 2
@@ -1092,117 +1249,128 @@ define i1 @icmp_known_bits(i4 %x, i4 %y) {
   %cmp = icmp eq i4 %add, 0
   ret i1 %cmp
 
-; CHECK-LABEL: @icmp_known_bits
-; CHECK-NEXT: ret i1 false
 }
 
 define i1 @icmp_shl_nuw_1(i64 %a) {
- %shl = shl nuw i64 1, %a
- %cmp = icmp ne i64 %shl, 0
- ret i1 %cmp
+; CHECK-LABEL: @icmp_shl_nuw_1(
+; CHECK-NEXT:    ret i1 true
+;
+  %shl = shl nuw i64 1, %a
+  %cmp = icmp ne i64 %shl, 0
+  ret i1 %cmp
 
-; CHECK-LABEL: @icmp_shl_nuw_1
-; CHECK-NEXT: ret i1 true
 }
 
 define i1 @icmp_shl_1_V_ugt_2147483648(i32 %V) {
+; CHECK-LABEL: @icmp_shl_1_V_ugt_2147483648(
+; CHECK-NEXT:    ret i1 false
+;
   %shl = shl i32 1, %V
   %cmp = icmp ugt i32 %shl, 2147483648
   ret i1 %cmp
 
-; CHECK-LABEL: @icmp_shl_1_V_ugt_2147483648(
-; CHECK-NEXT: ret i1 false
 }
 
 define i1 @icmp_shl_1_V_ule_2147483648(i32 %V) {
+; CHECK-LABEL: @icmp_shl_1_V_ule_2147483648(
+; CHECK-NEXT:    ret i1 true
+;
   %shl = shl i32 1, %V
   %cmp = icmp ule i32 %shl, 2147483648
   ret i1 %cmp
 
-; CHECK-LABEL: @icmp_shl_1_V_ule_2147483648(
-; CHECK-NEXT: ret i1 true
 }
 
 define i1 @icmp_shl_1_V_eq_31(i32 %V) {
+; CHECK-LABEL: @icmp_shl_1_V_eq_31(
+; CHECK-NEXT:    ret i1 false
+;
   %shl = shl i32 1, %V
   %cmp = icmp eq i32 %shl, 31
   ret i1 %cmp
 
-; CHECK-LABEL: @icmp_shl_1_V_eq_31(
-; CHECK-NEXT: ret i1 false
 }
 
 define i1 @icmp_shl_1_V_ne_31(i32 %V) {
+; CHECK-LABEL: @icmp_shl_1_V_ne_31(
+; CHECK-NEXT:    ret i1 true
+;
   %shl = shl i32 1, %V
   %cmp = icmp ne i32 %shl, 31
   ret i1 %cmp
 
-; CHECK-LABEL: @icmp_shl_1_V_ne_31(
-; CHECK-NEXT: ret i1 true
 }
 
 define i1 @tautological1(i32 %A, i32 %B) {
+; CHECK-LABEL: @tautological1(
+; CHECK-NEXT:    ret i1 false
+;
   %C = and i32 %A, %B
   %D = icmp ugt i32 %C, %A
   ret i1 %D
-; CHECK-LABEL: @tautological1(
-; CHECK: ret i1 false
 }
 
 define i1 @tautological2(i32 %A, i32 %B) {
+; CHECK-LABEL: @tautological2(
+; CHECK-NEXT:    ret i1 true
+;
   %C = and i32 %A, %B
   %D = icmp ule i32 %C, %A
   ret i1 %D
-; CHECK-LABEL: @tautological2(
-; CHECK: ret i1 true
 }
 
 define i1 @tautological3(i32 %A, i32 %B) {
+; CHECK-LABEL: @tautological3(
+; CHECK-NEXT:    ret i1 true
+;
   %C = or i32 %A, %B
   %D = icmp ule i32 %A, %C
   ret i1 %D
-; CHECK-LABEL: @tautological3(
-; CHECK: ret i1 true
 }
 
 define i1 @tautological4(i32 %A, i32 %B) {
+; CHECK-LABEL: @tautological4(
+; CHECK-NEXT:    ret i1 false
+;
   %C = or i32 %A, %B
   %D = icmp ugt i32 %A, %C
   ret i1 %D
-; CHECK-LABEL: @tautological4(
-; CHECK: ret i1 false
 }
 
 define i1 @tautological5(i32 %A, i32 %B) {
+; CHECK-LABEL: @tautological5(
+; CHECK-NEXT:    ret i1 false
+;
   %C = or i32 %A, %B
   %D = icmp ult i32 %C, %A
   ret i1 %D
-; CHECK-LABEL: @tautological5(
-; CHECK: ret i1 false
 }
 
 define i1 @tautological6(i32 %A, i32 %B) {
+; CHECK-LABEL: @tautological6(
+; CHECK-NEXT:    ret i1 true
+;
   %C = or i32 %A, %B
   %D = icmp uge i32 %C, %A
   ret i1 %D
-; CHECK-LABEL: @tautological6(
-; CHECK: ret i1 true
 }
 
 define i1 @tautological7(i32 %A, i32 %B) {
+; CHECK-LABEL: @tautological7(
+; CHECK-NEXT:    ret i1 true
+;
   %C = and i32 %A, %B
   %D = icmp uge i32 %A, %C
   ret i1 %D
-; CHECK-LABEL: @tautological7(
-; CHECK: ret i1 true
 }
 
 define i1 @tautological8(i32 %A, i32 %B) {
+; CHECK-LABEL: @tautological8(
+; CHECK-NEXT:    ret i1 false
+;
   %C = and i32 %A, %B
   %D = icmp ult i32 %A, %C
   ret i1 %D
-; CHECK-LABEL: @tautological8(
-; CHECK: ret i1 false
 }
 
 declare void @helper_i1(i1)
@@ -1213,6 +1381,62 @@ define void @icmp_slt_sge_or(i32 %Ax, i32 %Bx) {
 ; %E is 'icmp sge (or A, B), A' making it the not of %D
 ; %F is 'icmp sgt A, (or A, B)' making it the same as %D
 ; %G is 'icmp sle A, (or A, B)' making it the not of %D
+; CHECK-LABEL: @icmp_slt_sge_or(
+; CHECK-NEXT:    [[APOS:%.*]] = and i32 [[AX:%.*]], 2147483647
+; CHECK-NEXT:    [[BNEG:%.*]] = or i32 [[BX:%.*]], -2147483648
+; CHECK-NEXT:    [[CPX:%.*]] = or i32 [[APOS]], [[BX]]
+; CHECK-NEXT:    [[DPX:%.*]] = icmp slt i32 [[CPX]], [[APOS]]
+; CHECK-NEXT:    [[EPX:%.*]] = icmp sge i32 [[CPX]], [[APOS]]
+; CHECK-NEXT:    [[FPX:%.*]] = icmp sgt i32 [[APOS]], [[CPX]]
+; CHECK-NEXT:    [[GPX:%.*]] = icmp sle i32 [[APOS]], [[CPX]]
+; CHECK-NEXT:    [[CXX:%.*]] = or i32 [[AX]], [[BX]]
+; CHECK-NEXT:    [[DXX:%.*]] = icmp slt i32 [[CXX]], [[AX]]
+; CHECK-NEXT:    [[EXX:%.*]] = icmp sge i32 [[CXX]], [[AX]]
+; CHECK-NEXT:    [[FXX:%.*]] = icmp sgt i32 [[AX]], [[CXX]]
+; CHECK-NEXT:    [[GXX:%.*]] = icmp sle i32 [[AX]], [[CXX]]
+; CHECK-NEXT:    [[CXN:%.*]] = or i32 [[AX]], [[BNEG]]
+; CHECK-NEXT:    [[DXN:%.*]] = icmp slt i32 [[CXN]], [[AX]]
+; CHECK-NEXT:    [[EXN:%.*]] = icmp sge i32 [[CXN]], [[AX]]
+; CHECK-NEXT:    [[FXN:%.*]] = icmp sgt i32 [[AX]], [[CXN]]
+; CHECK-NEXT:    [[GXN:%.*]] = icmp sle i32 [[AX]], [[CXN]]
+; CHECK-NEXT:    call void @helper_i1(i1 false)
+; CHECK-NEXT:    call void @helper_i1(i1 true)
+; CHECK-NEXT:    call void @helper_i1(i1 false)
+; CHECK-NEXT:    call void @helper_i1(i1 true)
+; CHECK-NEXT:    call void @helper_i1(i1 [[DPX]])
+; CHECK-NEXT:    call void @helper_i1(i1 [[EPX]])
+; CHECK-NEXT:    call void @helper_i1(i1 [[FPX]])
+; CHECK-NEXT:    call void @helper_i1(i1 [[GPX]])
+; CHECK-NEXT:    call void @helper_i1(i1 true)
+; CHECK-NEXT:    call void @helper_i1(i1 false)
+; CHECK-NEXT:    call void @helper_i1(i1 true)
+; CHECK-NEXT:    call void @helper_i1(i1 false)
+; CHECK-NEXT:    call void @helper_i1(i1 false)
+; CHECK-NEXT:    call void @helper_i1(i1 true)
+; CHECK-NEXT:    call void @helper_i1(i1 false)
+; CHECK-NEXT:    call void @helper_i1(i1 true)
+; CHECK-NEXT:    call void @helper_i1(i1 [[DXX]])
+; CHECK-NEXT:    call void @helper_i1(i1 [[EXX]])
+; CHECK-NEXT:    call void @helper_i1(i1 [[FXX]])
+; CHECK-NEXT:    call void @helper_i1(i1 [[GXX]])
+; CHECK-NEXT:    call void @helper_i1(i1 [[DXN]])
+; CHECK-NEXT:    call void @helper_i1(i1 [[EXN]])
+; CHECK-NEXT:    call void @helper_i1(i1 [[FXN]])
+; CHECK-NEXT:    call void @helper_i1(i1 [[GXN]])
+; CHECK-NEXT:    call void @helper_i1(i1 false)
+; CHECK-NEXT:    call void @helper_i1(i1 true)
+; CHECK-NEXT:    call void @helper_i1(i1 false)
+; CHECK-NEXT:    call void @helper_i1(i1 true)
+; CHECK-NEXT:    call void @helper_i1(i1 false)
+; CHECK-NEXT:    call void @helper_i1(i1 true)
+; CHECK-NEXT:    call void @helper_i1(i1 false)
+; CHECK-NEXT:    call void @helper_i1(i1 true)
+; CHECK-NEXT:    call void @helper_i1(i1 false)
+; CHECK-NEXT:    call void @helper_i1(i1 true)
+; CHECK-NEXT:    call void @helper_i1(i1 false)
+; CHECK-NEXT:    call void @helper_i1(i1 true)
+; CHECK-NEXT:    ret void
+;
   %Aneg = or i32 %Ax, 2147483648
   %Apos = and i32 %Ax, 2147483647
   %Bneg = or i32 %Bx, 2147483648
@@ -1302,43 +1526,6 @@ define void @icmp_slt_sge_or(i32 %Ax, i32 %Bx) {
   call void @helper_i1(i1 %Enn)
   call void @helper_i1(i1 %Fnn)
   call void @helper_i1(i1 %Gnn)
-; CHECK-LABEL: @icmp_slt_sge_or
-; CHECK: call void @helper_i1(i1 false)
-; CHECK: call void @helper_i1(i1 true)
-; CHECK: call void @helper_i1(i1 false)
-; CHECK: call void @helper_i1(i1 true)
-; CHECK: call void @helper_i1(i1 %Dpx)
-; CHECK: call void @helper_i1(i1 %Epx)
-; CHECK: call void @helper_i1(i1 %Fpx)
-; CHECK: call void @helper_i1(i1 %Gpx)
-; CHECK: call void @helper_i1(i1 true)
-; CHECK: call void @helper_i1(i1 false)
-; CHECK: call void @helper_i1(i1 true)
-; CHECK: call void @helper_i1(i1 false)
-; CHECK: call void @helper_i1(i1 false)
-; CHECK: call void @helper_i1(i1 true)
-; CHECK: call void @helper_i1(i1 false)
-; CHECK: call void @helper_i1(i1 true)
-; CHECK: call void @helper_i1(i1 %Dxx)
-; CHECK: call void @helper_i1(i1 %Exx)
-; CHECK: call void @helper_i1(i1 %Fxx)
-; CHECK: call void @helper_i1(i1 %Gxx)
-; CHECK: call void @helper_i1(i1 %Dxn)
-; CHECK: call void @helper_i1(i1 %Exn)
-; CHECK: call void @helper_i1(i1 %Fxn)
-; CHECK: call void @helper_i1(i1 %Gxn)
-; CHECK: call void @helper_i1(i1 false)
-; CHECK: call void @helper_i1(i1 true)
-; CHECK: call void @helper_i1(i1 false)
-; CHECK: call void @helper_i1(i1 true)
-; CHECK: call void @helper_i1(i1 false)
-; CHECK: call void @helper_i1(i1 true)
-; CHECK: call void @helper_i1(i1 false)
-; CHECK: call void @helper_i1(i1 true)
-; CHECK: call void @helper_i1(i1 false)
-; CHECK: call void @helper_i1(i1 true)
-; CHECK: call void @helper_i1(i1 false)
-; CHECK: call void @helper_i1(i1 true)
   ret void
 }
 
@@ -1358,9 +1545,10 @@ define i1 @constant_fold_null_inttoptr() {
   ret i1 %x
 }
 
-; CHECK-LABEL: @cmp_through_addrspacecast(
-; CHECK-NEXT: ret i1 true
 define i1 @cmp_through_addrspacecast(i32 addrspace(1)* %p1) {
+; CHECK-LABEL: @cmp_through_addrspacecast(
+; CHECK-NEXT:    ret i1 true
+;
   %p0 = addrspacecast i32 addrspace(1)* %p1 to i32*
   %p0.1 = getelementptr inbounds i32, i32* %p0, i64 1
   %cmp = icmp ne i32* %p0, %p0.1