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

improve performance of lower_bound_of_target_clause (#1598)

Browse Source
This commit is contained in:
Mark
2023-12-15 10:10:09 -07:00
parent 13624568b5
commit 30f3818c66
1 changed files with 18 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/machine/compile.rs
View File

@@ -42,44 +42,33 @@ pub(super) fn bootstrapping_compile(
Ok(()) Ok(())
} }
fn lower_bound_of_target_clause(skeleton: &PredicateSkeleton, target_pos: usize) -> usize { fn lower_bound_of_target_clause(skeleton: &mut PredicateSkeleton, target_pos: usize) -> usize {
if target_pos == 0 { if target_pos == 0 {
return 0; return 0;
} }
let arg_num = skeleton.clauses[target_pos - 1].opt_arg_index_key.arg_num(); let index = target_pos - 1;
if arg_num == 0 { if let Some(index_loc) = skeleton.clauses[index]
return target_pos - 1;
}
let mut index_loc_opt = None;
for index in (0..target_pos).rev() {
let current_arg_num = skeleton.clauses[index].opt_arg_index_key.arg_num();
if current_arg_num == 0 || current_arg_num != arg_num {
return index + 1;
}
if let Some(index_loc) = index_loc_opt {
let current_index_loc = skeleton.clauses[index]
.opt_arg_index_key .opt_arg_index_key
.switch_on_term_loc(); .switch_on_term_loc()
{
let search_result = skeleton.clauses.make_contiguous()
[0..skeleton.core.clause_assert_margin]
.partition_point(|clause_index_info| clause_index_info.clause_start > index_loc);
if Some(index_loc) != current_index_loc { if search_result < skeleton.core.clause_assert_margin {
return index + 1; search_result
} else {
skeleton.clauses.make_contiguous()[skeleton.core.clause_assert_margin..]
.partition_point(|clause_index_info| clause_index_info.clause_start < index_loc)
+ skeleton.core.clause_assert_margin
} }
} else { } else {
index_loc_opt = skeleton.clauses[index] index
.opt_arg_index_key
.switch_on_term_loc();
} }
} }
0
}
fn derelictize_try_me_else( fn derelictize_try_me_else(
code: &mut Code, code: &mut Code,
index: usize, index: usize,
@@ -1526,6 +1515,7 @@ impl<'a, LS: LoadState<'a>> Loader<'a, LS> {
} = self.compile_standalone_clause(clause, settings)?; } = self.compile_standalone_clause(clause, settings)?;
let code_len = self.wam_prelude.code.len(); let code_len = self.wam_prelude.code.len();
standalone_skeleton.clauses[0].clause_start += code_len;
let skeleton = match self let skeleton = match self
.wam_prelude .wam_prelude
@@ -1539,8 +1529,8 @@ impl<'a, LS: LoadState<'a>> Loader<'a, LS> {
match append_or_prepend { match append_or_prepend {
AppendOrPrepend::Append => { AppendOrPrepend::Append => {
let clause_index_info = standalone_skeleton.clauses.pop_back().unwrap(); let clause_index_info = standalone_skeleton.clauses.pop_back().unwrap();
skeleton.clauses.push_back(clause_index_info);
skeleton.clauses.push_back(clause_index_info);
skeleton.core.clause_clause_locs.push_back(code_len); skeleton.core.clause_clause_locs.push_back(code_len);
self.payload self.payload