Noratrieb/brainfuck
1
0
Fork 0
mirror of https://github.com/Noratrieb/brainfuck.git synced 2026-01-14 13:35:00 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

rewrite pass_group

Browse source
This commit is contained in:
nora 2022-04-16 14:55:11 +02:00
parent fb2986783e
commit 5d943ba51c
1 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

28
rust2/src/opts.rs
View file

@ -55,13 +55,14 @@ pub enum StmtKind<'ir> {
} }
pub fn optimize<'ir>(alloc: &'ir Bump, instrs: &[(Instr<'_>, Span)]) -> Ir<'ir> { pub fn optimize<'ir>(alloc: &'ir Bump, instrs: &[(Instr<'_>, Span)]) -> Ir<'ir> {
let ir = ast_to_ir(alloc, instrs); let mut ir = ast_to_ir(alloc, instrs);
let mut ir = pass_group(alloc, ir); pass_group(alloc, &mut ir);
pass_find_set_null(&mut ir); pass_find_set_null(&mut ir);
pass_set_n(&mut ir); pass_set_n(&mut ir);
pass_cancel_left_right_add_sub(&mut ir); pass_cancel_left_right_add_sub(&mut ir);
pass_add_sub_offset(&mut ir); pass_add_sub_offset(&mut ir);
pass_move_add_to(&mut ir); pass_move_add_to(&mut ir);
ir ir
} }
@ -90,18 +91,25 @@ fn ast_to_ir<'ir>(alloc: &'ir Bump, ast: &[(Instr<'_>, Span)]) -> Ir<'ir> {
} }
/// pass that replaces things like `Sub(1) Sub(1)` with `Sub(2)` /// pass that replaces things like `Sub(1) Sub(1)` with `Sub(2)`
// TODO: This pass is really slow, speed it up please
#[tracing::instrument] #[tracing::instrument]
fn pass_group<'ir>(alloc: &'ir Bump, ir: Ir<'ir>) -> Ir<'ir> { fn pass_group<'ir>(alloc: &'ir Bump, ir_param: &mut Ir<'ir>) {
let empty_ir = Ir {
stmts: Vec::new_in(alloc),
};
let ir = std::mem::replace(ir_param, empty_ir);
let new_stmts = Vec::new_in(alloc); let new_stmts = Vec::new_in(alloc);
let stmts = ir let stmts = ir
.stmts .stmts
.into_iter() .into_iter()
.fold(new_stmts, |mut stmts: BumpVec<'ir, Stmt<'ir>>, next| { .fold(new_stmts, |mut stmts: BumpVec<'ir, Stmt<'ir>>, next| {
let Some(old) = stmts.last_mut() else { let Some(old) = stmts.last_mut() else {
if let StmtKind::Loop(body) = next.kind { if let StmtKind::Loop(mut body) = next.kind {
let new_body = pass_group(alloc, body); pass_group(alloc, &mut body);
stmts.push(Stmt::new( stmts.push(Stmt::new(
StmtKind::Loop(new_body), StmtKind::Loop(body),
next.span, next.span,
)); ));
} else { } else {
@ -131,11 +139,11 @@ fn pass_group<'ir>(alloc: &'ir Bump, ir: Ir<'ir>) -> Ir<'ir> {
old.span = old.span.merge(next.span); old.span = old.span.merge(next.span);
*a += b; *a += b;
} }
(_, StmtKind::Loop(body)) => { (_, StmtKind::Loop(mut body)) => {
let new_body = pass_group(alloc, body); pass_group(alloc, &mut body);
stmts.push(Stmt { stmts.push(Stmt {
span: next.span, span: next.span,
kind: StmtKind::Loop(new_body), kind: StmtKind::Loop(body),
}); });
} }
(_, kind) => { (_, kind) => {
@ -146,7 +154,7 @@ fn pass_group<'ir>(alloc: &'ir Bump, ir: Ir<'ir>) -> Ir<'ir> {
stmts stmts
}); });
Ir { stmts } *ir_param = Ir { stmts };
} }
/// pass that replaces `Loop([Sub(_)])` to `SetNull` /// pass that replaces `Loop([Sub(_)])` to `SetNull`