Skip to content

Commit

Permalink
Use TermIds everywhere to cleanup recursion
Browse files Browse the repository at this point in the history
  • Loading branch information
@wilcoxjay
wilcoxjay committed Aug 24, 2023
1 parent 6aa3ce3 commit 1f769e6
Showing 1 changed file with 78 additions and 73 deletions.
151 changes: 78 additions & 73 deletions src/conversions.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use crate::{
};
use bril_rs::{Argument, Code, EffectOps, Instruction, Literal, Program, Type, ValueOps};
use egglog::ast::{Expr, Symbol};
use egglog::{match_term_app, Term, TermDag};
use egglog::{match_term_app, Term, TermDag, TermId};
use ordered_float::OrderedFloat;

pub(crate) struct TermConverter<'a> {
Expand All @@ -18,35 +18,39 @@ pub(crate) struct TermConverter<'a> {
}

impl TermConverter<'_> {
pub(crate) fn get(&self, id: &TermId) -> Term {
self.termdag.get(*id)
}

pub(crate) fn term_to_structured_func(
&mut self,
t: &Term,
id: &TermId,
) -> StructuredFunction {
match_term_app!(t; {
match_term_app!(self.get(id); {
("Func", [func_name, argslist, body]) => {
let args = self.term_conslist_to_vec(&self.termdag.get(*argslist), "Arg")
let args = self.term_conslist_to_vec(argslist, "Arg")
.into_iter()
.map(|arg| self.term_to_argument(&arg))
.collect();

let fname = Optimizer::string_term_to_string(&self.termdag.get(*func_name));
let fname = self.string_term_to_string(func_name);
StructuredFunction {
name: fname.to_string(),
args: args,
block: self.term_to_structured_block(&self.termdag.get(*body)),
block: self.term_to_structured_block(body),
}
}
(head, _) => panic!("unexpected head {}, in {}:{}:{}", head, file!(), line!(), column!())
})
}

fn term_to_argument(&self, term: &Term) -> Argument {
match_term_app!(term; {
fn term_to_argument(&self, id: &TermId) -> Argument {
match_term_app!(self.get(id); {
("Arg", [name, ty]) => {
let name = Optimizer::string_term_to_string(&self.termdag.get(*name));
let name = self.string_term_to_string(name);
Argument {
name: name.to_string(),
arg_type: self.term_to_type(&self.termdag.get(*ty)),
arg_type: self.term_to_type(ty),
}
}
(head, _) => panic!("unexpected head {}, in {}:{}:{}", head, file!(), line!(), column!())
Expand All @@ -55,42 +59,42 @@ impl TermConverter<'_> {

pub(crate) fn term_to_structured_block(
&mut self,
term: &Term,
id: &TermId,
) -> StructuredBlock {
match_term_app!(term; {
match_term_app!(self.get(id); {
("Block", [block]) => {
StructuredBlock::Block(Box::new(self.term_to_structured_block(&self.termdag.get(*block))))
StructuredBlock::Block(Box::new(self.term_to_structured_block(block)))
},
("Basic", [basic_block]) => {
StructuredBlock::Basic(Box::new(self.term_to_basic_block(&self.termdag.get(*basic_block))))
StructuredBlock::Basic(Box::new(self.term_to_basic_block(basic_block)))
},
("Ite", [name, then_branch, else_branch]) => {
let string = Optimizer::string_term_to_string(&self.termdag.get(*name));
let string = self.string_term_to_string(name);
StructuredBlock::Ite(
string.to_string(),
Box::new(self.term_to_structured_block(&self.termdag.get(*then_branch))),
Box::new(self.term_to_structured_block(&self.termdag.get(*else_branch))),
Box::new(self.term_to_structured_block(then_branch)),
Box::new(self.term_to_structured_block(else_branch)),
)
},
("Loop", [block]) => {
StructuredBlock::Loop(Box::new(self.term_to_structured_block(&self.termdag.get(*block))))
StructuredBlock::Loop(Box::new(self.term_to_structured_block(block)))
},
("Sequence", [block, rest]) => StructuredBlock::Sequence(vec![
self.term_to_structured_block(&self.termdag.get(*block)),
self.term_to_structured_block(&self.termdag.get(*rest)),
self.term_to_structured_block(block),
self.term_to_structured_block(rest),
]),
("Break", [n]) => {
if let Term::Lit(egglog::ast::Literal::Int(n)) = self.termdag.get(*n) {
if let Term::Lit(egglog::ast::Literal::Int(n)) = self.get(n) {
StructuredBlock::Break(n.try_into().unwrap())
} else {
panic!("expected int literal for break");
}
},
("Return", [val]) => {
match_term_app!(self.termdag.get(*val); {
match_term_app!(self.get(val); {
("Void", _) => StructuredBlock::Return(None),
("ReturnValue", [arg]) => {
match self.termdag.get(*arg) {
match self.get(arg) {
Term::Lit(egglog::ast::Literal::String(s)) => {
StructuredBlock::Return(Some(s.to_string()))
}
Expand All @@ -104,11 +108,11 @@ impl TermConverter<'_> {
})
}

pub(crate) fn term_to_basic_block(&mut self, term: &Term) -> BasicBlock {
match_term_app!(term; {
pub(crate) fn term_to_basic_block(&mut self, id: &TermId) -> BasicBlock {
match_term_app!(self.get(id); {
("BlockNamed", [name, code]) => {
let name = Optimizer::string_term_to_string(&self.termdag.get(*name));
let code_vec = self.term_conslist_to_vec(&self.termdag.get(*code), "Code");
let name = self.string_term_to_string(name);
let code_vec = self.term_conslist_to_vec(code, "Code");
let mut instrs = vec![];
// let mut memo = HashMap::<Term, String>::new();

Expand All @@ -126,27 +130,27 @@ impl TermConverter<'_> {
})
}

fn term_conslist_to_vec_helper(&self, term: &Term, res: &mut Vec<Term>, prefix: &str) {
match_term_app!(term; {
fn term_conslist_to_vec_helper(&self, id: &TermId, res: &mut Vec<TermId>, prefix: &str) {
match_term_app!(self.get(id); {
(op, [head, tail]) if op == prefix.to_string() + "Cons" => {
res.push(self.termdag.get(*head));
self.term_conslist_to_vec_helper(&self.termdag.get(*tail), res, prefix);
res.push(*head);
self.term_conslist_to_vec_helper(tail, res, prefix);
},
(op, []) if op == prefix.to_string() + "Nil" => {}
(head, _) => panic!("unexpected head {}, in {}:{}:{}", head, file!(), line!(), column!())
})
}

fn term_conslist_to_vec(&self, term: &Term, prefix: &str) -> Vec<Term> {
fn term_conslist_to_vec(&self, id: &TermId, prefix: &str) -> Vec<TermId> {
let mut res = vec![];
self.term_conslist_to_vec_helper(term, &mut res, prefix);
self.term_conslist_to_vec_helper(id, &mut res, prefix);
res
}

fn term_to_instructions(&mut self, term: &Term, res: &mut Vec<Instruction>) {
match_term_app!(term; {
fn term_to_instructions(&mut self, id: &TermId, res: &mut Vec<Instruction>) {
match_term_app!(self.get(id); {
("Print", [arg]) => {
let arg = self.term_to_code(&self.termdag.get(*arg), res, None);
let arg = self.term_to_code(arg, res, None);

res.push(Instruction::Effect {
op: EffectOps::Print,
Expand All @@ -158,13 +162,13 @@ impl TermConverter<'_> {
},
("End", []) => {},
("Assign", [dest, src]) => {
let dest = Optimizer::string_term_to_string(&self.termdag.get(*dest));
self.term_to_code(&self.termdag.get(*src), res, Some(dest.to_string()));
let dest = self.string_term_to_string(dest);
self.term_to_code(src, res, Some(dest.to_string()));
},
(op @ ("store" | "free"), args) => {
let args = args
.iter()
.map(|arg| self.term_to_code(&self.termdag.get(*arg), res, None))
.map(|arg| self.term_to_code(arg, res, None))
.collect::<Vec<String>>();


Expand All @@ -177,9 +181,9 @@ impl TermConverter<'_> {
});
},
("alloc", [atype, dest, arg]) => {
let atype = self.term_to_type(&self.termdag.get(*atype));
let dest = Optimizer::string_term_to_string(&self.termdag.get(*dest));
let arg = self.term_to_code(&self.termdag.get(*arg), res, None);
let atype = self.term_to_type(atype);
let dest = self.string_term_to_string(dest);
let arg = self.term_to_code(arg, res, None);
res.push(Instruction::Value {
dest,
args: vec![arg],
Expand All @@ -196,7 +200,7 @@ impl TermConverter<'_> {

pub(crate) fn term_to_code(
&mut self,
term: &Term,
id: &TermId,
res: &mut Vec<Instruction>,
assign_to: Option<String>,
) -> String {
Expand All @@ -205,14 +209,14 @@ impl TermConverter<'_> {
None => self.optimizer.fresh_var(),
};

match term {
match self.get(id) {
Term::Lit(literal) => {
res.push(Instruction::Constant {
dest: dest.clone(),
op: bril_rs::ConstOps::Const,
value: self.optimizer.literal_to_bril(literal),
value: self.optimizer.literal_to_bril(&literal),
pos: None,
const_type: self.optimizer.literal_to_type(literal),
const_type: self.optimizer.literal_to_type(&literal),
});
dest
}
Expand All @@ -223,31 +227,31 @@ impl TermConverter<'_> {
var.to_string()
}
}
_ => {
match_term_app!(term; {
t => {
match_term_app!(t; {
("Var", [arg]) => {
match self.termdag.get(*arg) {
match self.get(arg) {
Term::Lit(egglog::ast::Literal::String(var)) => var.to_string(),
_ => panic!("expected string literal for var"),
}
},
("ReturnValue", [arg]) => self.term_to_code(&self.termdag.get(*arg), res, assign_to),
("ReturnValue", [arg]) => self.term_to_code(arg, res, assign_to),
(op @ ("True" | "False" | "Int" | "Float" | "Char"), [ty, args @ ..]) => {
let lit = match (op, args) {
("True", []) => Literal::Bool(true),
("False", []) => Literal::Bool(false),
("Int", [arg]) => {
let arg = self.termdag.get(*arg);
let arg = self.get(arg);
let arg_s = self.termdag.to_string(&arg);
Literal::Int(arg_s.parse::<i64>().unwrap())
}
("Float", [arg]) => {
let arg = self.termdag.get(*arg);
let arg = self.get(arg);
let arg_s = self.termdag.to_string(&arg);
Literal::Float(arg_s.parse::<f64>().unwrap())
}
("Char", [arg]) => {
let arg = self.termdag.get(*arg);
let arg = self.get(arg);
let arg_s = self.termdag.to_string(&arg);
assert_eq!(arg_s.len(), 1);
Literal::Char(arg_s.chars().next().unwrap())
Expand All @@ -259,16 +263,16 @@ impl TermConverter<'_> {
op: bril_rs::ConstOps::Const,
value: lit,
pos: None,
const_type: self.term_to_type(&self.termdag.get(*ty)),
const_type: self.term_to_type(ty),
});
dest
},
("phi", [etype, arg1, arg2, label1, label2]) => {
let etype = self.term_to_type(&self.termdag.get(*etype));
let arg1 = self.term_to_code(&self.termdag.get(*arg1), res, None);
let arg2 = self.term_to_code(&self.termdag.get(*arg2), res, None);
let label1 = Optimizer::string_term_to_string(&self.termdag.get(*label1));
let label2 = Optimizer::string_term_to_string(&self.termdag.get(*label2));
let etype = self.term_to_type(etype);
let arg1 = self.term_to_code(arg1, res, None);
let arg2 = self.term_to_code(arg2, res, None);
let label1 = self.string_term_to_string(label1);
let label2 = self.string_term_to_string(label2);
res.push(Instruction::Value {
dest: dest.clone(),
args: vec![arg1, arg2],
Expand All @@ -282,11 +286,11 @@ impl TermConverter<'_> {
},
(op, args) => {
assert!(op != "Void");
let etype = self.term_to_type(&self.termdag.get(args[0]));
let etype = self.term_to_type(&args[0]);
let args_vars = args
.iter()
.skip(1)
.map(|arg| self.term_to_code(&self.termdag.get(*arg), res, None))
.map(|arg| self.term_to_code(arg, res, None))
.collect::<Vec<String>>();
res.push(Instruction::Value {
dest: dest.clone(),
Expand All @@ -304,16 +308,25 @@ impl TermConverter<'_> {
}
}

pub(crate) fn term_to_type(&self, term: &Term) -> Type {
match_term_app!(term; {
pub(crate) fn term_to_type(&self, id: &TermId) -> Type {
match_term_app!(self.get(id); {
("IntT", []) => Type::Int,
("BoolT", []) => Type::Bool,
("FloatT", []) => Type::Float,
("CharT", []) => Type::Char,
("PointerT", [child]) => Type::Pointer(Box::new(self.term_to_type(&self.termdag.get(*child)))),
("PointerT", [child]) => Type::Pointer(Box::new(self.term_to_type(child))),
(head, _) => panic!("unexpected head {}, in {}:{}:{}", head, file!(), line!(), column!())
})
}

fn string_term_to_string(&self, id: &TermId) -> String {
if let Term::Lit(egglog::ast::Literal::String(string)) = self.get(id) {
string.to_string()
} else {
panic!("expected string literal");
}
}

}

impl Optimizer {
Expand All @@ -323,7 +336,7 @@ impl Optimizer {
term: &Term,
) -> StructuredFunction {
let mut converter = TermConverter { optimizer: self, termdag };
converter.term_to_structured_func(term)
converter.term_to_structured_func(&termdag.lookup(term))
}

pub(crate) fn func_to_expr(&mut self, func: &StructuredFunction) -> Expr {
Expand Down Expand Up @@ -419,14 +432,6 @@ impl Optimizer {
Expr::Call("Var".into(), vec![self.string_to_expr(string)])
}

fn string_term_to_string(term: &Term) -> String {
if let Term::Lit(egglog::ast::Literal::String(string)) = term {
string.to_string()
} else {
panic!("expected string literal");
}
}

pub(crate) fn convert_basic_block(&mut self, block: &BasicBlock) -> Expr {
// leave prints in order
// leave any effects in order
Expand Down

0 comments on commit 1f769e6

Please sign in to comment.