[llvm] 6676f79 - [IR] Use single map in PredIteratorCache (NFC) (#101950)

[via llvm-commits]

Author: Nikita Popov
Date: 2024-08-05T13:00:49+02:00
New Revision: 6676f794dcdab9ad78d59e044dfdc355dc0916a2

URL: https://github.com/llvm/llvm-project/commit/6676f794dcdab9ad78d59e044dfdc355dc0916a2
DIFF: https://github.com/llvm/llvm-project/commit/6676f794dcdab9ad78d59e044dfdc355dc0916a2.diff

LOG: [IR] Use single map in PredIteratorCache (NFC) (#101950)

Use a single map storing ArrayRef instead of two separate maps for the
base pointer and size. This saves one map lookup per cache accesses.

This is an alternative to
https://github.com/llvm/llvm-project/pull/101885 with a similar
compile-time improvement.

Added: 
    

Modified: 
    llvm/include/llvm/IR/PredIteratorCache.h

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/IR/PredIteratorCache.h b/llvm/include/llvm/IR/PredIteratorCache.h
index fc8cf20e9f759..ba3228347076b 100644
--- a/llvm/include/llvm/IR/PredIteratorCache.h
+++ b/llvm/include/llvm/IR/PredIteratorCache.h
@@ -25,52 +25,29 @@ namespace llvm {
 /// predecessor iterator queries.  This is useful for code that repeatedly
 /// wants the predecessor list for the same blocks.
 class PredIteratorCache {
-  /// BlockToPredsMap - Pointer to null-terminated list.
-  mutable DenseMap<BasicBlock *, BasicBlock **> BlockToPredsMap;
-  mutable DenseMap<BasicBlock *, unsigned> BlockToPredCountMap;
+  /// Cached list of predecessors, allocated in Memory.
+  DenseMap<BasicBlock *, ArrayRef<BasicBlock *>> BlockToPredsMap;
 
   /// Memory - This is the space that holds cached preds.
   BumpPtrAllocator Memory;
 
-private:
-  /// GetPreds - Get a cached list for the null-terminated predecessor list of
-  /// the specified block.  This can be used in a loop like this:
-  ///   for (BasicBlock **PI = PredCache->GetPreds(BB); *PI; ++PI)
-  ///      use(*PI);
-  /// instead of:
-  /// for (pred_iterator PI = pred_begin(BB), E = pred_end(BB); PI != E; ++PI)
-  BasicBlock **GetPreds(BasicBlock *BB) {
-    BasicBlock **&Entry = BlockToPredsMap[BB];
-    if (Entry)
+public:
+  size_t size(BasicBlock *BB) { return get(BB).size(); }
+  ArrayRef<BasicBlock *> get(BasicBlock *BB) {
+    ArrayRef<BasicBlock *> &Entry = BlockToPredsMap[BB];
+    if (Entry.data())
       return Entry;
 
     SmallVector<BasicBlock *, 32> PredCache(predecessors(BB));
-    PredCache.push_back(nullptr); // null terminator.
-
-    BlockToPredCountMap[BB] = PredCache.size() - 1;
-
-    Entry = Memory.Allocate<BasicBlock *>(PredCache.size());
-    std::copy(PredCache.begin(), PredCache.end(), Entry);
+    BasicBlock **Data = Memory.Allocate<BasicBlock *>(PredCache.size());
+    std::copy(PredCache.begin(), PredCache.end(), Data);
+    Entry = ArrayRef(Data, PredCache.size());
     return Entry;
   }
 
-  unsigned GetNumPreds(BasicBlock *BB) const {
-    auto Result = BlockToPredCountMap.find(BB);
-    if (Result != BlockToPredCountMap.end())
-      return Result->second;
-    return BlockToPredCountMap[BB] = pred_size(BB);
-  }
-
-public:
-  size_t size(BasicBlock *BB) const { return GetNumPreds(BB); }
-  ArrayRef<BasicBlock *> get(BasicBlock *BB) {
-    return ArrayRef(GetPreds(BB), GetNumPreds(BB));
-  }
-
   /// clear - Remove all information.
   void clear() {
     BlockToPredsMap.clear();
-    BlockToPredCountMap.clear();
     Memory.Reset();
   }
 };