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

[meta] Riscv: add back stacknull encodings for copy_nop;

Browse Source
This commit is contained in:
Benjamin Bouvier
2019-07-08 13:00:02 +02:00
parent 59f6c81e4f
commit 84a6795873
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cranelift/codegen/meta/src/isa/riscv/encodings.rs
View File

@@ -7,7 +7,8 @@ use crate::cdsl::recipes::{EncodingRecipeNumber, Recipes};
use crate::cdsl::settings::SettingGroup;
use crate::shared::types::Bool::B1;
use crate::shared::types::Int::{I32, I64};
use crate::shared::types::Float::{F32, F64};
use crate::shared::types::Int::{I16, I32, I64, I8};
use crate::shared::Definitions as SharedDefinitions;
use super::recipes::RecipeGroup;
@@ -119,6 +120,7 @@ pub fn define<'defs>(
let call = shared.by_name("call");
let call_indirect = shared.by_name("call_indirect");
let copy = shared.by_name("copy");
let copy_nop = shared.by_name("copy_nop");
let fill = shared.by_name("fill");
let iadd = shared.by_name("iadd");
let iadd_imm = shared.by_name("iadd_imm");
@@ -153,6 +155,7 @@ pub fn define<'defs>(
let r_rshamt = recipes.by_name("Rshamt");
let r_sb = recipes.by_name("SB");
let r_sb_zero = recipes.by_name("SBzero");
let r_stacknull = recipes.by_name("stacknull");
let r_u = recipes.by_name("U");
let r_uj = recipes.by_name("UJ");
let r_uj_call = recipes.by_name("UJcall");
@@ -379,5 +382,17 @@ pub fn define<'defs>(
e.add32(enc(regmove.bind(B1), r_irmov, opimm_bits(0b000, 0)));
e.add64(enc(regmove.bind(B1), r_irmov, opimm_bits(0b000, 0)));
// Stack-slot-to-the-same-stack-slot copy, which is guaranteed to turn
// into a no-op.
// The same encoding is generated for both the 64- and 32-bit architectures.
for &ty in &[I64, I32, I16, I8] {
e.add32(enc(copy_nop.bind(ty), r_stacknull, 0));
e.add64(enc(copy_nop.bind(ty), r_stacknull, 0));
}
for &ty in &[F64, F32] {
e.add32(enc(copy_nop.bind(ty), r_stacknull, 0));
e.add64(enc(copy_nop.bind(ty), r_stacknull, 0));
}
e
}

8
cranelift/codegen/meta/src/isa/riscv/recipes.rs
View File

@@ -263,5 +263,13 @@ pub fn define<'formats>(
.emit("unimplemented!();"),
);
// Stack-slot to same stack-slot copy, which is guaranteed to turn into a no-op.
recipes.push(
EncodingRecipeBuilder::new("stacknull", f_unary, 0)
.operands_in(vec![Stack::new(gpr)])
.operands_out(vec![Stack::new(gpr)])
.emit(""),
);
recipes
}