Skip to content

Skip dense meet joined-mask scans #47

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

Open
MesTTo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Skip dense meet joined-mask scans #47

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
162 changes: 79 additions & 83 deletions src/dense_byte_node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,15 @@ impl<V: Clone + Send + Sync, A: Allocator, Cf: CoFree<V=V, A=A>> ByteNode<Cf, A>
alloc,
}
}
#[inline(always)]
fn slot_in_word(mask_word: u64, word_base: usize, bit_idx: u32) -> usize {
let preceding_bits = if bit_idx == 0 {
0
} else {
(1u64 << bit_idx) - 1
};
word_base + (mask_word & preceding_bits).count_ones() as usize
}
#[inline]
pub fn reserve_capacity(&mut self, additional: usize) {
self.values.reserve(additional)
Expand Down Expand Up @@ -2043,10 +2052,8 @@ impl<V: Clone + Send + Sync + Lattice, A: Allocator, Cf: CoFree<V=V, A=A>, Other
}

fn pmeet(&self, other: &ByteNode<OtherCf, A>) -> AlgebraicResult<Self> {
// TODO this technically doesn't need to calculate and iterate over jm
// iterating over mm and calculating m such that the following suffices
// c_{self,other} += popcnt(m & {self,other})
let jm: ByteMask = self.mask | other.mask;
// Iterate the overlap mask directly. Slot indexes are recovered with
// prefix popcounts in each dense-mask word.
let mut mm: ByteMask = self.mask & other.mask;

let mut is_identity = self.mask == mm;
Expand All @@ -2058,58 +2065,55 @@ impl<V: Clone + Send + Sync + Lattice, A: Allocator, Cf: CoFree<V=V, A=A>, Other
let mut v = ValuesVec::with_capacity_in(len, self.alloc.clone());
let new_v = v.v.spare_capacity_mut();

let mut l = 0;
let mut r = 0;
let mut c = 0;
let mut self_word_base = 0;
let mut other_word_base = 0;

for i in 0..4 {
let mut lm = jm.0[i];
let self_word = self.mask.0[i];
let other_word = other.mask.0[i];
let mut lm = mm.0[i];
while lm != 0 {
let index = lm.trailing_zeros();

if ((1u64 << index) & mm.0[i]) != 0 {
//This runs for cofrees that exist in both nodes

let lv = unsafe { self.values.get_unchecked(l) };
let rv = unsafe { other.values.get_unchecked(r) };
match lv.pmeet(rv) {
AlgebraicResult::None => {
is_counter_identity = false;
is_identity = false;
mm.0[i] ^= 1u64 << index;
},
AlgebraicResult::Identity(mask) => {
debug_assert!((mask & SELF_IDENT > 0) || (mask & COUNTER_IDENT > 0));
if mask & SELF_IDENT == 0 {
is_identity = false;
}
if mask & COUNTER_IDENT == 0 {
is_counter_identity = false;
}
if mask & SELF_IDENT > 0 {
unsafe { new_v.get_unchecked_mut(c).write(lv.clone()) };
} else {
let new_cf = Cf::from_cf(rv.clone());
unsafe { new_v.get_unchecked_mut(c).write(new_cf) };
}
c += 1;
},
AlgebraicResult::Element(jv) => {
let l = Self::slot_in_word(self_word, self_word_base, index);
let r = Self::slot_in_word(other_word, other_word_base, index);

//This runs for cofrees that exist in both nodes
let lv = unsafe { self.values.get_unchecked(l) };
let rv = unsafe { other.values.get_unchecked(r) };
match lv.pmeet(rv) {
AlgebraicResult::None => {
is_counter_identity = false;
is_identity = false;
mm.0[i] ^= 1u64 << index;
},
AlgebraicResult::Identity(mask) => {
debug_assert!((mask & SELF_IDENT > 0) || (mask & COUNTER_IDENT > 0));
if mask & SELF_IDENT == 0 {
is_identity = false;
}
if mask & COUNTER_IDENT == 0 {
is_counter_identity = false;
unsafe { new_v.get_unchecked_mut(c).write(jv) };
c += 1;
},
}
l += 1;
r += 1;
} else if ((1u64 << index) & self.mask.0[i]) != 0 {
l += 1;
} else {
r += 1;
}
if mask & SELF_IDENT > 0 {
unsafe { new_v.get_unchecked_mut(c).write(lv.clone()) };
} else {
let new_cf = Cf::from_cf(rv.clone());
unsafe { new_v.get_unchecked_mut(c).write(new_cf) };
}
c += 1;
},
AlgebraicResult::Element(jv) => {
is_identity = false;
is_counter_identity = false;
unsafe { new_v.get_unchecked_mut(c).write(jv) };
c += 1;
},
}
lm ^= 1u64 << index;
}
self_word_base += self_word.count_ones() as usize;
other_word_base += other_word.count_ones() as usize;
}

unsafe{ v.v.set_len(c); }
Expand Down Expand Up @@ -2222,62 +2226,54 @@ impl<V: DistributiveLattice + Clone + Send + Sync, A: Allocator, Cf: CoFree<V=V,
// `other` be differently parameterized types
impl<V: Clone + Send + Sync, A: Allocator, Cf: CoFree<V=V, A=A>> ByteNode<Cf, A> {
fn prestrict<OtherCf: CoFree<V=V, A=A>>(&self, other: &ByteNode<OtherCf, A>) -> AlgebraicResult<Self> where Self: Sized {
let mut is_identity = true;

// TODO this technically doesn't need to calculate and iterate over jm
// iterating over mm and calculating m such that the following suffices
// c_{self,other} += popcnt(m & {self,other})
let jm: ByteMask = self.mask | other.mask;
// Iterate the overlap mask directly. Slot indexes are recovered with
// prefix popcounts in each dense-mask word.
let mut mm: ByteMask = self.mask & other.mask;
let mut is_identity = self.mask == mm && other.mask == mm;

let mmc = [mm.0[0].count_ones(), mm.0[1].count_ones(), mm.0[2].count_ones(), mm.0[3].count_ones()];

let len = (mmc[0] + mmc[1] + mmc[2] + mmc[3]) as usize;
let mut v = ValuesVec::with_capacity_in(len, self.alloc.clone());
let new_v = v.v.spare_capacity_mut();

let mut l = 0;
let mut r = 0;
let mut c = 0;
let mut self_word_base = 0;
let mut other_word_base = 0;

for i in 0..4 {
let mut lm = jm.0[i];
let self_word = self.mask.0[i];
let other_word = other.mask.0[i];
let mut lm = mm.0[i];
while lm != 0 {
let index = lm.trailing_zeros();
let l = Self::slot_in_word(self_word, self_word_base, index);
let r = Self::slot_in_word(other_word, other_word_base, index);

if ((1u64 << index) & mm.0[i]) != 0 {
let lv = unsafe { self.values.get_unchecked(l) };
let rv = unsafe { other.values.get_unchecked(r) };
// println!("dense prestrict {}", index as usize + i*64);
let lv = unsafe { self.values.get_unchecked(l) };
let rv = unsafe { other.values.get_unchecked(r) };
// println!("dense prestrict {}", index as usize + i*64);

match lv.prestrict(rv) {
AlgebraicResult::None => {
is_identity = false;
mm.0[i] ^= 1u64 << index;
}
AlgebraicResult::Identity(mask) => {
debug_assert_eq!(mask, SELF_IDENT); //restrict is non-commutative
unsafe { new_v.get_unchecked_mut(c).write(lv.clone()) };
c += 1;
},
AlgebraicResult::Element(jv) => {
is_identity = false;
unsafe { new_v.get_unchecked_mut(c).write(jv) };
c += 1;
},
}
l += 1;
r += 1;
} else {
is_identity = false;
if ((1u64 << index) & self.mask.0[i]) != 0 {
l += 1;
} else {
r += 1;
match lv.prestrict(rv) {
AlgebraicResult::None => {
is_identity = false;
mm.0[i] ^= 1u64 << index;
}
AlgebraicResult::Identity(mask) => {
debug_assert_eq!(mask, SELF_IDENT); //restrict is non-commutative
unsafe { new_v.get_unchecked_mut(c).write(lv.clone()) };
c += 1;
},
AlgebraicResult::Element(jv) => {
is_identity = false;
unsafe { new_v.get_unchecked_mut(c).write(jv) };
c += 1;
},
}
lm ^= 1u64 << index;
}
self_word_base += self_word.count_ones() as usize;
other_word_base += other_word.count_ones() as usize;
}

unsafe{ v.v.set_len(c); }
Expand Down