Skip to content

GitLab

WARNING! Access to this system is limited to authorised users only.
Unauthorised users may be subject to prosecution.
Unauthorised access to this system is a criminal offence under Australian law (Federal Crimes Act 1914 Part VIA)
It is a criminal offence to:
(1) Obtain access to data without authority. -Penalty 2 years imprisonment.
(2) Damage, delete, alter or insert data without authority. -Penalty 10 years imprisonment.
User activity is monitored and recorded. Anyone using this system expressly consents to such monitoring and recording.

To protect your data, the CISO officer has suggested users to enable 2FA as soon as possible.
Currently 2.7% of users enabled 2FA.

Commit dbb70ac9 authored by qinsoon's avatar qinsoon
Browse files

[wip] refactoring: compiler owns a reference to vm context

parent f408e4f4
Hide whitespace changes
Inline Side-by-side
src/compiler/mod.rs
View file @ dbb70ac9
......@@ -2,22 +2,27 @@ use ast::ir::*;
use vm::context::VMContext;
use std::cell::RefCell;
use std::sync::Arc;
pub mod passes;
pub mod backend;
pub struct Compiler {
policy: RefCell<CompilerPolicy>
policy: RefCell<CompilerPolicy>,
vm: Arc<VMContext>
}
impl Compiler {
pub fn new(policy: CompilerPolicy) -> Compiler {
Compiler{policy: RefCell::new(policy)}
pub fn new(policy: CompilerPolicy, vm: Arc<VMContext>) -> Compiler {
Compiler{
policy: RefCell::new(policy),
vm: vm
}
}
pub fn compile(&self, vm: &VMContext, func: &mut MuFunction) {
pub fn compile(&self, func: &mut MuFunction) {
for pass in self.policy.borrow_mut().passes.iter_mut() {
pass.execute(vm, func);
pass.execute(&self.vm, func);
}
}
}
......
tests/test_compiler/test_instsel.rs
View file @ dbb70ac9
......@@ -6,21 +6,24 @@ use test_ir::test_ir::factorial;
use self::mu::compiler::*;
use self::mu::vm::context::VMContext;
use std::sync::Arc;
#[test]
fn test_instsel_fac() {
simple_logger::init_with_level(log::LogLevel::Trace).ok();
let vm_context : VMContext = factorial();
let vm_context = Arc::new(factorial());
let compiler = Compiler::new(CompilerPolicy::new(vec![
Box::new(passes::DefUse::new()),
Box::new(passes::TreeGen::new()),
Box::new(passes::ControlFlowAnalysis::new()),
Box::new(passes::TraceGen::new()),
Box::new(backend::inst_sel::InstructionSelection::new())
]));
]), vm_context.clone());
let funcs = vm_context.funcs().read().unwrap();
let mut factorial_func = funcs.get("fac").unwrap().borrow_mut();
compiler.compile(&vm_context, &mut factorial_func);
compiler.compile(&mut factorial_func);
}
\ No newline at end of file
tests/test_compiler/test_pre_instsel.rs
View file @ dbb70ac9
......@@ -9,19 +9,21 @@ use self::mu::ast::ir::*;
use self::mu::compiler::*;
use self::mu::vm::context::VMContext;
use std::sync::Arc;
#[test]
fn test_use_count() {
simple_logger::init_with_level(log::LogLevel::Trace).ok();
let vm_context : VMContext = factorial();
let vm_context = Arc::new(factorial());
let compiler = Compiler::new(CompilerPolicy::new(
vec![Box::new(passes::DefUse::new())]
));
), vm_context.clone());
let funcs = vm_context.funcs().read().unwrap();
let mut factorial_func = funcs.get("fac").unwrap().borrow_mut();
compiler.compile(&vm_context, &mut factorial_func);
compiler.compile(&mut factorial_func);
assert!(factorial_func.context.get_value_by_tag("blk_0_n_3").unwrap().use_count.get() == 2, "blk_0_n_3 use should be 2");
assert!(factorial_func.context.get_value_by_tag("blk_0_v48").unwrap().use_count.get() == 1, "blk_0_v48 use should be 1");
......@@ -36,33 +38,33 @@ fn test_use_count() {
fn test_build_tree() {
simple_logger::init_with_level(log::LogLevel::Trace).ok();
let vm_context : VMContext = factorial();
let vm_context = Arc::new(factorial());
let compiler = Compiler::new(CompilerPolicy::new(
vec![Box::new(passes::DefUse::new()),
Box::new(passes::TreeGen::new())]
));
), vm_context.clone());
let funcs = vm_context.funcs().read().unwrap();
let mut factorial_func = funcs.get("fac").unwrap().borrow_mut();
compiler.compile(&vm_context, &mut factorial_func);
compiler.compile(&mut factorial_func);
}
#[test]
fn test_cfa_factorial() {
simple_logger::init_with_level(log::LogLevel::Trace).ok();
let vm_context : VMContext = factorial();
let vm_context = Arc::new(factorial());
let compiler = Compiler::new(CompilerPolicy::new(vec![
Box::new(passes::DefUse::new()),
Box::new(passes::TreeGen::new()),
Box::new(passes::ControlFlowAnalysis::new())
]));
]), vm_context.clone());
let funcs = vm_context.funcs().read().unwrap();
let mut factorial_func = funcs.get("fac").unwrap().borrow_mut();
compiler.compile(&vm_context, &mut factorial_func);
compiler.compile(&mut factorial_func);
// assert cfa
let content = factorial_func.content.as_ref().unwrap();
......@@ -87,17 +89,17 @@ fn test_cfa_factorial() {
fn test_cfa_sum() {
simple_logger::init_with_level(log::LogLevel::Trace).ok();
let vm_context : VMContext = sum();
let vm_context = Arc::new(sum());
let compiler = Compiler::new(CompilerPolicy::new(vec![
Box::new(passes::DefUse::new()),
Box::new(passes::TreeGen::new()),
Box::new(passes::ControlFlowAnalysis::new())
]));
]), vm_context.clone());
let funcs = vm_context.funcs().read().unwrap();
let mut sum_func = funcs.get("sum").unwrap().borrow_mut();
compiler.compile(&vm_context, &mut sum_func);
compiler.compile(&mut sum_func);
// assert cfa
let content = sum_func.content.as_ref().unwrap();
......@@ -130,18 +132,18 @@ fn block_edges_into_vec(edges: &Vec<BlockEdge>) -> Vec<&str> {
fn test_trace_factorial() {
simple_logger::init_with_level(log::LogLevel::Trace).ok();
let vm_context : VMContext = factorial();
let vm_context = Arc::new(factorial());
let compiler = Compiler::new(CompilerPolicy::new(vec![
Box::new(passes::DefUse::new()),
Box::new(passes::TreeGen::new()),
Box::new(passes::ControlFlowAnalysis::new()),
Box::new(passes::TraceGen::new())
]));
]), vm_context.clone());
let funcs = vm_context.funcs().read().unwrap();
let mut factorial_func = funcs.get("fac").unwrap().borrow_mut();
compiler.compile(&vm_context, &mut factorial_func);
compiler.compile(&mut factorial_func);
assert_vector_ordered(factorial_func.block_trace.as_ref().unwrap(), &vec!["blk_0", "blk_1", "blk_2"]);
}
......@@ -150,18 +152,18 @@ fn test_trace_factorial() {
fn test_trace_sum() {
simple_logger::init_with_level(log::LogLevel::Trace).ok();
let vm_context : VMContext = sum();
let vm_context = Arc::new(sum());
let compiler = Compiler::new(CompilerPolicy::new(vec![
Box::new(passes::DefUse::new()),
Box::new(passes::TreeGen::new()),
Box::new(passes::ControlFlowAnalysis::new()),
Box::new(passes::TraceGen::new())
]));
]), vm_context.clone());
let funcs = vm_context.funcs().read().unwrap();
let mut sum_func = funcs.get("sum").unwrap().borrow_mut();
compiler.compile(&vm_context, &mut sum_func);
compiler.compile(&mut sum_func);
assert_vector_ordered(sum_func.block_trace.as_ref().unwrap(), &vec!["entry", "head", "ret"]);
}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment