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

Attach encodings to regmove instructions generated during coloring.

Browse Source 
All emitted regmove instructions must be materialized as real move
instructions.
This commit is contained in:
Jakob Stoklund Olesen
2017-07-12 10:37:50 -07:00
parent 2ee37784ff
commit abc1743486
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,8 @@
//! The exception is the entry block whose arguments are colored from the ABI requirements. //! The exception is the entry block whose arguments are colored from the ABI requirements.
use dominator_tree::DominatorTree; use dominator_tree::DominatorTree;
use ir::{Ebb, Inst, Value, Function, Cursor, ValueLoc, DataFlowGraph, Layout, ValueLocations}; use ir::{Ebb, Inst, Value, Function, Cursor, ValueLoc, DataFlowGraph, Layout};
use ir::{InstEncodings, ValueLocations};
use ir::{InstBuilder, Signature, ArgumentType, ArgumentLoc}; use ir::{InstBuilder, Signature, ArgumentType, ArgumentLoc};
use isa::{RegUnit, RegClass, RegInfo, regs_overlap}; use isa::{RegUnit, RegClass, RegInfo, regs_overlap};
use isa::{TargetIsa, EncInfo, RecipeConstraints, OperandConstraint, ConstraintKind}; use isa::{TargetIsa, EncInfo, RecipeConstraints, OperandConstraint, ConstraintKind};
@@ -156,6 +157,7 @@ impl<'a> Context<'a> {
tracker, tracker,
&mut regs, &mut regs,
&mut func.locations, &mut func.locations,
&mut func.encodings,
&func.signature); &func.signature);
} else { } else {
let (_throughs, kills) = tracker.process_ghost(inst); let (_throughs, kills) = tracker.process_ghost(inst);
@@ -279,6 +281,7 @@ impl<'a> Context<'a> {
tracker: &mut LiveValueTracker, tracker: &mut LiveValueTracker,
regs: &mut AllocatableSet, regs: &mut AllocatableSet,
locations: &mut ValueLocations, locations: &mut ValueLocations,
encodings: &mut InstEncodings,
func_signature: &Signature) { func_signature: &Signature) {
dbg!("Coloring {}\n {}", dbg!("Coloring {}\n {}",
dfg.display_inst(inst, self.isa), dfg.display_inst(inst, self.isa),
@@ -354,7 +357,7 @@ impl<'a> Context<'a> {
// The solution and/or fixed input constraints may require us to shuffle the set of live // The solution and/or fixed input constraints may require us to shuffle the set of live
// registers around. // registers around.
self.shuffle_inputs(pos, dfg, regs); self.shuffle_inputs(pos, dfg, regs, encodings);
// If this is the first time we branch to `dest`, color its arguments to match the current // If this is the first time we branch to `dest`, color its arguments to match the current
// register state. // register state.
@@ -695,12 +698,18 @@ impl<'a> Context<'a> {
fn shuffle_inputs(&mut self, fn shuffle_inputs(&mut self,
pos: &mut Cursor, pos: &mut Cursor,
dfg: &mut DataFlowGraph, dfg: &mut DataFlowGraph,
regs: &mut AllocatableSet) { regs: &mut AllocatableSet,
encodings: &mut InstEncodings) {
self.solver.schedule_moves(regs); self.solver.schedule_moves(regs);
for m in self.solver.moves() { for m in self.solver.moves() {
let ty = dfg.value_type(m.value);
self.divert.regmove(m.value, m.from, m.to); self.divert.regmove(m.value, m.from, m.to);
dfg.ins(pos).regmove(m.value, m.from, m.to); let inst = dfg.ins(pos).regmove(m.value, m.from, m.to);
match self.isa.encode(dfg, &dfg[inst], ty) {
Ok(encoding) => *encodings.ensure(inst) = encoding,
_ => panic!("Can't encode {} {}", m.rc, dfg.display_inst(inst, self.isa)),
}
} }
} }