6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-10-30 00:16:48 +00:00
Code Issues Projects Releases Wiki Activity

Convert to use ilist and non-pointer lists for extra goodness

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@41855 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Berlin
2007-09-11 17:42:22 +00:00
parent 4e319a30ba
commit 6320260e06
1 changed files with 105 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

193
include/llvm/ADT/SparseBitVector.h
View File

@@ -17,12 +17,11 @@
#include <cassert> #include <cassert>
#include <cstring> #include <cstring>
#include <list>
#include <algorithm> #include <algorithm>
#include "llvm/Support/DataTypes.h" #include "llvm/Support/DataTypes.h"
#include "llvm/ADT/STLExtras.h" #include "llvm/ADT/STLExtras.h"
#include "llvm/Support/MathExtras.h" #include "llvm/Support/MathExtras.h"
#include "llvm/ADT/ilist"
namespace llvm { namespace llvm {
/// SparseBitVector is an implementation of a bitvector that is sparse by only /// SparseBitVector is an implementation of a bitvector that is sparse by only
@@ -48,11 +47,35 @@ public:
BITWORDS_PER_ELEMENT = (ElementSize + BITWORD_SIZE - 1) / BITWORD_SIZE, BITWORDS_PER_ELEMENT = (ElementSize + BITWORD_SIZE - 1) / BITWORD_SIZE,
BITS_PER_ELEMENT = ElementSize BITS_PER_ELEMENT = ElementSize
}; };
SparseBitVectorElement<ElementSize> *getNext() const {
return Next;
}
SparseBitVectorElement<ElementSize> *getPrev() const {
return Prev;
}
void setNext(SparseBitVectorElement<ElementSize> *RHS) {
Next = RHS;
}
void setPrev(SparseBitVectorElement<ElementSize> *RHS) {
Prev = RHS;
}
private: private:
SparseBitVectorElement<ElementSize> *Next;
SparseBitVectorElement<ElementSize> *Prev;
// Index of Element in terms of where first bit starts. // Index of Element in terms of where first bit starts.
unsigned ElementIndex; unsigned ElementIndex;
BitWord Bits[BITWORDS_PER_ELEMENT]; BitWord Bits[BITWORDS_PER_ELEMENT];
SparseBitVectorElement(); // Needed for sentinels
SparseBitVectorElement() {
ElementIndex = ~0UL;
memset(&Bits[0], 0, sizeof (BitWord) * BITWORDS_PER_ELEMENT);
}
friend struct ilist_traits<SparseBitVectorElement<ElementSize> >;
public: public:
explicit SparseBitVectorElement(unsigned Idx) { explicit SparseBitVectorElement(unsigned Idx) {
ElementIndex = Idx; ElementIndex = Idx;
@@ -262,12 +285,11 @@ public:
} }
BecameZero = !allzero; BecameZero = !allzero;
} }
}; };
template <unsigned ElementSize = 128> template <unsigned ElementSize = 128>
class SparseBitVector { class SparseBitVector {
typedef std::list<SparseBitVectorElement<ElementSize> *> ElementList; typedef ilist<SparseBitVectorElement<ElementSize> > ElementList;
typedef typename ElementList::iterator ElementListIter; typedef typename ElementList::iterator ElementListIter;
typedef typename ElementList::const_iterator ElementListConstIter; typedef typename ElementList::const_iterator ElementListConstIter;
enum { enum {
@@ -294,15 +316,15 @@ class SparseBitVector {
// Search from our current iterator, either backwards or forwards, // Search from our current iterator, either backwards or forwards,
// depending on what element we are looking for. // depending on what element we are looking for.
ElementListIter ElementIter = CurrElementIter; ElementListIter ElementIter = CurrElementIter;
if ((*CurrElementIter)->index() == ElementIndex) { if (CurrElementIter->index() == ElementIndex) {
return ElementIter; return ElementIter;
} else if ((*CurrElementIter)->index() > ElementIndex) { } else if (CurrElementIter->index() > ElementIndex) {
while (ElementIter != Elements.begin() while (ElementIter != Elements.begin()
&& (*ElementIter)->index() > ElementIndex) && ElementIter->index() > ElementIndex)
--ElementIter; --ElementIter;
} else { } else {
while (ElementIter != Elements.end() && while (ElementIter != Elements.end() &&
(*ElementIter)->index() <= ElementIndex) ElementIter->index() <= ElementIndex)
++ElementIter; ++ElementIter;
--ElementIter; --ElementIter;
} }
@@ -339,11 +361,11 @@ class SparseBitVector {
return; return;
} }
Iter = BitVector->Elements.begin(); Iter = BitVector->Elements.begin();
BitNumber = (*Iter)->index() * ElementSize; BitNumber = Iter->index() * ElementSize;
unsigned BitPos = (*Iter)->find_first(); unsigned BitPos = Iter->find_first();
BitNumber += BitPos; BitNumber += BitPos;
WordNumber = (BitNumber % ElementSize) / BITWORD_SIZE; WordNumber = (BitNumber % ElementSize) / BITWORD_SIZE;
Bits = (*Iter)->word(WordNumber); Bits = Iter->word(WordNumber);
Bits >>= BitPos % BITWORD_SIZE; Bits >>= BitPos % BITWORD_SIZE;
} }
@@ -359,7 +381,7 @@ class SparseBitVector {
// See if we ran out of Bits in this word. // See if we ran out of Bits in this word.
if (!Bits) { if (!Bits) {
int NextSetBitNumber = (*Iter)->find_next(BitNumber % ElementSize) ; int NextSetBitNumber = Iter->find_next(BitNumber % ElementSize) ;
// If we ran out of set bits in this element, move to next element. // If we ran out of set bits in this element, move to next element.
if (NextSetBitNumber == -1 || (BitNumber % ElementSize == 0)) { if (NextSetBitNumber == -1 || (BitNumber % ElementSize == 0)) {
++Iter; ++Iter;
@@ -371,15 +393,15 @@ class SparseBitVector {
return; return;
} }
// Set up for next non zero word in bitmap. // Set up for next non zero word in bitmap.
BitNumber = (*Iter)->index() * ElementSize; BitNumber = Iter->index() * ElementSize;
NextSetBitNumber = (*Iter)->find_first(); NextSetBitNumber = Iter->find_first();
BitNumber += NextSetBitNumber; BitNumber += NextSetBitNumber;
WordNumber = (BitNumber % ElementSize) / BITWORD_SIZE; WordNumber = (BitNumber % ElementSize) / BITWORD_SIZE;
Bits = (*Iter)->word(WordNumber); Bits = Iter->word(WordNumber);
Bits >>= NextSetBitNumber % BITWORD_SIZE; Bits >>= NextSetBitNumber % BITWORD_SIZE;
} else { } else {
WordNumber = (NextSetBitNumber % ElementSize) / BITWORD_SIZE; WordNumber = (NextSetBitNumber % ElementSize) / BITWORD_SIZE;
Bits = (*Iter)->word(WordNumber); Bits = Iter->word(WordNumber);
Bits >>= NextSetBitNumber % BITWORD_SIZE; Bits >>= NextSetBitNumber % BITWORD_SIZE;
} }
} }
@@ -438,17 +460,14 @@ public:
} }
~SparseBitVector() { ~SparseBitVector() {
for_each(Elements.begin(), Elements.end(),
deleter<SparseBitVectorElement<ElementSize> >);
} }
// SparseBitVector copy ctor. // SparseBitVector copy ctor.
SparseBitVector(const SparseBitVector &RHS) { SparseBitVector(const SparseBitVector &RHS) {
ElementListConstIter ElementIter = RHS.Elements.begin(); ElementListConstIter ElementIter = RHS.Elements.begin();
while (ElementIter != RHS.Elements.end()) { while (ElementIter != RHS.Elements.end()) {
SparseBitVectorElement<ElementSize> *ElementCopy; Elements.push_back(SparseBitVectorElement<ElementSize>(*ElementIter));
ElementCopy = new SparseBitVectorElement<ElementSize>(*(*ElementIter)); ++ElementIter;
Elements.push_back(ElementCopy);
} }
CurrElementIter = Elements.begin (); CurrElementIter = Elements.begin ();
@@ -465,9 +484,9 @@ public:
// If we can't find an element that is supposed to contain this bit, there // If we can't find an element that is supposed to contain this bit, there
// is nothing more to do. // is nothing more to do.
if (ElementIter == Elements.end() || if (ElementIter == Elements.end() ||
(*ElementIter)->index() != ElementIndex) ElementIter->index() != ElementIndex)
return false; return false;
return (*ElementIter)->test(Idx % ElementSize); return ElementIter->test(Idx % ElementSize);
} }
void reset(unsigned Idx) { void reset(unsigned Idx) {
@@ -480,38 +499,36 @@ public:
// If we can't find an element that is supposed to contain this bit, there // If we can't find an element that is supposed to contain this bit, there
// is nothing more to do. // is nothing more to do.
if (ElementIter == Elements.end() || if (ElementIter == Elements.end() ||
(*ElementIter)->index() != ElementIndex) ElementIter->index() != ElementIndex)
return; return;
(*ElementIter)->reset(Idx % ElementSize); ElementIter->reset(Idx % ElementSize);
// When the element is zeroed out, delete it. // When the element is zeroed out, delete it.
if ((*ElementIter)->empty()) { if (ElementIter->empty()) {
delete (*ElementIter);
++CurrElementIter; ++CurrElementIter;
Elements.erase(ElementIter); Elements.erase(ElementIter);
} }
} }
void set(unsigned Idx) { void set(unsigned Idx) {
SparseBitVectorElement<ElementSize> *Element;
unsigned ElementIndex = Idx / ElementSize; unsigned ElementIndex = Idx / ElementSize;
SparseBitVectorElement<ElementSize> *Element;
ElementListIter ElementIter;
if (Elements.empty()) { if (Elements.empty()) {
Element = new SparseBitVectorElement<ElementSize>(ElementIndex); Element = new SparseBitVectorElement<ElementSize>(ElementIndex);
Elements.push_back(Element); ElementIter = Elements.insert(Elements.end(), Element);
} else {
ElementListIter ElementIter = FindLowerBound(ElementIndex);
if (ElementIter != Elements.end() && } else {
(*ElementIter)->index() == ElementIndex) ElementIter = FindLowerBound(ElementIndex);
Element = *ElementIter;
else { if (ElementIter == Elements.end() ||
ElementIter->index() != ElementIndex) {
Element = new SparseBitVectorElement<ElementSize>(ElementIndex); Element = new SparseBitVectorElement<ElementSize>(ElementIndex);
// Insert does insert before, and lower bound gives the one before. // Insert does insert before, and lower bound gives the one before.
Elements.insert(++ElementIter, Element); ElementIter = Elements.insert(++ElementIter, Element);
} }
} }
Element->set(Idx % ElementSize); ElementIter->set(Idx % ElementSize);
} }
bool test_and_set (unsigned Idx) { bool test_and_set (unsigned Idx) {
@@ -527,8 +544,8 @@ public:
ElementListIter Iter1 = Elements.begin(); ElementListIter Iter1 = Elements.begin();
ElementListConstIter Iter2 = RHS.Elements.begin(); ElementListConstIter Iter2 = RHS.Elements.begin();
// IE They may both be end // Check if both bitmaps are empty
if (Iter1 == Iter2) if (Elements.empty() && RHS.Elements.empty())
return false; return false;
// See if the first bitmap element is the same in both. This is only // See if the first bitmap element is the same in both. This is only
@@ -538,15 +555,13 @@ public:
return false; return false;
while (Iter2 != RHS.Elements.end()) { while (Iter2 != RHS.Elements.end()) {
if (Iter1 == Elements.end() || (*Iter1)->index() > (*Iter2)->index()) { if (Iter1 == Elements.end() || Iter1->index() > Iter2->index()) {
SparseBitVectorElement<ElementSize> *NewElem; Elements.insert(Iter1,
new SparseBitVectorElement<ElementSize>(*Iter2));
NewElem = new SparseBitVectorElement<ElementSize>(*(*Iter2));
Elements.insert(Iter1, NewElem);
++Iter2; ++Iter2;
changed = true; changed = true;
} else if ((*Iter1)->index() == (*Iter2)->index()) { } else if (Iter1->index() == Iter2->index()) {
changed |= (*Iter1)->unionWith(*(*Iter2)); changed |= Iter1->unionWith(*Iter2);
++Iter1; ++Iter1;
++Iter2; ++Iter2;
} else { } else {
@@ -563,8 +578,8 @@ public:
ElementListIter Iter1 = Elements.begin(); ElementListIter Iter1 = Elements.begin();
ElementListConstIter Iter2 = RHS.Elements.begin(); ElementListConstIter Iter2 = RHS.Elements.begin();
// IE They may both be end. // Check if both bitmaps are empty.
if (Iter1 == Iter2) if (Elements.empty() && RHS.Elements.empty())
return false; return false;
// See if the first bitmap element is the same in both. This is only // See if the first bitmap element is the same in both. This is only
@@ -578,14 +593,13 @@ public:
if (Iter1 == Elements.end()) if (Iter1 == Elements.end())
return changed; return changed;
if ((*Iter1)->index() > (*Iter2)->index()) { if (Iter1->index() > Iter2->index()) {
++Iter2; ++Iter2;
} else if ((*Iter1)->index() == (*Iter2)->index()) { } else if (Iter1->index() == Iter2->index()) {
bool BecameZero; bool BecameZero;
changed |= (*Iter1)->intersectWith(*(*Iter2), BecameZero); changed |= Iter1->intersectWith(*Iter2, BecameZero);
if (BecameZero) { if (BecameZero) {
ElementListIter IterTmp = Iter1; ElementListIter IterTmp = Iter1;
delete *IterTmp;
Elements.erase(IterTmp); Elements.erase(IterTmp);
} }
++Iter1; ++Iter1;
@@ -593,12 +607,9 @@ public:
} else { } else {
ElementListIter IterTmp = Iter1; ElementListIter IterTmp = Iter1;
++Iter1; ++Iter1;
delete *IterTmp;
Elements.erase(IterTmp); Elements.erase(IterTmp);
} }
} }
for_each(Iter1, Elements.end(),
deleter<SparseBitVectorElement<ElementSize> >);
Elements.erase(Iter1, Elements.end()); Elements.erase(Iter1, Elements.end());
CurrElementIter = Elements.begin(); CurrElementIter = Elements.begin();
return changed; return changed;
@@ -611,16 +622,14 @@ public:
ElementListIter Iter1 = Elements.begin(); ElementListIter Iter1 = Elements.begin();
ElementListConstIter Iter2 = RHS.Elements.begin(); ElementListConstIter Iter2 = RHS.Elements.begin();
// IE They may both be end. // Check if they are both empty
if (Iter1 == Iter2) if (Elements.empty() && RHS.Elements.empty())
return false; return false;
// See if the first bitmap element is the same in both. This is only // See if the first bitmap element is the same in both. This is only
// possible if they are the same bitmap. // possible if they are the same bitmap.
if (Iter1 != Elements.end() && Iter2 != RHS.Elements.end()) if (Iter1 != Elements.end() && Iter2 != RHS.Elements.end())
if (*Iter1 == *Iter2) { if (*Iter1 == *Iter2) {
for_each(Elements.begin(), Elements.end(),
deleter<SparseBitVectorElement<ElementSize> >);
Elements.clear(); Elements.clear();
return true; return true;
} }
@@ -630,14 +639,13 @@ public:
if (Iter1 == Elements.end()) if (Iter1 == Elements.end())
return changed; return changed;
if ((*Iter1)->index() > (*Iter2)->index()) { if (Iter1->index() > Iter2->index()) {
++Iter2; ++Iter2;
} else if ((*Iter1)->index() == (*Iter2)->index()) { } else if (Iter1->index() == Iter2->index()) {
bool BecameZero; bool BecameZero;
changed |= (*Iter1)->intersectWithComplement(*(*Iter2), BecameZero); changed |= Iter1->intersectWithComplement(*Iter2, BecameZero);
if (BecameZero) { if (BecameZero) {
ElementListIter IterTmp = Iter1; ElementListIter IterTmp = Iter1;
delete *IterTmp;
Elements.erase(IterTmp); Elements.erase(IterTmp);
} }
++Iter1; ++Iter1;
@@ -645,7 +653,6 @@ public:
} else { } else {
ElementListIter IterTmp = Iter1; ElementListIter IterTmp = Iter1;
++Iter1; ++Iter1;
delete *IterTmp;
Elements.erase(IterTmp); Elements.erase(IterTmp);
} }
} }
@@ -663,15 +670,12 @@ public:
void intersectWithComplement(const SparseBitVector<ElementSize> &RHS1, void intersectWithComplement(const SparseBitVector<ElementSize> &RHS1,
const SparseBitVector<ElementSize> &RHS2) const SparseBitVector<ElementSize> &RHS2)
{ {
for_each(Elements.begin(), Elements.end(),
deleter<SparseBitVectorElement<ElementSize> >);
Elements.clear(); Elements.clear();
ElementListConstIter Iter1 = RHS1.Elements.begin(); ElementListConstIter Iter1 = RHS1.Elements.begin();
ElementListConstIter Iter2 = RHS2.Elements.begin(); ElementListConstIter Iter2 = RHS2.Elements.begin();
// IE They may both be end. // Check if they are both empty.
if (Iter1 == Iter2) if (RHS1.empty() && RHS2.empty())
return; return;
// See if the first bitmap element is the same in both. This is only // See if the first bitmap element is the same in both. This is only
@@ -686,19 +690,18 @@ public:
if (Iter1 == RHS1.Elements.end()) if (Iter1 == RHS1.Elements.end())
return; return;
if ((*Iter1)->index() > (*Iter2)->index()) { if (Iter1->index() > Iter2->index()) {
++Iter2; ++Iter2;
} else if ((*Iter1)->index() == (*Iter2)->index()) { } else if (Iter1->index() == Iter2->index()) {
bool BecameZero = false; bool BecameZero = false;
SparseBitVectorElement<ElementSize> *NewElement = SparseBitVectorElement<ElementSize> *NewElement =
new SparseBitVectorElement<ElementSize>((*Iter1)->index()); new SparseBitVectorElement<ElementSize>(Iter1->index());
NewElement->intersectWithComplement(*Iter1, *Iter2, BecameZero);
NewElement->intersectWithComplement(*(*Iter1), *(*Iter2), BecameZero); if (!BecameZero) {
if (BecameZero) {
delete NewElement;
} else {
Elements.push_back(NewElement); Elements.push_back(NewElement);
} }
else
delete NewElement;
++Iter1; ++Iter1;
++Iter2; ++Iter2;
@@ -706,12 +709,13 @@ public:
++Iter1; ++Iter1;
} }
} }
// copy the remaining elements
// copy the remaining elements
while (Iter1 != RHS1.Elements.end()) { while (Iter1 != RHS1.Elements.end()) {
SparseBitVectorElement<ElementSize> *NewElement = SparseBitVectorElement<ElementSize> *NewElement =
new SparseBitVectorElement<ElementSize>(*(*Iter1)); new SparseBitVectorElement<ElementSize>(*Iter1);
Elements.push_back(NewElement); Elements.push_back(NewElement);
++Iter1;
} }
CurrElementIter = Elements.begin(); CurrElementIter = Elements.begin();
@@ -732,8 +736,8 @@ public:
ElementListConstIter Iter1 = Elements.begin(); ElementListConstIter Iter1 = Elements.begin();
ElementListConstIter Iter2 = RHS.Elements.begin(); ElementListConstIter Iter2 = RHS.Elements.begin();
// IE They may both be end. // Check if both bitmaps are empty.
if (Iter1 == Iter2) if (Elements.empty() && RHS.Elements.empty())
return false; return false;
// See if the first bitmap element is the same in both. This is only // See if the first bitmap element is the same in both. This is only
@@ -748,10 +752,10 @@ public:
if (Iter1 == Elements.end()) if (Iter1 == Elements.end())
return false; return false;
if ((*Iter1)->index() > (*Iter2)->index()) { if (Iter1->index() > Iter2->index()) {
++Iter2; ++Iter2;
} else if ((*Iter1)->index() == (*Iter2)->index()) { } else if (Iter1->index() == Iter2->index()) {
if ((*Iter1)->intersects(*(*Iter2))) if (Iter1->intersects(*Iter2))
return true; return true;
++Iter1; ++Iter1;
++Iter2; ++Iter2;
@@ -766,8 +770,8 @@ public:
int find_first() const { int find_first() const {
if (Elements.empty()) if (Elements.empty())
return -1; return -1;
const SparseBitVectorElement<ElementSize> *First = *(Elements.begin()); const SparseBitVectorElement<ElementSize> &First = *(Elements.begin());
return (First->index() * ElementSize) + First->find_first(); return (First.index() * ElementSize) + First.find_first();
} }
// Return true if the SparseBitVector is empty // Return true if the SparseBitVector is empty
@@ -780,7 +784,7 @@ public:
for (ElementListConstIter Iter = Elements.begin(); for (ElementListConstIter Iter = Elements.begin();
Iter != Elements.end(); Iter != Elements.end();
++Iter) ++Iter)
BitCount += (*Iter)->count(); BitCount += Iter->count();
return BitCount; return BitCount;
} }
@@ -791,6 +795,17 @@ public:
iterator end() const { iterator end() const {
return iterator(this, ~0); return iterator(this, ~0);
} }
// Dump our bits to stderr
void dump(llvm::OStream &out) const {
out << "[ ";
for (iterator bi = begin();
bi != end();
++bi) {
out << *bi << " ";
}
out << std::endl;
}
}; };
// Convenience functions to allow Or and And without dereferencing in the user // Convenience functions to allow Or and And without dereferencing in the user