T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Constrain solver variables as little as possible.

Browse Source 
When solver variables represent operands on the current instruction,
they need to be constrained as required by the instructions, but
variables that are simply moved out of the way should only be
constrained to their top-level register class. The live range affinity
is just a hint, not a requirement.
This commit is contained in:
Jakob Stoklund Olesen
2017-10-06 15:03:50 -07:00
parent 12a8d6cce1
commit ac8c8a676a
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/cretonne/src/isa/registers.rs
View File

@@ -296,6 +296,11 @@ impl RegInfo {
pub fn rc(&self, idx: RegClassIndex) -> RegClass { pub fn rc(&self, idx: RegClassIndex) -> RegClass {
self.classes[idx.index()] self.classes[idx.index()]
} }
/// Get the top-level register class containing the `idx` class.
pub fn toprc(&self, idx: RegClassIndex) -> RegClass {
self.classes[self.rc(idx).toprc as usize]
}
} }
/// Temporary object that holds enough information to print a register unit. /// Temporary object that holds enough information to print a register unit.

26
lib/cretonne/src/regalloc/coloring.rs
View File

@@ -572,10 +572,10 @@ impl<'a> Context<'a> {
fn divert_fixed_input_conflicts(&mut self, live: &[LiveValue]) { fn divert_fixed_input_conflicts(&mut self, live: &[LiveValue]) {
for lv in live { for lv in live {
if let Affinity::Reg(rci) = lv.affinity { if let Affinity::Reg(rci) = lv.affinity {
let rc = self.reginfo.rc(rci); let toprc = self.reginfo.toprc(rci);
let reg = self.divert.reg(lv.value, &self.cur.func.locations); let reg = self.divert.reg(lv.value, &self.cur.func.locations);
if self.solver.is_fixed_input_conflict(rc, reg) { if self.solver.is_fixed_input_conflict(toprc, reg) {
self.solver.add_var(lv.value, rc, reg); self.solver.add_var(lv.value, toprc, reg);
} }
} }
} }
@@ -633,15 +633,12 @@ impl<'a> Context<'a> {
// The fixed output conflicts with some of the live-through registers. // The fixed output conflicts with some of the live-through registers.
for lv in throughs { for lv in throughs {
if let Affinity::Reg(rci) = lv.affinity { if let Affinity::Reg(rci) = lv.affinity {
let rc2 = self.reginfo.rc(rci); let toprc2 = self.reginfo.toprc(rci);
let reg2 = self.divert.reg(lv.value, &self.cur.func.locations); let reg2 = self.divert.reg(lv.value, &self.cur.func.locations);
if regs_overlap(rc, reg, rc2, reg2) { if regs_overlap(rc, reg, toprc2, reg2) {
// This live-through value is interfering with the fixed output assignment. // This live-through value is interfering with the fixed output assignment.
// Convert it to a solver variable. // Convert it to a solver variable.
// TODO: Use a looser constraint than the affinity hint. Any allocatable self.solver.add_var(lv.value, toprc2, reg2);
// register in the top-level register class would be OK. Maybe `add_var`
// should take both a preferred class and a required constraint class.
self.solver.add_var(lv.value, rc2, reg2);
} }
} }
} }
@@ -709,15 +706,14 @@ impl<'a> Context<'a> {
for lv in throughs { for lv in throughs {
if let Affinity::Reg(rci) = lv.affinity { if let Affinity::Reg(rci) = lv.affinity {
let rc2 = self.reginfo.rc(rci); // The new variable gets to roam the whole top-level register class because it is
// not actually constrained by the instruction. We just want it out of the way.
let toprc2 = self.reginfo.rc(rci);
let reg2 = self.divert.reg(lv.value, &self.cur.func.locations); let reg2 = self.divert.reg(lv.value, &self.cur.func.locations);
if rc.contains(reg2) && self.solver.can_add_var(lv.value, rc2, reg2) && if rc.contains(reg2) && self.solver.can_add_var(lv.value, toprc2, reg2) &&
!self.is_live_on_outgoing_edge(lv.value) !self.is_live_on_outgoing_edge(lv.value)
{ {
// The new variable gets to roam the whole top-level register class because self.solver.add_var(lv.value, toprc2, reg2);
// it is not actually constrained by the instruction. We just want it out
// of the way.
self.solver.add_var(lv.value, rc2.toprc(), reg2);
return true; return true;
} }
} }