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 0435809c authored by Isaac Oscar Gariano's avatar Isaac Oscar Gariano

Merge branch 'develop' of gitlab.anu.edu.au:mu/mu-impl-fast into develop

parents 30966222 6495a919
Pipeline #734 passed with stages
in 28 minutes and 21 seconds
......@@ -2091,8 +2091,8 @@ impl CodeGenerator for ASMCodeGen {
ValueLocation::Relocatable(RegGroup::GPR, callsite)
}
fn emit_blr(&mut self, callsite: String, func: Reg, pe: Option<MuName>, args: Vec<P<Value>>) -> ValueLocation {
trace_emit!("\tBLR {}({:?})", func, args);
fn emit_blr(&mut self, callsite: String, func: Reg, pe: Option<MuName>) -> ValueLocation {
trace_emit!("\tBLR {}", func);
let (reg1, id1, loc1) = self.prepare_reg(func, 3 + 1);
let asm = format!("BLR {}", reg1);
......
......@@ -363,7 +363,8 @@ pub fn build_interference_graph_chaitin_briggs(cf: &mut CompiledFunction, func:
trace_if!(TRACE_LIVENESS, "Block{}: Inst{}: src={:?}", block, i, src);
// for every definition D in I
for d in cf.mc().get_inst_reg_defines(i) {
let defines = cf.mc().get_inst_reg_defines(i);
for d in defines.clone() {
trace_if!(TRACE_LIVENESS, "Block{}: Inst{}: for definition {}",
block, i, func.context.get_temp_display(d));
// add an interference from D to every element E in Current_Live - {D}
......@@ -393,6 +394,22 @@ pub fn build_interference_graph_chaitin_briggs(cf: &mut CompiledFunction, func:
}
}
}
// D also interferes with other definition D_ in I
for d_ in defines.iter() {
let node1 = ig.get_node(d);
let node2 = ig.get_node(*d_);
// if D and D_ are not the same node, not already interfered, and in the same reg group
// we add an intereference edge between them
if !ig.is_same_node(node1, node2) && ig.is_same_group(node1, node2) && !ig.is_adj(node1, node2){
trace_if!(TRACE_LIVENESS, "Block{}: Inst{}: add intereference between {} and {}",
block, i,
func.context.get_temp_display(d),
func.context.get_temp_display(*d_));
ig.add_interference_edge(node1, node2);
}
}
}
// for every definition D in I
......
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