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

Apply register diversions during binemit tests.

Browse Source 
When "binemit" tests encode instructions, keep track of the current set
of register diversions, and use the diverted locations to check operand
constraints.

This matches how constraints are applied during a real binemit phase.
This commit is contained in:
Jakob Stoklund Olesen
2017-10-04 16:33:50 -07:00
parent dda3efcbdd
commit 826d4062fb
3 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/cretonne/src/isa/constraints.rs
View File

@@ -10,6 +10,7 @@
use binemit::CodeOffset;
use isa::{RegClass, RegUnit};
use ir::{Function, ValueLoc, Inst};
use regalloc::RegDiversions;
/// Register constraint for a single value operand or instruction result.
pub struct OperandConstraint {
@@ -109,9 +110,9 @@ pub struct RecipeConstraints {
impl RecipeConstraints {
/// Check that these constraints are satisfied by the operands on `inst`.
pub fn satisfied(&self, inst: Inst, func: &Function) -> bool {
pub fn satisfied(&self, inst: Inst, divert: &RegDiversions, func: &Function) -> bool {
for (&arg, constraint) in func.dfg.inst_args(inst).iter().zip(self.ins) {
let loc = func.locations[arg];
let loc = divert.get(arg, &func.locations);
if let ConstraintKind::Tied(out_index) = constraint.kind {
let out_val = func.dfg.inst_results(inst)[out_index as usize];
@@ -127,7 +128,7 @@ impl RecipeConstraints {
}
for (&arg, constraint) in func.dfg.inst_results(inst).iter().zip(self.outs) {
let loc = func.locations[arg];
let loc = divert.get(arg, &func.locations);
if !constraint.satisfied(loc) {
return false;
}