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

[meta] Avoid unwrapping instructions several times during legalization;

Browse Source 
This avoids doing multiple unpacking of the InstructionData for a single
legalization, improving readability and reducing size of the generated
code. For instance, icmp had to unpack the format once per IntCC
condition code.
This commit is contained in:
Benjamin Bouvier
2019-07-04 18:28:12 +02:00
parent ca53090f1b
commit 350b3b2406
5 changed files with 131 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cranelift/codegen/meta/src/cdsl/instructions.rs
View File

@@ -856,14 +856,14 @@ pub enum TypePredicateNode {
}
impl TypePredicateNode {
fn rust_predicate(&self) -> String {
fn rust_predicate(&self, func_str: &str) -> String {
match self {
TypePredicateNode::TypeVarCheck(index, value_type_name) => format!(
"func.dfg.value_type(args[{}]) == {}",
index, value_type_name
"{}.dfg.value_type(args[{}]) == {}",
func_str, index, value_type_name
),
TypePredicateNode::CtrlTypeVarCheck(value_type_name) => {
format!("func.dfg.ctrl_typevar(inst) == {}", value_type_name)
format!("{}.dfg.ctrl_typevar(inst) == {}", func_str, value_type_name)
}
}
}
@@ -884,18 +884,18 @@ pub enum InstructionPredicateNode {
}
impl InstructionPredicateNode {
fn rust_predicate(&self) -> String {
fn rust_predicate(&self, func_str: &str) -> String {
match self {
InstructionPredicateNode::FormatPredicate(node) => node.rust_predicate(),
InstructionPredicateNode::TypePredicate(node) => node.rust_predicate(),
InstructionPredicateNode::TypePredicate(node) => node.rust_predicate(func_str),
InstructionPredicateNode::And(nodes) => nodes
.iter()
.map(|x| x.rust_predicate())
.map(|x| x.rust_predicate(func_str))
.collect::<Vec<_>>()
.join(" && "),
InstructionPredicateNode::Or(nodes) => nodes
.iter()
.map(|x| x.rust_predicate())
.map(|x| x.rust_predicate(func_str))
.collect::<Vec<_>>()
.join(" || "),
}
@@ -1169,9 +1169,9 @@ impl InstructionPredicate {
self
}
pub fn rust_predicate(&self) -> String {
pub fn rust_predicate(&self, func_str: &str) -> String {
match &self.node {
Some(root) => root.rust_predicate(),
Some(root) => root.rust_predicate(func_str),
None => "true".into(),
}
}