GitLab will continue to be upgraded from 11.4.5-ce.0 on November 25th 2019 at 4.00pm (AEDT) to 5.00pm (AEDT) due to Critical Security Patch Availability. During the update, GitLab and Mattermost services will not be available.

Commit cd0e3739 authored by qinsoon's avatar qinsoon

make output clean, and remove warnings

parent 6c64ef82
......@@ -213,23 +213,23 @@ impl InterferenceGraph {
use compiler::backend::reg_alloc::graph_coloring::petgraph::dot::Dot;
use compiler::backend::reg_alloc::graph_coloring::petgraph::dot::Config;
debug!("");
debug!("Interference Graph");
trace!("");
trace!("Interference Graph");
debug!("nodes:");
trace!("nodes:");
for id in self.nodes.keys() {
let val = context.get_value(*id).unwrap().value();
debug!("Reg {} -> {:?}", val, self.nodes.get(&id).unwrap());
trace!("Reg {} -> {:?}", val, self.nodes.get(&id).unwrap());
}
debug!("moves:");
trace!("moves:");
for mov in self.moves.iter() {
debug!("Move {:?} -> {:?}", mov.from, mov.to);
trace!("Move {:?} -> {:?}", mov.from, mov.to);
}
debug!("graph:");
debug!("\n\n{:?}\n", Dot::with_config(&self.graph, &[Config::EdgeNoLabel]));
debug!("");
trace!("graph:");
trace!("\n\n{:?}\n", Dot::with_config(&self.graph, &[Config::EdgeNoLabel]));
trace!("");
}
}
......@@ -238,7 +238,7 @@ const TRACE_BUILD_LIVE_SET : bool = false;
fn build_live_set (cf: &mut CompiledFunction, func: &MuFunctionVersion) {
info!("---start building live set---");
let cfg = local_liveness_analysis(cf, func);
let cfg = local_liveness_analysis(cf);
global_liveness_analysis(cfg, cf, func);
info!("---finish building live set---");
......@@ -255,7 +255,7 @@ struct CFGBlockNode {
defs: Vec<MuID>
}
fn local_liveness_analysis (cf: &mut CompiledFunction, func: &MuFunctionVersion) -> HashMap<String, CFGBlockNode> {
fn local_liveness_analysis (cf: &mut CompiledFunction) -> HashMap<String, CFGBlockNode> {
info!("---local liveness analysis---");
let mc = cf.mc();
......@@ -272,7 +272,7 @@ fn local_liveness_analysis (cf: &mut CompiledFunction, func: &MuFunctionVersion)
None => panic!("cannot find range for block {}", block)
};
debug!("Block {}: start_inst={}, end_inst(inclusive)={}", block, range.start, range.end-1);
trace!("Block {}: start_inst={}, end_inst(inclusive)={}", block, range.start, range.end-1);
start_inst_map.insert(range.start, block);
end_inst_map.insert(range.end - 1, block);
}
......@@ -389,7 +389,8 @@ fn local_liveness_analysis (cf: &mut CompiledFunction, func: &MuFunctionVersion)
//}
fn global_liveness_analysis(blocks: HashMap<String, CFGBlockNode>, cf: &mut CompiledFunction, func: &MuFunctionVersion) {
let n_nodes = blocks.len();
info!("---global liveness analysis---");
info!("{} blocks", blocks.len());
// init live in and live out
let mut livein : HashMap<String, LinkedHashSet<MuID>> = {
......@@ -466,6 +467,8 @@ fn global_liveness_analysis(blocks: HashMap<String, CFGBlockNode>, cf: &mut Comp
}
}
info!("finished in {} iterations", i);
for block in blocks.keys() {
let livein : Vec<MuID> = livein.get(block).unwrap().clone().iter().map(|x| *x).collect();
{
......@@ -484,7 +487,7 @@ fn global_liveness_analysis(blocks: HashMap<String, CFGBlockNode>, cf: &mut Comp
}
#[allow(dead_code)]
fn naive_global_liveness_analysis(cf: &mut CompiledFunction, func: &MuFunctionVersion) {
fn naive_global_liveness_analysis(cf: &mut CompiledFunction) {
let n_insts = cf.mc().number_of_insts();
let mut livein : Vec<LinkedHashSet<MuID>> = vec![LinkedHashSet::new(); n_insts];
......
......@@ -34,7 +34,7 @@ pub trait CompilerPass {
fn visit_function(&mut self, vm: &VM, func: &mut MuFunctionVersion) {
for (label, ref mut block) in func.content.as_mut().unwrap().blocks.iter_mut() {
debug!("block: {}", label);
trace!("block: {}", label);
self.start_block(vm, &mut func.context, block);
self.visit_block(vm, &mut func.context, block);
......@@ -44,7 +44,7 @@ pub trait CompilerPass {
fn visit_block(&mut self, vm: &VM, func_context: &mut FunctionContext, block: &mut Block) {
for inst in block.content.as_mut().unwrap().body.iter_mut() {
debug!("{}", inst);
trace!("{}", inst);
self.visit_inst(vm, func_context, inst);
}
......
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