diff --git a/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp b/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp
--- a/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp
@@ -3580,8 +3580,12 @@
 }
 
 static Instruction *
-foldICmpUSubSatWithConstant(ICmpInst::Predicate Pred, IntrinsicInst *II,
-                            const APInt &C, InstCombiner::BuilderTy &Builder) {
+foldICmpUSubSatOrUAddSatWithConstant(ICmpInst::Predicate Pred,
+                                     IntrinsicInst *II, const APInt &C,
+                                     InstCombiner::BuilderTy &Builder) {
+  assert(isa<SaturatingInst>(II) &&
+         "This function can only be called with usub_sat and uadd_sat!");
+
   // This transform may end up producing more than one instruction for the
   // intrinsic, so limit it to one user of the intrinsic.
   if (!II->hasOneUse())
@@ -3598,25 +3602,68 @@
   //    Y = (X < C) ? false : ((X - C) pred C2)
   // => Y = !(X < C) && ((X - C) pred C2)
   // => Y = (X >= C) && ((X - C) pred C2)
+  //======================================
+  // Let Y = uadd_sat(X, C) pred C2
+  //  => Y = ((X + C < UINT_MAX) ? (X + C) : UINT_MAX) pred C2
+  // Now,
+  //  Let  Z = (X + C < UINT_MAX)
+  //  Then Z = (X < UINT_MAX - C)
+  //    => Z = (X < (UINT_MAX + ~C + 1)) [as -C == (~C + 1)]
+  //    => Z = (X < (~C + 0))            [as (UINT_MAX + 1) == 0]
+  //    => Z = (X < ~C)
+  // Therefore
+  //    Y = ((X < ~C) ? (X + C) : UINT_MAX) pred C2
+  // => Y = (X < ~C) ? ((X + C) pred C2) : (UINT_MAX pred C2)
+  //
+  // When (UINT_MAX pred C2) is true, then
+  //    Y =  (X < ~C) ? ((X + C) pred C2) : true
+  // => Y = !(X < ~C) ? true : ((X + C) pred C2)
+  // => Y = !(X < ~C)  || ((X + C) pred C2)
+  // => Y =  (X >= ~C) || ((X + C) pred C2)
+  // else
+  //    Y = (X < ~C) ?  ((X + C) pred C2) : false
+  // => Y = (X < ~C) && ((X + C) pred C2)
   Value *Op0 = II->getOperand(0);
   Value *Op1 = II->getOperand(1);
 
-  // Check (0 pred C2)
-  auto [NewPred, LogicalOp] =
-      ICmpInst::compare(APInt::getZero(C.getBitWidth()), C, Pred)
-          ? std::make_pair(ICmpInst::ICMP_ULT, Instruction::BinaryOps::Or)
-          : std::make_pair(ICmpInst::ICMP_UGE, Instruction::BinaryOps::And);
-
   const APInt *COp1;
-  // This transform only works when the usub_sat has an integral constant or
+  // This transform only works when the intrinsic has an integral constant or
   // splat vector as the second operand.
   if (!match(Op1, m_APInt(COp1)))
     return nullptr;
 
-  ConstantRange C1 = ConstantRange::makeExactICmpRegion(NewPred, *COp1);
-  // Convert '(X - C) pred C2' into 'X pred C2' shifted by C.
+  bool IntrinsicIsUAddSat = II->getIntrinsicID() == Intrinsic::uadd_sat;
+  APInt SaturatingValue = IntrinsicIsUAddSat
+                              ? APInt::getAllOnes(C.getBitWidth())
+                              : APInt::getZero(C.getBitWidth());
+
+  // Check either (0 pred C2) or (UINT_MAX pred C2)
+  bool SaturatingValueCheck = ICmpInst::compare(SaturatingValue, C, Pred);
+
+  // When SaturatingValueCheck is false, we combine the two operations using an
+  // And. The range of values where the expression is true are those where both
+  // the operation-does-not-wrap check is true and the RHS is true.
+  //
+  // When SaturatingValueCheck is true, we combine the two operations using an
+  // Or. From the formula, the expression will be true either when the operation
+  // wraps or if the RHS is true. In this case, the range of values for the LHS
+  // to be true is the exact inverse of the above.
+  SaturatingInst *SII = cast<SaturatingInst>(II);
+  ConstantRange C1 = ConstantRange::makeExactNoWrapRegion(
+      SII->getBinaryOp(), *COp1, SII->getNoWrapKind());
+
+  if (SaturatingValueCheck)
+    C1 = C1.inverse();
+
   ConstantRange C2 = ConstantRange::makeExactICmpRegion(Pred, C);
-  C2 = C2.add(*COp1);
+  if (IntrinsicIsUAddSat)
+    C2 = C2.sub(*COp1);
+  else
+    C2 = C2.add(*COp1);
+
+  Instruction::BinaryOps LogicalOp = SaturatingValueCheck
+                                         ? Instruction::BinaryOps::Or
+                                         : Instruction::BinaryOps::And;
 
   std::optional<ConstantRange> Combination;
   if (LogicalOp == Instruction::BinaryOps::Or)
@@ -3649,8 +3696,10 @@
   switch (II->getIntrinsicID()) {
   default:
     break;
+  case Intrinsic::uadd_sat:
   case Intrinsic::usub_sat:
-    if (auto *Folded = foldICmpUSubSatWithConstant(Pred, II, C, Builder))
+    if (auto *Folded =
+            foldICmpUSubSatOrUAddSatWithConstant(Pred, II, C, Builder))
       return Folded;
     break;
   }
diff --git a/llvm/test/Transforms/InstCombine/icmp-uadd-sat.ll b/llvm/test/Transforms/InstCombine/icmp-uadd-sat.ll
--- a/llvm/test/Transforms/InstCombine/icmp-uadd-sat.ll
+++ b/llvm/test/Transforms/InstCombine/icmp-uadd-sat.ll
@@ -10,8 +10,7 @@
 define i1 @icmp_eq_basic(i8 %arg) {
 ; CHECK-LABEL: define i1 @icmp_eq_basic
 ; CHECK-SAME: (i8 [[ARG:%.*]]) {
-; CHECK-NEXT:    [[ADD:%.*]] = call i8 @llvm.uadd.sat.i8(i8 [[ARG]], i8 2)
-; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i8 [[ADD]], 5
+; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i8 [[ARG]], 3
 ; CHECK-NEXT:    ret i1 [[CMP]]
 ;
   %add = call i8 @llvm.uadd.sat.i8(i8 %arg, i8 2)
@@ -22,8 +21,7 @@
 define i1 @icmp_ne_basic(i16 %arg) {
 ; CHECK-LABEL: define i1 @icmp_ne_basic
 ; CHECK-SAME: (i16 [[ARG:%.*]]) {
-; CHECK-NEXT:    [[ADD:%.*]] = call i16 @llvm.uadd.sat.i16(i16 [[ARG]], i16 8)
-; CHECK-NEXT:    [[CMP:%.*]] = icmp ne i16 [[ADD]], 9
+; CHECK-NEXT:    [[CMP:%.*]] = icmp ne i16 [[ARG]], 1
 ; CHECK-NEXT:    ret i1 [[CMP]]
 ;
   %add = call i16 @llvm.uadd.sat.i16(i16 %arg, i16 8)
@@ -34,8 +32,7 @@
 define i1 @icmp_ule_basic(i32 %arg) {
 ; CHECK-LABEL: define i1 @icmp_ule_basic
 ; CHECK-SAME: (i32 [[ARG:%.*]]) {
-; CHECK-NEXT:    [[ADD:%.*]] = call i32 @llvm.uadd.sat.i32(i32 [[ARG]], i32 2)
-; CHECK-NEXT:    [[CMP:%.*]] = icmp ult i32 [[ADD]], 4
+; CHECK-NEXT:    [[CMP:%.*]] = icmp ult i32 [[ARG]], 2
 ; CHECK-NEXT:    ret i1 [[CMP]]
 ;
   %add = call i32 @llvm.uadd.sat.i32(i32 %arg, i32 2)
@@ -46,8 +43,7 @@
 define i1 @icmp_ult_basic(i64 %arg) {
 ; CHECK-LABEL: define i1 @icmp_ult_basic
 ; CHECK-SAME: (i64 [[ARG:%.*]]) {
-; CHECK-NEXT:    [[ADD:%.*]] = call i64 @llvm.uadd.sat.i64(i64 [[ARG]], i64 5)
-; CHECK-NEXT:    [[CMP:%.*]] = icmp ult i64 [[ADD]], 20
+; CHECK-NEXT:    [[CMP:%.*]] = icmp ult i64 [[ARG]], 15
 ; CHECK-NEXT:    ret i1 [[CMP]]
 ;
   %add = call i64 @llvm.uadd.sat.i64(i64 %arg, i64 5)
@@ -58,8 +54,7 @@
 define i1 @icmp_uge_basic(i8 %arg) {
 ; CHECK-LABEL: define i1 @icmp_uge_basic
 ; CHECK-SAME: (i8 [[ARG:%.*]]) {
-; CHECK-NEXT:    [[ADD:%.*]] = call i8 @llvm.uadd.sat.i8(i8 [[ARG]], i8 4)
-; CHECK-NEXT:    [[CMP:%.*]] = icmp ugt i8 [[ADD]], 7
+; CHECK-NEXT:    [[CMP:%.*]] = icmp ugt i8 [[ARG]], 3
 ; CHECK-NEXT:    ret i1 [[CMP]]
 ;
   %add = call i8 @llvm.uadd.sat.i8(i8 %arg, i8 4)
@@ -70,8 +65,7 @@
 define i1 @icmp_ugt_basic(i16 %arg) {
 ; CHECK-LABEL: define i1 @icmp_ugt_basic
 ; CHECK-SAME: (i16 [[ARG:%.*]]) {
-; CHECK-NEXT:    [[ADD:%.*]] = call i16 @llvm.uadd.sat.i16(i16 [[ARG]], i16 1)
-; CHECK-NEXT:    [[CMP:%.*]] = icmp ugt i16 [[ADD]], 3
+; CHECK-NEXT:    [[CMP:%.*]] = icmp ugt i16 [[ARG]], 2
 ; CHECK-NEXT:    ret i1 [[CMP]]
 ;
   %add = call i16 @llvm.uadd.sat.i16(i16 %arg, i16 1)
@@ -82,8 +76,7 @@
 define i1 @icmp_sle_basic(i32 %arg) {
 ; CHECK-LABEL: define i1 @icmp_sle_basic
 ; CHECK-SAME: (i32 [[ARG:%.*]]) {
-; CHECK-NEXT:    [[ADD:%.*]] = call i32 @llvm.uadd.sat.i32(i32 [[ARG]], i32 10)
-; CHECK-NEXT:    [[CMP:%.*]] = icmp slt i32 [[ADD]], 9
+; CHECK-NEXT:    [[CMP:%.*]] = icmp ugt i32 [[ARG]], 2147483637
 ; CHECK-NEXT:    ret i1 [[CMP]]
 ;
   %add = call i32 @llvm.uadd.sat.i32(i32 %arg, i32 10)
@@ -94,8 +87,7 @@
 define i1 @icmp_slt_basic(i64 %arg) {
 ; CHECK-LABEL: define i1 @icmp_slt_basic
 ; CHECK-SAME: (i64 [[ARG:%.*]]) {
-; CHECK-NEXT:    [[ADD:%.*]] = call i64 @llvm.uadd.sat.i64(i64 [[ARG]], i64 24)
-; CHECK-NEXT:    [[CMP:%.*]] = icmp slt i64 [[ADD]], 5
+; CHECK-NEXT:    [[CMP:%.*]] = icmp ugt i64 [[ARG]], 9223372036854775783
 ; CHECK-NEXT:    ret i1 [[CMP]]
 ;
   %add = call i64 @llvm.uadd.sat.i64(i64 %arg, i64 24)
@@ -106,8 +98,8 @@
 define i1 @icmp_sge_basic(i8 %arg) {
 ; CHECK-LABEL: define i1 @icmp_sge_basic
 ; CHECK-SAME: (i8 [[ARG:%.*]]) {
-; CHECK-NEXT:    [[ADD:%.*]] = call i8 @llvm.uadd.sat.i8(i8 [[ARG]], i8 1)
-; CHECK-NEXT:    [[CMP:%.*]] = icmp sgt i8 [[ADD]], 3
+; CHECK-NEXT:    [[TMP1:%.*]] = add i8 [[ARG]], -3
+; CHECK-NEXT:    [[CMP:%.*]] = icmp ult i8 [[TMP1]], 124
 ; CHECK-NEXT:    ret i1 [[CMP]]
 ;
   %add = call i8 @llvm.uadd.sat.i8(i8 %arg, i8 1)
@@ -118,8 +110,8 @@
 define i1 @icmp_sgt_basic(i16 %arg) {
 ; CHECK-LABEL: define i1 @icmp_sgt_basic
 ; CHECK-SAME: (i16 [[ARG:%.*]]) {
-; CHECK-NEXT:    [[ADD:%.*]] = call i16 @llvm.uadd.sat.i16(i16 [[ARG]], i16 2)
-; CHECK-NEXT:    [[CMP:%.*]] = icmp sgt i16 [[ADD]], 5
+; CHECK-NEXT:    [[TMP1:%.*]] = add i16 [[ARG]], -4
+; CHECK-NEXT:    [[CMP:%.*]] = icmp ult i16 [[TMP1]], 32762
 ; CHECK-NEXT:    ret i1 [[CMP]]
 ;
   %add = call i16 @llvm.uadd.sat.i16(i16 %arg, i16 2)
@@ -150,8 +142,7 @@
 define <2 x i1> @icmp_eq_vector_equal(<2 x i8> %arg) {
 ; CHECK-LABEL: define <2 x i1> @icmp_eq_vector_equal
 ; CHECK-SAME: (<2 x i8> [[ARG:%.*]]) {
-; CHECK-NEXT:    [[ADD:%.*]] = call <2 x i8> @llvm.uadd.sat.v2i8(<2 x i8> [[ARG]], <2 x i8> <i8 2, i8 2>)
-; CHECK-NEXT:    [[CMP:%.*]] = icmp eq <2 x i8> [[ADD]], <i8 5, i8 5>
+; CHECK-NEXT:    [[CMP:%.*]] = icmp eq <2 x i8> [[ARG]], <i8 3, i8 3>
 ; CHECK-NEXT:    ret <2 x i1> [[CMP]]
 ;
   %add = call <2 x i8> @llvm.uadd.sat.v2i8(<2 x i8> %arg, <2 x i8> <i8 2, i8 2>)
@@ -174,8 +165,7 @@
 define <2 x i1> @icmp_ne_vector_equal(<2 x i16> %arg) {
 ; CHECK-LABEL: define <2 x i1> @icmp_ne_vector_equal
 ; CHECK-SAME: (<2 x i16> [[ARG:%.*]]) {
-; CHECK-NEXT:    [[ADD:%.*]] = call <2 x i16> @llvm.uadd.sat.v2i16(<2 x i16> [[ARG]], <2 x i16> <i16 3, i16 3>)
-; CHECK-NEXT:    [[CMP:%.*]] = icmp ne <2 x i16> [[ADD]], <i16 5, i16 5>
+; CHECK-NEXT:    [[CMP:%.*]] = icmp ne <2 x i16> [[ARG]], <i16 2, i16 2>
 ; CHECK-NEXT:    ret <2 x i1> [[CMP]]
 ;
   %add = call <2 x i16> @llvm.uadd.sat.v2i16(<2 x i16> %arg, <2 x i16> <i16 3, i16 3>)
@@ -198,8 +188,7 @@
 define <2 x i1> @icmp_ule_vector_equal(<2 x i32> %arg) {
 ; CHECK-LABEL: define <2 x i1> @icmp_ule_vector_equal
 ; CHECK-SAME: (<2 x i32> [[ARG:%.*]]) {
-; CHECK-NEXT:    [[ADD:%.*]] = call <2 x i32> @llvm.uadd.sat.v2i32(<2 x i32> [[ARG]], <2 x i32> <i32 3, i32 3>)
-; CHECK-NEXT:    [[CMP:%.*]] = icmp ult <2 x i32> [[ADD]], <i32 5, i32 5>
+; CHECK-NEXT:    [[CMP:%.*]] = icmp ult <2 x i32> [[ARG]], <i32 2, i32 2>
 ; CHECK-NEXT:    ret <2 x i1> [[CMP]]
 ;
   %add = call <2 x i32> @llvm.uadd.sat.v2i32(<2 x i32> %arg, <2 x i32> <i32 3, i32 3>)
@@ -222,8 +211,7 @@
 define <2 x i1> @icmp_sgt_vector_equal(<2 x i64> %arg) {
 ; CHECK-LABEL: define <2 x i1> @icmp_sgt_vector_equal
 ; CHECK-SAME: (<2 x i64> [[ARG:%.*]]) {
-; CHECK-NEXT:    [[ADD:%.*]] = call <2 x i64> @llvm.uadd.sat.v2i64(<2 x i64> [[ARG]], <2 x i64> <i64 409623, i64 409623>)
-; CHECK-NEXT:    [[CMP:%.*]] = icmp sgt <2 x i64> [[ADD]], <i64 1234, i64 1234>
+; CHECK-NEXT:    [[CMP:%.*]] = icmp ult <2 x i64> [[ARG]], <i64 9223372036854366185, i64 9223372036854366185>
 ; CHECK-NEXT:    ret <2 x i1> [[CMP]]
 ;
   %add = call <2 x i64> @llvm.uadd.sat.v2i64(<2 x i64> %arg, <2 x i64> <i64 409623, i64 409623>)
diff --git a/llvm/test/Transforms/InstCombine/icmp-usub-sat.ll b/llvm/test/Transforms/InstCombine/icmp-usub-sat.ll
--- a/llvm/test/Transforms/InstCombine/icmp-usub-sat.ll
+++ b/llvm/test/Transforms/InstCombine/icmp-usub-sat.ll
@@ -1,7 +1,8 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 2
 ; RUN: opt < %s -passes=instcombine -S | FileCheck %s
 
-; Tests for InstCombineCompares.cpp::foldICmpUSubSatWithConstant
+; Tests for InstCombineCompares.cpp::foldICmpUSubSatOrUAddSatWithConstant
+; - usub_sat case
 ; https://github.com/llvm/llvm-project/issues/58342
 
 ; ==============================================================================