[AIE] Factor getLoopID from getMinTripCount

Xilinx · Aug 21, 2024 · 71484dd · 71484dd
1 parent b906925
commit 71484dd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/llvm/lib/Target/AIE/Utils/AIELoopUtils.cpp b/llvm/lib/Target/AIE/Utils/AIELoopUtils.cpp
@@ -14,9 +14,20 @@
 #define DEBUG_TYPE "aielooputils"
 
 namespace llvm::AIELoopUtils {
+const MDNode *getLoopID(const MachineBasicBlock &LoopBlock) {
+  const BasicBlock *BBLK = LoopBlock.getBasicBlock();
+  if (!BBLK)
+    return nullptr;
 
-std::optional<int64_t> getMinTripCount(const MDNode *LoopID) {
+  const Instruction *TI = BBLK->getTerminator();
+  if (!TI)
+    return nullptr;
+
+  const MDNode *LoopID = TI->getMetadata(LLVMContext::MD_loop);
+  return LoopID;
+}
 
+std::optional<int64_t> getMinTripCount(const MDNode *LoopID) {
   if (LoopID == nullptr)
     return std::nullopt;
 
@@ -48,16 +59,7 @@ std::optional<int64_t> getMinTripCount(const MDNode *LoopID) {
 }
 
 std::optional<int64_t> getMinTripCount(const MachineBasicBlock &LoopBlock) {
-  const BasicBlock *BBLK = LoopBlock.getBasicBlock();
-  if (!BBLK)
-    return std::nullopt;
-
-  const Instruction *TI = BBLK->getTerminator();
-  if (!TI)
-    return std::nullopt;
-
-  const MDNode *LoopID = TI->getMetadata(LLVMContext::MD_loop);
-  return getMinTripCount(LoopID);
+  return getMinTripCount(getLoopID(LoopBlock));
 }
 
 MachineBasicBlock *

diff --git a/llvm/lib/Target/AIE/Utils/AIELoopUtils.h b/llvm/lib/Target/AIE/Utils/AIELoopUtils.h
@@ -22,6 +22,9 @@ class MachineBasicBlock;
 
 namespace llvm::AIELoopUtils {
 
+/// Get the LoopID from a single block loop or nullptr
+const MDNode *getLoopID(const MachineBasicBlock &LoopBlock);
+
 /// Get the tripcount from the LoopID node
 std::optional<int64_t> getMinTripCount(const MDNode *LoopID);