Refactoring of branch ordering and zero-check optimization based on PR feedback.
This commit is contained in:
Tyler McMullen
committed by
Benjamin Bouvier
Benjamin Bouvier
parent
861ef3a2e5
commit
67cc5aafec
@@ -566,37 +566,36 @@ fn branch_opt(pos: &mut FuncCursor, inst: Inst) {
|
|||||||
let args = pos.func.dfg.inst_args(inst);
|
let args = pos.func.dfg.inst_args(inst);
|
||||||
args[0]
|
args[0]
|
||||||
};
|
};
|
||||||
if let ValueDef::Result(iconst_inst, _) = pos.func.dfg.value_def(first_arg) {
|
let iconst_inst =
|
||||||
if let InstructionData::BinaryImm {
|
if let ValueDef::Result(iconst_inst, _) = pos.func.dfg.value_def(first_arg) {
|
||||||
opcode: Opcode::IfcmpImm,
|
iconst_inst
|
||||||
imm: cmp_imm,
|
|
||||||
arg: cmp_arg,
|
|
||||||
} = pos.func.dfg[iconst_inst]
|
|
||||||
{
|
|
||||||
let cmp_imm: i64 = cmp_imm.into();
|
|
||||||
if cmp_imm != 0 {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
match br_cond {
|
|
||||||
IntCC::NotEqual => BranchOptInfo {
|
|
||||||
br_inst: inst,
|
|
||||||
cmp_arg: cmp_arg,
|
|
||||||
destination: destination,
|
|
||||||
args: args.clone(),
|
|
||||||
kind: BranchOptKind::NotEqualZero,
|
|
||||||
},
|
|
||||||
IntCC::Equal => BranchOptInfo {
|
|
||||||
br_inst: inst,
|
|
||||||
cmp_arg: cmp_arg,
|
|
||||||
destination: destination,
|
|
||||||
args: args.clone(),
|
|
||||||
kind: BranchOptKind::EqualZero,
|
|
||||||
},
|
|
||||||
_ => return,
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
return;
|
return;
|
||||||
|
};
|
||||||
|
|
||||||
|
if let InstructionData::BinaryImm {
|
||||||
|
opcode: Opcode::IfcmpImm,
|
||||||
|
imm: cmp_imm,
|
||||||
|
arg: cmp_arg,
|
||||||
|
} = pos.func.dfg[iconst_inst]
|
||||||
|
{
|
||||||
|
let cmp_imm: i64 = cmp_imm.into();
|
||||||
|
if cmp_imm != 0 {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
let kind = match br_cond {
|
||||||
|
IntCC::NotEqual => BranchOptKind::NotEqualZero,
|
||||||
|
IntCC::Equal => BranchOptKind::EqualZero,
|
||||||
|
_ => return,
|
||||||
|
};
|
||||||
|
|
||||||
|
BranchOptInfo {
|
||||||
|
br_inst: inst,
|
||||||
|
cmp_arg: cmp_arg,
|
||||||
|
destination: destination,
|
||||||
|
args: args.clone(),
|
||||||
|
kind: kind,
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
return;
|
return;
|
||||||
@@ -648,114 +647,109 @@ fn branch_order(pos: &mut FuncCursor, cfg: &mut ControlFlowGraph, ebb: Ebb, inst
|
|||||||
destination,
|
destination,
|
||||||
ref args,
|
ref args,
|
||||||
} => {
|
} => {
|
||||||
if let Some(next_ebb) = pos.func.layout.next_ebb(ebb) {
|
let next_ebb = if let Some(next_ebb) = pos.func.layout.next_ebb(ebb) {
|
||||||
if destination == next_ebb {
|
next_ebb
|
||||||
return;
|
} else {
|
||||||
}
|
return;
|
||||||
|
};
|
||||||
|
|
||||||
if let Some(prev_inst) = pos.func.layout.prev_inst(inst) {
|
if destination == next_ebb {
|
||||||
let prev_inst_data = &pos.func.dfg[prev_inst];
|
return;
|
||||||
if !prev_inst_data.opcode().is_branch() {
|
}
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if let Some(prev_dest) = prev_inst_data.branch_destination() {
|
let prev_inst = if let Some(prev_inst) = pos.func.layout.prev_inst(inst) {
|
||||||
if prev_dest != next_ebb {
|
prev_inst
|
||||||
return;
|
} else {
|
||||||
}
|
return;
|
||||||
|
};
|
||||||
|
|
||||||
match prev_inst_data {
|
let prev_inst_data = &pos.func.dfg[prev_inst];
|
||||||
InstructionData::Branch {
|
|
||||||
opcode,
|
|
||||||
args: ref prev_args,
|
|
||||||
destination: cond_dest,
|
|
||||||
..
|
|
||||||
} => {
|
|
||||||
let cond_arg = {
|
|
||||||
let args = pos.func.dfg.inst_args(prev_inst);
|
|
||||||
args[0]
|
|
||||||
};
|
|
||||||
|
|
||||||
match opcode {
|
if let Some(prev_dest) = prev_inst_data.branch_destination() {
|
||||||
Opcode::Brz => BranchOrderInfo {
|
if prev_dest != next_ebb {
|
||||||
term_inst: inst,
|
|
||||||
term_inst_args: args.clone(),
|
|
||||||
term_dest: destination,
|
|
||||||
cond_inst: prev_inst,
|
|
||||||
cond_arg: cond_arg,
|
|
||||||
cond_inst_args: prev_args.clone(),
|
|
||||||
cond_dest: *cond_dest,
|
|
||||||
kind: BranchOrderKind::BrzToBrnz,
|
|
||||||
},
|
|
||||||
Opcode::Brnz => BranchOrderInfo {
|
|
||||||
term_inst: inst,
|
|
||||||
term_inst_args: args.clone(),
|
|
||||||
term_dest: destination,
|
|
||||||
cond_inst: prev_inst,
|
|
||||||
cond_arg: cond_arg,
|
|
||||||
cond_inst_args: prev_args.clone(),
|
|
||||||
cond_dest: *cond_dest,
|
|
||||||
kind: BranchOrderKind::BrnzToBrz,
|
|
||||||
},
|
|
||||||
_ => panic!("unexpected opcode"),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
InstructionData::BranchInt {
|
|
||||||
opcode: Opcode::Brif,
|
|
||||||
args: ref prev_args,
|
|
||||||
cond,
|
|
||||||
destination: cond_dest,
|
|
||||||
..
|
|
||||||
} => {
|
|
||||||
let cond_arg = {
|
|
||||||
let args = pos.func.dfg.inst_args(prev_inst);
|
|
||||||
args[0]
|
|
||||||
};
|
|
||||||
BranchOrderInfo {
|
|
||||||
term_inst: inst,
|
|
||||||
term_inst_args: args.clone(),
|
|
||||||
term_dest: destination,
|
|
||||||
cond_inst: prev_inst,
|
|
||||||
cond_arg: cond_arg,
|
|
||||||
cond_inst_args: prev_args.clone(),
|
|
||||||
cond_dest: *cond_dest,
|
|
||||||
kind: BranchOrderKind::InvertIntCond(*cond),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
InstructionData::BranchFloat {
|
|
||||||
opcode: Opcode::Brff,
|
|
||||||
args: ref prev_args,
|
|
||||||
cond,
|
|
||||||
destination: cond_dest,
|
|
||||||
..
|
|
||||||
} => {
|
|
||||||
let cond_arg = {
|
|
||||||
let args = pos.func.dfg.inst_args(prev_inst);
|
|
||||||
args[0]
|
|
||||||
};
|
|
||||||
BranchOrderInfo {
|
|
||||||
term_inst: inst,
|
|
||||||
term_inst_args: args.clone(),
|
|
||||||
term_dest: destination,
|
|
||||||
cond_inst: prev_inst,
|
|
||||||
cond_arg: cond_arg,
|
|
||||||
cond_inst_args: prev_args.clone(),
|
|
||||||
cond_dest: *cond_dest,
|
|
||||||
kind: BranchOrderKind::InvertFloatCond(*cond),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
_ => return,
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
match prev_inst_data {
|
||||||
|
InstructionData::Branch {
|
||||||
|
opcode,
|
||||||
|
args: ref prev_args,
|
||||||
|
destination: cond_dest,
|
||||||
|
..
|
||||||
|
} => {
|
||||||
|
let cond_arg = {
|
||||||
|
let args = pos.func.dfg.inst_args(prev_inst);
|
||||||
|
args[0]
|
||||||
|
};
|
||||||
|
|
||||||
|
let kind = match opcode {
|
||||||
|
Opcode::Brz => BranchOrderKind::BrzToBrnz,
|
||||||
|
Opcode::Brnz => BranchOrderKind::BrnzToBrz,
|
||||||
|
_ => panic!("unexpected opcode"),
|
||||||
|
};
|
||||||
|
|
||||||
|
BranchOrderInfo {
|
||||||
|
term_inst: inst,
|
||||||
|
term_inst_args: args.clone(),
|
||||||
|
term_dest: destination,
|
||||||
|
cond_inst: prev_inst,
|
||||||
|
cond_arg: cond_arg,
|
||||||
|
cond_inst_args: prev_args.clone(),
|
||||||
|
cond_dest: *cond_dest,
|
||||||
|
kind: kind,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
InstructionData::BranchInt {
|
||||||
|
opcode: Opcode::Brif,
|
||||||
|
args: ref prev_args,
|
||||||
|
cond,
|
||||||
|
destination: cond_dest,
|
||||||
|
..
|
||||||
|
} => {
|
||||||
|
let cond_arg = {
|
||||||
|
let args = pos.func.dfg.inst_args(prev_inst);
|
||||||
|
args[0]
|
||||||
|
};
|
||||||
|
BranchOrderInfo {
|
||||||
|
term_inst: inst,
|
||||||
|
term_inst_args: args.clone(),
|
||||||
|
term_dest: destination,
|
||||||
|
cond_inst: prev_inst,
|
||||||
|
cond_arg: cond_arg,
|
||||||
|
cond_inst_args: prev_args.clone(),
|
||||||
|
cond_dest: *cond_dest,
|
||||||
|
kind: BranchOrderKind::InvertIntCond(*cond),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
InstructionData::BranchFloat {
|
||||||
|
opcode: Opcode::Brff,
|
||||||
|
args: ref prev_args,
|
||||||
|
cond,
|
||||||
|
destination: cond_dest,
|
||||||
|
..
|
||||||
|
} => {
|
||||||
|
let cond_arg = {
|
||||||
|
let args = pos.func.dfg.inst_args(prev_inst);
|
||||||
|
args[0]
|
||||||
|
};
|
||||||
|
BranchOrderInfo {
|
||||||
|
term_inst: inst,
|
||||||
|
term_inst_args: args.clone(),
|
||||||
|
term_dest: destination,
|
||||||
|
cond_inst: prev_inst,
|
||||||
|
cond_arg: cond_arg,
|
||||||
|
cond_inst_args: prev_args.clone(),
|
||||||
|
cond_dest: *cond_dest,
|
||||||
|
kind: BranchOrderKind::InvertFloatCond(*cond),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ => return,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_ => return,
|
_ => return,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user