Skip to content

Use 64‑bit words and default allocator #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bugparty merged 1 commit into from
Jun 7, 2025
Merged

Use 64‑bit words and default allocator #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions bitvector.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <simde/x86/avx512.h>
namespace bowen
{
template<typename T,unsigned int ALIGN_SIZE=32>
template<typename T, unsigned int ALIGN_SIZE = 32>
class MMAllocator {
public:
typedef T value_type;
Expand All @@ -42,7 +42,7 @@ namespace bowen
}
};

typedef uint32_t BitType;
typedef unsigned long BitType;
const int WORD_BITS = static_cast<int>(sizeof(BitType) * 8);
constexpr int compute_shift(int bits) {
int shift = 0;
Expand All @@ -55,7 +55,7 @@ namespace bowen
static constexpr int WORD_SHIFT = compute_shift(WORD_BITS);
static_assert((1u << WORD_SHIFT) == WORD_BITS,
"WORD_BITS must be a power of two for fast indexing");
template<typename Allocator = MMAllocator<BitType>>
template<typename Allocator = std::allocator<BitType>>
class BitReference
{
private:
Expand Down Expand Up @@ -90,7 +90,7 @@ namespace bowen
*m_ptr ^= m_mask;
}
};
template<typename Allocator = MMAllocator<BitType>>
template<typename Allocator = std::allocator<BitType>>
class BitIterator {
using iterator_category = std::random_access_iterator_tag;
using value_type = bool;
Expand Down Expand Up @@ -140,7 +140,7 @@ namespace bowen
return !(*this == other);
}
};
template<typename Allocator = MMAllocator<BitType>>
template<typename Allocator = std::allocator<BitType>>
class bitvector
{
private:
Expand Down Expand Up @@ -336,7 +336,7 @@ namespace bowen
}
while(pos < m_size-WORD_BITS&& (*this)[pos] != 0){
BitType num = m_data[pos / WORD_BITS];
int oneCounts = _tzcnt_u32(~num);
int oneCounts = _tzcnt_u64(~num);
if(oneCounts == WORD_BITS){
pos+= oneCounts;
}else{
Expand Down