Move checks to FoldOpIntoSelect

Author: thevar1able

llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp

@@ -1654,29 +1654,6 @@ Instruction *InstCombinerImpl::visitCallInst(CallInst &CI) {
   if (Value *FreedOp = getFreedOperand(&CI, &TLI))
     return visitFree(CI, FreedOp);
 
-  if (Function *F = CI.getCalledFunction()) {
-    if (F->getIntrinsicID() == Intrinsic::umin ||
-        F->getIntrinsicID() == Intrinsic::umax) {
-      for (Value *Arg : CI.args()) {
-        auto *SI = dyn_cast<SelectInst>(Arg);
-        if (!SI)
-          continue;
-
-        auto *TrueC = dyn_cast<Constant>(SI->getTrueValue());
-        auto *FalseC = dyn_cast<Constant>(SI->getFalseValue());
-
-        // Block only if the select is masking, e.g. select(cond, val, -1)
-        if ((TrueC && TrueC->isAllOnesValue()) ||
-            (FalseC && FalseC->isAllOnesValue())) {
-          LLVM_DEBUG(
-              dbgs()
-              << "InstCombine: skipping umin/umax folding for masked select\n");
-          return nullptr;
-        }
-      }
-    }
-  }
-
   // If the caller function (i.e. us, the function that contains this CallInst)
   // is nounwind, mark the call as nounwind, even if the callee isn't.
   if (CI.getFunction()->doesNotThrow() && !CI.doesNotThrow()) {

llvm/lib/Transforms/InstCombine/InstructionCombining.cpp

@@ -1719,6 +1719,25 @@ Instruction *InstCombinerImpl::FoldOpIntoSelect(Instruction &Op, SelectInst *SI,
   if (SI->getType()->isIntOrIntVectorTy(1))
     return nullptr;
 
+  if (auto *II = dyn_cast<IntrinsicInst>(&Op)) {
+    switch (II->getIntrinsicID()) {
+      case Intrinsic::umin:
+      case Intrinsic::smin:
+        if (ConstantInt *C = dyn_cast<ConstantInt>(FV))
+          if (C->isAllOnesValue())
+            return nullptr;
+        break;
+      case Intrinsic::umax:
+      case Intrinsic::smax:
+        if (ConstantInt *C = dyn_cast<ConstantInt>(FV))
+          if (C->isZero())
+            return nullptr;
+        break;
+      default:
+        break;
+    }
+  }
+
   // Test if a FCmpInst instruction is used exclusively by a select as
   // part of a minimum or maximum operation. If so, refrain from doing
   // any other folding. This helps out other analyses which understand