[PATCH] D32885: [ADT] Add BitVector::find_prev

[Zachary Turner via Phabricator via llvm-commits]

zturner updated this revision to Diff 97899.
zturner added a comment.

Removed all unrelated changes and committed them separately.


https://reviews.llvm.org/D32885

Files:
  llvm/include/llvm/ADT/BitVector.h
  llvm/include/llvm/ADT/SmallBitVector.h
  llvm/unittests/ADT/BitVectorTest.cpp


Index: llvm/unittests/ADT/BitVectorTest.cpp
===================================================================
--- llvm/unittests/ADT/BitVectorTest.cpp
+++ llvm/unittests/ADT/BitVectorTest.cpp
@@ -204,6 +204,11 @@
   EXPECT_EQ(75, A.find_next(13));
   EXPECT_EQ(-1, A.find_next(75));
 
+  EXPECT_EQ(-1, A.find_prev(12));
+  EXPECT_EQ(12, A.find_prev(13));
+  EXPECT_EQ(13, A.find_prev(75));
+  EXPECT_EQ(75, A.find_prev(90));
+
   EXPECT_EQ(0, A.find_first_unset());
   EXPECT_EQ(99, A.find_last_unset());
   EXPECT_EQ(14, A.find_next_unset(11));
@@ -240,6 +245,11 @@
   EXPECT_EQ(16, A.find_next(4));
   EXPECT_EQ(-1, A.find_next(16));
 
+  EXPECT_EQ(-1, A.find_prev(3));
+  EXPECT_EQ(3, A.find_prev(4));
+  EXPECT_EQ(4, A.find_prev(16));
+  EXPECT_EQ(16, A.find_prev(18));
+
   EXPECT_EQ(0, A.find_first_unset());
   EXPECT_EQ(19, A.find_last_unset());
   EXPECT_EQ(5, A.find_next_unset(3));
Index: llvm/include/llvm/ADT/SmallBitVector.h
===================================================================
--- llvm/include/llvm/ADT/SmallBitVector.h
+++ llvm/include/llvm/ADT/SmallBitVector.h
@@ -278,6 +278,24 @@
     return getPointer()->find_next_unset(Prev);
   }
 
+  /// find_prev - Returns the index of the next set bit *preceding* the
+  /// \p Next bit.  Returns -1 if all previous bits are unset.
+  int find_prev(unsigned Next) const {
+    if (isSmall()) {
+      if (Next == 0)
+        return -1;
+
+      --Next;
+      uintptr_t Bits = getSmallBits();
+      Bits &= maskTrailingOnes<uintptr_t>(Next + 1);
+      if (Bits == 0)
+        return -1;
+
+      return NumBaseBits - countLeadingZeros(Bits) - 1;
+    }
+    return getPointer()->find_prev(Next);
+  }
+
   /// Clear all bits.
   void clear() {
     if (!isSmall())
Index: llvm/include/llvm/ADT/BitVector.h
===================================================================
--- llvm/include/llvm/ADT/BitVector.h
+++ llvm/include/llvm/ADT/BitVector.h
@@ -253,6 +253,33 @@
     return -1;
   }
 
+  /// find_prev - Returns the index of the next set bit *preceding* the
+  /// \p Next bit.  Returns -1 if all previous bits are unset.
+  int find_prev(unsigned Next) {
+    if (Next == 0)
+      return -1;
+
+    --Next;
+
+    unsigned WordPos = Next / BITWORD_SIZE;
+    unsigned BitPos = Next % BITWORD_SIZE;
+    BitWord Copy = Bits[WordPos];
+    // Mask off next bits.
+    Copy &= maskTrailingOnes<BitWord>(BitPos + 1);
+
+    if (Copy != 0)
+      return (WordPos + 1) * BITWORD_SIZE - countLeadingZeros(Copy) - 1;
+
+    // Check previous words.
+    for (unsigned i = 1; i <= WordPos; ++i) {
+      unsigned Index = WordPos - i;
+      if (Bits[Index] == 0)
+        continue;
+      return (Index + 1) * BITWORD_SIZE - countLeadingZeros(Bits[Index]) - 1;
+    }
+    return -1;
+  }
+
   /// clear - Clear all bits.
   void clear() {
     Size = 0;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D32885.97899.patch
Type: text/x-patch
Size: 2836 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170505/091c0f04/attachment.bin>