Update tests.

Author: Dinar Temirbulatov

llvm/lib/Analysis/IVDescriptors.cpp

@@ -635,57 +635,13 @@ RecurrenceDescriptor::isAnyOfPattern(Loop *Loop, PHINode *OrigPhi,
       return InstDesc(Select, Prev.getRecKind());
   }
 
-  SelectInst *SI = dyn_cast<SelectInst>(I);
-  Instruction *Cmp = nullptr;
-
-  if (SI) {
-    // Check that SelectInst is related to the this PHI reduction.
-    bool HasOrigPhiUser = false;
-    bool SelectNonPHIUserInLoop = false;
-    for (User *U : SI->users()) {
-      Instruction *Inst = dyn_cast<Instruction>(U);
-      if (!Inst)
-        continue;
-      if (Inst == OrigPhi) {
-        HasOrigPhiUser = true;
-      } else {
-        if (Loop->contains(Inst->getParent()))
-          SelectNonPHIUserInLoop = true;
-      }
-    }
-    Cmp = dyn_cast<CmpInst>(SI->getOperand(0));
-    // Checking the current CmpInst is safe as a recurrent reduction.
-    if (Cmp && !Cmp->hasOneUse() && HasOrigPhiUser && !SelectNonPHIUserInLoop) {
-      bool IsSafeCMP = true;
-      for (User *U : Cmp->users()) {
-        Instruction *UInst = dyn_cast<Instruction>(U);
-        if (!UInst)
-          continue;
-        if (SelectInst *SI1 = dyn_cast<SelectInst>(U)) {
-          if (!llvm::all_of(SI1->users(), [Loop](User *USI) {
-                Instruction *Inst1 = dyn_cast<Instruction>(USI);
-                if (!Inst1 || !Loop->contains(Inst1->getParent()) ||
-                    isa<PHINode>(Inst1))
-                  return true;
-                return false;
-              }))
-            IsSafeCMP = false;
-        }
-        if (IsSafeCMP && !isa<BranchInst>(UInst) && !isa<SelectInst>(UInst) &&
-            Loop->contains(UInst->getParent()))
-          IsSafeCMP = false;
-      }
-      if (!IsSafeCMP)
-        Cmp = nullptr;
-    }
-  }
-
-  // Only match select with single use cmp condition.
-  if (!Cmp && !match(I, m_Select(m_OneUse(m_Cmp(Pred, m_Value(), m_Value())),
-                                 m_Value(), m_Value())))
+  if (!match(I,
+             m_Select(m_Cmp(Pred, m_Value(), m_Value()), m_Value(), m_Value())))
     return InstDesc(false, I);
 
+  SelectInst *SI = cast<SelectInst>(I);
   Value *NonPhi = nullptr;
+
   if (OrigPhi == dyn_cast<PHINode>(SI->getTrueValue()))
     NonPhi = SI->getFalseValue();
   else if (OrigPhi == dyn_cast<PHINode>(SI->getFalseValue()))

llvm/lib/Transforms/Vectorize/LoopVectorizationLegality.cpp

