Skip to content
This repository has been archived by the owner on Feb 18, 2024. It is now read-only.

Speedup/simplify bitwise operations (avoid extra allocation) #586

Merged
merged 5 commits into from
Nov 8, 2021
Merged

Speedup/simplify bitwise operations (avoid extra allocation) #586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e4b848e
Speedup binary bitwise ops
Dandandan Nov 7, 2021
f12caca
Simplify
Dandandan Nov 7, 2021
d9a3a27
Implement changes for ternary,quaternary functions
Dandandan Nov 7, 2021
f7f9e4b
Simplify
Dandandan Nov 7, 2021
e68cda8
Remove comment
Dandandan Nov 7, 2021
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
2 changes: 1 addition & 1 deletion benches/bitwise.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::ops::{BitOr, BitXor, Not};
use std::ops::{BitAnd, BitOr, BitXor, Not};

use criterion::{criterion_group, criterion_main, Criterion};
use num_traits::NumCast;
Expand Down
79 changes: 33 additions & 46 deletions src/bitmap/bitmap_ops.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,29 +15,24 @@ where
assert_eq!(a1.len(), a2.len());
assert_eq!(a1.len(), a3.len());
assert_eq!(a1.len(), a4.len());
let mut a1_chunks = a1.chunks();
let mut a2_chunks = a2.chunks();
let mut a3_chunks = a3.chunks();
let mut a4_chunks = a4.chunks();
let a1_chunks = a1.chunks();
let a2_chunks = a2.chunks();
let a3_chunks = a3.chunks();
let a4_chunks = a4.chunks();

let rem_a1 = a1_chunks.remainder();
let rem_a2 = a2_chunks.remainder();
let rem_a3 = a3_chunks.remainder();
let rem_a4 = a4_chunks.remainder();

let chunks = a1_chunks
.by_ref()
.zip(a2_chunks.by_ref())
.zip(a3_chunks.by_ref())
.zip(a4_chunks.by_ref())
.zip(a2_chunks)
.zip(a3_chunks)
.zip(a4_chunks)
.map(|(((a1, a2), a3), a4)| op(a1, a2, a3, a4));
// Soundness: `BitChunks` is a trusted len iterator
let mut buffer = unsafe { MutableBuffer::from_chunk_iter_unchecked(chunks) };

let remainder_bytes = a1_chunks.remainder_len().saturating_add(7) / 8;
let rem = op(
a1_chunks.remainder(),
a2_chunks.remainder(),
a3_chunks.remainder(),
a4_chunks.remainder(),
let buffer = MutableBuffer::from_chunk_iter(
chunks.chain(std::iter::once(op(rem_a1, rem_a2, rem_a3, rem_a4))),
);
let rem = &rem.to_ne_bytes()[..remainder_bytes];
buffer.extend_from_slice(rem);

let length = a1.len();

Expand All @@ -51,26 +46,21 @@ where
{
assert_eq!(a1.len(), a2.len());
assert_eq!(a1.len(), a3.len());
let mut a1_chunks = a1.chunks();
let mut a2_chunks = a2.chunks();
let mut a3_chunks = a3.chunks();
let a1_chunks = a1.chunks();
let a2_chunks = a2.chunks();
let a3_chunks = a3.chunks();

let rem_a1 = a1_chunks.remainder();
let rem_a2 = a2_chunks.remainder();
let rem_a3 = a3_chunks.remainder();

let chunks = a1_chunks
.by_ref()
.zip(a2_chunks.by_ref())
.zip(a3_chunks.by_ref())
.zip(a2_chunks)
.zip(a3_chunks)
.map(|((a1, a2), a3)| op(a1, a2, a3));
// Soundness: `BitChunks` is a trusted len iterator
let mut buffer = unsafe { MutableBuffer::from_chunk_iter_unchecked(chunks) };

let remainder_bytes = a1_chunks.remainder_len().saturating_add(7) / 8;
let rem = op(
a1_chunks.remainder(),
a2_chunks.remainder(),
a3_chunks.remainder(),
);
let rem = &rem.to_ne_bytes()[..remainder_bytes];
buffer.extend_from_slice(rem);

let buffer =
MutableBuffer::from_chunk_iter(chunks.chain(std::iter::once(op(rem_a1, rem_a2, rem_a3))));

let length = a1.len();

Expand All @@ -83,20 +73,17 @@ where
F: Fn(u64, u64) -> u64,
{
assert_eq!(lhs.len(), rhs.len());
let mut lhs_chunks = lhs.chunks();
let mut rhs_chunks = rhs.chunks();
let lhs_chunks = lhs.chunks();
let rhs_chunks = rhs.chunks();
let rem_lhs = lhs_chunks.remainder();
let rem_rhs = rhs_chunks.remainder();

let chunks = lhs_chunks
.by_ref()
.zip(rhs_chunks.by_ref())
.zip(rhs_chunks)
.map(|(left, right)| op(left, right));
// Soundness: `BitChunks` is a trusted len iterator
let mut buffer = unsafe { MutableBuffer::from_chunk_iter_unchecked(chunks) };

let remainder_bytes = lhs_chunks.remainder_len().saturating_add(7) / 8;
let rem = op(lhs_chunks.remainder(), rhs_chunks.remainder());
let rem = &rem.to_ne_bytes()[..remainder_bytes];
buffer.extend_from_slice(rem);
let buffer =
MutableBuffer::from_chunk_iter(chunks.chain(std::iter::once(op(rem_lhs, rem_rhs))));

let length = lhs.len();

Expand Down