1 files changed, 51 insertions, 133 deletions

diff --git a/llvm/lib/Transforms/Utils/LoopUtils.cpp b/llvm/lib/Transforms/Utils/LoopUtils.cpp
index 9043baa..e7623aa 100644
--- a/llvm/lib/Transforms/Utils/LoopUtils.cpp
+++ b/llvm/lib/Transforms/Utils/LoopUtils.cpp
@@ -201,40 +201,34 @@ void llvm::initializeLoopPassPass(PassRegistry &Registry) {
 }
 
 /// Create MDNode for input string.
-static MDNode *createStringMetadata(Loop *TheLoop, StringRef Name,
-                                    std::optional<unsigned> V) {
+static MDNode *createStringMetadata(Loop *TheLoop, StringRef Name, unsigned V) {
   LLVMContext &Context = TheLoop->getHeader()->getContext();
-  if (V) {
-    Metadata *MDs[] = {MDString::get(Context, Name),
-                       ConstantAsMetadata::get(
-                           ConstantInt::get(Type::getInt32Ty(Context), *V))};
-    return MDNode::get(Context, MDs);
-  }
-  return MDNode::get(Context, {MDString::get(Context, Name)});
+  Metadata *MDs[] = {
+      MDString::get(Context, Name),
+      ConstantAsMetadata::get(ConstantInt::get(Type::getInt32Ty(Context), V))};
+  return MDNode::get(Context, MDs);
 }
 
-bool llvm::addStringMetadataToLoop(Loop *TheLoop, const char *StringMD,
-                                   std::optional<unsigned> V) {
+/// Set input string into loop metadata by keeping other values intact.
+/// If the string is already in loop metadata update value if it is
+/// different.
+void llvm::addStringMetadataToLoop(Loop *TheLoop, const char *StringMD,
+                                   unsigned V) {
   SmallVector<Metadata *, 4> MDs(1);
   // If the loop already has metadata, retain it.
   MDNode *LoopID = TheLoop->getLoopID();
   if (LoopID) {
     for (unsigned i = 1, ie = LoopID->getNumOperands(); i < ie; ++i) {
       MDNode *Node = cast<MDNode>(LoopID->getOperand(i));
-      // If it is of form key [= value], try to parse it.
-      unsigned NumOps = Node->getNumOperands();
-      if (NumOps == 1 || NumOps == 2) {
+      // If it is of form key = value, try to parse it.
+      if (Node->getNumOperands() == 2) {
         MDString *S = dyn_cast<MDString>(Node->getOperand(0));
         if (S && S->getString() == StringMD) {
-          // If the metadata and any value are already as specified, do nothing.
-          if (NumOps == 2 && V) {
-            ConstantInt *IntMD =
-                mdconst::extract_or_null<ConstantInt>(Node->getOperand(1));
-            if (IntMD && IntMD->getSExtValue() == *V)
-              return false;
-          } else if (NumOps == 1 && !V) {
-            return false;
-          }
+          ConstantInt *IntMD =
+              mdconst::extract_or_null<ConstantInt>(Node->getOperand(1));
+          if (IntMD && IntMD->getSExtValue() == V)
+            // It is already in place. Do nothing.
+            return;
           // We need to update the value, so just skip it here and it will
           // be added after copying other existed nodes.
           continue;
@@ -251,7 +245,6 @@ bool llvm::addStringMetadataToLoop(Loop *TheLoop, const char *StringMD,
   // Set operand 0 to refer to the loop id itself.
   NewLoopID->replaceOperandWith(0, NewLoopID);
   TheLoop->setLoopID(NewLoopID);
-  return true;
 }
 
 std::optional<ElementCount>
@@ -811,48 +804,26 @@ static BranchInst *getExpectedExitLoopLatchBranch(Loop *L) {
   return LatchBR;
 }
 
-struct DbgLoop {
-  const Loop *L;
-  explicit DbgLoop(const Loop *L) : L(L) {}
-};
-static inline raw_ostream &operator<<(raw_ostream &OS, DbgLoop D) {
-  OS << "function ";
-  D.L->getHeader()->getParent()->printAsOperand(OS, /*PrintType=*/false);
-  return OS << " " << *D.L;
-}
-
-static std::optional<unsigned> estimateLoopTripCount(Loop *L) {
-  // Currently we take the estimate exit count only from the loop latch,
-  // ignoring other exiting blocks.  This can overestimate the trip count
-  // if we exit through another exit, but can never underestimate it.
-  // TODO: incorporate information from other exits
-  BranchInst *ExitingBranch = getExpectedExitLoopLatchBranch(L);
-  if (!ExitingBranch) {
-    LLVM_DEBUG(dbgs() << "estimateLoopTripCount: Failed to find exiting "
-                      << "latch branch of required form in " << DbgLoop(L)
-                      << "\n");
-    return std::nullopt;
-  }
-
+/// Return the estimated trip count for any exiting branch which dominates
+/// the loop latch.
+static std::optional<unsigned> getEstimatedTripCount(BranchInst *ExitingBranch,
+                                                     Loop *L,
+                                                     uint64_t &OrigExitWeight) {
   // To estimate the number of times the loop body was executed, we want to
   // know the number of times the backedge was taken, vs. the number of times
   // we exited the loop.
   uint64_t LoopWeight, ExitWeight;
-  if (!extractBranchWeights(*ExitingBranch, LoopWeight, ExitWeight)) {
-    LLVM_DEBUG(dbgs() << "estimateLoopTripCount: Failed to extract branch "
-                      << "weights for " << DbgLoop(L) << "\n");
+  if (!extractBranchWeights(*ExitingBranch, LoopWeight, ExitWeight))
     return std::nullopt;
-  }
 
   if (L->contains(ExitingBranch->getSuccessor(1)))
     std::swap(LoopWeight, ExitWeight);
 
-  if (!ExitWeight) {
+  if (!ExitWeight)
     // Don't have a way to return predicated infinite
-    LLVM_DEBUG(dbgs() << "estimateLoopTripCount: Failed because of zero exit "
-                      << "probability for " << DbgLoop(L) << "\n");
     return std::nullopt;
-  }
+
+  OrigExitWeight = ExitWeight;
 
   // Estimated exit count is a ratio of the loop weight by the weight of the
   // edge exiting the loop, rounded to nearest.
@@ -863,86 +834,33 @@ static std::optional<unsigned> estimateLoopTripCount(Loop *L) {
     return std::numeric_limits<unsigned>::max();
 
   // Estimated trip count is one plus estimated exit count.
-  uint64_t TC = ExitCount + 1;
-  LLVM_DEBUG(dbgs() << "estimateLoopTripCount: estimated trip count of " << TC
-                    << " for " << DbgLoop(L) << "\n");
-  return TC;
+  return ExitCount + 1;
 }
 
-std::optional<unsigned> llvm::getLoopEstimatedTripCount(
-    Loop *L, unsigned *EstimatedLoopInvocationWeight, bool DbgForInit) {
-  // If requested, either compute *EstimatedLoopInvocationWeight or return
-  // nullopt if cannot.
-  //
-  // TODO: Eventually, once all passes have migrated away from setting branch
-  // weights to indicate estimated trip counts, this function will drop the
-  // EstimatedLoopInvocationWeight parameter.
-  if (EstimatedLoopInvocationWeight) {
-    if (BranchInst *ExitingBranch = getExpectedExitLoopLatchBranch(L)) {
-      uint64_t LoopWeight = 0, ExitWeight = 0; // Inits expected to be unused.
-      if (!extractBranchWeights(*ExitingBranch, LoopWeight, ExitWeight))
-        return std::nullopt;
-      if (L->contains(ExitingBranch->getSuccessor(1)))
-        std::swap(LoopWeight, ExitWeight);
-      if (!ExitWeight)
-        return std::nullopt;
-      *EstimatedLoopInvocationWeight = ExitWeight;
+std::optional<unsigned>
+llvm::getLoopEstimatedTripCount(Loop *L,
+                                unsigned *EstimatedLoopInvocationWeight) {
+  // Currently we take the estimate exit count only from the loop latch,
+  // ignoring other exiting blocks.  This can overestimate the trip count
+  // if we exit through another exit, but can never underestimate it.
+  // TODO: incorporate information from other exits
+  if (BranchInst *LatchBranch = getExpectedExitLoopLatchBranch(L)) {
+    uint64_t ExitWeight;
+    if (std::optional<uint64_t> EstTripCount =
+            getEstimatedTripCount(LatchBranch, L, ExitWeight)) {
+      if (EstimatedLoopInvocationWeight)
+        *EstimatedLoopInvocationWeight = ExitWeight;
+      return *EstTripCount;
     }
   }
-
-  // Return the estimated trip count from metadata unless the metadata is
-  // missing or has no value.
-  bool Missing = false; // Initialization is expected to be unused.
-  if (auto TC = getOptionalIntLoopAttribute(L, LLVMLoopEstimatedTripCount,
-                                            &Missing)) {
-    LLVM_DEBUG(dbgs() << "getLoopEstimatedTripCount: "
-                      << LLVMLoopEstimatedTripCount << " metadata has trip "
-                      << "count of " << *TC << " for " << DbgLoop(L) << "\n");
-    return TC;
-  }
-
-  // Estimate the trip count from latch branch weights.
-  std::optional<unsigned> TC = estimateLoopTripCount(L);
-  if (DbgForInit) {
-    // We expect no existing metadata as we are responsible for creating it.
-    LLVM_DEBUG(dbgs() << (Missing ? "" : "WARNING: ")
-                      << "getLoopEstimatedTripCount: "
-                      << LLVMLoopEstimatedTripCount << " metadata "
-                      << (Missing ? "" : "not ") << "missing as expected "
-                      << "during its init for " << DbgLoop(L) << "\n");
-  } else if (Missing) {
-    // We expect that metadata was already created.
-    LLVM_DEBUG(dbgs() << "WARNING: getLoopEstimatedTripCount: "
-                      << LLVMLoopEstimatedTripCount << " metadata missing for "
-                      << DbgLoop(L) << "\n");
-  } else {
-    // If the trip count is estimable, the value should have been added already.
-    LLVM_DEBUG(dbgs() << (TC ? "WARNING: " : "")
-                      << "getLoopEstimatedTripCount: "
-                      << LLVMLoopEstimatedTripCount << " metadata "
-                      << (TC ? "incorrectly " : "correctly ")
-                      << "indicates trip count is inestimable for "
-                      << DbgLoop(L) << "\n");
-  }
-  return TC;
+  return std::nullopt;
 }
 
-bool llvm::setLoopEstimatedTripCount(
-    Loop *L, std::optional<unsigned> EstimatedTripCount,
-    std::optional<unsigned> EstimatedloopInvocationWeight) {
-  // Set the metadata.
-  bool Updated = addStringMetadataToLoop(L, LLVMLoopEstimatedTripCount,
-                                         EstimatedTripCount);
-  if (!EstimatedTripCount || !EstimatedloopInvocationWeight)
-    return Updated;
-
-  // At the moment, we currently support changing the estimated trip count in
-  // the latch branch's branch weights only.  We could extend this API to
-  // manipulate estimated trip counts for any exit.
-  //
-  // TODO: Eventually, once all passes have migrated away from setting branch
-  // weights to indicate estimated trip counts, we will not set branch weights
-  // here at all.
+bool llvm::setLoopEstimatedTripCount(Loop *L, unsigned EstimatedTripCount,
+                                     unsigned EstimatedloopInvocationWeight) {
+  // At the moment, we currently support changing the estimate trip count of
+  // the latch branch only.  We could extend this API to manipulate estimated
+  // trip counts for any exit.
   BranchInst *LatchBranch = getExpectedExitLoopLatchBranch(L);
   if (!LatchBranch)
     return false;
@@ -951,9 +869,9 @@ bool llvm::setLoopEstimatedTripCount(
   unsigned LatchExitWeight = 0;
   unsigned BackedgeTakenWeight = 0;
 
-  if (*EstimatedTripCount != 0) {
-    LatchExitWeight = *EstimatedloopInvocationWeight;
-    BackedgeTakenWeight = (*EstimatedTripCount - 1) * LatchExitWeight;
+  if (EstimatedTripCount > 0) {
+    LatchExitWeight = EstimatedloopInvocationWeight;
+    BackedgeTakenWeight = (EstimatedTripCount - 1) * LatchExitWeight;
   }
 
   // Make a swap if back edge is taken when condition is "false".
@@ -967,7 +885,7 @@ bool llvm::setLoopEstimatedTripCount(
       LLVMContext::MD_prof,
       MDB.createBranchWeights(BackedgeTakenWeight, LatchExitWeight));
 
-  return Updated;
+  return true;
 }
 
 bool llvm::hasIterationCountInvariantInParent(Loop *InnerLoop,