diff --git a/llvm/test/Transforms/ConstraintElimination/add-nuw.ll b/llvm/test/Transforms/ConstraintElimination/add-nuw.ll
new file mode 100644
index 00000000000000..45dcd12ddec3c7
--- /dev/null
+++ b/llvm/test/Transforms/ConstraintElimination/add-nuw.ll
@@ -0,0 +1,242 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
+; RUN: opt -constraint-elimination -S %s | FileCheck %s
+
+define void @test.not.uge.ult(i8 %start, i8 %low, i8 %high) {
+; CHECK-LABEL: @test.not.uge.ult(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[ADD_PTR_I:%.*]] = add nuw i8 [[START:%.*]], 3
+; CHECK-NEXT:    [[C_1:%.*]] = icmp uge i8 [[ADD_PTR_I]], [[HIGH:%.*]]
+; CHECK-NEXT:    br i1 [[C_1]], label [[IF_THEN:%.*]], label [[IF_END:%.*]]
+; CHECK:       if.then:
+; CHECK-NEXT:    ret void
+; CHECK:       if.end:
+; CHECK-NEXT:    [[T_0:%.*]] = icmp ult i8 [[START]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_0]])
+; CHECK-NEXT:    [[START_1:%.*]] = add nuw i8 [[START]], 1
+; CHECK-NEXT:    [[T_1:%.*]] = icmp ult i8 [[START_1]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_1]])
+; CHECK-NEXT:    [[START_2:%.*]] = add nuw i8 [[START]], 2
+; CHECK-NEXT:    [[T_2:%.*]] = icmp ult i8 [[START_2]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_2]])
+; CHECK-NEXT:    [[START_3:%.*]] = add nuw i8 [[START]], 3
+; CHECK-NEXT:    [[T_3:%.*]] = icmp ult i8 [[START_3]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_3]])
+; CHECK-NEXT:    [[START_4:%.*]] = add nuw i8 [[START]], 4
+; CHECK-NEXT:    [[C_4:%.*]] = icmp ult i8 [[START_4]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[C_4]])
+; CHECK-NEXT:    ret void
+;
+entry:
+  %add.ptr.i = add nuw i8 %start, 3
+  %c.1 = icmp uge i8 %add.ptr.i, %high
+  br i1 %c.1, label %if.then, label %if.end
+
+if.then:                                          ; preds = %entry
+  ret void
+
+if.end:                                           ; preds = %entry
+  %t.0 = icmp ult i8 %start, %high
+  call void @use(i1 %t.0)
+  %start.1 = add nuw i8 %start, 1
+  %t.1 = icmp ult i8 %start.1, %high
+  call void @use(i1 %t.1)
+  %start.2 = add nuw i8 %start, 2
+  %t.2 = icmp ult i8 %start.2, %high
+  call void @use(i1 %t.2)
+  %start.3 = add nuw i8 %start, 3
+  %t.3 = icmp ult i8 %start.3, %high
+  call void @use(i1 %t.3)
+  %start.4 = add nuw i8 %start, 4
+  %c.4 = icmp ult i8 %start.4, %high
+  call void @use(i1 %c.4)
+  ret void
+}
+
+define void @test.not.uge.ule(i8 %start, i8 %low, i8 %high) {
+; CHECK-LABEL: @test.not.uge.ule(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[ADD_PTR_I:%.*]] = add nuw i8 [[START:%.*]], 3
+; CHECK-NEXT:    [[C_1:%.*]] = icmp uge i8 [[ADD_PTR_I]], [[HIGH:%.*]]
+; CHECK-NEXT:    br i1 [[C_1]], label [[IF_THEN:%.*]], label [[IF_END:%.*]]
+; CHECK:       if.then:
+; CHECK-NEXT:    ret void
+; CHECK:       if.end:
+; CHECK-NEXT:    [[T_0:%.*]] = icmp ule i8 [[START]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_0]])
+; CHECK-NEXT:    [[START_1:%.*]] = add nuw i8 [[START]], 1
+; CHECK-NEXT:    [[T_1:%.*]] = icmp ule i8 [[START_1]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_1]])
+; CHECK-NEXT:    [[START_2:%.*]] = add nuw i8 [[START]], 2
+; CHECK-NEXT:    [[T_2:%.*]] = icmp ule i8 [[START_2]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_2]])
+; CHECK-NEXT:    [[START_3:%.*]] = add nuw i8 [[START]], 3
+; CHECK-NEXT:    [[T_3:%.*]] = icmp ule i8 [[START_3]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_3]])
+; CHECK-NEXT:    [[START_4:%.*]] = add nuw i8 [[START]], 4
+; CHECK-NEXT:    [[T_4:%.*]] = icmp ule i8 [[START_4]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_4]])
+; CHECK-NEXT:    [[START_5:%.*]] = add nuw i8 [[START]], 5
+; CHECK-NEXT:    [[C_5:%.*]] = icmp ule i8 [[START_5]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[C_5]])
+; CHECK-NEXT:    ret void
+;
+entry:
+  %add.ptr.i = add nuw i8 %start, 3
+  %c.1 = icmp uge i8 %add.ptr.i, %high
+  br i1 %c.1, label %if.then, label %if.end
+
+if.then:                                          ; preds = %entry
+  ret void
+
+if.end:                                           ; preds = %entry
+  %t.0 = icmp ule i8 %start, %high
+  call void @use(i1 %t.0)
+  %start.1 = add nuw i8 %start, 1
+  %t.1 = icmp ule i8 %start.1, %high
+  call void @use(i1 %t.1)
+  %start.2 = add nuw i8 %start, 2
+  %t.2 = icmp ule i8 %start.2, %high
+  call void @use(i1 %t.2)
+  %start.3 = add nuw i8 %start, 3
+  %t.3 = icmp ule i8 %start.3, %high
+  call void @use(i1 %t.3)
+  %start.4 = add nuw i8 %start, 4
+  %t.4 = icmp ule i8 %start.4, %high
+  call void @use(i1 %t.4)
+
+  %start.5 = add nuw i8 %start, 5
+  %c.5 = icmp ule i8 %start.5, %high
+  call void @use(i1 %c.5)
+
+  ret void
+}
+
+define void @test.not.uge.ugt(i8 %start, i8 %low, i8 %high) {
+; CHECK-LABEL: @test.not.uge.ugt(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[ADD_PTR_I:%.*]] = add nuw i8 [[START:%.*]], 3
+; CHECK-NEXT:    [[C_1:%.*]] = icmp uge i8 [[ADD_PTR_I]], [[HIGH:%.*]]
+; CHECK-NEXT:    br i1 [[C_1]], label [[IF_THEN:%.*]], label [[IF_END:%.*]]
+; CHECK:       if.then:
+; CHECK-NEXT:    ret void
+; CHECK:       if.end:
+; CHECK-NEXT:    [[F_0:%.*]] = icmp ugt i8 [[START]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_0]])
+; CHECK-NEXT:    [[START_1:%.*]] = add nuw i8 [[START]], 1
+; CHECK-NEXT:    [[F_1:%.*]] = icmp ugt i8 [[START_1]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_1]])
+; CHECK-NEXT:    [[START_2:%.*]] = add nuw i8 [[START]], 2
+; CHECK-NEXT:    [[F_2:%.*]] = icmp ugt i8 [[START_2]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_2]])
+; CHECK-NEXT:    [[START_3:%.*]] = add nuw i8 [[START]], 3
+; CHECK-NEXT:    [[F_3:%.*]] = icmp ugt i8 [[START_3]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_3]])
+; CHECK-NEXT:    [[START_4:%.*]] = add nuw i8 [[START]], 4
+; CHECK-NEXT:    [[F_4:%.*]] = icmp ugt i8 [[START_4]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_4]])
+; CHECK-NEXT:    [[START_5:%.*]] = add nuw i8 [[START]], 5
+; CHECK-NEXT:    [[C_5:%.*]] = icmp ugt i8 [[START_5]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[C_5]])
+; CHECK-NEXT:    ret void
+;
+entry:
+  %add.ptr.i = add nuw i8 %start, 3
+  %c.1 = icmp uge i8 %add.ptr.i, %high
+  br i1 %c.1, label %if.then, label %if.end
+
+if.then:                                          ; preds = %entry
+  ret void
+
+if.end:                                           ; preds = %entry
+  %f.0 = icmp ugt i8 %start, %high
+  call void @use(i1 %f.0)
+
+  %start.1 = add nuw i8 %start, 1
+  %f.1 = icmp ugt i8 %start.1, %high
+  call void @use(i1 %f.1)
+
+  %start.2 = add nuw i8 %start, 2
+  %f.2 = icmp ugt i8 %start.2, %high
+  call void @use(i1 %f.2)
+
+  %start.3 = add nuw i8 %start, 3
+  %f.3 = icmp ugt i8 %start.3, %high
+  call void @use(i1 %f.3)
+
+  %start.4 = add nuw i8 %start, 4
+  %f.4 = icmp ugt i8 %start.4, %high
+  call void @use(i1 %f.4)
+
+  %start.5 = add nuw i8 %start, 5
+  %c.5 = icmp ugt i8 %start.5, %high
+  call void @use(i1 %c.5)
+
+  ret void
+}
+
+define void @test.not.uge.uge(i8 %start, i8 %low, i8 %high) {
+; CHECK-LABEL: @test.not.uge.uge(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[ADD_PTR_I:%.*]] = add nuw i8 [[START:%.*]], 3
+; CHECK-NEXT:    [[C_1:%.*]] = icmp uge i8 [[ADD_PTR_I]], [[HIGH:%.*]]
+; CHECK-NEXT:    br i1 [[C_1]], label [[IF_THEN:%.*]], label [[IF_END:%.*]]
+; CHECK:       if.then:
+; CHECK-NEXT:    ret void
+; CHECK:       if.end:
+; CHECK-NEXT:    [[F_0:%.*]] = icmp ugt i8 [[START]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_0]])
+; CHECK-NEXT:    [[START_1:%.*]] = add nuw i8 [[START]], 1
+; CHECK-NEXT:    [[F_1:%.*]] = icmp uge i8 [[START_1]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_1]])
+; CHECK-NEXT:    [[START_2:%.*]] = add nuw i8 [[START]], 2
+; CHECK-NEXT:    [[F_2:%.*]] = icmp uge i8 [[START_2]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_2]])
+; CHECK-NEXT:    [[START_3:%.*]] = add nuw i8 [[START]], 3
+; CHECK-NEXT:    [[F_3:%.*]] = icmp uge i8 [[START_3]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_3]])
+; CHECK-NEXT:    [[START_4:%.*]] = add nuw i8 [[START]], 4
+; CHECK-NEXT:    [[C_4:%.*]] = icmp uge i8 [[START_4]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[C_4]])
+; CHECK-NEXT:    [[START_5:%.*]] = add nuw i8 [[START]], 5
+; CHECK-NEXT:    [[C_5:%.*]] = icmp uge i8 [[START_5]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[C_5]])
+; CHECK-NEXT:    ret void
+;
+entry:
+  %add.ptr.i = add nuw i8 %start, 3
+  %c.1 = icmp uge i8 %add.ptr.i, %high
+  br i1 %c.1, label %if.then, label %if.end
+
+if.then:                                          ; preds = %entry
+  ret void
+
+if.end:                                           ; preds = %entry
+  %f.0 = icmp ugt i8 %start, %high
+  call void @use(i1 %f.0)
+
+  %start.1 = add nuw i8 %start, 1
+  %f.1 = icmp uge i8 %start.1, %high
+  call void @use(i1 %f.1)
+
+  %start.2 = add nuw i8 %start, 2
+  %f.2 = icmp uge i8 %start.2, %high
+  call void @use(i1 %f.2)
+
+  %start.3 = add nuw i8 %start, 3
+  %f.3 = icmp uge i8 %start.3, %high
+  call void @use(i1 %f.3)
+
+  %start.4 = add nuw i8 %start, 4
+  %c.4 = icmp uge i8 %start.4, %high
+  call void @use(i1 %c.4)
+
+  %start.5 = add nuw i8 %start, 5
+  %c.5 = icmp uge i8 %start.5, %high
+  call void @use(i1 %c.5)
+
+  ret void
+}
+
+
+declare void @use(i1)
+declare void @llvm.trap()
diff --git a/llvm/test/Transforms/ConstraintElimination/add.ll b/llvm/test/Transforms/ConstraintElimination/add.ll
new file mode 100644
index 00000000000000..ac8272203a6a9d
--- /dev/null
+++ b/llvm/test/Transforms/ConstraintElimination/add.ll
@@ -0,0 +1,242 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
+; RUN: opt -constraint-elimination -S %s | FileCheck %s
+
+define void @test.not.uge.ult(i8 %start, i8 %low, i8 %high) {
+; CHECK-LABEL: @test.not.uge.ult(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[ADD_PTR_I:%.*]] = add i8 [[START:%.*]], 3
+; CHECK-NEXT:    [[C_1:%.*]] = icmp uge i8 [[ADD_PTR_I]], [[HIGH:%.*]]
+; CHECK-NEXT:    br i1 [[C_1]], label [[IF_THEN:%.*]], label [[IF_END:%.*]]
+; CHECK:       if.then:
+; CHECK-NEXT:    ret void
+; CHECK:       if.end:
+; CHECK-NEXT:    [[T_0:%.*]] = icmp ult i8 [[START]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_0]])
+; CHECK-NEXT:    [[START_1:%.*]] = add i8 [[START]], 1
+; CHECK-NEXT:    [[T_1:%.*]] = icmp ult i8 [[START_1]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_1]])
+; CHECK-NEXT:    [[START_2:%.*]] = add i8 [[START]], 2
+; CHECK-NEXT:    [[T_2:%.*]] = icmp ult i8 [[START_2]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_2]])
+; CHECK-NEXT:    [[START_3:%.*]] = add i8 [[START]], 3
+; CHECK-NEXT:    [[T_3:%.*]] = icmp ult i8 [[START_3]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_3]])
+; CHECK-NEXT:    [[START_4:%.*]] = add i8 [[START]], 4
+; CHECK-NEXT:    [[C_4:%.*]] = icmp ult i8 [[START_4]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[C_4]])
+; CHECK-NEXT:    ret void
+;
+entry:
+  %add.ptr.i = add i8 %start, 3
+  %c.1 = icmp uge i8 %add.ptr.i, %high
+  br i1 %c.1, label %if.then, label %if.end
+
+if.then:                                          ; preds = %entry
+  ret void
+
+if.end:                                           ; preds = %entry
+  %t.0 = icmp ult i8 %start, %high
+  call void @use(i1 %t.0)
+  %start.1 = add i8 %start, 1
+  %t.1 = icmp ult i8 %start.1, %high
+  call void @use(i1 %t.1)
+  %start.2 = add i8 %start, 2
+  %t.2 = icmp ult i8 %start.2, %high
+  call void @use(i1 %t.2)
+  %start.3 = add i8 %start, 3
+  %t.3 = icmp ult i8 %start.3, %high
+  call void @use(i1 %t.3)
+  %start.4 = add i8 %start, 4
+  %c.4 = icmp ult i8 %start.4, %high
+  call void @use(i1 %c.4)
+  ret void
+}
+
+define void @test.not.uge.ule(i8 %start, i8 %low, i8 %high) {
+; CHECK-LABEL: @test.not.uge.ule(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[ADD_PTR_I:%.*]] = add i8 [[START:%.*]], 3
+; CHECK-NEXT:    [[C_1:%.*]] = icmp uge i8 [[ADD_PTR_I]], [[HIGH:%.*]]
+; CHECK-NEXT:    br i1 [[C_1]], label [[IF_THEN:%.*]], label [[IF_END:%.*]]
+; CHECK:       if.then:
+; CHECK-NEXT:    ret void
+; CHECK:       if.end:
+; CHECK-NEXT:    [[T_0:%.*]] = icmp ule i8 [[START]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_0]])
+; CHECK-NEXT:    [[START_1:%.*]] = add i8 [[START]], 1
+; CHECK-NEXT:    [[T_1:%.*]] = icmp ule i8 [[START_1]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_1]])
+; CHECK-NEXT:    [[START_2:%.*]] = add i8 [[START]], 2
+; CHECK-NEXT:    [[T_2:%.*]] = icmp ule i8 [[START_2]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_2]])
+; CHECK-NEXT:    [[START_3:%.*]] = add i8 [[START]], 3
+; CHECK-NEXT:    [[T_3:%.*]] = icmp ule i8 [[START_3]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_3]])
+; CHECK-NEXT:    [[START_4:%.*]] = add i8 [[START]], 4
+; CHECK-NEXT:    [[T_4:%.*]] = icmp ule i8 [[START_4]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_4]])
+; CHECK-NEXT:    [[START_5:%.*]] = add i8 [[START]], 5
+; CHECK-NEXT:    [[C_5:%.*]] = icmp ule i8 [[START_5]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[C_5]])
+; CHECK-NEXT:    ret void
+;
+entry:
+  %add.ptr.i = add i8 %start, 3
+  %c.1 = icmp uge i8 %add.ptr.i, %high
+  br i1 %c.1, label %if.then, label %if.end
+
+if.then:                                          ; preds = %entry
+  ret void
+
+if.end:                                           ; preds = %entry
+  %t.0 = icmp ule i8 %start, %high
+  call void @use(i1 %t.0)
+  %start.1 = add i8 %start, 1
+  %t.1 = icmp ule i8 %start.1, %high
+  call void @use(i1 %t.1)
+  %start.2 = add i8 %start, 2
+  %t.2 = icmp ule i8 %start.2, %high
+  call void @use(i1 %t.2)
+  %start.3 = add i8 %start, 3
+  %t.3 = icmp ule i8 %start.3, %high
+  call void @use(i1 %t.3)
+  %start.4 = add i8 %start, 4
+  %t.4 = icmp ule i8 %start.4, %high
+  call void @use(i1 %t.4)
+
+  %start.5 = add i8 %start, 5
+  %c.5 = icmp ule i8 %start.5, %high
+  call void @use(i1 %c.5)
+
+  ret void
+}
+
+define void @test.not.uge.ugt(i8 %start, i8 %low, i8 %high) {
+; CHECK-LABEL: @test.not.uge.ugt(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[ADD_PTR_I:%.*]] = add i8 [[START:%.*]], 3
+; CHECK-NEXT:    [[C_1:%.*]] = icmp uge i8 [[ADD_PTR_I]], [[HIGH:%.*]]
+; CHECK-NEXT:    br i1 [[C_1]], label [[IF_THEN:%.*]], label [[IF_END:%.*]]
+; CHECK:       if.then:
+; CHECK-NEXT:    ret void
+; CHECK:       if.end:
+; CHECK-NEXT:    [[F_0:%.*]] = icmp ugt i8 [[START]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_0]])
+; CHECK-NEXT:    [[START_1:%.*]] = add i8 [[START]], 1
+; CHECK-NEXT:    [[F_1:%.*]] = icmp ugt i8 [[START_1]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_1]])
+; CHECK-NEXT:    [[START_2:%.*]] = add i8 [[START]], 2
+; CHECK-NEXT:    [[F_2:%.*]] = icmp ugt i8 [[START_2]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_2]])
+; CHECK-NEXT:    [[START_3:%.*]] = add i8 [[START]], 3
+; CHECK-NEXT:    [[F_3:%.*]] = icmp ugt i8 [[START_3]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_3]])
+; CHECK-NEXT:    [[START_4:%.*]] = add i8 [[START]], 4
+; CHECK-NEXT:    [[F_4:%.*]] = icmp ugt i8 [[START_4]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_4]])
+; CHECK-NEXT:    [[START_5:%.*]] = add i8 [[START]], 5
+; CHECK-NEXT:    [[C_5:%.*]] = icmp ugt i8 [[START_5]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[C_5]])
+; CHECK-NEXT:    ret void
+;
+entry:
+  %add.ptr.i = add i8 %start, 3
+  %c.1 = icmp uge i8 %add.ptr.i, %high
+  br i1 %c.1, label %if.then, label %if.end
+
+if.then:                                          ; preds = %entry
+  ret void
+
+if.end:                                           ; preds = %entry
+  %f.0 = icmp ugt i8 %start, %high
+  call void @use(i1 %f.0)
+
+  %start.1 = add i8 %start, 1
+  %f.1 = icmp ugt i8 %start.1, %high
+  call void @use(i1 %f.1)
+
+  %start.2 = add i8 %start, 2
+  %f.2 = icmp ugt i8 %start.2, %high
+  call void @use(i1 %f.2)
+
+  %start.3 = add i8 %start, 3
+  %f.3 = icmp ugt i8 %start.3, %high
+  call void @use(i1 %f.3)
+
+  %start.4 = add i8 %start, 4
+  %f.4 = icmp ugt i8 %start.4, %high
+  call void @use(i1 %f.4)
+
+  %start.5 = add i8 %start, 5
+  %c.5 = icmp ugt i8 %start.5, %high
+  call void @use(i1 %c.5)
+
+  ret void
+}
+
+define void @test.not.uge.uge(i8 %start, i8 %low, i8 %high) {
+; CHECK-LABEL: @test.not.uge.uge(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[ADD_PTR_I:%.*]] = add i8 [[START:%.*]], 3
+; CHECK-NEXT:    [[C_1:%.*]] = icmp uge i8 [[ADD_PTR_I]], [[HIGH:%.*]]
+; CHECK-NEXT:    br i1 [[C_1]], label [[IF_THEN:%.*]], label [[IF_END:%.*]]
+; CHECK:       if.then:
+; CHECK-NEXT:    ret void
+; CHECK:       if.end:
+; CHECK-NEXT:    [[F_0:%.*]] = icmp ugt i8 [[START]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_0]])
+; CHECK-NEXT:    [[START_1:%.*]] = add i8 [[START]], 1
+; CHECK-NEXT:    [[F_1:%.*]] = icmp uge i8 [[START_1]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_1]])
+; CHECK-NEXT:    [[START_2:%.*]] = add i8 [[START]], 2
+; CHECK-NEXT:    [[F_2:%.*]] = icmp uge i8 [[START_2]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_2]])
+; CHECK-NEXT:    [[START_3:%.*]] = add i8 [[START]], 3
+; CHECK-NEXT:    [[F_3:%.*]] = icmp uge i8 [[START_3]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_3]])
+; CHECK-NEXT:    [[START_4:%.*]] = add i8 [[START]], 4
+; CHECK-NEXT:    [[C_4:%.*]] = icmp uge i8 [[START_4]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[C_4]])
+; CHECK-NEXT:    [[START_5:%.*]] = add i8 [[START]], 5
+; CHECK-NEXT:    [[C_5:%.*]] = icmp uge i8 [[START_5]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[C_5]])
+; CHECK-NEXT:    ret void
+;
+entry:
+  %add.ptr.i = add i8 %start, 3
+  %c.1 = icmp uge i8 %add.ptr.i, %high
+  br i1 %c.1, label %if.then, label %if.end
+
+if.then:                                          ; preds = %entry
+  ret void
+
+if.end:                                           ; preds = %entry
+  %f.0 = icmp ugt i8 %start, %high
+  call void @use(i1 %f.0)
+
+  %start.1 = add i8 %start, 1
+  %f.1 = icmp uge i8 %start.1, %high
+  call void @use(i1 %f.1)
+
+  %start.2 = add i8 %start, 2
+  %f.2 = icmp uge i8 %start.2, %high
+  call void @use(i1 %f.2)
+
+  %start.3 = add i8 %start, 3
+  %f.3 = icmp uge i8 %start.3, %high
+  call void @use(i1 %f.3)
+
+  %start.4 = add i8 %start, 4
+  %c.4 = icmp uge i8 %start.4, %high
+  call void @use(i1 %c.4)
+
+  %start.5 = add i8 %start, 5
+  %c.5 = icmp uge i8 %start.5, %high
+  call void @use(i1 %c.5)
+
+  ret void
+}
+
+
+declare void @use(i1)
+declare void @llvm.trap()
diff --git a/llvm/test/Transforms/ConstraintElimination/and.ll b/llvm/test/Transforms/ConstraintElimination/and.ll
new file mode 100644
index 00000000000000..2e7f61659dac1a
--- /dev/null
+++ b/llvm/test/Transforms/ConstraintElimination/and.ll
@@ -0,0 +1,70 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
+; RUN: opt -constraint-elimination -S %s | FileCheck %s
+
+declare void @use(i1)
+
+define i32 @test_and_ule(i32 %x, i32 %y, i32 %z, i32 %a) {
+; CHECK-LABEL: @test_and_ule(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[C_1:%.*]] = icmp ule i32 [[X:%.*]], [[Y:%.*]]
+; CHECK-NEXT:    [[C_2:%.*]] = icmp ule i32 [[Y]], [[Z:%.*]]
+; CHECK-NEXT:    [[AND:%.*]] = and i1 [[C_1]], [[C_2]]
+; CHECK-NEXT:    br i1 [[AND]], label [[BB1:%.*]], label [[EXIT:%.*]]
+; CHECK:       bb1:
+; CHECK-NEXT:    [[T_1:%.*]] = icmp ule i32 [[X]], [[Z]]
+; CHECK-NEXT:    call void @use(i1 [[T_1]])
+; CHECK-NEXT:    [[T_2:%.*]] = icmp ule i32 [[X]], [[Y]]
+; CHECK-NEXT:    call void @use(i1 [[T_2]])
+; CHECK-NEXT:    [[T_3:%.*]] = icmp ule i32 [[Y]], [[Z]]
+; CHECK-NEXT:    call void @use(i1 [[T_3]])
+; CHECK-NEXT:    [[C_3:%.*]] = icmp ule i32 [[X]], [[A:%.*]]
+; CHECK-NEXT:    call void @use(i1 [[C_3]])
+; CHECK-NEXT:    ret i32 10
+; CHECK:       exit:
+; CHECK-NEXT:    [[C_4:%.*]] = icmp ule i32 [[X]], [[Z]]
+; CHECK-NEXT:    call void @use(i1 [[C_4]])
+; CHECK-NEXT:    [[C_5:%.*]] = icmp ule i32 [[X]], [[A]]
+; CHECK-NEXT:    call void @use(i1 [[C_5]])
+; CHECK-NEXT:    [[C_6:%.*]] = icmp ule i32 [[X]], [[Y]]
+; CHECK-NEXT:    call void @use(i1 [[C_6]])
+; CHECK-NEXT:    [[C_7:%.*]] = icmp ule i32 [[Y]], [[Z]]
+; CHECK-NEXT:    call void @use(i1 [[C_7]])
+; CHECK-NEXT:    ret i32 20
+;
+entry:
+  %c.1 = icmp ule i32 %x, %y
+  %c.2 = icmp ule i32 %y, %z
+  %and = and i1 %c.1, %c.2
+  br i1 %and, label %bb1, label %exit
+
+bb1:
+  %t.1 = icmp ule i32 %x, %z
+  call void @use(i1 %t.1)
+
+  %t.2 = icmp ule i32 %x, %y
+  call void @use(i1 %t.2)
+
+  %t.3 = icmp ule i32 %y, %z
+  call void @use(i1 %t.3)
+
+
+  %c.3 = icmp ule i32 %x, %a
+  call void @use(i1 %c.3)
+
+  ret i32 10
+
+exit:
+  %c.4 = icmp ule i32 %x, %z
+  call void @use(i1 %c.4)
+
+  %c.5 = icmp ule i32 %x, %a
+  call void @use(i1 %c.5)
+
+  %c.6 = icmp ule i32 %x, %y
+  call void @use(i1 %c.6)
+
+  %c.7 = icmp ule i32 %y, %z
+  call void @use(i1 %c.7)
+
+  ret i32 20
+}
diff --git a/llvm/test/Transforms/ConstraintElimination/or.ll b/llvm/test/Transforms/ConstraintElimination/or.ll
new file mode 100644
index 00000000000000..400fedd6ea212f
--- /dev/null
+++ b/llvm/test/Transforms/ConstraintElimination/or.ll
@@ -0,0 +1,64 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
+; RUN: opt -constraint-elimination -S %s | FileCheck %s
+
+declare void @use(i1)
+
+define i32 @test_or_ule(i32 %x, i32 %y, i32 %z, i32 %a) {
+; CHECK-LABEL: @test_or_ule(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[C_1:%.*]] = icmp ule i32 [[X:%.*]], [[Y:%.*]]
+; CHECK-NEXT:    [[C_2:%.*]] = icmp ule i32 [[Y]], [[Z:%.*]]
+; CHECK-NEXT:    [[OR:%.*]] = or i1 [[C_1]], [[C_2]]
+; CHECK-NEXT:    br i1 [[OR]], label [[BB1:%.*]], label [[EXIT:%.*]]
+; CHECK:       bb1:
+; CHECK-NEXT:    [[C_3:%.*]] = icmp ule i32 [[X]], [[Z]]
+; CHECK-NEXT:    call void @use(i1 [[C_3]])
+; CHECK-NEXT:    [[C_4:%.*]] = icmp ule i32 [[X]], [[A:%.*]]
+; CHECK-NEXT:    call void @use(i1 [[C_4]])
+; CHECK-NEXT:    ret i32 10
+; CHECK:       exit:
+; CHECK-NEXT:    [[F_1:%.*]] = icmp ule i32 [[X]], [[Z]]
+; CHECK-NEXT:    call void @use(i1 [[F_1]])
+; CHECK-NEXT:    [[C_5:%.*]] = icmp ule i32 [[X]], [[A]]
+; CHECK-NEXT:    call void @use(i1 [[C_5]])
+; CHECK-NEXT:    [[T_1:%.*]] = icmp ugt i32 [[Y]], [[Z]]
+; CHECK-NEXT:    call void @use(i1 [[T_1]])
+; CHECK-NEXT:    [[T_2:%.*]] = icmp ugt i32 [[X]], [[Y]]
+; CHECK-NEXT:    call void @use(i1 [[T_2]])
+; CHECK-NEXT:    [[T_3:%.*]] = icmp ugt i32 [[X]], [[Z]]
+; CHECK-NEXT:    call void @use(i1 [[T_3]])
+; CHECK-NEXT:    ret i32 20
+;
+entry:
+  %c.1 = icmp ule i32 %x, %y
+  %c.2 = icmp ule i32 %y, %z
+  %or = or i1 %c.1, %c.2
+  br i1 %or, label %bb1, label %exit
+
+bb1:
+  %c.3 = icmp ule i32 %x, %z
+  call void @use(i1 %c.3)
+
+  %c.4 = icmp ule i32 %x, %a
+  call void @use(i1 %c.4)
+
+  ret i32 10
+
+exit:
+  %f.1 = icmp ule i32 %x, %z
+  call void @use(i1 %f.1)
+
+  %c.5 = icmp ule i32 %x, %a
+  call void @use(i1 %c.5)
+
+  %t.1 = icmp ugt i32 %y, %z
+  call void @use(i1 %t.1)
+
+  %t.2 = icmp ugt i32 %x, %y
+  call void @use(i1 %t.2)
+
+  %t.3 = icmp ugt i32 %x, %z
+  call void @use(i1 %t.3)
+
+  ret i32 20
+}
diff --git a/llvm/test/Transforms/ConstraintElimination/sub-nuw.ll b/llvm/test/Transforms/ConstraintElimination/sub-nuw.ll
new file mode 100644
index 00000000000000..f440bf7bbff208
--- /dev/null
+++ b/llvm/test/Transforms/ConstraintElimination/sub-nuw.ll
@@ -0,0 +1,242 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
+; RUN: opt -constraint-elimination -S %s | FileCheck %s
+
+define void @test.not.uge.ult(i8 %start, i8 %low, i8 %high) {
+; CHECK-LABEL: @test.not.uge.ult(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[SUB_PTR_I:%.*]] = sub nuw i8 [[START:%.*]], 3
+; CHECK-NEXT:    [[C_1:%.*]] = icmp uge i8 [[SUB_PTR_I]], [[HIGH:%.*]]
+; CHECK-NEXT:    br i1 [[C_1]], label [[IF_THEN:%.*]], label [[IF_END:%.*]]
+; CHECK:       if.then:
+; CHECK-NEXT:    ret void
+; CHECK:       if.end:
+; CHECK-NEXT:    [[T_0:%.*]] = icmp ult i8 [[START]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_0]])
+; CHECK-NEXT:    [[START_1:%.*]] = sub nuw i8 [[START]], 1
+; CHECK-NEXT:    [[T_1:%.*]] = icmp ult i8 [[START_1]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_1]])
+; CHECK-NEXT:    [[START_2:%.*]] = sub nuw i8 [[START]], 2
+; CHECK-NEXT:    [[T_2:%.*]] = icmp ult i8 [[START_2]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_2]])
+; CHECK-NEXT:    [[START_3:%.*]] = sub nuw i8 [[START]], 3
+; CHECK-NEXT:    [[T_3:%.*]] = icmp ult i8 [[START_3]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_3]])
+; CHECK-NEXT:    [[START_4:%.*]] = sub nuw i8 [[START]], 4
+; CHECK-NEXT:    [[C_4:%.*]] = icmp ult i8 [[START_4]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[C_4]])
+; CHECK-NEXT:    ret void
+;
+entry:
+  %sub.ptr.i = sub nuw i8 %start, 3
+  %c.1 = icmp uge i8 %sub.ptr.i, %high
+  br i1 %c.1, label %if.then, label %if.end
+
+if.then:                                          ; preds = %entry
+  ret void
+
+if.end:                                           ; preds = %entry
+  %t.0 = icmp ult i8 %start, %high
+  call void @use(i1 %t.0)
+  %start.1 = sub nuw i8 %start, 1
+  %t.1 = icmp ult i8 %start.1, %high
+  call void @use(i1 %t.1)
+  %start.2 = sub nuw i8 %start, 2
+  %t.2 = icmp ult i8 %start.2, %high
+  call void @use(i1 %t.2)
+  %start.3 = sub nuw i8 %start, 3
+  %t.3 = icmp ult i8 %start.3, %high
+  call void @use(i1 %t.3)
+  %start.4 = sub nuw i8 %start, 4
+  %c.4 = icmp ult i8 %start.4, %high
+  call void @use(i1 %c.4)
+  ret void
+}
+
+define void @test.not.uge.ule(i8 %start, i8 %low, i8 %high) {
+; CHECK-LABEL: @test.not.uge.ule(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[SUB_PTR_I:%.*]] = sub nuw i8 [[START:%.*]], 3
+; CHECK-NEXT:    [[C_1:%.*]] = icmp uge i8 [[SUB_PTR_I]], [[HIGH:%.*]]
+; CHECK-NEXT:    br i1 [[C_1]], label [[IF_THEN:%.*]], label [[IF_END:%.*]]
+; CHECK:       if.then:
+; CHECK-NEXT:    ret void
+; CHECK:       if.end:
+; CHECK-NEXT:    [[T_0:%.*]] = icmp ule i8 [[START]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_0]])
+; CHECK-NEXT:    [[START_1:%.*]] = sub nuw i8 [[START]], 1
+; CHECK-NEXT:    [[T_1:%.*]] = icmp ule i8 [[START_1]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_1]])
+; CHECK-NEXT:    [[START_2:%.*]] = sub nuw i8 [[START]], 2
+; CHECK-NEXT:    [[T_2:%.*]] = icmp ule i8 [[START_2]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_2]])
+; CHECK-NEXT:    [[START_3:%.*]] = sub nuw i8 [[START]], 3
+; CHECK-NEXT:    [[T_3:%.*]] = icmp ule i8 [[START_3]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_3]])
+; CHECK-NEXT:    [[START_4:%.*]] = sub nuw i8 [[START]], 4
+; CHECK-NEXT:    [[T_4:%.*]] = icmp ule i8 [[START_4]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_4]])
+; CHECK-NEXT:    [[START_5:%.*]] = sub nuw i8 [[START]], 5
+; CHECK-NEXT:    [[C_5:%.*]] = icmp ule i8 [[START_5]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[C_5]])
+; CHECK-NEXT:    ret void
+;
+entry:
+  %sub.ptr.i = sub nuw i8 %start, 3
+  %c.1 = icmp uge i8 %sub.ptr.i, %high
+  br i1 %c.1, label %if.then, label %if.end
+
+if.then:                                          ; preds = %entry
+  ret void
+
+if.end:                                           ; preds = %entry
+  %t.0 = icmp ule i8 %start, %high
+  call void @use(i1 %t.0)
+  %start.1 = sub nuw i8 %start, 1
+  %t.1 = icmp ule i8 %start.1, %high
+  call void @use(i1 %t.1)
+  %start.2 = sub nuw i8 %start, 2
+  %t.2 = icmp ule i8 %start.2, %high
+  call void @use(i1 %t.2)
+  %start.3 = sub nuw i8 %start, 3
+  %t.3 = icmp ule i8 %start.3, %high
+  call void @use(i1 %t.3)
+  %start.4 = sub nuw i8 %start, 4
+  %t.4 = icmp ule i8 %start.4, %high
+  call void @use(i1 %t.4)
+
+  %start.5 = sub nuw i8 %start, 5
+  %c.5 = icmp ule i8 %start.5, %high
+  call void @use(i1 %c.5)
+
+  ret void
+}
+
+define void @test.not.uge.ugt(i8 %start, i8 %low, i8 %high) {
+; CHECK-LABEL: @test.not.uge.ugt(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[SUB_PTR_I:%.*]] = sub nuw i8 [[START:%.*]], 3
+; CHECK-NEXT:    [[C_1:%.*]] = icmp uge i8 [[SUB_PTR_I]], [[HIGH:%.*]]
+; CHECK-NEXT:    br i1 [[C_1]], label [[IF_THEN:%.*]], label [[IF_END:%.*]]
+; CHECK:       if.then:
+; CHECK-NEXT:    ret void
+; CHECK:       if.end:
+; CHECK-NEXT:    [[F_0:%.*]] = icmp ugt i8 [[START]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_0]])
+; CHECK-NEXT:    [[START_1:%.*]] = sub nuw i8 [[START]], 1
+; CHECK-NEXT:    [[F_1:%.*]] = icmp ugt i8 [[START_1]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_1]])
+; CHECK-NEXT:    [[START_2:%.*]] = sub nuw i8 [[START]], 2
+; CHECK-NEXT:    [[F_2:%.*]] = icmp ugt i8 [[START_2]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_2]])
+; CHECK-NEXT:    [[START_3:%.*]] = sub nuw i8 [[START]], 3
+; CHECK-NEXT:    [[F_3:%.*]] = icmp ugt i8 [[START_3]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_3]])
+; CHECK-NEXT:    [[START_4:%.*]] = sub nuw i8 [[START]], 4
+; CHECK-NEXT:    [[F_4:%.*]] = icmp ugt i8 [[START_4]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_4]])
+; CHECK-NEXT:    [[START_5:%.*]] = sub nuw i8 [[START]], 5
+; CHECK-NEXT:    [[C_5:%.*]] = icmp ugt i8 [[START_5]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[C_5]])
+; CHECK-NEXT:    ret void
+;
+entry:
+  %sub.ptr.i = sub nuw i8 %start, 3
+  %c.1 = icmp uge i8 %sub.ptr.i, %high
+  br i1 %c.1, label %if.then, label %if.end
+
+if.then:                                          ; preds = %entry
+  ret void
+
+if.end:                                           ; preds = %entry
+  %f.0 = icmp ugt i8 %start, %high
+  call void @use(i1 %f.0)
+
+  %start.1 = sub nuw i8 %start, 1
+  %f.1 = icmp ugt i8 %start.1, %high
+  call void @use(i1 %f.1)
+
+  %start.2 = sub nuw i8 %start, 2
+  %f.2 = icmp ugt i8 %start.2, %high
+  call void @use(i1 %f.2)
+
+  %start.3 = sub nuw i8 %start, 3
+  %f.3 = icmp ugt i8 %start.3, %high
+  call void @use(i1 %f.3)
+
+  %start.4 = sub nuw i8 %start, 4
+  %f.4 = icmp ugt i8 %start.4, %high
+  call void @use(i1 %f.4)
+
+  %start.5 = sub nuw i8 %start, 5
+  %c.5 = icmp ugt i8 %start.5, %high
+  call void @use(i1 %c.5)
+
+  ret void
+}
+
+define void @test.not.uge.uge(i8 %start, i8 %low, i8 %high) {
+; CHECK-LABEL: @test.not.uge.uge(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[SUB_PTR_I:%.*]] = sub nuw i8 [[START:%.*]], 3
+; CHECK-NEXT:    [[C_1:%.*]] = icmp uge i8 [[SUB_PTR_I]], [[HIGH:%.*]]
+; CHECK-NEXT:    br i1 [[C_1]], label [[IF_THEN:%.*]], label [[IF_END:%.*]]
+; CHECK:       if.then:
+; CHECK-NEXT:    ret void
+; CHECK:       if.end:
+; CHECK-NEXT:    [[F_0:%.*]] = icmp ugt i8 [[START]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_0]])
+; CHECK-NEXT:    [[START_1:%.*]] = sub nuw i8 [[START]], 1
+; CHECK-NEXT:    [[F_1:%.*]] = icmp uge i8 [[START_1]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_1]])
+; CHECK-NEXT:    [[START_2:%.*]] = sub nuw i8 [[START]], 2
+; CHECK-NEXT:    [[F_2:%.*]] = icmp uge i8 [[START_2]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_2]])
+; CHECK-NEXT:    [[START_3:%.*]] = sub nuw i8 [[START]], 3
+; CHECK-NEXT:    [[F_3:%.*]] = icmp uge i8 [[START_3]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_3]])
+; CHECK-NEXT:    [[START_4:%.*]] = sub nuw i8 [[START]], 4
+; CHECK-NEXT:    [[C_4:%.*]] = icmp uge i8 [[START_4]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[C_4]])
+; CHECK-NEXT:    [[START_5:%.*]] = sub nuw i8 [[START]], 5
+; CHECK-NEXT:    [[C_5:%.*]] = icmp uge i8 [[START_5]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[C_5]])
+; CHECK-NEXT:    ret void
+;
+entry:
+  %sub.ptr.i = sub nuw i8 %start, 3
+  %c.1 = icmp uge i8 %sub.ptr.i, %high
+  br i1 %c.1, label %if.then, label %if.end
+
+if.then:                                          ; preds = %entry
+  ret void
+
+if.end:                                           ; preds = %entry
+  %f.0 = icmp ugt i8 %start, %high
+  call void @use(i1 %f.0)
+
+  %start.1 = sub nuw i8 %start, 1
+  %f.1 = icmp uge i8 %start.1, %high
+  call void @use(i1 %f.1)
+
+  %start.2 = sub nuw i8 %start, 2
+  %f.2 = icmp uge i8 %start.2, %high
+  call void @use(i1 %f.2)
+
+  %start.3 = sub nuw i8 %start, 3
+  %f.3 = icmp uge i8 %start.3, %high
+  call void @use(i1 %f.3)
+
+  %start.4 = sub nuw i8 %start, 4
+  %c.4 = icmp uge i8 %start.4, %high
+  call void @use(i1 %c.4)
+
+  %start.5 = sub nuw i8 %start, 5
+  %c.5 = icmp uge i8 %start.5, %high
+  call void @use(i1 %c.5)
+
+  ret void
+}
+
+
+declare void @use(i1)
+declare void @llvm.trap()
diff --git a/llvm/test/Transforms/ConstraintElimination/sub.ll b/llvm/test/Transforms/ConstraintElimination/sub.ll
new file mode 100644
index 00000000000000..bd78f9a0d25688
--- /dev/null
+++ b/llvm/test/Transforms/ConstraintElimination/sub.ll
@@ -0,0 +1,242 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
+; RUN: opt -constraint-elimination -S %s | FileCheck %s
+
+define void @test.not.uge.ult(i8 %start, i8 %low, i8 %high) {
+; CHECK-LABEL: @test.not.uge.ult(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[SUB_PTR_I:%.*]] = sub i8 [[START:%.*]], 3
+; CHECK-NEXT:    [[C_1:%.*]] = icmp uge i8 [[SUB_PTR_I]], [[HIGH:%.*]]
+; CHECK-NEXT:    br i1 [[C_1]], label [[IF_THEN:%.*]], label [[IF_END:%.*]]
+; CHECK:       if.then:
+; CHECK-NEXT:    ret void
+; CHECK:       if.end:
+; CHECK-NEXT:    [[T_0:%.*]] = icmp ult i8 [[START]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_0]])
+; CHECK-NEXT:    [[START_1:%.*]] = sub i8 [[START]], 1
+; CHECK-NEXT:    [[T_1:%.*]] = icmp ult i8 [[START_1]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_1]])
+; CHECK-NEXT:    [[START_2:%.*]] = sub i8 [[START]], 2
+; CHECK-NEXT:    [[T_2:%.*]] = icmp ult i8 [[START_2]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_2]])
+; CHECK-NEXT:    [[START_3:%.*]] = sub i8 [[START]], 3
+; CHECK-NEXT:    [[T_3:%.*]] = icmp ult i8 [[START_3]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_3]])
+; CHECK-NEXT:    [[START_4:%.*]] = sub i8 [[START]], 4
+; CHECK-NEXT:    [[C_4:%.*]] = icmp ult i8 [[START_4]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[C_4]])
+; CHECK-NEXT:    ret void
+;
+entry:
+  %sub.ptr.i = sub i8 %start, 3
+  %c.1 = icmp uge i8 %sub.ptr.i, %high
+  br i1 %c.1, label %if.then, label %if.end
+
+if.then:                                          ; preds = %entry
+  ret void
+
+if.end:                                           ; preds = %entry
+  %t.0 = icmp ult i8 %start, %high
+  call void @use(i1 %t.0)
+  %start.1 = sub i8 %start, 1
+  %t.1 = icmp ult i8 %start.1, %high
+  call void @use(i1 %t.1)
+  %start.2 = sub i8 %start, 2
+  %t.2 = icmp ult i8 %start.2, %high
+  call void @use(i1 %t.2)
+  %start.3 = sub i8 %start, 3
+  %t.3 = icmp ult i8 %start.3, %high
+  call void @use(i1 %t.3)
+  %start.4 = sub i8 %start, 4
+  %c.4 = icmp ult i8 %start.4, %high
+  call void @use(i1 %c.4)
+  ret void
+}
+
+define void @test.not.uge.ule(i8 %start, i8 %low, i8 %high) {
+; CHECK-LABEL: @test.not.uge.ule(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[SUB_PTR_I:%.*]] = sub i8 [[START:%.*]], 3
+; CHECK-NEXT:    [[C_1:%.*]] = icmp uge i8 [[SUB_PTR_I]], [[HIGH:%.*]]
+; CHECK-NEXT:    br i1 [[C_1]], label [[IF_THEN:%.*]], label [[IF_END:%.*]]
+; CHECK:       if.then:
+; CHECK-NEXT:    ret void
+; CHECK:       if.end:
+; CHECK-NEXT:    [[T_0:%.*]] = icmp ule i8 [[START]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_0]])
+; CHECK-NEXT:    [[START_1:%.*]] = sub i8 [[START]], 1
+; CHECK-NEXT:    [[T_1:%.*]] = icmp ule i8 [[START_1]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_1]])
+; CHECK-NEXT:    [[START_2:%.*]] = sub i8 [[START]], 2
+; CHECK-NEXT:    [[T_2:%.*]] = icmp ule i8 [[START_2]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_2]])
+; CHECK-NEXT:    [[START_3:%.*]] = sub i8 [[START]], 3
+; CHECK-NEXT:    [[T_3:%.*]] = icmp ule i8 [[START_3]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_3]])
+; CHECK-NEXT:    [[START_4:%.*]] = sub i8 [[START]], 4
+; CHECK-NEXT:    [[T_4:%.*]] = icmp ule i8 [[START_4]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[T_4]])
+; CHECK-NEXT:    [[START_5:%.*]] = sub i8 [[START]], 5
+; CHECK-NEXT:    [[C_5:%.*]] = icmp ule i8 [[START_5]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[C_5]])
+; CHECK-NEXT:    ret void
+;
+entry:
+  %sub.ptr.i = sub i8 %start, 3
+  %c.1 = icmp uge i8 %sub.ptr.i, %high
+  br i1 %c.1, label %if.then, label %if.end
+
+if.then:                                          ; preds = %entry
+  ret void
+
+if.end:                                           ; preds = %entry
+  %t.0 = icmp ule i8 %start, %high
+  call void @use(i1 %t.0)
+  %start.1 = sub i8 %start, 1
+  %t.1 = icmp ule i8 %start.1, %high
+  call void @use(i1 %t.1)
+  %start.2 = sub i8 %start, 2
+  %t.2 = icmp ule i8 %start.2, %high
+  call void @use(i1 %t.2)
+  %start.3 = sub i8 %start, 3
+  %t.3 = icmp ule i8 %start.3, %high
+  call void @use(i1 %t.3)
+  %start.4 = sub i8 %start, 4
+  %t.4 = icmp ule i8 %start.4, %high
+  call void @use(i1 %t.4)
+
+  %start.5 = sub i8 %start, 5
+  %c.5 = icmp ule i8 %start.5, %high
+  call void @use(i1 %c.5)
+
+  ret void
+}
+
+define void @test.not.uge.ugt(i8 %start, i8 %low, i8 %high) {
+; CHECK-LABEL: @test.not.uge.ugt(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[SUB_PTR_I:%.*]] = sub i8 [[START:%.*]], 3
+; CHECK-NEXT:    [[C_1:%.*]] = icmp uge i8 [[SUB_PTR_I]], [[HIGH:%.*]]
+; CHECK-NEXT:    br i1 [[C_1]], label [[IF_THEN:%.*]], label [[IF_END:%.*]]
+; CHECK:       if.then:
+; CHECK-NEXT:    ret void
+; CHECK:       if.end:
+; CHECK-NEXT:    [[F_0:%.*]] = icmp ugt i8 [[START]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_0]])
+; CHECK-NEXT:    [[START_1:%.*]] = sub i8 [[START]], 1
+; CHECK-NEXT:    [[F_1:%.*]] = icmp ugt i8 [[START_1]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_1]])
+; CHECK-NEXT:    [[START_2:%.*]] = sub i8 [[START]], 2
+; CHECK-NEXT:    [[F_2:%.*]] = icmp ugt i8 [[START_2]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_2]])
+; CHECK-NEXT:    [[START_3:%.*]] = sub i8 [[START]], 3
+; CHECK-NEXT:    [[F_3:%.*]] = icmp ugt i8 [[START_3]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_3]])
+; CHECK-NEXT:    [[START_4:%.*]] = sub i8 [[START]], 4
+; CHECK-NEXT:    [[F_4:%.*]] = icmp ugt i8 [[START_4]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_4]])
+; CHECK-NEXT:    [[START_5:%.*]] = sub i8 [[START]], 5
+; CHECK-NEXT:    [[C_5:%.*]] = icmp ugt i8 [[START_5]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[C_5]])
+; CHECK-NEXT:    ret void
+;
+entry:
+  %sub.ptr.i = sub i8 %start, 3
+  %c.1 = icmp uge i8 %sub.ptr.i, %high
+  br i1 %c.1, label %if.then, label %if.end
+
+if.then:                                          ; preds = %entry
+  ret void
+
+if.end:                                           ; preds = %entry
+  %f.0 = icmp ugt i8 %start, %high
+  call void @use(i1 %f.0)
+
+  %start.1 = sub i8 %start, 1
+  %f.1 = icmp ugt i8 %start.1, %high
+  call void @use(i1 %f.1)
+
+  %start.2 = sub i8 %start, 2
+  %f.2 = icmp ugt i8 %start.2, %high
+  call void @use(i1 %f.2)
+
+  %start.3 = sub i8 %start, 3
+  %f.3 = icmp ugt i8 %start.3, %high
+  call void @use(i1 %f.3)
+
+  %start.4 = sub i8 %start, 4
+  %f.4 = icmp ugt i8 %start.4, %high
+  call void @use(i1 %f.4)
+
+  %start.5 = sub i8 %start, 5
+  %c.5 = icmp ugt i8 %start.5, %high
+  call void @use(i1 %c.5)
+
+  ret void
+}
+
+define void @test.not.uge.uge(i8 %start, i8 %low, i8 %high) {
+; CHECK-LABEL: @test.not.uge.uge(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[SUB_PTR_I:%.*]] = sub i8 [[START:%.*]], 3
+; CHECK-NEXT:    [[C_1:%.*]] = icmp uge i8 [[SUB_PTR_I]], [[HIGH:%.*]]
+; CHECK-NEXT:    br i1 [[C_1]], label [[IF_THEN:%.*]], label [[IF_END:%.*]]
+; CHECK:       if.then:
+; CHECK-NEXT:    ret void
+; CHECK:       if.end:
+; CHECK-NEXT:    [[F_0:%.*]] = icmp ugt i8 [[START]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_0]])
+; CHECK-NEXT:    [[START_1:%.*]] = sub i8 [[START]], 1
+; CHECK-NEXT:    [[F_1:%.*]] = icmp uge i8 [[START_1]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_1]])
+; CHECK-NEXT:    [[START_2:%.*]] = sub i8 [[START]], 2
+; CHECK-NEXT:    [[F_2:%.*]] = icmp uge i8 [[START_2]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_2]])
+; CHECK-NEXT:    [[START_3:%.*]] = sub i8 [[START]], 3
+; CHECK-NEXT:    [[F_3:%.*]] = icmp uge i8 [[START_3]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[F_3]])
+; CHECK-NEXT:    [[START_4:%.*]] = sub i8 [[START]], 4
+; CHECK-NEXT:    [[C_4:%.*]] = icmp uge i8 [[START_4]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[C_4]])
+; CHECK-NEXT:    [[START_5:%.*]] = sub i8 [[START]], 5
+; CHECK-NEXT:    [[C_5:%.*]] = icmp uge i8 [[START_5]], [[HIGH]]
+; CHECK-NEXT:    call void @use(i1 [[C_5]])
+; CHECK-NEXT:    ret void
+;
+entry:
+  %sub.ptr.i = sub i8 %start, 3
+  %c.1 = icmp uge i8 %sub.ptr.i, %high
+  br i1 %c.1, label %if.then, label %if.end
+
+if.then:                                          ; preds = %entry
+  ret void
+
+if.end:                                           ; preds = %entry
+  %f.0 = icmp ugt i8 %start, %high
+  call void @use(i1 %f.0)
+
+  %start.1 = sub i8 %start, 1
+  %f.1 = icmp uge i8 %start.1, %high
+  call void @use(i1 %f.1)
+
+  %start.2 = sub i8 %start, 2
+  %f.2 = icmp uge i8 %start.2, %high
+  call void @use(i1 %f.2)
+
+  %start.3 = sub i8 %start, 3
+  %f.3 = icmp uge i8 %start.3, %high
+  call void @use(i1 %f.3)
+
+  %start.4 = sub i8 %start, 4
+  %c.4 = icmp uge i8 %start.4, %high
+  call void @use(i1 %c.4)
+
+  %start.5 = sub i8 %start, 5
+  %c.5 = icmp uge i8 %start.5, %high
+  call void @use(i1 %c.5)
+
+  ret void
+}
+
+
+declare void @use(i1)
+declare void @llvm.trap()