Handle vector types

Author: Poseydon42

llvm/lib/Transforms/InstCombine/InstCombineSelect.cpp

@@ -3575,11 +3575,11 @@ Instruction *InstCombinerImpl::foldSelectToCmp(SelectInst &SI) {
 
   // (x == y) ? 0 : (x > y ? 1 : -1)
   ICmpInst::Predicate FalseBranchSelectPredicate;
-  ConstantInt *InnerTV, *InnerFV;
+  const APInt *InnerTV, *InnerFV;
   if (Pred == ICmpInst::ICMP_EQ && match(TV, m_Zero()) &&
       match(FV, m_Select(m_c_ICmp(FalseBranchSelectPredicate, m_Specific(LHS),
                                   m_Specific(RHS)),
-                         m_ConstantInt(InnerTV), m_ConstantInt(InnerFV)))) {
+                         m_APInt(InnerTV), m_APInt(InnerFV)))) {
     if (!ICmpInst::isGT(FalseBranchSelectPredicate)) {
       FalseBranchSelectPredicate =
           ICmpInst::getSwappedPredicate(FalseBranchSelectPredicate);
@@ -3592,7 +3592,7 @@ Instruction *InstCombinerImpl::foldSelectToCmp(SelectInst &SI) {
     }
 
     if (ICmpInst::isGT(FalseBranchSelectPredicate) && InnerTV->isOne() &&
-        InnerFV->isAllOnesValue()) {
+        InnerFV->isAllOnes()) {
       IsSigned = ICmpInst::isSigned(FalseBranchSelectPredicate);
       Replace = true;
     }

llvm/test/Transforms/InstCombine/scmp.ll

@@ -358,6 +358,19 @@ define i8 @scmp_from_select_eq_and_gt(i32 %x, i32 %y) {
   ret i8 %r
 }
 
+define <4 x i8> @scmp_from_select_eq_and_gt_vec(<4 x i32> %x, <4 x i32> %y) {
+; CHECK-LABEL: define <4 x i8> @scmp_from_select_eq_and_gt_vec(
+; CHECK-SAME: <4 x i32> [[X:%.*]], <4 x i32> [[Y:%.*]]) {
+; CHECK-NEXT:    [[R:%.*]] = call <4 x i8> @llvm.scmp.v4i8.v4i32(<4 x i32> [[X]], <4 x i32> [[Y]])
+; CHECK-NEXT:    ret <4 x i8> [[R]]
+;
+  %eq = icmp eq <4 x i32> %x, %y
+  %gt = icmp sgt <4 x i32> %x, %y
+  %sel1 = select <4 x i1> %gt, <4 x i8> splat(i8 1), <4 x i8> splat(i8 -1)
+  %r = select <4 x i1> %eq, <4 x i8> splat(i8 0), <4 x i8> %sel1
+  ret <4 x i8> %r
+}
+
 define i8 @scmp_from_select_eq_and_gt_commuted1(i32 %x, i32 %y) {
 ; CHECK-LABEL: define i8 @scmp_from_select_eq_and_gt_commuted1(
 ; CHECK-SAME: i32 [[X:%.*]], i32 [[Y:%.*]]) {