rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

polish perm free list management

Browse Source
This commit is contained in:
Mark
2023-06-23 12:53:21 -06:00
parent f446939770
commit fcae0d9fcf
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/codegen.rs
View File

@@ -904,7 +904,7 @@ impl<'b> CodeGenerator<'b> {
code.push_back(instr!("proceed")); code.push_back(instr!("proceed"));
} else { } else {
self.marker.free_cut_var(chunk_num, var_num); self.marker.free_var(chunk_num, var_num);
} }
} }
&QueryTerm::Clause( &QueryTerm::Clause(

15
src/debray_allocator.rs
View File

@@ -151,8 +151,11 @@ impl DebrayAllocator {
}; };
for var_num in subsumed_hits.iter().cloned() { for var_num in subsumed_hits.iter().cloned() {
let running_count = self.var_data.records[var_num].running_count;
let num_occurrences = self.var_data.records[var_num].num_occurrences;
match &mut self.var_data.records[var_num].allocation { match &mut self.var_data.records[var_num].allocation {
VarAlloc::Perm(_, ref mut allocation) => { VarAlloc::Perm(_, allocation) => {
let shallow_safety = VarSafetyStatus::needed_if( let shallow_safety = VarSafetyStatus::needed_if(
shallow_safety.contains(var_num), shallow_safety.contains(var_num),
branch_designator, branch_designator,
@@ -163,7 +166,9 @@ impl DebrayAllocator {
branch_designator, branch_designator,
); );
*allocation = PermVarAllocation::Done { shallow_safety, deep_safety }; if running_count < num_occurrences {
*allocation = PermVarAllocation::Done { shallow_safety, deep_safety };
}
} }
_ => unreachable!() _ => unreachable!()
} }
@@ -435,7 +440,7 @@ impl DebrayAllocator {
None None
} }
pub(crate) fn free_cut_var(&mut self, chunk_num: usize, var_num: usize) { pub(crate) fn free_var(&mut self, chunk_num: usize, var_num: usize) {
match &mut self.var_data.records[var_num].allocation { match &mut self.var_data.records[var_num].allocation {
VarAlloc::Perm(_, allocation) => { VarAlloc::Perm(_, allocation) => {
*allocation = PermVarAllocation::Pending; *allocation = PermVarAllocation::Pending;
@@ -724,8 +729,8 @@ impl Allocator for DebrayAllocator {
if record.running_count < record.num_occurrences { if record.running_count < record.num_occurrences {
record.running_count += 1; record.running_count += 1;
} else if r.is_perm() { } else {
self.add_perm_to_free_list(term_loc.chunk_num(), var_num); self.free_var(term_loc.chunk_num(), var_num);
} }
self.in_use.insert(o); self.in_use.insert(o);