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

use a pair for ParallelHeapIter

Browse Source 
to ensure it is pushed popped in pairs
This commit is contained in:
Skgland
2026-06-01 23:58:17 +02:00
parent 8b6d68a4cd
commit 8aeb326e5c
1 changed files with 21 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/heap_iter.rs
View File

@@ -26,7 +26,7 @@ use std::vec::Vec;
// None's and pairs of variables as the Iterator Item. // None's and pairs of variables as the Iterator Item.
pub struct ParallelHeapIter<'a> { pub struct ParallelHeapIter<'a> {
stack: Vec<HeapCellValue>, stack: Vec<(HeapCellValue, HeapCellValue)>,
heap: &'a Heap, heap: &'a Heap,
arena: &'a Arena, arena: &'a Arena,
tabu_list: IndexSet<(usize, usize), FxBuildHasher>, tabu_list: IndexSet<(usize, usize), FxBuildHasher>,
@@ -35,7 +35,7 @@ pub struct ParallelHeapIter<'a> {
impl<'a> ParallelHeapIter<'a> { impl<'a> ParallelHeapIter<'a> {
pub fn from(machine_st: &'a MachineState, h1: HeapCellValue, h2: HeapCellValue) -> Self { pub fn from(machine_st: &'a MachineState, h1: HeapCellValue, h2: HeapCellValue) -> Self {
Self { Self {
stack: vec![h2, h1], stack: vec![(h1, h2)],
heap: &machine_st.heap, heap: &machine_st.heap,
arena: &machine_st.arena, arena: &machine_st.arena,
tabu_list: IndexSet::with_hasher(FxBuildHasher::new()), tabu_list: IndexSet::with_hasher(FxBuildHasher::new()),
@@ -89,10 +89,8 @@ impl Iterator for ParallelHeapIter<'_> {
fn next(&mut self) -> Option<Self::Item> { fn next(&mut self) -> Option<Self::Item> {
use crate::offset_table::F64Offset; use crate::offset_table::F64Offset;
while let Some(s1) = self.stack.pop() { while let Some((s1, s2)) = self.stack.pop() {
let s1 = heap_bound_deref(self.heap, s1); let s1 = heap_bound_deref(self.heap, s1);
let s2 = self.stack.pop().unwrap();
let s2 = heap_bound_deref(self.heap, s2); let s2 = heap_bound_deref(self.heap, s2);
let v1 = heap_bound_store(self.heap, s1); let v1 = heap_bound_store(self.heap, s1);
@@ -183,11 +181,8 @@ impl Iterator for ParallelHeapIter<'_> {
// correctness) different. // correctness) different.
let (c, succ_cell) = self.heap.last_str_char_and_tail(l2); let (c, succ_cell) = self.heap.last_str_char_and_tail(l2);
self.stack.push(succ_cell); self.stack.push((heap_loc_as_cell!(l1 + 1), succ_cell));
self.stack.push(heap_loc_as_cell!(l1 + 1)); self.stack.push((heap_loc_as_cell!(l1), char_as_cell!(c)));
self.stack.push(char_as_cell!(c));
self.stack.push(heap_loc_as_cell!(l1));
} }
(HeapCellValueTag::Lis, l2) => { (HeapCellValueTag::Lis, l2) => {
if self.tabu_list.contains(&(l1, l2)) { if self.tabu_list.contains(&(l1, l2)) {
@@ -196,11 +191,8 @@ impl Iterator for ParallelHeapIter<'_> {
self.tabu_list.insert((l1, l2)); self.tabu_list.insert((l1, l2));
self.stack.push(self.heap[l2 + 1]); self.stack.push((self.heap[l1 + 1], self.heap[l2 + 1]));
self.stack.push(self.heap[l1 + 1]); self.stack.push((self.heap[l1], self.heap[l2]));
self.stack.push(self.heap[l2]);
self.stack.push(self.heap[l1]);
} }
(HeapCellValueTag::Str, s2) => { (HeapCellValueTag::Str, s2) => {
if self.tabu_list.contains(&(l1, s2)) { if self.tabu_list.contains(&(l1, s2)) {
@@ -214,11 +206,8 @@ impl Iterator for ParallelHeapIter<'_> {
self.tabu_list.insert((l1, s2)); self.tabu_list.insert((l1, s2));
self.stack.push(self.heap[s2 + 2]); self.stack.push((self.heap[l1 + 1], self.heap[s2 + 2]));
self.stack.push(self.heap[l1 + 1]); self.stack.push((self.heap[l1], self.heap[s2 + 1]));
self.stack.push(self.heap[s2 + 1]);
self.stack.push(self.heap[l1]);
} }
_ => { _ => {
unreachable!(); unreachable!();
@@ -236,8 +225,8 @@ impl Iterator for ParallelHeapIter<'_> {
PStrSegmentCmpResult::Continue(v1, v2) => { PStrSegmentCmpResult::Continue(v1, v2) => {
self.tabu_list.insert((l1, l2)); self.tabu_list.insert((l1, l2));
self.stack.push(v1.offset_by(l1)); // this looks swapped
self.stack.push(v2.offset_by(l2)); self.stack.push((v2.offset_by(l2), v1.offset_by(l1) ));
} }
PStrSegmentCmpResult::Less => { PStrSegmentCmpResult::Less => {
self.stack.clear(); self.stack.clear();
@@ -258,11 +247,9 @@ impl Iterator for ParallelHeapIter<'_> {
let (c, succ_cell) = self.heap.last_str_char_and_tail(l1); let (c, succ_cell) = self.heap.last_str_char_and_tail(l1);
self.stack.push(succ_cell); // this looks swapped
self.stack.push(heap_loc_as_cell!(l2 + 1)); self.stack.push((heap_loc_as_cell!(l2 + 1), succ_cell));
self.stack.push((heap_loc_as_cell!(l2), char_as_cell!(c)));
self.stack.push(char_as_cell!(c));
self.stack.push(heap_loc_as_cell!(l2));
} }
(HeapCellValueTag::Str, s2) => { (HeapCellValueTag::Str, s2) => {
if self.tabu_list.contains(&(l1, s2)) { if self.tabu_list.contains(&(l1, s2)) {
@@ -278,11 +265,8 @@ impl Iterator for ParallelHeapIter<'_> {
let (c, succ_cell) = self.heap.last_str_char_and_tail(l1); let (c, succ_cell) = self.heap.last_str_char_and_tail(l1);
self.stack.push(heap_loc_as_cell!(s2+2)); self.stack.push((succ_cell, heap_loc_as_cell!(s2+2)));
self.stack.push(succ_cell); self.stack.push((char_as_cell!(c), heap_loc_as_cell!(s2+1)));
self.stack.push(heap_loc_as_cell!(s2+1));
self.stack.push(char_as_cell!(c));
} }
_ => { _ => {
unreachable!() unreachable!()
@@ -307,8 +291,7 @@ impl Iterator for ParallelHeapIter<'_> {
self.tabu_list.insert((s1, s2)); self.tabu_list.insert((s1, s2));
for idx in (1 .. a1+1).rev() { for idx in (1 .. a1+1).rev() {
self.stack.push(self.heap[s2+idx]); self.stack.push((self.heap[s1+idx], self.heap[s2+idx]));
self.stack.push(self.heap[s1+idx]);
} }
} }
(HeapCellValueTag::Lis, l2) => { (HeapCellValueTag::Lis, l2) => {
@@ -321,11 +304,9 @@ impl Iterator for ParallelHeapIter<'_> {
some_or_return!(self.parallel_cmp((a1, n1), (2, atom!(".")), v1, v2)); some_or_return!(self.parallel_cmp((a1, n1), (2, atom!(".")), v1, v2));
self.stack.push(self.heap[l2]); self.stack.push((self.heap[s1+1], self.heap[l2]));
self.stack.push(self.heap[s1+1]);
self.stack.push(self.heap[l2+1]); self.stack.push((self.heap[s1+2], self.heap[l2+1]));
self.stack.push(self.heap[s1+2]);
} }
(HeapCellValueTag::PStrLoc, l2) => { (HeapCellValueTag::PStrLoc, l2) => {
if self.tabu_list.contains(&(s1, l2)) { if self.tabu_list.contains(&(s1, l2)) {
@@ -341,11 +322,8 @@ impl Iterator for ParallelHeapIter<'_> {
let (c, succ_cell) = self.heap.last_str_char_and_tail(l2); let (c, succ_cell) = self.heap.last_str_char_and_tail(l2);
self.stack.push(succ_cell); self.stack.push((heap_loc_as_cell!(s1+2), succ_cell));
self.stack.push(heap_loc_as_cell!(s1+2)); self.stack.push((heap_loc_as_cell!(s1+1), char_as_cell!(c)));
self.stack.push(char_as_cell!(c));
self.stack.push(heap_loc_as_cell!(s1+1));
} }
_ => { _ => {
unreachable!() unreachable!()