Use helper

Author: luciechoi

llvm/lib/Transforms/Scalar/IndVarSimplify.cpp

@@ -31,6 +31,7 @@
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/Statistic.h"
 #include "llvm/ADT/iterator_range.h"
+#include "llvm/Analysis/CodeMetrics.h"
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/Analysis/LoopPass.h"
 #include "llvm/Analysis/MemorySSA.h"
@@ -1859,35 +1860,16 @@ bool IndVarSimplify::predicateLoopExits(Loop *L, SCEVExpander &Rewriter) {
         }
       }
 
-  // If the loop body uses a convergence token defined within the loop, skip
-  // predication. This is to avoid changing the convergence behavior of the
-  // loop.
-  SmallVector<BasicBlock *, 16> blocks = ExitingBlocks;
-  SmallVector<Value *, 16> tokens = {};
-  size_t index = 0; // Assume Exiting Blocks are sorted.
-  while (index < blocks.size()) {
-    BasicBlock *BB = blocks[index];
-    index++;
-    const auto exitingBlockName = BB->getName();
-    for (Instruction &I : *BB) {
-      // Check if the instruction uses any convergence tokens.
-      if (auto *CB = dyn_cast<CallBase>(&I);
-          CB && !isa<ConvergenceControlInst>(&I)) {
-        auto token = CB->getConvergenceControlToken();
-        if (token && llvm::is_contained(tokens, token)) {
-          return false;
-        }
-      }
-      if (isa<ConvergenceControlInst>(&I)) {
-        tokens.push_back(cast<Value>(&I));
-      }
-    }
+  CodeMetrics Metrics;
+  SmallPtrSet<const Value *, 32> EphValues;
+  for (BasicBlock *BB : L->blocks()) {
+    Metrics.analyzeBasicBlock(BB, *TTI, EphValues, /* PrepareForLTO= */ false,
+                              L);
+  }
 
-    for (BasicBlock *Succ : successors(BB)) {
-      const auto succName = Succ->getName();
-      if (Succ != L->getLoopLatch() && !llvm::is_contained(blocks, Succ))
-        blocks.push_back(Succ);
-    }
+  if (Metrics.Convergence == ConvergenceKind::ExtendedLoop) {
+    // Do not predicate loops with extended convergence.
+    return false;
   }
 
   bool Changed = false;