Skip to content

speedup BitSet iteration (by 2x or 3x) #33690

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
merged 2 commits into from
Oct 28, 2019
Merged

speedup BitSet iteration (by 2x or 3x) #33690

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f6cc5f
speedup BitSet iteration (by 2x or 3x)
rfourquet Oct 27, 2019
7ae6af4
use _blsr for returned state (@chethega review)
rfourquet Oct 28, 2019
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
11 changes: 7 additions & 4 deletions base/bitset.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,10 +340,13 @@ filter!(f, s::BitSet) = unsafe_filter!(f, s)
@inline in(n::Int, s::BitSet) = _bits_getindex(s.bits, n, s.offset)
@inline in(n::Integer, s::BitSet) = _is_convertible_Int(n) ? in(Int(n), s) : false

function iterate(s::BitSet, idx=0)
idx = _bits_findnext(s.bits, idx)
idx == -1 && return nothing
(idx + intoffset(s), idx+1)
function iterate(s::BitSet, (word, idx) = (CHK0, 0))
while word == 0
idx == length(s.bits) && return nothing
idx += 1
word = @inbounds s.bits[idx]
end
trailing_zeros(word) + (idx - 1 + s.offset) << 6, (_blsr(word), idx)
end

@noinline _throw_bitset_notempty_error() =
Expand Down