@@ -787,7 +787,6 @@ static bool isTLIScalarize(const TargetLibraryInfo &TLI, const CallInst &CI) {
 
 bool LoopVectorizationLegality::canVectorizeInstrs() {
   BasicBlock *Header = TheLoop->getHeader();
-  DenseMap<Instruction *, unsigned> MultiCmpsRed;
 
   // For each block in the loop.
   for (BasicBlock *BB : TheLoop->blocks()) {
@@ -831,20 +830,6 @@ bool LoopVectorizationLegality::canVectorizeInstrs() {
           Requirements->addExactFPMathInst(RedDes.getExactFPMathInst());
           AllowedExit.insert(RedDes.getLoopExitInstr());
           Reductions[Phi] = RedDes;
-          CmpInst *Cmp = nullptr;
-          for (Value *V :
-               {Phi->getIncomingValue(0), Phi->getIncomingValue(1)}) {
-            if (Instruction *SI = dyn_cast<SelectInst>(V))
-              Cmp = dyn_cast<CmpInst>(SI->getOperand(0));
-          }
-          RecurKind Kind = RedDes.getRecurrenceKind();
-          if (Cmp && !Cmp->hasOneUse() &&
-              (Kind == RecurKind::IAnyOf || Kind == RecurKind::FAnyOf)) {
-            if (MultiCmpsRed.contains(Cmp))
-              MultiCmpsRed[Cmp]++;
-            else
-              MultiCmpsRed[Cmp] = 1;
-          }
           continue;
         }
 
@@ -1060,23 +1045,6 @@ bool LoopVectorizationLegality::canVectorizeInstrs() {
     }
   }
 
-  // Make sure that all compare instruction users are recurrent if in loop's BB.
-  if (MultiCmpsRed.size() > 0) {
-    auto Blocks = TheLoop->getBlocksVector();
-    for (auto const &C : MultiCmpsRed) {
-      Instruction *Cmp = C.first;
-      unsigned Counter = 0;
-      for (User *U : Cmp->users()) {
-        SelectInst *Inst = dyn_cast<SelectInst>(U);
-        if (Inst && std::find(Blocks.begin(), Blocks.end(),
-                              Inst->getParent()) != Blocks.end())
-          Counter++;
-      }
-      if (Counter != C.second)
-        return false;
-    }
-  }
-
   // Now we know the widest induction type, check if our found induction
   // is the same size. If it's not, unset it here and InnerLoopVectorizer
   // will create another.

llvm/test/Transforms/LoopVectorize/AArch64/select-costs.ll

@@ -13,10 +13,6 @@ define void @selects_1(ptr nocapture %dst, i32 %A, i32 %B, i32 %C, i32 %N) {
 ; CHECK: LV: Found an estimated cost of 1 for VF 4 For instruction:   %cond6 = select i1 %cmp2, i32 30, i32 %and
 ; CHECK: LV: Found an estimated cost of 1 for VF 4 For instruction:   %cond11 = select i1 %cmp7, i32 %cond, i32 %cond6
 
-; CHECK-LABEL: define void @selects_1(
-; CHECK:       vector.body:
-; CHECK:         select <4 x i1>
-
 entry:
   %cmp26 = icmp sgt i32 %N, 0
   br i1 %cmp26, label %for.body.preheader, label %for.cond.cleanup
@@ -47,3 +43,47 @@ for.cond.cleanup.loopexit:                        ; preds = %for.body
 for.cond.cleanup:                                 ; preds = %for.cond.cleanup.loopexit, %entry
   ret void
 }
+
+define i32 @multi_user_cmp(ptr readonly %a, i32 noundef %n) {
+; CHECK: LV: Found an estimated cost of 0 for VF 16 For instruction:   %indvars.iv = phi i64 [ 0, %entry ], [ %indvars.iv.next, %for.body ]
+; CHECK-NEXT: LV: Found an estimated cost of 0 for VF 16 For instruction:   %all.0.off010 = phi i1 [ true, %entry ], [ %all.0.off0., %for.body ]
+; CHECK-NEXT: LV: Found an estimated cost of 0 for VF 16 For instruction:   %any.0.off09 = phi i1 [ false, %entry ], [ %.any.0.off0, %for.body ]
+; CHECK-NEXT: LV: Found an estimated cost of 0 for VF 16 For instruction:   %arrayidx = getelementptr inbounds float, ptr %a, i64 %indvars.iv
+; CHECK-NEXT: LV: Found an estimated cost of 4 for VF 16 For instruction:   %load1 = load float, ptr %arrayidx, align 4
+; CHECK-NEXT: LV: Found an estimated cost of 4 for VF 16 For instruction:   %cmp1 = fcmp olt float %load1, 0.000000e+00
+; CHECK-NEXT: LV: Found an estimated cost of 1 for VF 16 For instruction:   %.any.0.off0 = select i1 %cmp1, i1 true, i1 %any.0.off09
+; CHECK-NEXT: LV: Found an estimated cost of 1 for VF 16 For instruction:   %all.0.off0. = select i1 %cmp1, i1 %all.0.off010, i1 false
+; CHECK-NEXT: LV: Found an estimated cost of 1 for VF 16 For instruction:   %indvars.iv.next = add nuw nsw i64 %indvars.iv, 1
+; CHECK-NEXT: LV: Found an estimated cost of 1 for VF 16 For instruction:   %exitcond.not = icmp eq i64 %indvars.iv.next, %wide.trip.count
+; CHECK-NEXT: LV: Found an estimated cost of 0 for VF 16 For instruction:   br i1 %exitcond.not, label %exit, label %for.body
+; CHECK-NEXT: LV: Vector loop of width 16 costs: 0.
+entry:
+  %wide.trip.count = zext nneg i32 %n to i64
+  br label %for.body
+
+for.body:
+  %indvars.iv = phi i64 [ 0, %entry ], [ %indvars.iv.next, %for.body ]
+  %all.0.off010 = phi i1 [ true, %entry ], [ %all.0.off0., %for.body ]
+  %any.0.off09 = phi i1 [ false, %entry ], [ %.any.0.off0, %for.body ]
+  %arrayidx = getelementptr inbounds float, ptr %a, i64 %indvars.iv
+  %load1 = load float, ptr %arrayidx, align 4
+  %cmp1 = fcmp olt float %load1, 0.000000e+00
+  %.any.0.off0 = select i1 %cmp1, i1 true, i1 %any.0.off09
+  %all.0.off0. = select i1 %cmp1, i1 %all.0.off010, i1 false
+  %indvars.iv.next = add nuw nsw i64 %indvars.iv, 1
+  %exitcond.not = icmp eq i64 %indvars.iv.next, %wide.trip.count
+  br i1 %exitcond.not, label %exit, label %for.body
+
+exit:
+  %0 = select i1 %.any.0.off0, i32 2, i32 3
+  %1 = select i1 %all.0.off0., i32 1, i32 %0
+  ret i32 %1
+}
+
+; CHECK-LABEL: define void @selects_1(
+; CHECK:       vector.body:
+; CHECK:         select <4 x i1>
+
+; CHECK-LABEL: define i32 @multi_user_cmp(
+; CHECK:       vector.body:
+; CHECK:         %index = phi i64