peepmatic: Save RHS actions as a boxed slice, not vec

A boxed slice is only two words, while a vec is three words. This should cut
down on the memory size of our automata and improve cache usage.
This commit is contained in:
Nick Fitzgerald
2020-05-07 14:14:21 -07:00
parent 210b036320
commit eb2dab0aa4
4 changed files with 44 additions and 7 deletions

View File

@@ -6,10 +6,10 @@ use peepmatic_runtime::linear;
/// Construct an automaton from a set of linear optimizations.
pub fn automatize(
opts: &linear::Optimizations,
) -> Automaton<linear::MatchResult, linear::MatchOp, Vec<linear::Action>> {
) -> Automaton<linear::MatchResult, linear::MatchOp, Box<[linear::Action]>> {
debug_assert!(crate::linear_passes::is_sorted_lexicographically(opts));
let mut builder = Builder::<linear::MatchResult, linear::MatchOp, Vec<linear::Action>>::new();
let mut builder = Builder::<linear::MatchResult, linear::MatchOp, Box<[linear::Action]>>::new();
for opt in &opts.optimizations {
let mut insertion = builder.insert();
@@ -22,7 +22,7 @@ pub fn automatize(
insertion.set_state_data(inc.operation);
}
insertion.next(inc.expected, inc.actions.clone());
insertion.next(inc.expected, inc.actions.clone().into_boxed_slice());
}
insertion.finish();
}

View File

@@ -17,7 +17,7 @@ use std::num::NonZeroU16;
#[derive(Debug)]
pub(crate) struct PeepholeDotFmt<'a>(pub(crate) &'a PathInterner, pub(crate) &'a IntegerInterner);
impl DotFmt<linear::MatchResult, linear::MatchOp, Vec<linear::Action>> for PeepholeDotFmt<'_> {
impl DotFmt<linear::MatchResult, linear::MatchOp, Box<[linear::Action]>> for PeepholeDotFmt<'_> {
fn fmt_transition(
&self,
w: &mut impl Write,
@@ -73,7 +73,7 @@ impl DotFmt<linear::MatchResult, linear::MatchOp, Vec<linear::Action>> for Peeph
writeln!(w, "</font>")
}
fn fmt_output(&self, w: &mut impl Write, actions: &Vec<linear::Action>) -> io::Result<()> {
fn fmt_output(&self, w: &mut impl Write, actions: &Box<[linear::Action]>) -> io::Result<()> {
use linear::Action::*;
if actions.is_empty() {
@@ -84,7 +84,7 @@ impl DotFmt<linear::MatchResult, linear::MatchOp, Vec<linear::Action>> for Peeph
let p = p(self.0);
for a in actions {
for a in actions.iter() {
match a {
GetLhs { path } => write!(w, "get-lhs @ {}<br/>", p(path))?,
UnaryUnquote { operator, operand } => {