fixup! [ConstraintElim] Simplify MinMaxIntrinsic

Author: dtcxzyw

llvm/lib/Transforms/Scalar/ConstraintElimination.cpp

@@ -1065,17 +1065,16 @@ void State::addInfoFor(BasicBlock &BB) {
     case Intrinsic::umax:
     case Intrinsic::smin:
     case Intrinsic::smax:
+      // TODO: handle llvm.abs as well
+      WorkList.push_back(
+          FactOrCheck::getCheck(DT.getNode(&BB), cast<CallInst>(&I)));
       // TODO: Check if it is possible to instead only added the min/max facts
       // when simplifying uses of the min/max intrinsics.
       if (!isGuaranteedNotToBePoison(&I))
         break;
       [[fallthrough]];
     case Intrinsic::abs:
       WorkList.push_back(FactOrCheck::getInstFact(DT.getNode(&BB), &I));
-      // TODO: handle llvm.abs as well
-      if (ID != Intrinsic::abs)
-        WorkList.push_back(
-            FactOrCheck::getCheck(DT.getNode(&BB), cast<CallInst>(&I)));
       break;
     }
 
@@ -1400,26 +1399,21 @@ static bool checkAndReplaceCondition(
 }
 
 static bool checkAndReplaceMinMax(MinMaxIntrinsic *MinMax, ConstraintInfo &Info,
-                                  unsigned NumIn, unsigned NumOut,
-                                  Instruction *ContextInst, DominatorTree &DT,
                                   SmallVectorImpl<Instruction *> &ToRemove) {
   auto ReplaceMinMaxWithOperand = [&](MinMaxIntrinsic *MinMax, bool UseLHS) {
     // TODO: generate reproducer for min/max.
     MinMax->replaceAllUsesWith(MinMax->getOperand(UseLHS ? 0 : 1));
-    if (MinMax->use_empty())
-      ToRemove.push_back(MinMax);
+    ToRemove.push_back(MinMax);
     return true;
   };
 
   ICmpInst::Predicate Pred =
       ICmpInst::getNonStrictPredicate(MinMax->getPredicate());
-  if (auto ImpliedCondition =
-          checkCondition(Pred, MinMax->getOperand(0), MinMax->getOperand(1),
-                         MinMax, Info, NumIn, NumOut, ContextInst))
+  if (auto ImpliedCondition = checkCondition(
+          Pred, MinMax->getOperand(0), MinMax->getOperand(1), MinMax, Info))
     return ReplaceMinMaxWithOperand(MinMax, *ImpliedCondition);
-  if (auto ImpliedCondition =
-          checkCondition(Pred, MinMax->getOperand(1), MinMax->getOperand(0),
-                         MinMax, Info, NumIn, NumOut, ContextInst))
+  if (auto ImpliedCondition = checkCondition(
+          Pred, MinMax->getOperand(1), MinMax->getOperand(0), MinMax, Info))
     return ReplaceMinMaxWithOperand(MinMax, !*ImpliedCondition);
   return false;
 }
@@ -1725,8 +1719,7 @@ static bool eliminateConstraints(Function &F, DominatorTree &DT, LoopInfo &LI,
         }
         Changed |= Simplified;
       } else if (auto *MinMax = dyn_cast<MinMaxIntrinsic>(Inst)) {
-        Changed |= checkAndReplaceMinMax(MinMax, Info, CB.NumIn, CB.NumOut,
-                                         CB.getContextInst(), S.DT, ToRemove);
+        Changed |= checkAndReplaceMinMax(MinMax, Info, ToRemove);
       }
       continue;
     }