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

Reuse the DominatorTree postorder travesal in BlockLoweringOrder (#5843)

Browse Source 
* Rework the blockorder module to reuse the dom tree's cfg postorder

* Update domtree tests

* Treat br_table with an empty jump table as multiple block exits

* Bless tests

* Change branch_idx to succ_idx and fix the comment
This commit is contained in:
Trevor Elliott
2023-02-23 14:05:20 -08:00
committed by GitHub
parent 4314210162
commit 8abfe928d6
175 changed files with 2936 additions and 3186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cranelift/codegen/src/context.rs
View File

@@ -140,7 +140,7 @@ impl Context {
self.optimize(isa)?; self.optimize(isa)?;
isa.compile_function(&self.func, self.want_disasm) isa.compile_function(&self.func, &self.domtree, self.want_disasm)
} }
/// Optimize the function, performing all compilation steps up to /// Optimize the function, performing all compilation steps up to

10
cranelift/codegen/src/dominator_tree.rs
View File

@@ -311,9 +311,17 @@ impl DominatorTree {
self.nodes[block].rpo_number = SEEN; self.nodes[block].rpo_number = SEEN;
self.stack.push((Visit::Last, block)); self.stack.push((Visit::Last, block));
if let Some(inst) = func.stencil.layout.last_inst(block) { if let Some(inst) = func.stencil.layout.last_inst(block) {
// Heuristic: chase the children in reverse. This puts the first
// successor block first in the postorder, all other things being
// equal, which tends to prioritize loop backedges over out-edges,
// putting the edge-block closer to the loop body and minimizing
// live-ranges in linear instruction space. This heuristic doesn't have
// any effect on the computation of dominators, and is purely for other
// consumers of the postorder we cache here.
for block in func.stencil.dfg.insts[inst] for block in func.stencil.dfg.insts[inst]
.branch_destination(&func.stencil.dfg.jump_tables) .branch_destination(&func.stencil.dfg.jump_tables)
.iter() .iter()
.rev()
{ {
let succ = block.block(&func.stencil.dfg.value_lists); let succ = block.block(&func.stencil.dfg.value_lists);
@@ -641,7 +649,7 @@ mod tests {
// return // return
// } block2 // } block2
// } block0 // } block0
assert_eq!(dt.cfg_postorder(), &[trap_block, block2, block0]); assert_eq!(dt.cfg_postorder(), &[block2, trap_block, block0]);
let v2_def = cur.func.dfg.value_def(v2).unwrap_inst(); let v2_def = cur.func.dfg.value_def(v2).unwrap_inst();
assert!(!dt.dominates(v2_def, block0, &cur.func.layout)); assert!(!dt.dominates(v2_def, block0, &cur.func.layout));

65
cranelift/codegen/src/isa/aarch64/mod.rs
View File

@@ -1,5 +1,6 @@
//! ARM 64-bit Instruction Set Architecture. //! ARM 64-bit Instruction Set Architecture.
use crate::dominator_tree::DominatorTree;
use crate::ir::condcodes::IntCC; use crate::ir::condcodes::IntCC;
use crate::ir::{Function, Type}; use crate::ir::{Function, Type};
use crate::isa::aarch64::settings as aarch64_settings; use crate::isa::aarch64::settings as aarch64_settings;
@@ -56,11 +57,12 @@ impl AArch64Backend {
fn compile_vcode( fn compile_vcode(
&self, &self,
func: &Function, func: &Function,
domtree: &DominatorTree,
) -> CodegenResult<(VCode<inst::Inst>, regalloc2::Output)> { ) -> CodegenResult<(VCode<inst::Inst>, regalloc2::Output)> {
let emit_info = EmitInfo::new(self.flags.clone()); let emit_info = EmitInfo::new(self.flags.clone());
let sigs = SigSet::new::<abi::AArch64MachineDeps>(func, &self.flags)?; let sigs = SigSet::new::<abi::AArch64MachineDeps>(func, &self.flags)?;
let abi = abi::AArch64Callee::new(func, self, &self.isa_flags, &sigs)?; let abi = abi::AArch64Callee::new(func, self, &self.isa_flags, &sigs)?;
compile::compile::<AArch64Backend>(func, self, abi, emit_info, sigs) compile::compile::<AArch64Backend>(func, domtree, self, abi, emit_info, sigs)
} }
} }
@@ -68,9 +70,10 @@ impl TargetIsa for AArch64Backend {
fn compile_function( fn compile_function(
&self, &self,
func: &Function, func: &Function,
domtree: &DominatorTree,
want_disasm: bool, want_disasm: bool,
) -> CodegenResult<CompiledCodeStencil> { ) -> CodegenResult<CompiledCodeStencil> {
let (vcode, regalloc_result) = self.compile_vcode(func)?; let (vcode, regalloc_result) = self.compile_vcode(func, domtree)?;
let emit_result = vcode.emit( let emit_result = vcode.emit(
&regalloc_result, &regalloc_result,
@@ -241,6 +244,8 @@ pub fn isa_builder(triple: Triple) -> IsaBuilder {
mod test { mod test {
use super::*; use super::*;
use crate::cursor::{Cursor, FuncCursor}; use crate::cursor::{Cursor, FuncCursor};
use crate::dominator_tree::DominatorTree;
use crate::flowgraph::ControlFlowGraph;
use crate::ir::types::*; use crate::ir::types::*;
use crate::ir::{AbiParam, Function, InstBuilder, JumpTableData, Signature, UserFuncName}; use crate::ir::{AbiParam, Function, InstBuilder, JumpTableData, Signature, UserFuncName};
use crate::isa::CallConv; use crate::isa::CallConv;
@@ -275,7 +280,12 @@ mod test {
shared_flags, shared_flags,
isa_flags, isa_flags,
); );
let buffer = backend.compile_function(&mut func, false).unwrap().buffer; let cfg = ControlFlowGraph::with_function(&func);
let domtree = DominatorTree::with_function(&func, &cfg);
let buffer = backend
.compile_function(&mut func, &domtree, false)
.unwrap()
.buffer;
let code = buffer.data(); let code = buffer.data();
// To update this comment, write the golden bytes to a file, and run the following command // To update this comment, write the golden bytes to a file, and run the following command
@@ -328,8 +338,10 @@ mod test {
shared_flags, shared_flags,
isa_flags, isa_flags,
); );
let cfg = ControlFlowGraph::with_function(&func);
let domtree = DominatorTree::with_function(&func, &cfg);
let result = backend let result = backend
.compile_function(&mut func, /* want_disasm = */ false) .compile_function(&mut func, &domtree, /* want_disasm = */ false)
.unwrap(); .unwrap();
let code = result.buffer.data(); let code = result.buffer.data();
@@ -340,21 +352,22 @@ mod test {
// 0: 52824689 mov w9, #0x1234 // #4660 // 0: 52824689 mov w9, #0x1234 // #4660
// 4: 0b09000b add w11, w0, w9 // 4: 0b09000b add w11, w0, w9
// 8: 2a0b03ea mov w10, w11 // 8: 2a0b03ea mov w10, w11
// c: b50000aa cbnz x10, 0x20 // c: b40000ca cbz x10, 0x24
// 10: 5282468c mov w12, #0x1234 // #4660 // 10: 2a0b03ed mov w13, w11
// 14: 0b0c016e add w14, w11, w12 // 14: b500008d cbnz x13, 0x24
// 18: 2a0e03ed mov w13, w14 // 18: 5282468e mov w14, #0x1234 // #4660
// 1c: b5ffffad cbnz x13, 0x10 // 1c: 4b0e0160 sub w0, w11, w14
// 20: 2a0b03e0 mov w0, w11 // 20: d65f03c0 ret
// 24: b5ffff60 cbnz x0, 0x10 // 24: 5282468f mov w15, #0x1234 // #4660
// 28: 52824681 mov w1, #0x1234 // #4660 // 28: 0b0f0161 add w1, w11, w15
// 2c: 4b010160 sub w0, w11, w1 // 2c: 2a0103e0 mov w0, w1
// 30: d65f03c0 ret // 30: b5ffffa0 cbnz x0, 0x24
// 34: 17fffff7 b 0x10
let golden = vec![ let golden = vec![
137, 70, 130, 82, 11, 0, 9, 11, 234, 3, 11, 42, 170, 0, 0, 181, 140, 70, 130, 82, 110, 137, 70, 130, 82, 11, 0, 9, 11, 234, 3, 11, 42, 202, 0, 0, 180, 237, 3, 11, 42, 141, 0,
1, 12, 11, 237, 3, 14, 42, 173, 255, 255, 181, 224, 3, 11, 42, 96, 255, 255, 181, 129, 0, 181, 142, 70, 130, 82, 96, 1, 14, 75, 192, 3, 95, 214, 143, 70, 130, 82, 97, 1, 15,
70, 130, 82, 96, 1, 1, 75, 192, 3, 95, 214, 11, 224, 3, 1, 42, 160, 255, 255, 181, 247, 255, 255, 23,
]; ];
assert_eq!(code, &golden[..]); assert_eq!(code, &golden[..]);
@@ -409,8 +422,10 @@ mod test {
shared_flags, shared_flags,
isa_flags, isa_flags,
); );
let cfg = ControlFlowGraph::with_function(&func);
let domtree = DominatorTree::with_function(&func, &cfg);
let result = backend let result = backend
.compile_function(&mut func, /* want_disasm = */ false) .compile_function(&mut func, &domtree, /* want_disasm = */ false)
.unwrap(); .unwrap();
let code = result.buffer.data(); let code = result.buffer.data();
@@ -419,7 +434,7 @@ mod test {
// > aarch64-linux-gnu-objdump -b binary -D <file> -m aarch64 // > aarch64-linux-gnu-objdump -b binary -D <file> -m aarch64
// //
// 0: 7100081f cmp w0, #0x2 // 0: 7100081f cmp w0, #0x2
// 4: 54000122 b.cs 0x28 // b.hs, b.nlast // 4: 540001a2 b.cs 0x38 // b.hs, b.nlast
// 8: 9a8023e8 csel x8, xzr, x0, cs // cs = hs, nlast // 8: 9a8023e8 csel x8, xzr, x0, cs // cs = hs, nlast
// c: d503229f csdb // c: d503229f csdb
// 10: 10000087 adr x7, 0x20 // 10: 10000087 adr x7, 0x20
@@ -427,18 +442,18 @@ mod test {
// 18: 8b0800e7 add x7, x7, x8 // 18: 8b0800e7 add x7, x7, x8
// 1c: d61f00e0 br x7 // 1c: d61f00e0 br x7
// 20: 00000010 udf #16 // 20: 00000010 udf #16
// 24: 00000018 udf #24 // 24: 00000008 udf #8
// 28: 52800060 mov w0, #0x3 // #3 // 28: 52800040 mov w0, #0x2 // #2
// 2c: d65f03c0 ret // 2c: d65f03c0 ret
// 30: 52800020 mov w0, #0x1 // #1 // 30: 52800020 mov w0, #0x1 // #1
// 34: d65f03c0 ret // 34: d65f03c0 ret
// 38: 52800040 mov w0, #0x2 // #2 // 38: 52800060 mov w0, #0x3 // #3
// 3c: d65f03c0 ret // 3c: d65f03c0 ret
let golden = vec![ let golden = vec![
31, 8, 0, 113, 34, 1, 0, 84, 232, 35, 128, 154, 159, 34, 3, 213, 135, 0, 0, 16, 232, 31, 8, 0, 113, 162, 1, 0, 84, 232, 35, 128, 154, 159, 34, 3, 213, 135, 0, 0, 16, 232,
88, 168, 184, 231, 0, 8, 139, 224, 0, 31, 214, 16, 0, 0, 0, 24, 0, 0, 0, 96, 0, 128, 88, 168, 184, 231, 0, 8, 139, 224, 0, 31, 214, 16, 0, 0, 0, 8, 0, 0, 0, 64, 0, 128, 82,
82, 192, 3, 95, 214, 32, 0, 128, 82, 192, 3, 95, 214, 64, 0, 128, 82, 192, 3, 95, 214, 192, 3, 95, 214, 32, 0, 128, 82, 192, 3, 95, 214, 96, 0, 128, 82, 192, 3, 95, 214,
]; ];
assert_eq!(code, &golden[..]); assert_eq!(code, &golden[..]);

2
cranelift/codegen/src/isa/mod.rs
View File

@@ -43,6 +43,7 @@
//! The configured target ISA trait object is a `Box<TargetIsa>` which can be used for multiple //! The configured target ISA trait object is a `Box<TargetIsa>` which can be used for multiple
//! concurrent function compilations. //! concurrent function compilations.
use crate::dominator_tree::DominatorTree;
pub use crate::isa::call_conv::CallConv; pub use crate::isa::call_conv::CallConv;
use crate::flowgraph; use crate::flowgraph;
@@ -252,6 +253,7 @@ pub trait TargetIsa: fmt::Display + Send + Sync {
fn compile_function( fn compile_function(
&self, &self,
func: &Function, func: &Function,
domtree: &DominatorTree,
want_disasm: bool, want_disasm: bool,
) -> CodegenResult<CompiledCodeStencil>; ) -> CodegenResult<CompiledCodeStencil>;

13
cranelift/codegen/src/isa/riscv64/mod.rs
View File

@@ -1,5 +1,6 @@
//! risc-v 64-bit Instruction Set Architecture. //! risc-v 64-bit Instruction Set Architecture.
use crate::dominator_tree::DominatorTree;
use crate::ir; use crate::ir;
use crate::ir::condcodes::IntCC; use crate::ir::condcodes::IntCC;
use crate::ir::Function; use crate::ir::Function;
@@ -56,11 +57,12 @@ impl Riscv64Backend {
fn compile_vcode( fn compile_vcode(
&self, &self,
func: &Function, func: &Function,
domtree: &DominatorTree,
) -> CodegenResult<(VCode<inst::Inst>, regalloc2::Output)> { ) -> CodegenResult<(VCode<inst::Inst>, regalloc2::Output)> {
let emit_info = EmitInfo::new(self.flags.clone(), self.isa_flags.clone()); let emit_info = EmitInfo::new(self.flags.clone(), self.isa_flags.clone());
let sigs = SigSet::new::<abi::Riscv64MachineDeps>(func, &self.flags)?; let sigs = SigSet::new::<abi::Riscv64MachineDeps>(func, &self.flags)?;
let abi = abi::Riscv64Callee::new(func, self, &self.isa_flags, &sigs)?; let abi = abi::Riscv64Callee::new(func, self, &self.isa_flags, &sigs)?;
compile::compile::<Riscv64Backend>(func, self, abi, emit_info, sigs) compile::compile::<Riscv64Backend>(func, domtree, self, abi, emit_info, sigs)
} }
} }
@@ -68,9 +70,10 @@ impl TargetIsa for Riscv64Backend {
fn compile_function( fn compile_function(
&self, &self,
func: &Function, func: &Function,
domtree: &DominatorTree,
want_disasm: bool, want_disasm: bool,
) -> CodegenResult<CompiledCodeStencil> { ) -> CodegenResult<CompiledCodeStencil> {
let (vcode, regalloc_result) = self.compile_vcode(func)?; let (vcode, regalloc_result) = self.compile_vcode(func, domtree)?;
let want_disasm = want_disasm || log::log_enabled!(log::Level::Debug); let want_disasm = want_disasm || log::log_enabled!(log::Level::Debug);
let emit_result = vcode.emit( let emit_result = vcode.emit(
@@ -216,6 +219,8 @@ pub fn isa_builder(triple: Triple) -> IsaBuilder {
mod test { mod test {
use super::*; use super::*;
use crate::cursor::{Cursor, FuncCursor}; use crate::cursor::{Cursor, FuncCursor};
use crate::dominator_tree::DominatorTree;
use crate::flowgraph::ControlFlowGraph;
use crate::ir::types::*; use crate::ir::types::*;
use crate::ir::{AbiParam, Function, InstBuilder, Signature, UserFuncName}; use crate::ir::{AbiParam, Function, InstBuilder, Signature, UserFuncName};
use crate::isa::CallConv; use crate::isa::CallConv;
@@ -250,7 +255,9 @@ mod test {
shared_flags, shared_flags,
isa_flags, isa_flags,
); );
let buffer = backend.compile_function(&mut func, true).unwrap(); let cfg = ControlFlowGraph::with_function(&func);
let domtree = DominatorTree::with_function(&func, &cfg);
let buffer = backend.compile_function(&mut func, &domtree, true).unwrap();
let code = buffer.buffer.data(); let code = buffer.buffer.data();
// To update this comment, write the golden bytes to a file, and run the following command // To update this comment, write the golden bytes to a file, and run the following command

40
cranelift/codegen/src/isa/s390x/mod.rs
View File

@@ -1,5 +1,6 @@
//! IBM Z 64-bit Instruction Set Architecture. //! IBM Z 64-bit Instruction Set Architecture.
use crate::dominator_tree::DominatorTree;
use crate::ir::condcodes::IntCC; use crate::ir::condcodes::IntCC;
use crate::ir::{Function, Type}; use crate::ir::{Function, Type};
use crate::isa::s390x::settings as s390x_settings; use crate::isa::s390x::settings as s390x_settings;
@@ -56,11 +57,12 @@ impl S390xBackend {
fn compile_vcode( fn compile_vcode(
&self, &self,
func: &Function, func: &Function,
domtree: &DominatorTree,
) -> CodegenResult<(VCode<inst::Inst>, regalloc2::Output)> { ) -> CodegenResult<(VCode<inst::Inst>, regalloc2::Output)> {
let emit_info = EmitInfo::new(self.isa_flags.clone()); let emit_info = EmitInfo::new(self.isa_flags.clone());
let sigs = SigSet::new::<abi::S390xMachineDeps>(func, &self.flags)?; let sigs = SigSet::new::<abi::S390xMachineDeps>(func, &self.flags)?;
let abi = abi::S390xCallee::new(func, self, &self.isa_flags, &sigs)?; let abi = abi::S390xCallee::new(func, self, &self.isa_flags, &sigs)?;
compile::compile::<S390xBackend>(func, self, abi, emit_info, sigs) compile::compile::<S390xBackend>(func, domtree, self, abi, emit_info, sigs)
} }
} }
@@ -68,10 +70,11 @@ impl TargetIsa for S390xBackend {
fn compile_function( fn compile_function(
&self, &self,
func: &Function, func: &Function,
domtree: &DominatorTree,
want_disasm: bool, want_disasm: bool,
) -> CodegenResult<CompiledCodeStencil> { ) -> CodegenResult<CompiledCodeStencil> {
let flags = self.flags(); let flags = self.flags();
let (vcode, regalloc_result) = self.compile_vcode(func)?; let (vcode, regalloc_result) = self.compile_vcode(func, domtree)?;
let emit_result = vcode.emit(&regalloc_result, want_disasm, flags.machine_code_cfg_info()); let emit_result = vcode.emit(&regalloc_result, want_disasm, flags.machine_code_cfg_info());
let frame_size = emit_result.frame_size; let frame_size = emit_result.frame_size;
@@ -213,6 +216,8 @@ pub fn isa_builder(triple: Triple) -> IsaBuilder {
mod test { mod test {
use super::*; use super::*;
use crate::cursor::{Cursor, FuncCursor}; use crate::cursor::{Cursor, FuncCursor};
use crate::dominator_tree::DominatorTree;
use crate::flowgraph::ControlFlowGraph;
use crate::ir::types::*; use crate::ir::types::*;
use crate::ir::UserFuncName; use crate::ir::UserFuncName;
use crate::ir::{AbiParam, Function, InstBuilder, Signature}; use crate::ir::{AbiParam, Function, InstBuilder, Signature};
@@ -248,8 +253,10 @@ mod test {
shared_flags, shared_flags,
isa_flags, isa_flags,
); );
let cfg = ControlFlowGraph::with_function(&func);
let domtree = DominatorTree::with_function(&func, &cfg);
let result = backend let result = backend
.compile_function(&mut func, /* want_disasm = */ false) .compile_function(&mut func, &domtree, /* want_disasm = */ false)
.unwrap(); .unwrap();
let code = result.buffer.data(); let code = result.buffer.data();
@@ -297,8 +304,10 @@ mod test {
shared_flags, shared_flags,
isa_flags, isa_flags,
); );
let cfg = ControlFlowGraph::with_function(&func);
let domtree = DominatorTree::with_function(&func, &cfg);
let result = backend let result = backend
.compile_function(&mut func, /* want_disasm = */ false) .compile_function(&mut func, &domtree, /* want_disasm = */ false)
.unwrap(); .unwrap();
let code = result.buffer.data(); let code = result.buffer.data();
@@ -310,19 +319,20 @@ mod test {
// //
// 0: a7 2a 12 34 ahi %r2,4660 // 0: a7 2a 12 34 ahi %r2,4660
// 4: a7 2e 00 00 chi %r2,0 // 4: a7 2e 00 00 chi %r2,0
// 8: c0 64 00 00 00 0b jglh 0x1e // 8: c0 94 00 00 00 0b jgnlh 0x1e
// e: ec 32 12 34 00 d8 ahik %r3,%r2,4660 // e: a7 2e 00 00 chi %r2,0
// 14: a7 3e 00 00 chi %r3,0 // 12: c0 64 00 00 00 06 jglh 0x1e
// 18: c0 64 ff ff ff fb jglh 0xe // 18: a7 2a ed cc ahi %r2,-4660
// 1e: a7 2e 00 00 chi %r2,0 // 1c: 07 fe br %r14
// 22: c0 64 ff ff ff f6 jglh 0xe // 1e: ec 32 12 34 00 d8 ahik %r3,%r2,4660
// 28: a7 2a ed cc ahi %r2,-4660 // 24: a7 3e 00 00 chi %r3,0
// 2c: 07 fe br %r14 // 28: c0 64 ff ff ff fb jglh 0x1e
// 2e: c0 f4 ff ff ff f0 jg 0xe
let golden = vec![ let golden = vec![
167, 42, 18, 52, 167, 46, 0, 0, 192, 100, 0, 0, 0, 11, 236, 50, 18, 52, 0, 216, 167, 167, 42, 18, 52, 167, 46, 0, 0, 192, 148, 0, 0, 0, 11, 167, 46, 0, 0, 192, 100, 0, 0,
62, 0, 0, 192, 100, 255, 255, 255, 251, 167, 46, 0, 0, 192, 100, 255, 255, 255, 246, 0, 6, 167, 42, 237, 204, 7, 254, 236, 50, 18, 52, 0, 216, 167, 62, 0, 0, 192, 100, 255,
167, 42, 237, 204, 7, 254, 255, 255, 251, 192, 244, 255, 255, 255, 240,
]; ];
assert_eq!(code, &golden[..]); assert_eq!(code, &golden[..]);

56
cranelift/codegen/src/isa/x64/mod.rs
View File

@@ -3,6 +3,7 @@
pub use self::inst::{args, EmitInfo, EmitState, Inst}; pub use self::inst::{args, EmitInfo, EmitState, Inst};
use super::{OwnedTargetIsa, TargetIsa}; use super::{OwnedTargetIsa, TargetIsa};
use crate::dominator_tree::DominatorTree;
use crate::ir::{condcodes::IntCC, Function, Type}; use crate::ir::{condcodes::IntCC, Function, Type};
#[cfg(feature = "unwind")] #[cfg(feature = "unwind")]
use crate::isa::unwind::systemv; use crate::isa::unwind::systemv;
@@ -48,13 +49,14 @@ impl X64Backend {
fn compile_vcode( fn compile_vcode(
&self, &self,
func: &Function, func: &Function,
domtree: &DominatorTree,
) -> CodegenResult<(VCode<inst::Inst>, regalloc2::Output)> { ) -> CodegenResult<(VCode<inst::Inst>, regalloc2::Output)> {
// This performs lowering to VCode, register-allocates the code, computes // This performs lowering to VCode, register-allocates the code, computes
// block layout and finalizes branches. The result is ready for binary emission. // block layout and finalizes branches. The result is ready for binary emission.
let emit_info = EmitInfo::new(self.flags.clone(), self.x64_flags.clone()); let emit_info = EmitInfo::new(self.flags.clone(), self.x64_flags.clone());
let sigs = SigSet::new::<abi::X64ABIMachineSpec>(func, &self.flags)?; let sigs = SigSet::new::<abi::X64ABIMachineSpec>(func, &self.flags)?;
let abi = abi::X64Callee::new(&func, self, &self.x64_flags, &sigs)?; let abi = abi::X64Callee::new(func, self, &self.x64_flags, &sigs)?;
compile::compile::<Self>(&func, self, abi, emit_info, sigs) compile::compile::<Self>(func, domtree, self, abi, emit_info, sigs)
} }
} }
@@ -62,9 +64,10 @@ impl TargetIsa for X64Backend {
fn compile_function( fn compile_function(
&self, &self,
func: &Function, func: &Function,
domtree: &DominatorTree,
want_disasm: bool, want_disasm: bool,
) -> CodegenResult<CompiledCodeStencil> { ) -> CodegenResult<CompiledCodeStencil> {
let (vcode, regalloc_result) = self.compile_vcode(func)?; let (vcode, regalloc_result) = self.compile_vcode(func, domtree)?;
let emit_result = vcode.emit( let emit_result = vcode.emit(
&regalloc_result, &regalloc_result,
@@ -231,6 +234,8 @@ fn isa_constructor(
mod test { mod test {
use super::*; use super::*;
use crate::cursor::{Cursor, FuncCursor}; use crate::cursor::{Cursor, FuncCursor};
use crate::dominator_tree::DominatorTree;
use crate::flowgraph::ControlFlowGraph;
use crate::ir::{types::*, RelSourceLoc, SourceLoc, UserFuncName, ValueLabel, ValueLabelStart}; use crate::ir::{types::*, RelSourceLoc, SourceLoc, UserFuncName, ValueLabel, ValueLabelStart};
use crate::ir::{AbiParam, Function, InstBuilder, JumpTableData, Signature}; use crate::ir::{AbiParam, Function, InstBuilder, JumpTableData, Signature};
use crate::isa::CallConv; use crate::isa::CallConv;
@@ -341,8 +346,10 @@ mod test {
shared_flags, shared_flags,
isa_flags, isa_flags,
); );
let cfg = ControlFlowGraph::with_function(&func);
let domtree = DominatorTree::with_function(&func, &cfg);
let result = backend let result = backend
.compile_function(&mut func, /* want_disasm = */ false) .compile_function(&mut func, &domtree, /* want_disasm = */ false)
.unwrap(); .unwrap();
let code = result.buffer.data(); let code = result.buffer.data();
@@ -355,27 +362,28 @@ mod test {
// 4: 48 89 fe mov rsi,rdi // 4: 48 89 fe mov rsi,rdi
// 7: 81 c6 34 12 00 00 add esi,0x1234 // 7: 81 c6 34 12 00 00 add esi,0x1234
// d: 85 f6 test esi,esi // d: 85 f6 test esi,esi
// f: 0f 84 1c 00 00 00 je 0x31 // f: 0f 84 21 00 00 00 je 0x36
// 15: 49 89 f0 mov r8,rsi // 15: 49 89 f0 mov r8,rsi
// 18: 48 89 f0 mov rax,rsi // 18: 48 89 f0 mov rax,rsi
// 1b: 81 e8 34 12 00 00 sub eax,0x1234 // 1b: 81 e8 34 12 00 00 sub eax,0x1234
// 21: 44 01 c0 add eax,r8d // 21: 44 01 c0 add eax,r8d
// 24: 85 f6 test esi,esi // 24: 85 f6 test esi,esi
// 26: 0f 85 05 00 00 00 jne 0x31 // 26: 0f 85 0a 00 00 00 jne 0x36
// 2c: 48 89 ec mov rsp,rbp // 2c: 48 89 ec mov rsp,rbp
// 2f: 5d pop rbp // 2f: 5d pop rbp
// 30: c3 ret // 30: c3 ret
// 31: 49 89 f0 mov r8,rsi // 31: e9 e2 ff ff ff jmp 0x18
// 34: 41 81 c0 34 12 00 00 add r8d,0x1234 // 36: 49 89 f0 mov r8,rsi
// 3b: 45 85 c0 test r8d,r8d // 39: 41 81 c0 34 12 00 00 add r8d,0x1234
// 3e: 0f 85 ed ff ff ff jne 0x31 // 40: 45 85 c0 test r8d,r8d
// 44: e9 cf ff ff ff jmp 0x18 // 43: 0f 84 cf ff ff ff je 0x18
// 49: e9 e8 ff ff ff jmp 0x36
let golden = vec![ let golden = vec![
85, 72, 137, 229, 72, 137, 254, 129, 198, 52, 18, 0, 0, 133, 246, 15, 132, 28, 0, 0, 0, 85, 72, 137, 229, 72, 137, 254, 129, 198, 52, 18, 0, 0, 133, 246, 15, 132, 33, 0, 0, 0,
73, 137, 240, 72, 137, 240, 129, 232, 52, 18, 0, 0, 68, 1, 192, 133, 246, 15, 133, 5, 73, 137, 240, 72, 137, 240, 129, 232, 52, 18, 0, 0, 68, 1, 192, 133, 246, 15, 133, 10,
0, 0, 0, 72, 137, 236, 93, 195, 73, 137, 240, 65, 129, 192, 52, 18, 0, 0, 69, 133, 192, 0, 0, 0, 72, 137, 236, 93, 195, 233, 226, 255, 255, 255, 73, 137, 240, 65, 129, 192,
15, 133, 237, 255, 255, 255, 233, 207, 255, 255, 255, 52, 18, 0, 0, 69, 133, 192, 15, 132, 207, 255, 255, 255, 233, 232, 255, 255, 255,
]; ];
assert_eq!(code, &golden[..]); assert_eq!(code, &golden[..]);
@@ -450,8 +458,10 @@ mod test {
shared_flags, shared_flags,
isa_flags, isa_flags,
); );
let cfg = ControlFlowGraph::with_function(&func);
let domtree = DominatorTree::with_function(&func, &cfg);
let result = backend let result = backend
.compile_function(&mut func, /* want_disasm = */ false) .compile_function(&mut func, &domtree, /* want_disasm = */ false)
.unwrap(); .unwrap();
let code = result.buffer.data(); let code = result.buffer.data();
@@ -462,7 +472,7 @@ mod test {
// 0: 55 push rbp // 0: 55 push rbp
// 1: 48 89 e5 mov rbp,rsp // 1: 48 89 e5 mov rbp,rsp
// 4: 83 ff 02 cmp edi,0x2 // 4: 83 ff 02 cmp edi,0x2
// 7: 0f 83 27 00 00 00 jae 0x34 // 7: 0f 83 3b 00 00 00 jae 0x48
// d: 44 8b d7 mov r10d,edi // d: 44 8b d7 mov r10d,edi
// 10: 41 b9 00 00 00 00 mov r9d,0x0 // 10: 41 b9 00 00 00 00 mov r9d,0x0
// 16: 4d 0f 43 d1 cmovae r10,r9 // 16: 4d 0f 43 d1 cmovae r10,r9
@@ -472,9 +482,9 @@ mod test {
// 29: 41 ff e1 jmp r9 // 29: 41 ff e1 jmp r9
// 2c: 12 00 adc al,BYTE PTR [rax] // 2c: 12 00 adc al,BYTE PTR [rax]
// 2e: 00 00 add BYTE PTR [rax],al // 2e: 00 00 add BYTE PTR [rax],al
// 30: 1c 00 sbb al,0x0 // 30: 08 00 or BYTE PTR [rax],al
// 32: 00 00 add BYTE PTR [rax],al // 32: 00 00 add BYTE PTR [rax],al
// 34: b8 03 00 00 00 mov eax,0x3 // 34: b8 02 00 00 00 mov eax,0x2
// 39: 48 89 ec mov rsp,rbp // 39: 48 89 ec mov rsp,rbp
// 3c: 5d pop rbp // 3c: 5d pop rbp
// 3d: c3 ret // 3d: c3 ret
@@ -482,16 +492,16 @@ mod test {
// 43: 48 89 ec mov rsp,rbp // 43: 48 89 ec mov rsp,rbp
// 46: 5d pop rbp // 46: 5d pop rbp
// 47: c3 ret // 47: c3 ret
// 48: b8 02 00 00 00 mov eax,0x2 // 48: b8 03 00 00 00 mov eax,0x3
// 4d: 48 89 ec mov rsp,rbp // 4d: 48 89 ec mov rsp,rbp
// 50: 5d pop rbp // 50: 5d pop rbp
// 51: c3 ret // 51: c3 ret
let golden = vec![ let golden = vec![
85, 72, 137, 229, 131, 255, 2, 15, 131, 39, 0, 0, 0, 68, 139, 215, 65, 185, 0, 0, 0, 0, 85, 72, 137, 229, 131, 255, 2, 15, 131, 59, 0, 0, 0, 68, 139, 215, 65, 185, 0, 0, 0, 0,
77, 15, 67, 209, 76, 141, 13, 11, 0, 0, 0, 79, 99, 84, 145, 0, 77, 1, 209, 65, 255, 77, 15, 67, 209, 76, 141, 13, 11, 0, 0, 0, 79, 99, 84, 145, 0, 77, 1, 209, 65, 255,
225, 18, 0, 0, 0, 28, 0, 0, 0, 184, 3, 0, 0, 0, 72, 137, 236, 93, 195, 184, 1, 0, 0, 0, 225, 18, 0, 0, 0, 8, 0, 0, 0, 184, 2, 0, 0, 0, 72, 137, 236, 93, 195, 184, 1, 0, 0, 0,
72, 137, 236, 93, 195, 184, 2, 0, 0, 0, 72, 137, 236, 93, 195, 72, 137, 236, 93, 195, 184, 3, 0, 0, 0, 72, 137, 236, 93, 195,
]; ];
assert_eq!(code, &golden[..]); assert_eq!(code, &golden[..]);

18
cranelift/codegen/src/loop_analysis.rs
View File

@@ -417,25 +417,23 @@ mod tests {
} }
let mut loop_analysis = LoopAnalysis::new(); let mut loop_analysis = LoopAnalysis::new();
let mut cfg = ControlFlowGraph::new(); let cfg = ControlFlowGraph::with_function(&func);
let mut domtree = DominatorTree::new(); let domtree = DominatorTree::with_function(&func, &cfg);
cfg.compute(&func);
domtree.compute(&func, &cfg);
loop_analysis.compute(&func, &cfg, &domtree); loop_analysis.compute(&func, &cfg, &domtree);
let loops = loop_analysis.loops().collect::<Vec<Loop>>(); let loops = loop_analysis.loops().collect::<Vec<Loop>>();
assert_eq!(loops.len(), 3); assert_eq!(loops.len(), 3);
assert_eq!(loop_analysis.loop_header(loops[0]), block0); assert_eq!(loop_analysis.loop_header(loops[0]), block0);
assert_eq!(loop_analysis.loop_header(loops[1]), block1); assert_eq!(loop_analysis.loop_header(loops[1]), block3);
assert_eq!(loop_analysis.loop_header(loops[2]), block3); assert_eq!(loop_analysis.loop_header(loops[2]), block1);
assert_eq!(loop_analysis.loop_parent(loops[1]), Some(loops[0])); assert_eq!(loop_analysis.loop_parent(loops[1]), Some(loops[0]));
assert_eq!(loop_analysis.loop_parent(loops[2]), Some(loops[0])); assert_eq!(loop_analysis.loop_parent(loops[2]), Some(loops[0]));
assert_eq!(loop_analysis.loop_parent(loops[0]), None); assert_eq!(loop_analysis.loop_parent(loops[0]), None);
assert_eq!(loop_analysis.is_in_loop(block0, loops[0]), true); assert_eq!(loop_analysis.is_in_loop(block0, loops[0]), true);
assert_eq!(loop_analysis.is_in_loop(block1, loops[1]), true); assert_eq!(loop_analysis.is_in_loop(block1, loops[2]), true);
assert_eq!(loop_analysis.is_in_loop(block2, loops[1]), true); assert_eq!(loop_analysis.is_in_loop(block2, loops[2]), true);
assert_eq!(loop_analysis.is_in_loop(block3, loops[2]), true); assert_eq!(loop_analysis.is_in_loop(block3, loops[1]), true);
assert_eq!(loop_analysis.is_in_loop(block4, loops[2]), true); assert_eq!(loop_analysis.is_in_loop(block4, loops[1]), true);
assert_eq!(loop_analysis.is_in_loop(block5, loops[0]), true); assert_eq!(loop_analysis.is_in_loop(block5, loops[0]), true);
assert_eq!(loop_analysis.loop_level(block0).level(), 1); assert_eq!(loop_analysis.loop_level(block0).level(), 1);
assert_eq!(loop_analysis.loop_level(block1).level(), 2); assert_eq!(loop_analysis.loop_level(block1).level(), 2);

584
cranelift/codegen/src/machinst/blockorder.rs
View File

@@ -36,25 +36,16 @@
//! +--------------+ +--------------+ //! +--------------+ +--------------+
//! | (edge 0->1) | | (edge 0->2) | //! | (edge 0->1) | | (edge 0->2) |
//! | CLIF block 1 | | CLIF block 2 | //! | CLIF block 1 | | CLIF block 2 |
//! | (edge 1->3) | | (edge 2->3) |
//! +--------------+ +--------------+ //! +--------------+ +--------------+
//! \ / //! \ /
//! +-----------+ +-----------+
//! |(edge 1->3)| |(edge 2->3)|
//! +-----------+ +-----------+
//! \ / //! \ /
//! +------------+ //! +------------+
//! |CLIF block 3| //! |CLIF block 3|
//! +------------+ //! +------------+
//! ``` //! ```
//! //!
//! (note that the edges into CLIF blocks 1 and 2 could be merged with those //! Each `LoweredBlock` names just an original CLIF block, or just an edge block.
//! blocks' original bodies, but the out-edges could not because for simplicity
//! in the successor-function definition, we only ever merge an edge onto one
//! side of an original CLIF block.)
//!
//! Each `LoweredBlock` names just an original CLIF block, an original CLIF
//! block prepended or appended with an edge block (never both, though), or just
//! an edge block.
//! //!
//! To compute this lowering, we do a DFS over the CLIF-plus-edge-block graph //! To compute this lowering, we do a DFS over the CLIF-plus-edge-block graph
//! (never actually materialized, just defined by a "successors" function), and //! (never actually materialized, just defined by a "successors" function), and
@@ -69,6 +60,7 @@
//! branch editing that in practice elides empty blocks and simplifies some of //! branch editing that in practice elides empty blocks and simplifies some of
//! the other redundancies that this scheme produces. //! the other redundancies that this scheme produces.
use crate::dominator_tree::DominatorTree;
use crate::entity::SecondaryMap; use crate::entity::SecondaryMap;
use crate::fx::{FxHashMap, FxHashSet}; use crate::fx::{FxHashMap, FxHashSet};
use crate::inst_predicates::visit_block_succs; use crate::inst_predicates::visit_block_succs;
@@ -84,21 +76,11 @@ pub struct BlockLoweringOrder {
/// (i) a CLIF block, and (ii) inserted crit-edge blocks before or after; /// (i) a CLIF block, and (ii) inserted crit-edge blocks before or after;
/// see [LoweredBlock] for details. /// see [LoweredBlock] for details.
lowered_order: Vec<LoweredBlock>, lowered_order: Vec<LoweredBlock>,
/// Successors for all lowered blocks, in one serialized vector. Indexed by /// BlockIndex values for successors for all lowered blocks, indexing `lowered_order`.
/// the ranges in `lowered_succ_ranges`. lowered_succ_indices: Vec<BlockIndex>,
#[allow(dead_code)] /// Ranges in `lowered_succ_indices` giving the successor lists for each lowered
lowered_succs: Vec<(Inst, LoweredBlock)>,
/// BlockIndex values for successors for all lowered blocks, in the same
/// order as `lowered_succs`.
lowered_succ_indices: Vec<(Inst, BlockIndex)>,
/// Ranges in `lowered_succs` giving the successor lists for each lowered
/// block. Indexed by lowering-order index (`BlockIndex`). /// block. Indexed by lowering-order index (`BlockIndex`).
lowered_succ_ranges: Vec<(usize, usize)>, lowered_succ_ranges: Vec<(Option<Inst>, std::ops::Range<usize>)>,
/// Mapping from CLIF BB to BlockIndex (index in lowered order). Note that
/// some CLIF BBs may not be lowered; in particular, we skip unreachable
/// blocks.
#[allow(dead_code)]
orig_map: SecondaryMap<Block, Option<BlockIndex>>,
/// Cold blocks. These blocks are not reordered in the /// Cold blocks. These blocks are not reordered in the
/// `lowered_order` above; the lowered order must respect RPO /// `lowered_order` above; the lowered order must respect RPO
/// (uses after defs) in order for lowering to be /// (uses after defs) in order for lowering to be
@@ -110,390 +92,198 @@ pub struct BlockLoweringOrder {
indirect_branch_targets: FxHashSet<BlockIndex>, indirect_branch_targets: FxHashSet<BlockIndex>,
} }
/// The origin of a block in the lowered block-order: either an original CLIF
/// block, or an inserted edge-block, or a combination of the two if an edge is
/// non-critical.
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
pub enum LoweredBlock { pub enum LoweredBlock {
/// Block in original CLIF, with no merged edge-blocks. /// Block in original CLIF.
Orig { Orig {
/// Original CLIF block. /// Original CLIF block.
block: Block, block: Block,
}, },
/// Block in the original CLIF, plus edge-block to one succ (which is the
/// one successor of the original block). /// Critical edge between two CLIF blocks.
OrigAndEdge { CriticalEdge {
/// The original CLIF block contained in this lowered block. /// The predecessor block.
block: Block,
/// The edge (jump) instruction transitioning from this block
/// to the next, i.e., corresponding to the included edge-block. This
/// will be an instruction in `block`.
edge_inst: Inst,
/// The successor index in this edge, to distinguish multiple
/// edges between the same block pair.
succ_idx: usize,
/// The successor CLIF block.
succ: Block,
},
/// Block in the original CLIF, preceded by edge-block from one pred (which
/// is the one pred of the original block).
EdgeAndOrig {
/// The previous CLIF block, i.e., the edge block's predecessor.
pred: Block, pred: Block,
/// The edge (jump) instruction corresponding to the included
/// edge-block. This will be an instruction in `pred`. /// The successor block.
edge_inst: Inst,
/// The successor index in this edge, to distinguish multiple
/// edges between the same block pair.
succ_idx: usize,
/// The original CLIF block included in this lowered block.
block: Block,
},
/// Split critical edge between two CLIF blocks. This lowered block does not
/// correspond to any original CLIF blocks; it only serves as an insertion
/// point for work to happen on the transition from `pred` to `succ`.
Edge {
/// The predecessor CLIF block.
pred: Block,
/// The edge (jump) instruction corresponding to this edge's transition.
/// This will be an instruction in `pred`.
edge_inst: Inst,
/// The successor index in this edge, to distinguish multiple
/// edges between the same block pair.
succ_idx: usize,
/// The successor CLIF block.
succ: Block, succ: Block,
/// The index of this branch in the successor edges from `pred`, following the same
/// indexing order as `inst_predicates::visit_block_succs`. This is used to distinguish
/// multiple edges between the same CLIF blocks.
succ_idx: u32,
}, },
} }
impl LoweredBlock { impl LoweredBlock {
/// The associated original (CLIF) block included in this lowered block, if /// Unwrap an `Orig` block.
/// any. pub fn orig_block(&self) -> Option<Block> {
pub fn orig_block(self) -> Option<Block> {
match self { match self {
LoweredBlock::Orig { block, .. } &LoweredBlock::Orig { block } => Some(block),
| LoweredBlock::OrigAndEdge { block, .. } &LoweredBlock::CriticalEdge { .. } => None,
| LoweredBlock::EdgeAndOrig { block, .. } => Some(block),
LoweredBlock::Edge { .. } => None,
} }
} }
/// The associated in-edge, if any. /// The associated in-edge predecessor, if this is a critical edge.
#[cfg(test)] #[cfg(test)]
pub fn in_edge(self) -> Option<(Block, Inst, Block)> { pub fn in_edge(&self) -> Option<Block> {
match self { match self {
LoweredBlock::EdgeAndOrig { &LoweredBlock::CriticalEdge { pred, .. } => Some(pred),
pred, &LoweredBlock::Orig { .. } => None,
edge_inst,
block,
..
} => Some((pred, edge_inst, block)),
_ => None,
} }
} }
/// the associated out-edge, if any. Also includes edge-only blocks. /// The associated out-edge successor, if this is a critical edge.
#[cfg(test)] #[cfg(test)]
pub fn out_edge(self) -> Option<(Block, Inst, Block)> { pub fn out_edge(&self) -> Option<Block> {
match self { match self {
LoweredBlock::OrigAndEdge { &LoweredBlock::CriticalEdge { succ, .. } => Some(succ),
block, &LoweredBlock::Orig { .. } => None,
edge_inst,
succ,
..
} => Some((block, edge_inst, succ)),
LoweredBlock::Edge {
pred,
edge_inst,
succ,
..
} => Some((pred, edge_inst, succ)),
_ => None,
} }
} }
} }
impl BlockLoweringOrder { impl BlockLoweringOrder {
/// Compute and return a lowered block order for `f`. /// Compute and return a lowered block order for `f`.
pub fn new(f: &Function) -> BlockLoweringOrder { pub fn new(f: &Function, domtree: &DominatorTree) -> BlockLoweringOrder {
trace!("BlockLoweringOrder: function body {:?}", f); trace!("BlockLoweringOrder: function body {:?}", f);
// Make sure that we have an entry block, and the entry block is
// not marked as cold. (The verifier ensures this as well, but
// the user may not have run the verifier, and this property is
// critical to avoid a miscompile, so we assert it here too.)
let entry = f.layout.entry_block().expect("Must have entry block");
assert!(!f.layout.is_cold(entry));
// Step 1: compute the in-edge and out-edge count of every block. // Step 1: compute the in-edge and out-edge count of every block.
let mut block_in_count = SecondaryMap::with_default(0); let mut block_in_count = SecondaryMap::with_default(0);
let mut block_out_count = SecondaryMap::with_default(0); let mut block_out_count = SecondaryMap::with_default(0);
// Cache the block successors to avoid re-examining branches below. // Block successors are stored as `LoweredBlocks` to simplify the construction of
let mut block_succs: SmallVec<[(Inst, usize, Block); 128]> = SmallVec::new(); // `lowered_succs` in the final result. Initially, all entries are `Orig` values, and are
let mut block_succ_range = SecondaryMap::with_default((0, 0)); // updated to be `CriticalEdge` when those cases are identified in step 2 below.
let mut block_succs: SmallVec<[LoweredBlock; 128]> = SmallVec::new();
let mut block_succ_range = SecondaryMap::with_default(0..0);
let mut indirect_branch_target_clif_blocks = FxHashSet::default(); let mut indirect_branch_target_clif_blocks = FxHashSet::default();
for block in f.layout.blocks() { for block in f.layout.blocks() {
let block_succ_start = block_succs.len(); let start = block_succs.len();
let mut succ_idx = 0; visit_block_succs(f, block, |_, succ, from_table| {
visit_block_succs(f, block, |inst, succ, from_table| {
block_out_count[block] += 1; block_out_count[block] += 1;
block_in_count[succ] += 1; block_in_count[succ] += 1;
block_succs.push((inst, succ_idx, succ)); block_succs.push(LoweredBlock::Orig { block: succ });
succ_idx += 1;
if from_table { if from_table {
indirect_branch_target_clif_blocks.insert(succ); indirect_branch_target_clif_blocks.insert(succ);
} }
}); });
let block_succ_end = block_succs.len();
block_succ_range[block] = (block_succ_start, block_succ_end);
// Ensure that blocks terminated by br_table instructions with an empty jump table are
// still treated like conditional blocks from the point of view of critical edge
// splitting.
if let Some(inst) = f.layout.last_inst(block) { if let Some(inst) = f.layout.last_inst(block) {
if f.dfg.insts[inst].opcode() == Opcode::Return { if Opcode::BrTable == f.dfg.insts[inst].opcode() {
// Implicit output edge for any return. block_out_count[block] = block_out_count[block].max(2);
block_out_count[block] += 1;
}
}
}
// Implicit input edge for entry block.
block_in_count[entry] += 1;
// All blocks ending in conditional branches or br_tables must
// have edge-moves inserted at the top of successor blocks,
// not at the end of themselves. This is because the moves
// would have to be inserted prior to the branch's register
// use; but RA2's model is that the moves happen *on* the
// edge, after every def/use in the block. RA2 will check for
// "branch register use safety" and panic if such a problem
// occurs. To avoid this, we force the below algorithm to
// never merge the edge block onto the end of a block that
// ends in a conditional branch. We do this by "faking" more
// than one successor, even if there is only one.
//
// (One might ask, isn't that always the case already? It
// could not be, in cases of br_table with no table and just a
// default label, for example.)
for block in f.layout.blocks() {
if let Some(inst) = f.layout.last_inst(block) {
// If the block has a branch with any "fixed args"
// (not blockparam args) ...
if f.dfg.insts[inst].opcode().is_branch() && f.dfg.inst_fixed_args(inst).len() > 0 {
// ... then force a minimum successor count of
// two, so the below algorithm cannot put
// edge-moves on the end of the block.
block_out_count[block] = std::cmp::max(2, block_out_count[block]);
}
}
}
// Here we define the implicit CLIF-plus-edges graph. There are
// conceptually two such graphs: the original, with every edge explicit,
// and the merged one, with blocks (represented by `LoweredBlock`
// values) that contain original CLIF blocks, edges, or both. This
// function returns a lowered block's successors as per the latter, with
// consideration to edge-block merging.
//
// Note that there is a property of the block-merging rules below
// that is very important to ensure we don't miss any lowered blocks:
// any block in the implicit CLIF-plus-edges graph will *only* be
// included in one block in the merged graph.
//
// This, combined with the property that every edge block is reachable
// only from one predecessor (and hence cannot be reached by a DFS
// backedge), means that it is sufficient in our DFS below to track
// visited-bits per original CLIF block only, not per edge. This greatly
// simplifies the data structures (no need to keep a sparse hash-set of
// (block, block) tuples).
let compute_lowered_succs = |ret: &mut Vec<(Inst, LoweredBlock)>, block: LoweredBlock| {
let start_idx = ret.len();
match block {
LoweredBlock::Orig { block } | LoweredBlock::EdgeAndOrig { block, .. } => {
// At an orig block; successors are always edge blocks,
// possibly with orig blocks following.
let range = block_succ_range[block];
for &(edge_inst, succ_idx, succ) in &block_succs[range.0..range.1] {
if block_in_count[succ] == 1 {
ret.push((
edge_inst,
LoweredBlock::EdgeAndOrig {
pred: block,
edge_inst,
succ_idx,
block: succ,
},
));
} else {
ret.push((
edge_inst,
LoweredBlock::Edge {
pred: block,
edge_inst,
succ_idx,
succ,
},
));
}
}
}
LoweredBlock::Edge {
succ, edge_inst, ..
}
| LoweredBlock::OrigAndEdge {
succ, edge_inst, ..
} => {
// At an edge block; successors are always orig blocks,
// possibly with edge blocks following.
if block_out_count[succ] == 1 {
let range = block_succ_range[succ];
// check if the one succ is a real CFG edge (vs.
// implicit return succ).
if range.1 - range.0 > 0 {
debug_assert!(range.1 - range.0 == 1);
let (succ_edge_inst, succ_succ_idx, succ_succ) = block_succs[range.0];
ret.push((
edge_inst,
LoweredBlock::OrigAndEdge {
block: succ,
edge_inst: succ_edge_inst,
succ_idx: succ_succ_idx,
succ: succ_succ,
},
));
} else {
ret.push((edge_inst, LoweredBlock::Orig { block: succ }));
}
} else {
ret.push((edge_inst, LoweredBlock::Orig { block: succ }));
}
}
}
let end_idx = ret.len();
(start_idx, end_idx)
};
// Build the explicit LoweredBlock-to-LoweredBlock successors list.
let mut lowered_succs = vec![];
let mut lowered_succ_indices = vec![];
// Step 2: Compute RPO traversal of the implicit CLIF-plus-edge-block graph. Use an
// explicit stack so we don't overflow the real stack with a deep DFS.
#[derive(Debug)]
struct StackEntry {
this: LoweredBlock,
succs: (usize, usize), // range in lowered_succs
cur_succ: usize, // index in lowered_succs
}
let mut stack: SmallVec<[StackEntry; 16]> = SmallVec::new();
let mut visited = FxHashSet::default();
let mut postorder = vec![];
// Add the entry block.
//
// FIXME(cfallin): we might be able to use OrigAndEdge. Find a
// way to not special-case the entry block here.
let block = LoweredBlock::Orig { block: entry };
visited.insert(block);
let range = compute_lowered_succs(&mut lowered_succs, block);
lowered_succ_indices.resize(lowered_succs.len(), 0);
stack.push(StackEntry {
this: block,
succs: range,
cur_succ: range.1,
});
while !stack.is_empty() {
let stack_entry = stack.last_mut().unwrap();
let range = stack_entry.succs;
if stack_entry.cur_succ == range.0 {
postorder.push((stack_entry.this, range));
stack.pop();
} else {
// Heuristic: chase the children in reverse. This puts the first
// successor block first in RPO, all other things being equal,
// which tends to prioritize loop backedges over out-edges,
// putting the edge-block closer to the loop body and minimizing
// live-ranges in linear instruction space.
let next = lowered_succs[stack_entry.cur_succ - 1].1;
stack_entry.cur_succ -= 1;
if visited.contains(&next) {
continue;
}
visited.insert(next);
let range = compute_lowered_succs(&mut lowered_succs, next);
lowered_succ_indices.resize(lowered_succs.len(), 0);
stack.push(StackEntry {
this: next,
succs: range,
cur_succ: range.1,
});
} }
} }
postorder.reverse(); let end = block_succs.len();
let rpo = postorder; block_succ_range[block] = start..end;
}
// Step 2: walk the postorder from the domtree in reverse to produce our desired node
// lowering order, identifying critical edges to split along the way.
// Step 3: now that we have RPO, build the BlockIndex/BB fwd/rev maps.
let mut lowered_order = vec![];
let mut cold_blocks = FxHashSet::default();
let mut lowered_succ_ranges = vec![];
let mut lb_to_bindex = FxHashMap::default(); let mut lb_to_bindex = FxHashMap::default();
let mut indirect_branch_targets = FxHashSet::default(); let mut lowered_order = Vec::new();
for (block, succ_range) in rpo.into_iter() {
let index = BlockIndex::new(lowered_order.len()); for &block in domtree.cfg_postorder().iter().rev() {
lb_to_bindex.insert(block, index); let lb = LoweredBlock::Orig { block };
lowered_order.push(block); let bindex = BlockIndex::new(lowered_order.len());
lowered_succ_ranges.push(succ_range); lb_to_bindex.insert(lb.clone(), bindex);
lowered_order.push(lb);
if block_out_count[block] > 1 {
let range = block_succ_range[block].clone();
for (succ_ix, lb) in block_succs[range].iter_mut().enumerate() {
let succ = lb.orig_block().unwrap();
if block_in_count[succ] > 1 {
// Mutate the successor to be a critical edge, as `block` has multiple
// edges leaving it, and `succ` has multiple edges entering it.
*lb = LoweredBlock::CriticalEdge {
pred: block,
succ,
succ_idx: succ_ix as u32,
};
let bindex = BlockIndex::new(lowered_order.len());
lb_to_bindex.insert(*lb, bindex);
lowered_order.push(*lb);
}
}
}
}
// Step 3: build the successor tables given the lowering order. We can't perform this step
// during the creation of `lowering_order`, as we need `lb_to_bindex` to be fully populated
// first.
let mut lowered_succ_indices = Vec::new();
let mut cold_blocks = FxHashSet::default();
let mut indirect_branch_targets = FxHashSet::default();
let lowered_succ_ranges =
Vec::from_iter(lowered_order.iter().enumerate().map(|(ix, lb)| {
let bindex = BlockIndex::new(ix);
let start = lowered_succ_indices.len();
let opt_inst = match lb {
// Block successors are pulled directly over, as they'll have been mutated when
// determining the block order already.
&LoweredBlock::Orig { block } => {
let range = block_succ_range[block].clone();
lowered_succ_indices
.extend(block_succs[range].iter().map(|lb| lb_to_bindex[lb]));
match block {
LoweredBlock::Orig { block }
| LoweredBlock::OrigAndEdge { block, .. }
| LoweredBlock::EdgeAndOrig { block, .. } => {
if f.layout.is_cold(block) { if f.layout.is_cold(block) {
cold_blocks.insert(index); cold_blocks.insert(bindex);
} }
if indirect_branch_target_clif_blocks.contains(&block) { if indirect_branch_target_clif_blocks.contains(&block) {
indirect_branch_targets.insert(index); indirect_branch_targets.insert(bindex);
} }
let last = f.layout.last_inst(block).unwrap();
let opcode = f.dfg.insts[last].opcode();
assert!(opcode.is_terminator());
opcode.is_branch().then_some(last)
} }
LoweredBlock::Edge { pred, succ, .. } => {
if f.layout.is_cold(pred) || f.layout.is_cold(succ) { // Critical edges won't have successor information in block_succ_range, but
cold_blocks.insert(index); // they only have a single known successor to record anyway.
&LoweredBlock::CriticalEdge { succ, .. } => {
let succ_index = lb_to_bindex[&LoweredBlock::Orig { block: succ }];
lowered_succ_indices.push(succ_index);
// Edges inherit indirect branch and cold block metadata from their
// successor.
if f.layout.is_cold(succ) {
cold_blocks.insert(bindex);
} }
if indirect_branch_target_clif_blocks.contains(&succ) { if indirect_branch_target_clif_blocks.contains(&succ) {
indirect_branch_targets.insert(index); indirect_branch_targets.insert(bindex);
}
}
}
} }
let lowered_succ_indices = lowered_succs None
.iter()
.map(|&(inst, succ)| (inst, lb_to_bindex.get(&succ).cloned().unwrap()))
.collect();
let mut orig_map = SecondaryMap::with_default(None);
for (i, lb) in lowered_order.iter().enumerate() {
let i = BlockIndex::new(i);
if let Some(b) = lb.orig_block() {
orig_map[b] = Some(i);
}
} }
};
let end = lowered_succ_indices.len();
(opt_inst, start..end)
}));
let result = BlockLoweringOrder { let result = BlockLoweringOrder {
lowered_order, lowered_order,
lowered_succs,
lowered_succ_indices, lowered_succ_indices,
lowered_succ_ranges, lowered_succ_ranges,
orig_map,
cold_blocks, cold_blocks,
indirect_branch_targets, indirect_branch_targets,
}; };
trace!("BlockLoweringOrder: {:?}", result);
trace!("BlockLoweringOrder: {:#?}", result);
result result
} }
@@ -503,9 +293,9 @@ impl BlockLoweringOrder {
} }
/// Get the successor indices for a lowered block. /// Get the successor indices for a lowered block.
pub fn succ_indices(&self, block: BlockIndex) -> &[(Inst, BlockIndex)] { pub fn succ_indices(&self, block: BlockIndex) -> (Option<Inst>, &[BlockIndex]) {
let range = self.lowered_succ_ranges[block.index()]; let (opt_inst, range) = &self.lowered_succ_ranges[block.index()];
&self.lowered_succ_indices[range.0..range.1] (opt_inst.clone(), &self.lowered_succ_indices[range.clone()])
} }
/// Determine whether the given lowered-block index is cold. /// Determine whether the given lowered-block index is cold.
@@ -524,12 +314,13 @@ impl BlockLoweringOrder {
mod test { mod test {
use super::*; use super::*;
use crate::cursor::{Cursor, FuncCursor}; use crate::cursor::{Cursor, FuncCursor};
use crate::flowgraph::ControlFlowGraph;
use crate::ir::types::*; use crate::ir::types::*;
use crate::ir::UserFuncName; use crate::ir::UserFuncName;
use crate::ir::{AbiParam, Function, InstBuilder, Signature}; use crate::ir::{AbiParam, Function, InstBuilder, Signature};
use crate::isa::CallConv; use crate::isa::CallConv;
fn build_test_func(n_blocks: usize, edges: &[(usize, usize)]) -> Function { fn build_test_func(n_blocks: usize, edges: &[(usize, usize)]) -> BlockLoweringOrder {
assert!(n_blocks > 0); assert!(n_blocks > 0);
let name = UserFuncName::testcase("test0"); let name = UserFuncName::testcase("test0");
@@ -568,42 +359,20 @@ mod test {
} }
} }
func let mut cfg = ControlFlowGraph::new();
cfg.compute(&func);
let dom_tree = DominatorTree::with_function(&func, &cfg);
BlockLoweringOrder::new(&func, &dom_tree)
} }
#[test] #[test]
fn test_blockorder_diamond() { fn test_blockorder_diamond() {
let func = build_test_func(4, &[(0, 1), (0, 2), (1, 3), (2, 3)]); let order = build_test_func(4, &[(0, 1), (0, 2), (1, 3), (2, 3)]);
let order = BlockLoweringOrder::new(&func);
assert_eq!(order.lowered_order.len(), 6); // This test case doesn't need to introduce any critical edges, as all regalloc allocations
// can sit on either the entry or exit of blocks 1 and 2.
assert!(order.lowered_order[0].orig_block().unwrap().as_u32() == 0); assert_eq!(order.lowered_order.len(), 4);
assert!(order.lowered_order[0].in_edge().is_none());
assert!(order.lowered_order[0].out_edge().is_none());
assert!(order.lowered_order[1].orig_block().unwrap().as_u32() == 1);
assert!(order.lowered_order[1].in_edge().unwrap().0.as_u32() == 0);
assert!(order.lowered_order[1].in_edge().unwrap().2.as_u32() == 1);
assert!(order.lowered_order[2].orig_block().is_none());
assert!(order.lowered_order[2].in_edge().is_none());
assert!(order.lowered_order[2].out_edge().unwrap().0.as_u32() == 1);
assert!(order.lowered_order[2].out_edge().unwrap().2.as_u32() == 3);
assert!(order.lowered_order[3].orig_block().unwrap().as_u32() == 2);
assert!(order.lowered_order[3].in_edge().unwrap().0.as_u32() == 0);
assert!(order.lowered_order[3].in_edge().unwrap().2.as_u32() == 2);
assert!(order.lowered_order[3].out_edge().is_none());
assert!(order.lowered_order[4].orig_block().is_none());
assert!(order.lowered_order[4].in_edge().is_none());
assert!(order.lowered_order[4].out_edge().unwrap().0.as_u32() == 2);
assert!(order.lowered_order[4].out_edge().unwrap().2.as_u32() == 3);
assert!(order.lowered_order[5].orig_block().unwrap().as_u32() == 3);
assert!(order.lowered_order[5].in_edge().is_none());
assert!(order.lowered_order[5].out_edge().is_none());
} }
#[test] #[test]
@@ -618,9 +387,9 @@ mod test {
// | /\ | // | /\ |
// 5 6 // 5 6
// //
// (3 -> 5, 3 -> 6, 4 -> 6 are critical edges and must be split) // (3 -> 5, and 3 -> 6 are critical edges and must be split)
// //
let func = build_test_func( let order = build_test_func(
7, 7,
&[ &[
(0, 1), (0, 1),
@@ -633,72 +402,53 @@ mod test {
(4, 6), (4, 6),
], ],
); );
let order = BlockLoweringOrder::new(&func);
assert_eq!(order.lowered_order.len(), 11); assert_eq!(order.lowered_order.len(), 9);
println!("ordered = {:?}", order.lowered_order); println!("ordered = {:?}", order.lowered_order);
// block 0 // block 0
assert!(order.lowered_order[0].orig_block().unwrap().as_u32() == 0); assert_eq!(order.lowered_order[0].orig_block().unwrap().as_u32(), 0);
assert!(order.lowered_order[0].in_edge().is_none()); assert!(order.lowered_order[0].in_edge().is_none());
assert!(order.lowered_order[0].out_edge().is_none()); assert!(order.lowered_order[0].out_edge().is_none());
// edge 0->1 + block 1 // block 2
assert!(order.lowered_order[1].orig_block().unwrap().as_u32() == 1); assert_eq!(order.lowered_order[1].orig_block().unwrap().as_u32(), 2);
assert!(order.lowered_order[1].in_edge().unwrap().0.as_u32() == 0); assert!(order.lowered_order[1].in_edge().is_none());
assert!(order.lowered_order[1].in_edge().unwrap().2.as_u32() == 1);
assert!(order.lowered_order[1].out_edge().is_none()); assert!(order.lowered_order[1].out_edge().is_none());
// edge 1->3 + block 3 // block 1
assert!(order.lowered_order[2].orig_block().unwrap().as_u32() == 3); assert_eq!(order.lowered_order[2].orig_block().unwrap().as_u32(), 1);
assert!(order.lowered_order[2].in_edge().unwrap().0.as_u32() == 1); assert!(order.lowered_order[2].in_edge().is_none());
assert!(order.lowered_order[2].in_edge().unwrap().2.as_u32() == 3);
assert!(order.lowered_order[2].out_edge().is_none()); assert!(order.lowered_order[2].out_edge().is_none());
// edge 3->5 // block 4
assert!(order.lowered_order[3].orig_block().is_none()); assert_eq!(order.lowered_order[3].orig_block().unwrap().as_u32(), 4);
assert!(order.lowered_order[3].in_edge().is_none()); assert!(order.lowered_order[3].in_edge().is_none());
assert!(order.lowered_order[3].out_edge().unwrap().0.as_u32() == 3); assert!(order.lowered_order[3].out_edge().is_none());
assert!(order.lowered_order[3].out_edge().unwrap().2.as_u32() == 5);
// edge 3->6 // block 3
assert!(order.lowered_order[4].orig_block().is_none()); assert_eq!(order.lowered_order[4].orig_block().unwrap().as_u32(), 3);
assert!(order.lowered_order[4].in_edge().is_none()); assert!(order.lowered_order[4].in_edge().is_none());
assert!(order.lowered_order[4].out_edge().unwrap().0.as_u32() == 3); assert!(order.lowered_order[4].out_edge().is_none());
assert!(order.lowered_order[4].out_edge().unwrap().2.as_u32() == 6);
// edge 1->4 + block 4 // critical edge 3 -> 5
assert!(order.lowered_order[5].orig_block().unwrap().as_u32() == 4); assert!(order.lowered_order[5].orig_block().is_none());
assert!(order.lowered_order[5].in_edge().unwrap().0.as_u32() == 1); assert_eq!(order.lowered_order[5].in_edge().unwrap().as_u32(), 3);
assert!(order.lowered_order[5].in_edge().unwrap().2.as_u32() == 4); assert_eq!(order.lowered_order[5].out_edge().unwrap().as_u32(), 5);
assert!(order.lowered_order[5].out_edge().is_none());
// edge 4->6 // critical edge 3 -> 6
assert!(order.lowered_order[6].orig_block().is_none()); assert!(order.lowered_order[6].orig_block().is_none());
assert!(order.lowered_order[6].in_edge().is_none()); assert_eq!(order.lowered_order[6].in_edge().unwrap().as_u32(), 3);
assert!(order.lowered_order[6].out_edge().unwrap().0.as_u32() == 4); assert_eq!(order.lowered_order[6].out_edge().unwrap().as_u32(), 6);
assert!(order.lowered_order[6].out_edge().unwrap().2.as_u32() == 6);
// block 6 // block 6
assert!(order.lowered_order[7].orig_block().unwrap().as_u32() == 6); assert_eq!(order.lowered_order[7].orig_block().unwrap().as_u32(), 6);
assert!(order.lowered_order[7].in_edge().is_none()); assert!(order.lowered_order[7].in_edge().is_none());
assert!(order.lowered_order[7].out_edge().is_none()); assert!(order.lowered_order[7].out_edge().is_none());
// edge 0->2 + block 2
assert!(order.lowered_order[8].orig_block().unwrap().as_u32() == 2);
assert!(order.lowered_order[8].in_edge().unwrap().0.as_u32() == 0);
assert!(order.lowered_order[8].in_edge().unwrap().2.as_u32() == 2);
assert!(order.lowered_order[8].out_edge().is_none());
// edge 2->5
assert!(order.lowered_order[9].orig_block().is_none());
assert!(order.lowered_order[9].in_edge().is_none());
assert!(order.lowered_order[9].out_edge().unwrap().0.as_u32() == 2);
assert!(order.lowered_order[9].out_edge().unwrap().2.as_u32() == 5);
// block 5 // block 5
assert!(order.lowered_order[10].orig_block().unwrap().as_u32() == 5); assert_eq!(order.lowered_order[8].orig_block().unwrap().as_u32(), 5);
assert!(order.lowered_order[10].in_edge().is_none()); assert!(order.lowered_order[8].in_edge().is_none());
assert!(order.lowered_order[10].out_edge().is_none()); assert!(order.lowered_order[8].out_edge().is_none());
} }
} }

4
cranelift/codegen/src/machinst/compile.rs
View File

@@ -1,5 +1,6 @@
//! Compilation backend pipeline: optimized IR to VCode / binemit. //! Compilation backend pipeline: optimized IR to VCode / binemit.
use crate::dominator_tree::DominatorTree;
use crate::ir::Function; use crate::ir::Function;
use crate::isa::TargetIsa; use crate::isa::TargetIsa;
use crate::machinst::*; use crate::machinst::*;
@@ -12,6 +13,7 @@ use regalloc2::RegallocOptions;
/// for binary emission. /// for binary emission.
pub fn compile<B: LowerBackend + TargetIsa>( pub fn compile<B: LowerBackend + TargetIsa>(
f: &Function, f: &Function,
domtree: &DominatorTree,
b: &B, b: &B,
abi: Callee<<<B as LowerBackend>::MInst as MachInst>::ABIMachineSpec>, abi: Callee<<<B as LowerBackend>::MInst as MachInst>::ABIMachineSpec>,
emit_info: <B::MInst as MachInstEmit>::Info, emit_info: <B::MInst as MachInstEmit>::Info,
@@ -20,7 +22,7 @@ pub fn compile<B: LowerBackend + TargetIsa>(
let machine_env = b.machine_env(); let machine_env = b.machine_env();
// Compute lowered block order. // Compute lowered block order.
let block_order = BlockLoweringOrder::new(f); let block_order = BlockLoweringOrder::new(f, domtree);
// Build the lowering context. // Build the lowering context.
let lower = crate::machinst::Lower::new(f, machine_env, abi, emit_info, block_order, sigs)?; let lower = crate::machinst::Lower::new(f, machine_env, abi, emit_info, block_order, sigs)?;

24
cranelift/codegen/src/machinst/lower.rs
View File

@@ -928,9 +928,12 @@ impl<'func, I: VCodeInst> Lower<'func, I> {
} }
fn lower_branch_blockparam_args(&mut self, block: BlockIndex) { fn lower_branch_blockparam_args(&mut self, block: BlockIndex) {
for succ_idx in 0..self.vcode.block_order().succ_indices(block).len() { // TODO: why not make `block_order` public?
for succ_idx in 0..self.vcode.block_order().succ_indices(block).1.len() {
// Avoid immutable borrow by explicitly indexing. // Avoid immutable borrow by explicitly indexing.
let (inst, succ) = self.vcode.block_order().succ_indices(block)[succ_idx]; let (opt_inst, succs) = self.vcode.block_order().succ_indices(block);
let inst = opt_inst.expect("lower_branch_blockparam_args called on a critical edge!");
let succ = succs[succ_idx];
// The use of `succ_idx` to index `branch_destination` is valid on the assumption that // The use of `succ_idx` to index `branch_destination` is valid on the assumption that
// the traversal order defined in `visit_block_succs` mirrors the order returned by // the traversal order defined in `visit_block_succs` mirrors the order returned by
@@ -960,17 +963,9 @@ impl<'func, I: VCodeInst> Lower<'func, I> {
targets: &mut SmallVec<[MachLabel; 2]>, targets: &mut SmallVec<[MachLabel; 2]>,
) -> Option<Inst> { ) -> Option<Inst> {
targets.clear(); targets.clear();
let mut last_inst = None; let (opt_inst, succs) = self.vcode.block_order().succ_indices(bindex);
for &(inst, succ) in self.vcode.block_order().succ_indices(bindex) { targets.extend(succs.iter().map(|succ| MachLabel::from_block(*succ)));
// Basic blocks may end in a single branch instruction, but those instructions may have opt_inst
// multiple destinations. As such, all `inst` values in `succ_indices` must be the
// same, or this basic block would have multiple branch instructions present.
debug_assert!(last_inst.map_or(true, |prev| prev == inst));
last_inst = Some(inst);
targets.push(MachLabel::from_block(succ));
}
last_inst
} }
/// Lower the function. /// Lower the function.
@@ -1025,7 +1020,8 @@ impl<'func, I: VCodeInst> Lower<'func, I> {
// according to the one successor, and pass them // according to the one successor, and pass them
// through; note that the successor must have an // through; note that the successor must have an
// original block. // original block.
let (_, succ) = self.vcode.block_order().succ_indices(bindex)[0]; let (_, succs) = self.vcode.block_order().succ_indices(bindex);
let succ = succs[0];
let orig_succ = lowered_order[succ.index()]; let orig_succ = lowered_order[succ.index()];
let orig_succ = orig_succ let orig_succ = orig_succ

32
cranelift/filetests/filetests/domtree/loops.clif
View File

@@ -44,21 +44,21 @@ function %test(i32) {
; ;
; check: cfg_postorder: ; check: cfg_postorder:
; sameln: block6 ; sameln: block6
; sameln: block5
; sameln: block4
; sameln: block3 ; sameln: block3
; sameln: block1 ; sameln: block4
; sameln: block5
; sameln: block2 ; sameln: block2
; sameln: block1
; sameln: block0 ; sameln: block0
; check: domtree_preorder { ; check: domtree_preorder {
; nextln: block0: block2 block1 block3 block4 block5 ; nextln: block0: block1 block2 block5 block4 block3
; nextln: block2:
; nextln: block1: ; nextln: block1:
; nextln: block3: ; nextln: block2:
; nextln: block4:
; nextln: block5: block6 ; nextln: block5: block6
; nextln: block6: ; nextln: block6:
; nextln: block4:
; nextln: block3:
; nextln: } ; nextln: }
function %loop2(i32) system_v { function %loop2(i32) system_v {
@@ -84,26 +84,26 @@ function %loop2(i32) system_v {
return return
} }
; check: cfg_postorder: ; check: cfg_postorder:
; sameln: block9
; sameln: block7 ; sameln: block7
; sameln: block6 ; sameln: block6
; sameln: block9
; sameln: block5
; sameln: block8 ; sameln: block8
; sameln: block4
; sameln: block3 ; sameln: block3
; sameln: block1 ; sameln: block4
; sameln: block5
; sameln: block2 ; sameln: block2
; sameln: block1
; sameln: block0 ; sameln: block0
; check: domtree_preorder { ; check: domtree_preorder {
; nextln: block0: block2 block1 block3 block4 block5 ; nextln: block0: block1 block2 block5 block4 block3
; nextln: block2:
; nextln: block1: ; nextln: block1:
; nextln: block3: ; nextln: block2:
; nextln: block5: block9
; nextln: block9:
; nextln: block4: block8 ; nextln: block4: block8
; nextln: block8: block6 ; nextln: block8: block6
; nextln: block6: block7 ; nextln: block6: block7
; nextln: block7: ; nextln: block7:
; nextln: block5: block9 ; nextln: block3:
; nextln: block9:
; nextln: } ; nextln: }

28
cranelift/filetests/filetests/domtree/loops2.clif
View File

@@ -30,18 +30,18 @@ function %loop1(i32) {
} }
; check: domtree_preorder { ; check: domtree_preorder {
; nextln: block0: block10 block1 block6 ; nextln: block0: block1 block10 block6
; nextln: block10: block2 block3 block9 ; nextln: block1:
; nextln: block2: block5 block4 block7 block8 ; nextln: block10: block3 block2 block9
; nextln: block5: block12 ; nextln: block3:
; nextln: block12: ; nextln: block2: block4 block5 block7 block8
; nextln: block4: block11 ; nextln: block4: block11
; nextln: block11: ; nextln: block11:
; nextln: block5: block12
; nextln: block12:
; nextln: block7: ; nextln: block7:
; nextln: block8: ; nextln: block8:
; nextln: block3:
; nextln: block9: ; nextln: block9:
; nextln: block1:
; nextln: block6: ; nextln: block6:
; nextln: } ; nextln: }
@@ -63,19 +63,19 @@ function %loop2(i32) system_v {
} }
; check: cfg_postorder: ; check: cfg_postorder:
; sameln: block6 ; sameln: block6
; sameln: block5
; sameln: block4
; sameln: block3 ; sameln: block3
; sameln: block1 ; sameln: block4
; sameln: block5
; sameln: block2 ; sameln: block2
; sameln: block1
; sameln: block0 ; sameln: block0
; check: domtree_preorder { ; check: domtree_preorder {
; nextln: block0: block2 block1 block3 block4 block5 ; nextln: block0: block1 block2 block5 block4 block3
; nextln: block2:
; nextln: block1: ; nextln: block1:
; nextln: block3: ; nextln: block2:
; nextln: block4:
; nextln: block5: block6 ; nextln: block5: block6
; nextln: block6: ; nextln: block6:
; nextln: block4:
; nextln: block3:
; nextln: } ; nextln: }

18
cranelift/filetests/filetests/domtree/tall-tree.clif
View File

@@ -32,18 +32,18 @@ function %test(i32) {
} }
; check: domtree_preorder { ; check: domtree_preorder {
; nextln: block0: block12 block1 ; nextln: block0: block1 block12
; nextln: block12: block2 block3 block5
; nextln: block2:
; nextln: block3:
; nextln: block5:
; nextln: block1: block4 ; nextln: block1: block4
; nextln: block4: block7 block6 block10 ; nextln: block4: block6 block7 block10
; nextln: block7: ; nextln: block6: block8 block13 block11
; nextln: block6: block13 block8 block11 ; nextln: block8:
; nextln: block13: block9 ; nextln: block13: block9
; nextln: block9: ; nextln: block9:
; nextln: block8:
; nextln: block11: ; nextln: block11:
; nextln: block7:
; nextln: block10: ; nextln: block10:
; nextln: block12: block3 block2 block5
; nextln: block3:
; nextln: block2:
; nextln: block5:
; nextln: } ; nextln: }

28
cranelift/filetests/filetests/domtree/wide-tree.clif
View File

@@ -43,22 +43,22 @@ function %test(i32) {
; check: domtree_preorder { ; check: domtree_preorder {
; nextln: block0: block1 block13 ; nextln: block0: block1 block13
; nextln: block1: block20 block2 block7 ; nextln: block1: block2 block20 block7
; nextln: block20: block3 block21
; nextln: block3:
; nextln: block21: block22 block4
; nextln: block22: block5 block6
; nextln: block5:
; nextln: block6:
; nextln: block4:
; nextln: block2: ; nextln: block2:
; nextln: block7: block8 block23 block12 ; nextln: block20: block21 block3
; nextln: block8: ; nextln: block21: block4 block22
; nextln: block23: block24 block9 ; nextln: block4:
; nextln: block24: block10 block11 ; nextln: block22: block6 block5
; nextln: block10: ; nextln: block6:
; nextln: block11: ; nextln: block5:
; nextln: block3:
; nextln: block7: block23 block8 block12
; nextln: block23: block9 block24
; nextln: block9: ; nextln: block9:
; nextln: block24: block11 block10
; nextln: block11:
; nextln: block10:
; nextln: block8:
; nextln: block12: ; nextln: block12:
; nextln: block13: ; nextln: block13:
; nextln: } ; nextln: }

91
cranelift/filetests/filetests/isa/aarch64/bti.clif
View File

@@ -32,31 +32,23 @@ block5(v5: i32):
; block0: ; block0:
; emit_island 44 ; emit_island 44
; subs wzr, w0, #3 ; subs wzr, w0, #3
; b.hs label1 ; csel x15, xzr, x0, hs ; csdb ; adr x14, pc+16 ; ldrsw x15, [x14, x15, uxtw #2] ; add x14, x14, x15 ; br x14 ; jt_entries [Label(MachLabel(3)), Label(MachLabel(5)), Label(MachLabel(7))] ; b.hs label4 ; csel x11, xzr, x0, hs ; csdb ; adr x10, pc+16 ; ldrsw x11, [x10, x11, uxtw #2] ; add x10, x10, x11 ; br x10 ; jt_entries [Label(MachLabel(3)), Label(MachLabel(2)), Label(MachLabel(1))]
; block1: ; block1:
; movz w5, #4 ; bti j
; b label2 ; movz w5, #3
; b label5
; block2: ; block2:
; b label9 ; bti j
; movz w5, #2
; b label5
; block3: ; block3:
; bti j ; bti j
; movz w5, #1 ; movz w5, #1
; b label4 ; b label5
; block4: ; block4:
; b label9 ; movz w5, #4
; b label5
; block5: ; block5:
; bti j
; movz w5, #2
; b label6
; block6:
; b label9
; block7:
; bti j
; movz w5, #3
; b label8
; block8:
; b label9
; block9:
; add w0, w0, w5 ; add w0, w0, w5
; ret ; ret
; ;
@@ -65,34 +57,31 @@ block5(v5: i32):
; hint #0x22 ; hint #0x22
; block1: ; offset 0x4 ; block1: ; offset 0x4
; cmp w0, #3 ; cmp w0, #3
; b.hs #0x30 ; b.hs #0x54
; csel x15, xzr, x0, hs ; csel x11, xzr, x0, hs
; csdb ; csdb
; adr x14, #0x24 ; adr x10, #0x24
; ldrsw x15, [x14, w15, uxtw #2] ; ldrsw x11, [x10, w11, uxtw #2]
; add x14, x14, x15 ; add x10, x10, x11
; br x14 ; br x10
; .byte 0x14, 0x00, 0x00, 0x00 ; .byte 0x24, 0x00, 0x00, 0x00
; .byte 0x20, 0x00, 0x00, 0x00 ; .byte 0x18, 0x00, 0x00, 0x00
; .byte 0x2c, 0x00, 0x00, 0x00 ; .byte 0x0c, 0x00, 0x00, 0x00
; block2: ; offset 0x30 ; block2: ; offset 0x30
; mov w5, #4
; block3: ; offset 0x34
; b #0x58
; block4: ; offset 0x38
; hint #0x24
; mov w5, #1
; block5: ; offset 0x40
; b #0x58
; block6: ; offset 0x44
; hint #0x24
; mov w5, #2
; block7: ; offset 0x4c
; b #0x58
; block8: ; offset 0x50
; hint #0x24 ; hint #0x24
; mov w5, #3 ; mov w5, #3
; block9: ; offset 0x58 ; b #0x58
; block3: ; offset 0x3c
; hint #0x24
; mov w5, #2
; b #0x58
; block4: ; offset 0x48
; hint #0x24
; mov w5, #1
; b #0x58
; block5: ; offset 0x54
; mov w5, #4
; block6: ; offset 0x58
; add w0, w0, w5 ; add w0, w0, w5
; ret ; ret
@@ -118,15 +107,15 @@ block2:
; mov x8, x5 ; mov x8, x5
; emit_island 36 ; emit_island 36
; subs wzr, w0, #1 ; subs wzr, w0, #1
; b.hs label1 ; csel x7, xzr, x0, hs ; csdb ; adr x6, pc+16 ; ldrsw x7, [x6, x7, uxtw #2] ; add x6, x6, x7 ; br x6 ; jt_entries [Label(MachLabel(2))] ; b.hs label2 ; csel x7, xzr, x0, hs ; csdb ; adr x6, pc+16 ; ldrsw x7, [x6, x7, uxtw #2] ; add x6, x6, x7 ; br x6 ; jt_entries [Label(MachLabel(1))]
; block1: ; block1:
; mov x0, x8
; ret
; block2:
; bti j ; bti j
; mov x0, x8 ; mov x0, x8
; add x0, x0, #42 ; add x0, x0, #42
; ret ; ret
; block2:
; mov x0, x8
; ret
; ;
; Disassembled: ; Disassembled:
; block0: ; offset 0x0 ; block0: ; offset 0x0
@@ -135,22 +124,22 @@ block2:
; ldr x5, [x0] ; ldr x5, [x0]
; mov x8, x5 ; mov x8, x5
; cmp w0, #1 ; cmp w0, #1
; b.hs #0x30 ; b.hs #0x40
; csel x7, xzr, x0, hs ; csel x7, xzr, x0, hs
; csdb ; csdb
; adr x6, #0x2c ; adr x6, #0x2c
; ldrsw x7, [x6, w7, uxtw #2] ; ldrsw x7, [x6, w7, uxtw #2]
; add x6, x6, x7 ; add x6, x6, x7
; br x6 ; br x6
; .byte 0x0c, 0x00, 0x00, 0x00 ; .byte 0x04, 0x00, 0x00, 0x00
; block2: ; offset 0x30 ; block2: ; offset 0x30
; mov x0, x8
; ret
; block3: ; offset 0x38
; hint #0x24 ; hint #0x24
; mov x0, x8 ; mov x0, x8
; add x0, x0, #0x2a ; add x0, x0, #0x2a
; ret ; ret
; block3: ; offset 0x40
; mov x0, x8
; ret
function %f3(i64) -> i64 { function %f3(i64) -> i64 {
fn0 = %g(i64) -> i64 fn0 = %g(i64) -> i64

12
cranelift/filetests/filetests/isa/aarch64/condbr.clif
View File

@@ -270,23 +270,23 @@ block2:
; VCode: ; VCode:
; block0: ; block0:
; subs xzr, x0, x1 ; subs xzr, x0, x1
; b.eq label1 ; b label2 ; b.eq label2 ; b label1
; block1: ; block1:
; movz x0, #1 ; movz x0, #2
; ret ; ret
; block2: ; block2:
; movz x0, #2 ; movz x0, #1
; ret ; ret
; ;
; Disassembled: ; Disassembled:
; block0: ; offset 0x0 ; block0: ; offset 0x0
; cmp x0, x1 ; cmp x0, x1
; b.ne #0x10 ; b.eq #0x10
; block1: ; offset 0x8 ; block1: ; offset 0x8
; mov x0, #1 ; mov x0, #2
; ret ; ret
; block2: ; offset 0x10 ; block2: ; offset 0x10
; mov x0, #2 ; mov x0, #1
; ret ; ret
function %f(i64, i64) -> i64 { function %f(i64, i64) -> i64 {

63
cranelift/filetests/filetests/isa/aarch64/jumptable.clif
View File

@@ -31,59 +31,48 @@ block5(v5: i32):
; block0: ; block0:
; emit_island 44 ; emit_island 44
; subs wzr, w0, #3 ; subs wzr, w0, #3
; b.hs label1 ; csel x15, xzr, x0, hs ; csdb ; adr x14, pc+16 ; ldrsw x15, [x14, x15, uxtw #2] ; add x14, x14, x15 ; br x14 ; jt_entries [Label(MachLabel(3)), Label(MachLabel(5)), Label(MachLabel(7))] ; b.hs label4 ; csel x11, xzr, x0, hs ; csdb ; adr x10, pc+16 ; ldrsw x11, [x10, x11, uxtw #2] ; add x10, x10, x11 ; br x10 ; jt_entries [Label(MachLabel(3)), Label(MachLabel(2)), Label(MachLabel(1))]
; block1: ; block1:
; movz w5, #4 ; movz w5, #3
; b label2 ; b label5
; block2: ; block2:
; b label9 ; movz w5, #2
; b label5
; block3: ; block3:
; movz w5, #1 ; movz w5, #1
; b label4 ; b label5
; block4: ; block4:
; b label9 ; movz w5, #4
; b label5
; block5: ; block5:
; movz w5, #2
; b label6
; block6:
; b label9
; block7:
; movz w5, #3
; b label8
; block8:
; b label9
; block9:
; add w0, w0, w5 ; add w0, w0, w5
; ret ; ret
; ;
; Disassembled: ; Disassembled:
; block0: ; offset 0x0 ; block0: ; offset 0x0
; cmp w0, #3 ; cmp w0, #3
; b.hs #0x2c ; b.hs #0x44
; csel x15, xzr, x0, hs ; csel x11, xzr, x0, hs
; csdb ; csdb
; adr x14, #0x20 ; adr x10, #0x20
; ldrsw x15, [x14, w15, uxtw #2] ; ldrsw x11, [x10, w11, uxtw #2]
; add x14, x14, x15 ; add x10, x10, x11
; br x14 ; br x10
; .byte 0x14, 0x00, 0x00, 0x00
; .byte 0x1c, 0x00, 0x00, 0x00 ; .byte 0x1c, 0x00, 0x00, 0x00
; .byte 0x24, 0x00, 0x00, 0x00 ; .byte 0x14, 0x00, 0x00, 0x00
; .byte 0x0c, 0x00, 0x00, 0x00
; block1: ; offset 0x2c ; block1: ; offset 0x2c
; mov w5, #4
; block2: ; offset 0x30
; b #0x48
; block3: ; offset 0x34
; mov w5, #1
; block4: ; offset 0x38
; b #0x48
; block5: ; offset 0x3c
; mov w5, #2
; block6: ; offset 0x40
; b #0x48
; block7: ; offset 0x44
; mov w5, #3 ; mov w5, #3
; block8: ; offset 0x48 ; b #0x48
; block2: ; offset 0x34
; mov w5, #2
; b #0x48
; block3: ; offset 0x3c
; mov w5, #1
; b #0x48
; block4: ; offset 0x44
; mov w5, #4
; block5: ; offset 0x48
; add w0, w0, w5 ; add w0, w0, w5
; ret ; ret

62
cranelift/filetests/filetests/isa/aarch64/reftypes.clif
View File

@@ -94,28 +94,24 @@ block3(v7: r64, v8: r64):
; block0: ; block0:
; str x0, [sp, #8] ; str x0, [sp, #8]
; str x1, [sp, #16] ; str x1, [sp, #16]
; load_ext_name x1, TestCase(%f)+0 ; load_ext_name x12, TestCase(%f)+0
; blr x1 ; blr x12
; mov x15, sp ; mov x11, sp
; ldr x6, [sp, #8] ; ldr x2, [sp, #8]
; str x6, [x15] ; str x2, [x11]
; uxtb w0, w0 ; uxtb w12, w0
; cbnz x0, label1 ; b label3 ; cbnz x12, label2 ; b label1
; block1: ; block1:
; b label2 ; mov x1, x2
; block2:
; mov x0, x6
; ldr x1, [sp, #16]
; b label5
; block3:
; b label4
; block4:
; mov x1, x6
; ldr x0, [sp, #16] ; ldr x0, [sp, #16]
; b label5 ; b label3
; block5: ; block2:
; mov x2, sp ; mov x0, x2
; ldr x2, [x2] ; ldr x1, [sp, #16]
; b label3
; block3:
; mov x15, sp
; ldr x2, [x15]
; add sp, sp, #32 ; add sp, sp, #32
; ldp fp, lr, [sp], #16 ; ldp fp, lr, [sp], #16
; ret ; ret
@@ -128,26 +124,26 @@ block3(v7: r64, v8: r64):
; block1: ; offset 0xc ; block1: ; offset 0xc
; stur x0, [sp, #8] ; stur x0, [sp, #8]
; stur x1, [sp, #0x10] ; stur x1, [sp, #0x10]
; ldr x1, #0x1c ; ldr x12, #0x1c
; b #0x24 ; b #0x24
; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %f 0 ; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %f 0
; .byte 0x00, 0x00, 0x00, 0x00 ; .byte 0x00, 0x00, 0x00, 0x00
; blr x1 ; blr x12
; mov x15, sp ; mov x11, sp
; ldur x6, [sp, #8] ; ldur x2, [sp, #8]
; str x6, [x15] ; str x2, [x11]
; uxtb w0, w0 ; uxtb w12, w0
; cbz x0, #0x48 ; cbnz x12, #0x48
; block2: ; offset 0x3c ; block2: ; offset 0x3c
; mov x0, x6 ; mov x1, x2
; ldur x1, [sp, #0x10] ; ldur x0, [sp, #0x10]
; b #0x50 ; b #0x50
; block3: ; offset 0x48 ; block3: ; offset 0x48
; mov x1, x6 ; mov x0, x2
; ldur x0, [sp, #0x10] ; ldur x1, [sp, #0x10]
; block4: ; offset 0x50 ; block4: ; offset 0x50
; mov x2, sp ; mov x15, sp
; ldr x2, [x2] ; ldr x2, [x15]
; add sp, sp, #0x20 ; add sp, sp, #0x20
; ldp x29, x30, [sp], #0x10 ; ldp x29, x30, [sp], #0x10
; ret ; ret

28
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat
View File

@@ -45,14 +45,14 @@
;; ldr x8, [x2, #8] ;; ldr x8, [x2, #8]
;; sub x8, x8, #4 ;; sub x8, x8, #4
;; subs xzr, x7, x8 ;; subs xzr, x7, x8
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x10, [x2]
;; str w1, [x10, w0, UXTW]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x9, [x2]
;; str w1, [x9, w0, UXTW]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
@@ -61,12 +61,12 @@
;; ldr x8, [x1, #8] ;; ldr x8, [x1, #8]
;; sub x8, x8, #4 ;; sub x8, x8, #4
;; subs xzr, x7, x8 ;; subs xzr, x7, x8
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x10, [x1]
;; ldr w0, [x10, w0, UXTW]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x9, [x1]
;; ldr w0, [x9, w0, UXTW]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

32
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
View File

@@ -46,15 +46,15 @@
;; movn x8, #4099 ;; movn x8, #4099
;; add x10, x10, x8 ;; add x10, x10, x8
;; subs xzr, x9, x10 ;; subs xzr, x9, x10
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x12, [x2]
;; add x12, x12, #4096
;; str w1, [x12, w0, UXTW]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x11, [x2]
;; add x11, x11, #4096
;; str w1, [x11, w0, UXTW]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
@@ -64,13 +64,13 @@
;; movn x8, #4099 ;; movn x8, #4099
;; add x10, x10, x8 ;; add x10, x10, x8
;; subs xzr, x9, x10 ;; subs xzr, x9, x10
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x12, [x1]
;; add x11, x12, #4096
;; ldr w0, [x11, w0, UXTW]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x11, [x1]
;; add x10, x11, #4096
;; ldr w0, [x10, w0, UXTW]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

36
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
View File

@@ -47,16 +47,16 @@
;; b.lo 8 ; udf ;; b.lo 8 ; udf
;; ldr x12, [x2, #8] ;; ldr x12, [x2, #8]
;; subs xzr, x11, x12 ;; subs xzr, x11, x12
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x14, [x2]
;; movz x15, #65535, LSL #16
;; add x14, x15, x14
;; str w1, [x14, w0, UXTW]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x13, [x2]
;; movz x14, #65535, LSL #16
;; add x13, x14, x13
;; str w1, [x13, w0, UXTW]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
@@ -67,14 +67,14 @@
;; b.lo 8 ; udf ;; b.lo 8 ; udf
;; ldr x12, [x1, #8] ;; ldr x12, [x1, #8]
;; subs xzr, x11, x12 ;; subs xzr, x11, x12
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x14, [x1]
;; movz x13, #65535, LSL #16
;; add x13, x13, x14
;; ldr w0, [x13, w0, UXTW]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x13, [x1]
;; movz x12, #65535, LSL #16
;; add x12, x12, x13
;; ldr w0, [x12, w0, UXTW]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

28
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat
View File

@@ -44,14 +44,14 @@
;; mov w6, w0 ;; mov w6, w0
;; ldr x7, [x2, #8] ;; ldr x7, [x2, #8]
;; subs xzr, x6, x7 ;; subs xzr, x6, x7
;; b.hs label1 ; b label2 ;; b.hs label3 ; b label1
;; block2:
;; ldr x9, [x2]
;; strb w1, [x9, w0, UXTW]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x8, [x2]
;; strb w1, [x8, w0, UXTW]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
@@ -59,12 +59,12 @@
;; mov w6, w0 ;; mov w6, w0
;; ldr x7, [x1, #8] ;; ldr x7, [x1, #8]
;; subs xzr, x6, x7 ;; subs xzr, x6, x7
;; b.hs label1 ; b label2 ;; b.hs label3 ; b label1
;; block2:
;; ldr x9, [x1]
;; ldrb w0, [x9, w0, UXTW]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x8, [x1]
;; ldrb w0, [x8, w0, UXTW]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

32
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
View File

@@ -46,15 +46,15 @@
;; movn x8, #4096 ;; movn x8, #4096
;; add x10, x10, x8 ;; add x10, x10, x8
;; subs xzr, x9, x10 ;; subs xzr, x9, x10
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x12, [x2]
;; add x12, x12, #4096
;; strb w1, [x12, w0, UXTW]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x11, [x2]
;; add x11, x11, #4096
;; strb w1, [x11, w0, UXTW]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
@@ -64,13 +64,13 @@
;; movn x8, #4096 ;; movn x8, #4096
;; add x10, x10, x8 ;; add x10, x10, x8
;; subs xzr, x9, x10 ;; subs xzr, x9, x10
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x12, [x1]
;; add x11, x12, #4096
;; ldrb w0, [x11, w0, UXTW]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x11, [x1]
;; add x10, x11, #4096
;; ldrb w0, [x10, w0, UXTW]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

36
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
View File

@@ -47,16 +47,16 @@
;; b.lo 8 ; udf ;; b.lo 8 ; udf
;; ldr x12, [x2, #8] ;; ldr x12, [x2, #8]
;; subs xzr, x11, x12 ;; subs xzr, x11, x12
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x14, [x2]
;; movz x15, #65535, LSL #16
;; add x14, x15, x14
;; strb w1, [x14, w0, UXTW]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x13, [x2]
;; movz x14, #65535, LSL #16
;; add x13, x14, x13
;; strb w1, [x13, w0, UXTW]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
@@ -67,14 +67,14 @@
;; b.lo 8 ; udf ;; b.lo 8 ; udf
;; ldr x12, [x1, #8] ;; ldr x12, [x1, #8]
;; subs xzr, x11, x12 ;; subs xzr, x11, x12
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x14, [x1]
;; movz x13, #65535, LSL #16
;; add x13, x13, x14
;; ldrb w0, [x13, w0, UXTW]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x13, [x1]
;; movz x12, #65535, LSL #16
;; add x12, x12, x13
;; ldrb w0, [x12, w0, UXTW]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

28
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
View File

@@ -45,14 +45,14 @@
;; ldr x8, [x2, #8] ;; ldr x8, [x2, #8]
;; sub x8, x8, #4 ;; sub x8, x8, #4
;; subs xzr, x7, x8 ;; subs xzr, x7, x8
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x10, [x2]
;; str w1, [x10, w0, UXTW]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x9, [x2]
;; str w1, [x9, w0, UXTW]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
@@ -61,12 +61,12 @@
;; ldr x8, [x1, #8] ;; ldr x8, [x1, #8]
;; sub x8, x8, #4 ;; sub x8, x8, #4
;; subs xzr, x7, x8 ;; subs xzr, x7, x8
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x10, [x1]
;; ldr w0, [x10, w0, UXTW]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x9, [x1]
;; ldr w0, [x9, w0, UXTW]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

32
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
View File

@@ -46,15 +46,15 @@
;; movn x8, #4099 ;; movn x8, #4099
;; add x10, x10, x8 ;; add x10, x10, x8
;; subs xzr, x9, x10 ;; subs xzr, x9, x10
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x12, [x2]
;; add x12, x12, #4096
;; str w1, [x12, w0, UXTW]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x11, [x2]
;; add x11, x11, #4096
;; str w1, [x11, w0, UXTW]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
@@ -64,13 +64,13 @@
;; movn x8, #4099 ;; movn x8, #4099
;; add x10, x10, x8 ;; add x10, x10, x8
;; subs xzr, x9, x10 ;; subs xzr, x9, x10
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x12, [x1]
;; add x11, x12, #4096
;; ldr w0, [x11, w0, UXTW]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x11, [x1]
;; add x10, x11, #4096
;; ldr w0, [x10, w0, UXTW]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

36
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
View File

@@ -47,16 +47,16 @@
;; b.lo 8 ; udf ;; b.lo 8 ; udf
;; ldr x12, [x2, #8] ;; ldr x12, [x2, #8]
;; subs xzr, x11, x12 ;; subs xzr, x11, x12
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x14, [x2]
;; movz x15, #65535, LSL #16
;; add x14, x15, x14
;; str w1, [x14, w0, UXTW]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x13, [x2]
;; movz x14, #65535, LSL #16
;; add x13, x14, x13
;; str w1, [x13, w0, UXTW]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
@@ -67,14 +67,14 @@
;; b.lo 8 ; udf ;; b.lo 8 ; udf
;; ldr x12, [x1, #8] ;; ldr x12, [x1, #8]
;; subs xzr, x11, x12 ;; subs xzr, x11, x12
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x14, [x1]
;; movz x13, #65535, LSL #16
;; add x13, x13, x14
;; ldr w0, [x13, w0, UXTW]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x13, [x1]
;; movz x12, #65535, LSL #16
;; add x12, x12, x13
;; ldr w0, [x12, w0, UXTW]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

28
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
View File

@@ -44,14 +44,14 @@
;; mov w6, w0 ;; mov w6, w0
;; ldr x7, [x2, #8] ;; ldr x7, [x2, #8]
;; subs xzr, x6, x7 ;; subs xzr, x6, x7
;; b.hs label1 ; b label2 ;; b.hs label3 ; b label1
;; block2:
;; ldr x9, [x2]
;; strb w1, [x9, w0, UXTW]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x8, [x2]
;; strb w1, [x8, w0, UXTW]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
@@ -59,12 +59,12 @@
;; mov w6, w0 ;; mov w6, w0
;; ldr x7, [x1, #8] ;; ldr x7, [x1, #8]
;; subs xzr, x6, x7 ;; subs xzr, x6, x7
;; b.hs label1 ; b label2 ;; b.hs label3 ; b label1
;; block2:
;; ldr x9, [x1]
;; ldrb w0, [x9, w0, UXTW]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x8, [x1]
;; ldrb w0, [x8, w0, UXTW]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

32
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
View File

@@ -46,15 +46,15 @@
;; movn x8, #4096 ;; movn x8, #4096
;; add x10, x10, x8 ;; add x10, x10, x8
;; subs xzr, x9, x10 ;; subs xzr, x9, x10
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x12, [x2]
;; add x12, x12, #4096
;; strb w1, [x12, w0, UXTW]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x11, [x2]
;; add x11, x11, #4096
;; strb w1, [x11, w0, UXTW]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
@@ -64,13 +64,13 @@
;; movn x8, #4096 ;; movn x8, #4096
;; add x10, x10, x8 ;; add x10, x10, x8
;; subs xzr, x9, x10 ;; subs xzr, x9, x10
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x12, [x1]
;; add x11, x12, #4096
;; ldrb w0, [x11, w0, UXTW]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x11, [x1]
;; add x10, x11, #4096
;; ldrb w0, [x10, w0, UXTW]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

36
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
View File

@@ -47,16 +47,16 @@
;; b.lo 8 ; udf ;; b.lo 8 ; udf
;; ldr x12, [x2, #8] ;; ldr x12, [x2, #8]
;; subs xzr, x11, x12 ;; subs xzr, x11, x12
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x14, [x2]
;; movz x15, #65535, LSL #16
;; add x14, x15, x14
;; strb w1, [x14, w0, UXTW]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x13, [x2]
;; movz x14, #65535, LSL #16
;; add x13, x14, x13
;; strb w1, [x13, w0, UXTW]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
@@ -67,14 +67,14 @@
;; b.lo 8 ; udf ;; b.lo 8 ; udf
;; ldr x12, [x1, #8] ;; ldr x12, [x1, #8]
;; subs xzr, x11, x12 ;; subs xzr, x11, x12
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x14, [x1]
;; movz x13, #65535, LSL #16
;; add x13, x13, x14
;; ldrb w0, [x13, w0, UXTW]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x13, [x1]
;; movz x12, #65535, LSL #16
;; add x12, x12, x13
;; ldrb w0, [x12, w0, UXTW]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

28
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat
View File

@@ -44,14 +44,14 @@
;; ldr x6, [x2, #8] ;; ldr x6, [x2, #8]
;; sub x6, x6, #4 ;; sub x6, x6, #4
;; subs xzr, x0, x6 ;; subs xzr, x0, x6
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x9, [x2]
;; str w1, [x9, x0]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x8, [x2]
;; str w1, [x8, x0]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
@@ -59,12 +59,12 @@
;; ldr x6, [x1, #8] ;; ldr x6, [x1, #8]
;; sub x6, x6, #4 ;; sub x6, x6, #4
;; subs xzr, x0, x6 ;; subs xzr, x0, x6
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x9, [x1]
;; ldr w0, [x9, x0]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x8, [x1]
;; ldr w0, [x8, x0]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

32
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
View File

@@ -45,15 +45,15 @@
;; movn x7, #4099 ;; movn x7, #4099
;; add x9, x8, x7 ;; add x9, x8, x7
;; subs xzr, x0, x9 ;; subs xzr, x0, x9
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x11, [x2]
;; add x12, x0, #4096
;; str w1, [x12, x11]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x10, [x2]
;; add x11, x0, #4096
;; str w1, [x11, x10]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
@@ -62,13 +62,13 @@
;; movn x7, #4099 ;; movn x7, #4099
;; add x9, x8, x7 ;; add x9, x8, x7
;; subs xzr, x0, x9 ;; subs xzr, x0, x9
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x11, [x1]
;; add x10, x0, #4096
;; ldr w0, [x10, x11]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x10, [x1]
;; add x9, x0, #4096
;; ldr w0, [x9, x10]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

36
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
View File

@@ -46,16 +46,16 @@
;; b.lo 8 ; udf ;; b.lo 8 ; udf
;; ldr x11, [x2, #8] ;; ldr x11, [x2, #8]
;; subs xzr, x10, x11 ;; subs xzr, x10, x11
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x13, [x2]
;; movz x14, #65535, LSL #16
;; add x14, x14, x0
;; str w1, [x14, x13]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x12, [x2]
;; movz x13, #65535, LSL #16
;; add x13, x13, x0
;; str w1, [x13, x12]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
@@ -65,14 +65,14 @@
;; b.lo 8 ; udf ;; b.lo 8 ; udf
;; ldr x11, [x1, #8] ;; ldr x11, [x1, #8]
;; subs xzr, x10, x11 ;; subs xzr, x10, x11
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x13, [x1]
;; movz x12, #65535, LSL #16
;; add x12, x12, x0
;; ldr w0, [x12, x13]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x12, [x1]
;; movz x11, #65535, LSL #16
;; add x11, x11, x0
;; ldr w0, [x11, x12]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

28
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat
View File

@@ -43,26 +43,26 @@
;; block0: ;; block0:
;; ldr x5, [x2, #8] ;; ldr x5, [x2, #8]
;; subs xzr, x0, x5 ;; subs xzr, x0, x5
;; b.hs label1 ; b label2 ;; b.hs label3 ; b label1
;; block2:
;; ldr x8, [x2]
;; strb w1, [x8, x0]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x7, [x2]
;; strb w1, [x7, x0]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
;; block0: ;; block0:
;; ldr x5, [x1, #8] ;; ldr x5, [x1, #8]
;; subs xzr, x0, x5 ;; subs xzr, x0, x5
;; b.hs label1 ; b label2 ;; b.hs label3 ; b label1
;; block2:
;; ldr x8, [x1]
;; ldrb w0, [x8, x0]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x7, [x1]
;; ldrb w0, [x7, x0]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

32
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
View File

@@ -45,15 +45,15 @@
;; movn x7, #4096 ;; movn x7, #4096
;; add x9, x8, x7 ;; add x9, x8, x7
;; subs xzr, x0, x9 ;; subs xzr, x0, x9
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x11, [x2]
;; add x12, x0, #4096
;; strb w1, [x12, x11]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x10, [x2]
;; add x11, x0, #4096
;; strb w1, [x11, x10]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
@@ -62,13 +62,13 @@
;; movn x7, #4096 ;; movn x7, #4096
;; add x9, x8, x7 ;; add x9, x8, x7
;; subs xzr, x0, x9 ;; subs xzr, x0, x9
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x11, [x1]
;; add x10, x0, #4096
;; ldrb w0, [x10, x11]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x10, [x1]
;; add x9, x0, #4096
;; ldrb w0, [x9, x10]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

36
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
View File

@@ -46,16 +46,16 @@
;; b.lo 8 ; udf ;; b.lo 8 ; udf
;; ldr x11, [x2, #8] ;; ldr x11, [x2, #8]
;; subs xzr, x10, x11 ;; subs xzr, x10, x11
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x13, [x2]
;; movz x14, #65535, LSL #16
;; add x14, x14, x0
;; strb w1, [x14, x13]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x12, [x2]
;; movz x13, #65535, LSL #16
;; add x13, x13, x0
;; strb w1, [x13, x12]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
@@ -65,14 +65,14 @@
;; b.lo 8 ; udf ;; b.lo 8 ; udf
;; ldr x11, [x1, #8] ;; ldr x11, [x1, #8]
;; subs xzr, x10, x11 ;; subs xzr, x10, x11
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x13, [x1]
;; movz x12, #65535, LSL #16
;; add x12, x12, x0
;; ldrb w0, [x12, x13]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x12, [x1]
;; movz x11, #65535, LSL #16
;; add x11, x11, x0
;; ldrb w0, [x11, x12]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

28
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
View File

@@ -44,14 +44,14 @@
;; ldr x6, [x2, #8] ;; ldr x6, [x2, #8]
;; sub x6, x6, #4 ;; sub x6, x6, #4
;; subs xzr, x0, x6 ;; subs xzr, x0, x6
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x9, [x2]
;; str w1, [x9, x0]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x8, [x2]
;; str w1, [x8, x0]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
@@ -59,12 +59,12 @@
;; ldr x6, [x1, #8] ;; ldr x6, [x1, #8]
;; sub x6, x6, #4 ;; sub x6, x6, #4
;; subs xzr, x0, x6 ;; subs xzr, x0, x6
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x9, [x1]
;; ldr w0, [x9, x0]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x8, [x1]
;; ldr w0, [x8, x0]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

32
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
View File

@@ -45,15 +45,15 @@
;; movn x7, #4099 ;; movn x7, #4099
;; add x9, x8, x7 ;; add x9, x8, x7
;; subs xzr, x0, x9 ;; subs xzr, x0, x9
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x11, [x2]
;; add x12, x0, #4096
;; str w1, [x12, x11]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x10, [x2]
;; add x11, x0, #4096
;; str w1, [x11, x10]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
@@ -62,13 +62,13 @@
;; movn x7, #4099 ;; movn x7, #4099
;; add x9, x8, x7 ;; add x9, x8, x7
;; subs xzr, x0, x9 ;; subs xzr, x0, x9
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x11, [x1]
;; add x10, x0, #4096
;; ldr w0, [x10, x11]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x10, [x1]
;; add x9, x0, #4096
;; ldr w0, [x9, x10]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

36
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
View File

@@ -46,16 +46,16 @@
;; b.lo 8 ; udf ;; b.lo 8 ; udf
;; ldr x11, [x2, #8] ;; ldr x11, [x2, #8]
;; subs xzr, x10, x11 ;; subs xzr, x10, x11
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x13, [x2]
;; movz x14, #65535, LSL #16
;; add x14, x14, x0
;; str w1, [x14, x13]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x12, [x2]
;; movz x13, #65535, LSL #16
;; add x13, x13, x0
;; str w1, [x13, x12]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
@@ -65,14 +65,14 @@
;; b.lo 8 ; udf ;; b.lo 8 ; udf
;; ldr x11, [x1, #8] ;; ldr x11, [x1, #8]
;; subs xzr, x10, x11 ;; subs xzr, x10, x11
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x13, [x1]
;; movz x12, #65535, LSL #16
;; add x12, x12, x0
;; ldr w0, [x12, x13]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x12, [x1]
;; movz x11, #65535, LSL #16
;; add x11, x11, x0
;; ldr w0, [x11, x12]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

28
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
View File

@@ -43,26 +43,26 @@
;; block0: ;; block0:
;; ldr x5, [x2, #8] ;; ldr x5, [x2, #8]
;; subs xzr, x0, x5 ;; subs xzr, x0, x5
;; b.hs label1 ; b label2 ;; b.hs label3 ; b label1
;; block2:
;; ldr x8, [x2]
;; strb w1, [x8, x0]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x7, [x2]
;; strb w1, [x7, x0]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
;; block0: ;; block0:
;; ldr x5, [x1, #8] ;; ldr x5, [x1, #8]
;; subs xzr, x0, x5 ;; subs xzr, x0, x5
;; b.hs label1 ; b label2 ;; b.hs label3 ; b label1
;; block2:
;; ldr x8, [x1]
;; ldrb w0, [x8, x0]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x7, [x1]
;; ldrb w0, [x7, x0]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

32
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
View File

@@ -45,15 +45,15 @@
;; movn x7, #4096 ;; movn x7, #4096
;; add x9, x8, x7 ;; add x9, x8, x7
;; subs xzr, x0, x9 ;; subs xzr, x0, x9
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x11, [x2]
;; add x12, x0, #4096
;; strb w1, [x12, x11]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x10, [x2]
;; add x11, x0, #4096
;; strb w1, [x11, x10]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
@@ -62,13 +62,13 @@
;; movn x7, #4096 ;; movn x7, #4096
;; add x9, x8, x7 ;; add x9, x8, x7
;; subs xzr, x0, x9 ;; subs xzr, x0, x9
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x11, [x1]
;; add x10, x0, #4096
;; ldrb w0, [x10, x11]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x10, [x1]
;; add x9, x0, #4096
;; ldrb w0, [x9, x10]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

36
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
View File

@@ -46,16 +46,16 @@
;; b.lo 8 ; udf ;; b.lo 8 ; udf
;; ldr x11, [x2, #8] ;; ldr x11, [x2, #8]
;; subs xzr, x10, x11 ;; subs xzr, x10, x11
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x13, [x2]
;; movz x14, #65535, LSL #16
;; add x14, x14, x0
;; strb w1, [x14, x13]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x12, [x2]
;; movz x13, #65535, LSL #16
;; add x13, x13, x0
;; strb w1, [x13, x12]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
@@ -65,14 +65,14 @@
;; b.lo 8 ; udf ;; b.lo 8 ; udf
;; ldr x11, [x1, #8] ;; ldr x11, [x1, #8]
;; subs xzr, x10, x11 ;; subs xzr, x10, x11
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x13, [x1]
;; movz x12, #65535, LSL #16
;; add x12, x12, x0
;; ldrb w0, [x12, x13]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x12, [x1]
;; movz x11, #65535, LSL #16
;; add x11, x11, x0
;; ldrb w0, [x11, x12]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

28
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat
View File

@@ -42,14 +42,14 @@
;; mov w6, w0 ;; mov w6, w0
;; orr x7, xzr, #268435452 ;; orr x7, xzr, #268435452
;; subs xzr, x6, x7 ;; subs xzr, x6, x7
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x9, [x2]
;; str w1, [x9, w0, UXTW]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x8, [x2]
;; str w1, [x8, w0, UXTW]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
@@ -57,12 +57,12 @@
;; mov w6, w0 ;; mov w6, w0
;; orr x7, xzr, #268435452 ;; orr x7, xzr, #268435452
;; subs xzr, x6, x7 ;; subs xzr, x6, x7
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x9, [x1]
;; ldr w0, [x9, w0, UXTW]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x8, [x1]
;; ldr w0, [x8, w0, UXTW]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

32
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
View File

@@ -43,15 +43,15 @@
;; movz w9, #61436 ;; movz w9, #61436
;; movk w9, w9, #4095, LSL #16 ;; movk w9, w9, #4095, LSL #16
;; subs xzr, x8, x9 ;; subs xzr, x8, x9
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x11, [x2]
;; add x11, x11, #4096
;; str w1, [x11, w0, UXTW]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x10, [x2]
;; add x10, x10, #4096
;; str w1, [x10, w0, UXTW]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
@@ -60,13 +60,13 @@
;; movz w9, #61436 ;; movz w9, #61436
;; movk w9, w9, #4095, LSL #16 ;; movk w9, w9, #4095, LSL #16
;; subs xzr, x8, x9 ;; subs xzr, x8, x9
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x11, [x1]
;; add x10, x11, #4096
;; ldr w0, [x10, w0, UXTW]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x10, [x1]
;; add x9, x10, #4096
;; ldr w0, [x9, w0, UXTW]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

28
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat
View File

@@ -42,14 +42,14 @@
;; mov w6, w0 ;; mov w6, w0
;; orr x7, xzr, #268435455 ;; orr x7, xzr, #268435455
;; subs xzr, x6, x7 ;; subs xzr, x6, x7
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x9, [x2]
;; strb w1, [x9, w0, UXTW]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x8, [x2]
;; strb w1, [x8, w0, UXTW]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
@@ -57,12 +57,12 @@
;; mov w6, w0 ;; mov w6, w0
;; orr x7, xzr, #268435455 ;; orr x7, xzr, #268435455
;; subs xzr, x6, x7 ;; subs xzr, x6, x7
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x9, [x1]
;; ldrb w0, [x9, w0, UXTW]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x8, [x1]
;; ldrb w0, [x8, w0, UXTW]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

32
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
View File

@@ -43,15 +43,15 @@
;; movz w9, #61439 ;; movz w9, #61439
;; movk w9, w9, #4095, LSL #16 ;; movk w9, w9, #4095, LSL #16
;; subs xzr, x8, x9 ;; subs xzr, x8, x9
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x11, [x2]
;; add x11, x11, #4096
;; strb w1, [x11, w0, UXTW]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x10, [x2]
;; add x10, x10, #4096
;; strb w1, [x10, w0, UXTW]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
@@ -60,13 +60,13 @@
;; movz w9, #61439 ;; movz w9, #61439
;; movk w9, w9, #4095, LSL #16 ;; movk w9, w9, #4095, LSL #16
;; subs xzr, x8, x9 ;; subs xzr, x8, x9
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x11, [x1]
;; add x10, x11, #4096
;; ldrb w0, [x10, w0, UXTW]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x10, [x1]
;; add x9, x10, #4096
;; ldrb w0, [x9, w0, UXTW]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

28
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat
View File

@@ -41,26 +41,26 @@
;; block0: ;; block0:
;; orr x5, xzr, #268435452 ;; orr x5, xzr, #268435452
;; subs xzr, x0, x5 ;; subs xzr, x0, x5
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x8, [x2]
;; str w1, [x8, x0]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x7, [x2]
;; str w1, [x7, x0]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
;; block0: ;; block0:
;; orr x5, xzr, #268435452 ;; orr x5, xzr, #268435452
;; subs xzr, x0, x5 ;; subs xzr, x0, x5
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x8, [x1]
;; ldr w0, [x8, x0]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x7, [x1]
;; ldr w0, [x7, x0]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

32
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
View File

@@ -42,15 +42,15 @@
;; movz w7, #61436 ;; movz w7, #61436
;; movk w7, w7, #4095, LSL #16 ;; movk w7, w7, #4095, LSL #16
;; subs xzr, x0, x7 ;; subs xzr, x0, x7
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x10, [x2]
;; add x11, x0, #4096
;; str w1, [x11, x10]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x9, [x2]
;; add x10, x0, #4096
;; str w1, [x10, x9]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
@@ -58,13 +58,13 @@
;; movz w7, #61436 ;; movz w7, #61436
;; movk w7, w7, #4095, LSL #16 ;; movk w7, w7, #4095, LSL #16
;; subs xzr, x0, x7 ;; subs xzr, x0, x7
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x10, [x1]
;; add x9, x0, #4096
;; ldr w0, [x9, x10]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x9, [x1]
;; add x8, x0, #4096
;; ldr w0, [x8, x9]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

28
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat
View File

@@ -41,26 +41,26 @@
;; block0: ;; block0:
;; orr x5, xzr, #268435455 ;; orr x5, xzr, #268435455
;; subs xzr, x0, x5 ;; subs xzr, x0, x5
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x8, [x2]
;; strb w1, [x8, x0]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x7, [x2]
;; strb w1, [x7, x0]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
;; block0: ;; block0:
;; orr x5, xzr, #268435455 ;; orr x5, xzr, #268435455
;; subs xzr, x0, x5 ;; subs xzr, x0, x5
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x8, [x1]
;; ldrb w0, [x8, x0]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x7, [x1]
;; ldrb w0, [x7, x0]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

32
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
View File

@@ -42,15 +42,15 @@
;; movz w7, #61439 ;; movz w7, #61439
;; movk w7, w7, #4095, LSL #16 ;; movk w7, w7, #4095, LSL #16
;; subs xzr, x0, x7 ;; subs xzr, x0, x7
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x10, [x2]
;; add x11, x0, #4096
;; strb w1, [x11, x10]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x9, [x2]
;; add x10, x0, #4096
;; strb w1, [x10, x9]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
@@ -58,13 +58,13 @@
;; movz w7, #61439 ;; movz w7, #61439
;; movk w7, w7, #4095, LSL #16 ;; movk w7, w7, #4095, LSL #16
;; subs xzr, x0, x7 ;; subs xzr, x0, x7
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x10, [x1]
;; add x9, x0, #4096
;; ldrb w0, [x9, x10]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x9, [x1]
;; add x8, x0, #4096
;; ldrb w0, [x8, x9]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

28
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
View File

@@ -41,26 +41,26 @@
;; block0: ;; block0:
;; orr x5, xzr, #268435452 ;; orr x5, xzr, #268435452
;; subs xzr, x0, x5 ;; subs xzr, x0, x5
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x8, [x2]
;; str w1, [x8, x0]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x7, [x2]
;; str w1, [x7, x0]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
;; block0: ;; block0:
;; orr x5, xzr, #268435452 ;; orr x5, xzr, #268435452
;; subs xzr, x0, x5 ;; subs xzr, x0, x5
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x8, [x1]
;; ldr w0, [x8, x0]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x7, [x1]
;; ldr w0, [x7, x0]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

32
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
View File

@@ -42,15 +42,15 @@
;; movz w7, #61436 ;; movz w7, #61436
;; movk w7, w7, #4095, LSL #16 ;; movk w7, w7, #4095, LSL #16
;; subs xzr, x0, x7 ;; subs xzr, x0, x7
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x10, [x2]
;; add x11, x0, #4096
;; str w1, [x11, x10]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x9, [x2]
;; add x10, x0, #4096
;; str w1, [x10, x9]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
@@ -58,13 +58,13 @@
;; movz w7, #61436 ;; movz w7, #61436
;; movk w7, w7, #4095, LSL #16 ;; movk w7, w7, #4095, LSL #16
;; subs xzr, x0, x7 ;; subs xzr, x0, x7
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x10, [x1]
;; add x9, x0, #4096
;; ldr w0, [x9, x10]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x9, [x1]
;; add x8, x0, #4096
;; ldr w0, [x8, x9]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

28
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
View File

@@ -41,26 +41,26 @@
;; block0: ;; block0:
;; orr x5, xzr, #268435455 ;; orr x5, xzr, #268435455
;; subs xzr, x0, x5 ;; subs xzr, x0, x5
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x8, [x2]
;; strb w1, [x8, x0]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x7, [x2]
;; strb w1, [x7, x0]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
;; block0: ;; block0:
;; orr x5, xzr, #268435455 ;; orr x5, xzr, #268435455
;; subs xzr, x0, x5 ;; subs xzr, x0, x5
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x8, [x1]
;; ldrb w0, [x8, x0]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x7, [x1]
;; ldrb w0, [x7, x0]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

32
cranelift/filetests/filetests/isa/aarch64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
View File

@@ -42,15 +42,15 @@
;; movz w7, #61439 ;; movz w7, #61439
;; movk w7, w7, #4095, LSL #16 ;; movk w7, w7, #4095, LSL #16
;; subs xzr, x0, x7 ;; subs xzr, x0, x7
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x10, [x2]
;; add x11, x0, #4096
;; strb w1, [x11, x10]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x9, [x2]
;; add x10, x0, #4096
;; strb w1, [x10, x9]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f
;; ;;
;; function u0:1: ;; function u0:1:
@@ -58,13 +58,13 @@
;; movz w7, #61439 ;; movz w7, #61439
;; movk w7, w7, #4095, LSL #16 ;; movk w7, w7, #4095, LSL #16
;; subs xzr, x0, x7 ;; subs xzr, x0, x7
;; b.hi label1 ; b label2 ;; b.hi label3 ; b label1
;; block2:
;; ldr x10, [x1]
;; add x9, x0, #4096
;; ldrb w0, [x9, x10]
;; b label3
;; block3:
;; ret
;; block1: ;; block1:
;; ldr x9, [x1]
;; add x8, x0, #4096
;; ldrb w0, [x8, x9]
;; b label2
;; block2:
;; ret
;; block3:
;; udf #0xc11f ;; udf #0xc11f

80
cranelift/filetests/filetests/isa/riscv64/br_table.clif
View File

@@ -29,67 +29,61 @@ block5(v5: i32):
; VCode: ; VCode:
; block0: ; block0:
; br_table a0,[MachLabel(1),MachLabel(3),MachLabel(5),MachLabel(6),MachLabel(8)]##tmp1=t3,tmp2=t4 ; br_table a0,[MachLabel(6),MachLabel(5),MachLabel(1),MachLabel(2),MachLabel(3)]##tmp1=a5,tmp2=a6
; block1: ; block1:
; li a1,4
; j label2
; block2:
; j label10
; block3:
; li a1,1
; j label4 ; j label4
; block2:
; j label4
; block3:
; li a2,3
; j label7
; block4: ; block4:
; j label10 ; li a2,2
; j label7
; block5: ; block5:
; li a2,1
; j label7 ; j label7
; block6: ; block6:
; li a2,4
; j label7 ; j label7
; block7: ; block7:
; li a1,2 ; addw a0,a0,a2
; j label10
; block8:
; li a1,3
; j label9
; block9:
; j label10
; block10:
; addw a0,a0,a1
; ret ; ret
; ;
; Disassembled: ; Disassembled:
; block0: ; offset 0x0 ; block0: ; offset 0x0
; slli t6, a0, 0x20 ; slli t6, a0, 0x20
; srli t6, t6, 0x20 ; srli t6, t6, 0x20
; addi t4, zero, 4 ; addi a6, zero, 4
; bltu t6, t4, 0xc ; bltu t6, a6, 0xc
; auipc t4, 0 ; auipc a6, 0
; jalr zero, t4, 0x38 ; jalr zero, a6, 0x54
; auipc t3, 0 ; auipc a5, 0
; slli t4, t6, 3 ; slli a6, t6, 3
; add t3, t3, t4 ; add a5, a5, a6
; jalr zero, t3, 0x10 ; jalr zero, a5, 0x10
; auipc t4, 0 ; auipc a6, 0
; jalr zero, t4, 0x28 ; jalr zero, a6, 0x34
; auipc t4, 0 ; auipc a6, 0
; jalr zero, t4, 0x28 ; jalr zero, a6, 0x24
; auipc t4, 0 ; auipc a6, 0
; jalr zero, t4, 0x20 ; jalr zero, a6, 0x1c
; auipc t4, 0 ; auipc a6, 0
; jalr zero, t4, 0x20 ; jalr zero, a6, 0xc
; block1: ; offset 0x48 ; block1: ; offset 0x48
; addi a1, zero, 4 ; j 0xc
; block2: ; offset 0x4c ; block2: ; offset 0x4c
; addi a2, zero, 3
; j 0x18 ; j 0x18
; block3: ; offset 0x50 ; block3: ; offset 0x54
; addi a1, zero, 1 ; addi a2, zero, 2
; block4: ; offset 0x54
; j 0x10 ; j 0x10
; block5: ; offset 0x58 ; block4: ; offset 0x5c
; addi a1, zero, 2 ; addi a2, zero, 1
; j 8 ; j 8
; block6: ; offset 0x60 ; block5: ; offset 0x64
; addi a1, zero, 3 ; addi a2, zero, 4
; block7: ; offset 0x64 ; block6: ; offset 0x68
; addw a0, a0, a1 ; addw a0, a0, a2
; ret ; ret

12
cranelift/filetests/filetests/isa/riscv64/condbr.clif
View File

@@ -246,12 +246,12 @@ block2:
; VCode: ; VCode:
; block0: ; block0:
; eq a2,a0,a1##ty=i64 ; eq a2,a0,a1##ty=i64
; bne a2,zero,taken(label1),not_taken(label2) ; bne a2,zero,taken(label2),not_taken(label1)
; block1: ; block1:
; li a0,1 ; li a0,2
; ret ; ret
; block2: ; block2:
; li a0,2 ; li a0,1
; ret ; ret
; ;
; Disassembled: ; Disassembled:
@@ -260,12 +260,12 @@ block2:
; addi a2, zero, 1 ; addi a2, zero, 1
; j 8 ; j 8
; mv a2, zero ; mv a2, zero
; beqz a2, 0xc ; bnez a2, 0xc
; block1: ; offset 0x14 ; block1: ; offset 0x14
; addi a0, zero, 1 ; addi a0, zero, 2
; ret ; ret
; block2: ; offset 0x1c ; block2: ; offset 0x1c
; addi a0, zero, 2 ; addi a0, zero, 1
; ret ; ret
function %f(i64, i64) -> i64 { function %f(i64, i64) -> i64 {

76
cranelift/filetests/filetests/isa/riscv64/reftypes.clif
View File

@@ -94,38 +94,34 @@ block3(v7: r64, v8: r64):
; sd ra,8(sp) ; sd ra,8(sp)
; sd fp,0(sp) ; sd fp,0(sp)
; mv fp,sp ; mv fp,sp
; sd s7,-8(sp) ; sd s3,-8(sp)
; add sp,-48 ; add sp,-48
; block0: ; block0:
; sd a0,8(nominal_sp) ; sd a0,8(nominal_sp)
; sd a1,16(nominal_sp) ; sd a1,16(nominal_sp)
; mv s7,a2 ; mv s3,a2
; load_sym a1,%f+0 ; load_sym t0,%f+0
; callind a1 ; callind t0
; load_addr a1,nsp+0 ; load_addr t4,nsp+0
; ld t4,8(nominal_sp) ; ld a5,8(nominal_sp)
; sd t4,0(a1) ; sd a5,0(t4)
; andi a1,a0,255 ; andi t0,a0,255
; bne a1,zero,taken(label1),not_taken(label3) ; bne t0,zero,taken(label2),not_taken(label1)
; block1: ; block1:
; j label2 ; mv a1,a5
; block2:
; mv a0,t4
; ld a1,16(nominal_sp)
; j label5
; block3:
; j label4
; block4:
; mv a1,t4
; ld a0,16(nominal_sp) ; ld a0,16(nominal_sp)
; j label5 ; j label3
; block5: ; block2:
; mv a0,a5
; ld a1,16(nominal_sp)
; j label3
; block3:
; load_addr a2,nsp+0 ; load_addr a2,nsp+0
; ld a2,0(a2) ; ld a2,0(a2)
; mv a3,s7 ; mv t3,s3
; sd a2,0(a3) ; sd a2,0(t3)
; add sp,+48 ; add sp,+48
; ld s7,-8(sp) ; ld s3,-8(sp)
; ld ra,8(sp) ; ld ra,8(sp)
; ld fp,0(sp) ; ld fp,0(sp)
; add sp,+16 ; add sp,+16
@@ -137,37 +133,37 @@ block3(v7: r64, v8: r64):
; sd ra, 8(sp) ; sd ra, 8(sp)
; sd s0, 0(sp) ; sd s0, 0(sp)
; ori s0, sp, 0 ; ori s0, sp, 0
; sd s7, -8(sp) ; sd s3, -8(sp)
; addi sp, sp, -0x30 ; addi sp, sp, -0x30
; block1: ; offset 0x18 ; block1: ; offset 0x18
; sd a0, 8(sp) ; sd a0, 8(sp)
; sd a1, 0x10(sp) ; sd a1, 0x10(sp)
; ori s7, a2, 0 ; ori s3, a2, 0
; auipc a1, 0 ; auipc t0, 0
; ld a1, 0xc(a1) ; ld t0, 0xc(t0)
; j 0xc ; j 0xc
; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %f 0 ; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %f 0
; .byte 0x00, 0x00, 0x00, 0x00 ; .byte 0x00, 0x00, 0x00, 0x00
; jalr a1 ; jalr t0
; mv a1, sp ; mv t4, sp
; ld t4, 8(sp) ; ld a5, 8(sp)
; sd t4, 0(a1) ; sd a5, 0(t4)
; andi a1, a0, 0xff ; andi t0, a0, 0xff
; beqz a1, 0x10 ; bnez t0, 0x10
; block2: ; offset 0x50 ; block2: ; offset 0x50
; ori a0, t4, 0 ; ori a1, a5, 0
; ld a1, 0x10(sp) ; ld a0, 0x10(sp)
; j 0xc ; j 0xc
; block3: ; offset 0x5c ; block3: ; offset 0x5c
; ori a1, t4, 0 ; ori a0, a5, 0
; ld a0, 0x10(sp) ; ld a1, 0x10(sp)
; block4: ; offset 0x64 ; block4: ; offset 0x64
; mv a2, sp ; mv a2, sp
; ld a2, 0(a2) ; ld a2, 0(a2)
; ori a3, s7, 0 ; ori t3, s3, 0
; sd a2, 0(a3) ; sd a2, 0(t3)
; addi sp, sp, 0x30 ; addi sp, sp, 0x30
; ld s7, -8(sp) ; ld s3, -8(sp)
; ld ra, 8(sp) ; ld ra, 8(sp)
; ld s0, 0(sp) ; ld s0, 0(sp)
; addi sp, sp, 0x10 ; addi sp, sp, 0x10

6
cranelift/filetests/filetests/isa/riscv64/traps.clif
View File

@@ -27,10 +27,10 @@ block0(v0: i64):
; block0: ; block0:
; li t2,42 ; li t2,42
; eq a1,a0,t2##ty=i64 ; eq a1,a0,t2##ty=i64
; bne a1,zero,taken(label1),not_taken(label2) ; bne a1,zero,taken(label2),not_taken(label1)
; block2:
; ret
; block1: ; block1:
; ret
; block2:
; udf##trap_code=user0 ; udf##trap_code=user0
; ;
; Disassembled: ; Disassembled:

32
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat
View File

@@ -46,15 +46,15 @@
;; ld a7,8(a2) ;; ld a7,8(a2)
;; addi a7,a7,-4 ;; addi a7,a7,-4
;; ugt a7,t3,a7##ty=i64 ;; ugt a7,t3,a7##ty=i64
;; bne a7,zero,taken(label1),not_taken(label2) ;; bne a7,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t4,0(a2)
;; add t4,t4,t3
;; sw a1,0(t4)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t4,0(a2)
;; add t3,t4,t3
;; sw a1,0(t3)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
@@ -64,13 +64,13 @@
;; ld a7,8(a1) ;; ld a7,8(a1)
;; addi a7,a7,-4 ;; addi a7,a7,-4
;; ugt a7,t3,a7##ty=i64 ;; ugt a7,t3,a7##ty=i64
;; bne a7,zero,taken(label1),not_taken(label2) ;; bne a7,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t4,0(a1)
;; add t4,t4,t3
;; lw a0,0(t4)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t4,0(a1)
;; add t3,t4,t3
;; lw a0,0(t3)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

40
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
View File

@@ -48,17 +48,17 @@
;; addi t0,t0,4092 ;; addi t0,t0,4092
;; add a0,t1,t0 ;; add a0,t1,t0
;; ugt t1,t2,a0##ty=i64 ;; ugt t1,t2,a0##ty=i64
;; bne t1,zero,taken(label1),not_taken(label2) ;; bne t1,zero,taken(label3),not_taken(label1)
;; block2:
;; ld a0,0(a2)
;; add a0,a0,t2
;; lui t2,1
;; add a2,a0,t2
;; sw a1,0(a2)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld a0,0(a2)
;; add t2,a0,t2
;; lui t1,1
;; add a0,t2,t1
;; sw a1,0(a0)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
@@ -70,15 +70,15 @@
;; addi t0,t0,4092 ;; addi t0,t0,4092
;; add a0,t1,t0 ;; add a0,t1,t0
;; ugt t1,t2,a0##ty=i64 ;; ugt t1,t2,a0##ty=i64
;; bne t1,zero,taken(label1),not_taken(label2) ;; bne t1,zero,taken(label3),not_taken(label1)
;; block2:
;; ld a0,0(a1)
;; add a0,a0,t2
;; lui t2,1
;; add a1,a0,t2
;; lw a0,0(a1)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld a0,0(a1)
;; add t2,a0,t2
;; lui t1,1
;; add a0,t2,t1
;; lw a0,0(a0)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

40
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
View File

@@ -49,17 +49,17 @@
;; trap_if a0,heap_oob ;; trap_if a0,heap_oob
;; ld a0,8(a2) ;; ld a0,8(a2)
;; ugt a0,t1,a0##ty=i64 ;; ugt a0,t1,a0##ty=i64
;; bne a0,zero,taken(label1),not_taken(label2) ;; bne a0,zero,taken(label3),not_taken(label1)
;; block2:
;; ld a2,0(a2)
;; add a2,a2,t2
;; auipc a0,0; ld a0,12(a0); j 12; .8byte 0xffff0000
;; add a2,a2,a0
;; sw a1,0(a2)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld a0,0(a2)
;; add a0,a0,t2
;; auipc t2,0; ld t2,12(t2); j 12; .8byte 0xffff0000
;; add a2,a0,t2
;; sw a1,0(a2)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
@@ -72,15 +72,15 @@
;; trap_if a0,heap_oob ;; trap_if a0,heap_oob
;; ld a0,8(a1) ;; ld a0,8(a1)
;; ugt a0,t1,a0##ty=i64 ;; ugt a0,t1,a0##ty=i64
;; bne a0,zero,taken(label1),not_taken(label2) ;; bne a0,zero,taken(label3),not_taken(label1)
;; block2:
;; ld a1,0(a1)
;; add a1,a1,t2
;; auipc a0,0; ld a0,12(a0); j 12; .8byte 0xffff0000
;; add a2,a1,a0
;; lw a0,0(a2)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld a0,0(a1)
;; add a0,a0,t2
;; auipc t2,0; ld t2,12(t2); j 12; .8byte 0xffff0000
;; add a1,a0,t2
;; lw a0,0(a1)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

32
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat
View File

@@ -45,15 +45,15 @@
;; srli a7,a5,32 ;; srli a7,a5,32
;; ld a6,8(a2) ;; ld a6,8(a2)
;; uge a6,a7,a6##ty=i64 ;; uge a6,a7,a6##ty=i64
;; bne a6,zero,taken(label1),not_taken(label2) ;; bne a6,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t3,0(a2)
;; add t3,t3,a7
;; sb a1,0(t3)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t3,0(a2)
;; add a7,t3,a7
;; sb a1,0(a7)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
@@ -62,13 +62,13 @@
;; srli a7,a5,32 ;; srli a7,a5,32
;; ld a6,8(a1) ;; ld a6,8(a1)
;; uge a6,a7,a6##ty=i64 ;; uge a6,a7,a6##ty=i64
;; bne a6,zero,taken(label1),not_taken(label2) ;; bne a6,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t3,0(a1)
;; add t3,t3,a7
;; lbu a0,0(t3)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t3,0(a1)
;; add a7,t3,a7
;; lbu a0,0(a7)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

40
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
View File

@@ -48,17 +48,17 @@
;; addi t0,t0,4095 ;; addi t0,t0,4095
;; add a0,t1,t0 ;; add a0,t1,t0
;; ugt t1,t2,a0##ty=i64 ;; ugt t1,t2,a0##ty=i64
;; bne t1,zero,taken(label1),not_taken(label2) ;; bne t1,zero,taken(label3),not_taken(label1)
;; block2:
;; ld a0,0(a2)
;; add a0,a0,t2
;; lui t2,1
;; add a2,a0,t2
;; sb a1,0(a2)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld a0,0(a2)
;; add t2,a0,t2
;; lui t1,1
;; add a0,t2,t1
;; sb a1,0(a0)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
@@ -70,15 +70,15 @@
;; addi t0,t0,4095 ;; addi t0,t0,4095
;; add a0,t1,t0 ;; add a0,t1,t0
;; ugt t1,t2,a0##ty=i64 ;; ugt t1,t2,a0##ty=i64
;; bne t1,zero,taken(label1),not_taken(label2) ;; bne t1,zero,taken(label3),not_taken(label1)
;; block2:
;; ld a0,0(a1)
;; add a0,a0,t2
;; lui t2,1
;; add a1,a0,t2
;; lbu a0,0(a1)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld a0,0(a1)
;; add t2,a0,t2
;; lui t1,1
;; add a0,t2,t1
;; lbu a0,0(a0)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

40
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
View File

@@ -49,17 +49,17 @@
;; trap_if a0,heap_oob ;; trap_if a0,heap_oob
;; ld a0,8(a2) ;; ld a0,8(a2)
;; ugt a0,t1,a0##ty=i64 ;; ugt a0,t1,a0##ty=i64
;; bne a0,zero,taken(label1),not_taken(label2) ;; bne a0,zero,taken(label3),not_taken(label1)
;; block2:
;; ld a2,0(a2)
;; add a2,a2,t2
;; auipc a0,0; ld a0,12(a0); j 12; .8byte 0xffff0000
;; add a2,a2,a0
;; sb a1,0(a2)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld a0,0(a2)
;; add a0,a0,t2
;; auipc t2,0; ld t2,12(t2); j 12; .8byte 0xffff0000
;; add a2,a0,t2
;; sb a1,0(a2)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
@@ -72,15 +72,15 @@
;; trap_if a0,heap_oob ;; trap_if a0,heap_oob
;; ld a0,8(a1) ;; ld a0,8(a1)
;; ugt a0,t1,a0##ty=i64 ;; ugt a0,t1,a0##ty=i64
;; bne a0,zero,taken(label1),not_taken(label2) ;; bne a0,zero,taken(label3),not_taken(label1)
;; block2:
;; ld a1,0(a1)
;; add a1,a1,t2
;; auipc a0,0; ld a0,12(a0); j 12; .8byte 0xffff0000
;; add a2,a1,a0
;; lbu a0,0(a2)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld a0,0(a1)
;; add a0,a0,t2
;; auipc t2,0; ld t2,12(t2); j 12; .8byte 0xffff0000
;; add a1,a0,t2
;; lbu a0,0(a1)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

32
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
View File

@@ -46,15 +46,15 @@
;; ld a7,8(a2) ;; ld a7,8(a2)
;; addi a7,a7,-4 ;; addi a7,a7,-4
;; ugt a7,t3,a7##ty=i64 ;; ugt a7,t3,a7##ty=i64
;; bne a7,zero,taken(label1),not_taken(label2) ;; bne a7,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t4,0(a2)
;; add t4,t4,t3
;; sw a1,0(t4)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t4,0(a2)
;; add t3,t4,t3
;; sw a1,0(t3)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
@@ -64,13 +64,13 @@
;; ld a7,8(a1) ;; ld a7,8(a1)
;; addi a7,a7,-4 ;; addi a7,a7,-4
;; ugt a7,t3,a7##ty=i64 ;; ugt a7,t3,a7##ty=i64
;; bne a7,zero,taken(label1),not_taken(label2) ;; bne a7,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t4,0(a1)
;; add t4,t4,t3
;; lw a0,0(t4)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t4,0(a1)
;; add t3,t4,t3
;; lw a0,0(t3)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

40
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
View File

@@ -48,17 +48,17 @@
;; addi t0,t0,4092 ;; addi t0,t0,4092
;; add a0,t1,t0 ;; add a0,t1,t0
;; ugt t1,t2,a0##ty=i64 ;; ugt t1,t2,a0##ty=i64
;; bne t1,zero,taken(label1),not_taken(label2) ;; bne t1,zero,taken(label3),not_taken(label1)
;; block2:
;; ld a0,0(a2)
;; add a0,a0,t2
;; lui t2,1
;; add a2,a0,t2
;; sw a1,0(a2)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld a0,0(a2)
;; add t2,a0,t2
;; lui t1,1
;; add a0,t2,t1
;; sw a1,0(a0)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
@@ -70,15 +70,15 @@
;; addi t0,t0,4092 ;; addi t0,t0,4092
;; add a0,t1,t0 ;; add a0,t1,t0
;; ugt t1,t2,a0##ty=i64 ;; ugt t1,t2,a0##ty=i64
;; bne t1,zero,taken(label1),not_taken(label2) ;; bne t1,zero,taken(label3),not_taken(label1)
;; block2:
;; ld a0,0(a1)
;; add a0,a0,t2
;; lui t2,1
;; add a1,a0,t2
;; lw a0,0(a1)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld a0,0(a1)
;; add t2,a0,t2
;; lui t1,1
;; add a0,t2,t1
;; lw a0,0(a0)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

40
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
View File

@@ -49,17 +49,17 @@
;; trap_if a0,heap_oob ;; trap_if a0,heap_oob
;; ld a0,8(a2) ;; ld a0,8(a2)
;; ugt a0,t1,a0##ty=i64 ;; ugt a0,t1,a0##ty=i64
;; bne a0,zero,taken(label1),not_taken(label2) ;; bne a0,zero,taken(label3),not_taken(label1)
;; block2:
;; ld a2,0(a2)
;; add a2,a2,t2
;; auipc a0,0; ld a0,12(a0); j 12; .8byte 0xffff0000
;; add a2,a2,a0
;; sw a1,0(a2)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld a0,0(a2)
;; add a0,a0,t2
;; auipc t2,0; ld t2,12(t2); j 12; .8byte 0xffff0000
;; add a2,a0,t2
;; sw a1,0(a2)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
@@ -72,15 +72,15 @@
;; trap_if a0,heap_oob ;; trap_if a0,heap_oob
;; ld a0,8(a1) ;; ld a0,8(a1)
;; ugt a0,t1,a0##ty=i64 ;; ugt a0,t1,a0##ty=i64
;; bne a0,zero,taken(label1),not_taken(label2) ;; bne a0,zero,taken(label3),not_taken(label1)
;; block2:
;; ld a1,0(a1)
;; add a1,a1,t2
;; auipc a0,0; ld a0,12(a0); j 12; .8byte 0xffff0000
;; add a2,a1,a0
;; lw a0,0(a2)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld a0,0(a1)
;; add a0,a0,t2
;; auipc t2,0; ld t2,12(t2); j 12; .8byte 0xffff0000
;; add a1,a0,t2
;; lw a0,0(a1)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

32
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
View File

@@ -45,15 +45,15 @@
;; srli a7,a5,32 ;; srli a7,a5,32
;; ld a6,8(a2) ;; ld a6,8(a2)
;; uge a6,a7,a6##ty=i64 ;; uge a6,a7,a6##ty=i64
;; bne a6,zero,taken(label1),not_taken(label2) ;; bne a6,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t3,0(a2)
;; add t3,t3,a7
;; sb a1,0(t3)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t3,0(a2)
;; add a7,t3,a7
;; sb a1,0(a7)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
@@ -62,13 +62,13 @@
;; srli a7,a5,32 ;; srli a7,a5,32
;; ld a6,8(a1) ;; ld a6,8(a1)
;; uge a6,a7,a6##ty=i64 ;; uge a6,a7,a6##ty=i64
;; bne a6,zero,taken(label1),not_taken(label2) ;; bne a6,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t3,0(a1)
;; add t3,t3,a7
;; lbu a0,0(t3)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t3,0(a1)
;; add a7,t3,a7
;; lbu a0,0(a7)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

40
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
View File

@@ -48,17 +48,17 @@
;; addi t0,t0,4095 ;; addi t0,t0,4095
;; add a0,t1,t0 ;; add a0,t1,t0
;; ugt t1,t2,a0##ty=i64 ;; ugt t1,t2,a0##ty=i64
;; bne t1,zero,taken(label1),not_taken(label2) ;; bne t1,zero,taken(label3),not_taken(label1)
;; block2:
;; ld a0,0(a2)
;; add a0,a0,t2
;; lui t2,1
;; add a2,a0,t2
;; sb a1,0(a2)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld a0,0(a2)
;; add t2,a0,t2
;; lui t1,1
;; add a0,t2,t1
;; sb a1,0(a0)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
@@ -70,15 +70,15 @@
;; addi t0,t0,4095 ;; addi t0,t0,4095
;; add a0,t1,t0 ;; add a0,t1,t0
;; ugt t1,t2,a0##ty=i64 ;; ugt t1,t2,a0##ty=i64
;; bne t1,zero,taken(label1),not_taken(label2) ;; bne t1,zero,taken(label3),not_taken(label1)
;; block2:
;; ld a0,0(a1)
;; add a0,a0,t2
;; lui t2,1
;; add a1,a0,t2
;; lbu a0,0(a1)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld a0,0(a1)
;; add t2,a0,t2
;; lui t1,1
;; add a0,t2,t1
;; lbu a0,0(a0)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

40
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
View File

@@ -49,17 +49,17 @@
;; trap_if a0,heap_oob ;; trap_if a0,heap_oob
;; ld a0,8(a2) ;; ld a0,8(a2)
;; ugt a0,t1,a0##ty=i64 ;; ugt a0,t1,a0##ty=i64
;; bne a0,zero,taken(label1),not_taken(label2) ;; bne a0,zero,taken(label3),not_taken(label1)
;; block2:
;; ld a2,0(a2)
;; add a2,a2,t2
;; auipc a0,0; ld a0,12(a0); j 12; .8byte 0xffff0000
;; add a2,a2,a0
;; sb a1,0(a2)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld a0,0(a2)
;; add a0,a0,t2
;; auipc t2,0; ld t2,12(t2); j 12; .8byte 0xffff0000
;; add a2,a0,t2
;; sb a1,0(a2)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
@@ -72,15 +72,15 @@
;; trap_if a0,heap_oob ;; trap_if a0,heap_oob
;; ld a0,8(a1) ;; ld a0,8(a1)
;; ugt a0,t1,a0##ty=i64 ;; ugt a0,t1,a0##ty=i64
;; bne a0,zero,taken(label1),not_taken(label2) ;; bne a0,zero,taken(label3),not_taken(label1)
;; block2:
;; ld a1,0(a1)
;; add a1,a1,t2
;; auipc a0,0; ld a0,12(a0); j 12; .8byte 0xffff0000
;; add a2,a1,a0
;; lbu a0,0(a2)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld a0,0(a1)
;; add a0,a0,t2
;; auipc t2,0; ld t2,12(t2); j 12; .8byte 0xffff0000
;; add a1,a0,t2
;; lbu a0,0(a1)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

32
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat
View File

@@ -44,15 +44,15 @@
;; ld a5,8(a2) ;; ld a5,8(a2)
;; addi a5,a5,-4 ;; addi a5,a5,-4
;; ugt a5,a0,a5##ty=i64 ;; ugt a5,a0,a5##ty=i64
;; bne a5,zero,taken(label1),not_taken(label2) ;; bne a5,zero,taken(label3),not_taken(label1)
;; block2:
;; ld a7,0(a2)
;; add a7,a7,a0
;; sw a1,0(a7)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld a6,0(a2)
;; add a6,a6,a0
;; sw a1,0(a6)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
@@ -60,13 +60,13 @@
;; ld a5,8(a1) ;; ld a5,8(a1)
;; addi a5,a5,-4 ;; addi a5,a5,-4
;; ugt a5,a0,a5##ty=i64 ;; ugt a5,a0,a5##ty=i64
;; bne a5,zero,taken(label1),not_taken(label2) ;; bne a5,zero,taken(label3),not_taken(label1)
;; block2:
;; ld a7,0(a1)
;; add a7,a7,a0
;; lw a0,0(a7)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld a6,0(a1)
;; add a6,a6,a0
;; lw a0,0(a6)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

40
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
View File

@@ -46,17 +46,17 @@
;; addi t3,t3,4092 ;; addi t3,t3,4092
;; add t1,t4,t3 ;; add t1,t4,t3
;; ugt t4,a0,t1##ty=i64 ;; ugt t4,a0,t1##ty=i64
;; bne t4,zero,taken(label1),not_taken(label2) ;; bne t4,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t1,0(a2)
;; add t1,t1,a0
;; lui t0,1
;; add t2,t1,t0
;; sw a1,0(t2)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t0,0(a2)
;; add t0,t0,a0
;; lui t4,1
;; add t1,t0,t4
;; sw a1,0(t1)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
@@ -66,15 +66,15 @@
;; addi t3,t3,4092 ;; addi t3,t3,4092
;; add t1,t4,t3 ;; add t1,t4,t3
;; ugt t4,a0,t1##ty=i64 ;; ugt t4,a0,t1##ty=i64
;; bne t4,zero,taken(label1),not_taken(label2) ;; bne t4,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t1,0(a1)
;; add t1,t1,a0
;; lui t0,1
;; add t2,t1,t0
;; lw a0,0(t2)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t0,0(a1)
;; add t0,t0,a0
;; lui t4,1
;; add t1,t0,t4
;; lw a0,0(t1)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

40
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
View File

@@ -47,17 +47,17 @@
;; trap_if t1,heap_oob ;; trap_if t1,heap_oob
;; ld t0,8(a2) ;; ld t0,8(a2)
;; ugt t0,t4,t0##ty=i64 ;; ugt t0,t4,t0##ty=i64
;; bne t0,zero,taken(label1),not_taken(label2) ;; bne t0,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t2,0(a2)
;; add t2,t2,a0
;; auipc t1,0; ld t1,12(t1); j 12; .8byte 0xffff0000
;; add a0,t2,t1
;; sw a1,0(a0)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t1,0(a2)
;; add t1,t1,a0
;; auipc t0,0; ld t0,12(t0); j 12; .8byte 0xffff0000
;; add t2,t1,t0
;; sw a1,0(t2)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
@@ -68,15 +68,15 @@
;; trap_if t1,heap_oob ;; trap_if t1,heap_oob
;; ld t0,8(a1) ;; ld t0,8(a1)
;; ugt t0,t4,t0##ty=i64 ;; ugt t0,t4,t0##ty=i64
;; bne t0,zero,taken(label1),not_taken(label2) ;; bne t0,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t2,0(a1)
;; add t2,t2,a0
;; auipc t1,0; ld t1,12(t1); j 12; .8byte 0xffff0000
;; add a0,t2,t1
;; lw a0,0(a0)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t1,0(a1)
;; add t1,t1,a0
;; auipc t0,0; ld t0,12(t0); j 12; .8byte 0xffff0000
;; add t2,t1,t0
;; lw a0,0(t2)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

32
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat
View File

@@ -43,28 +43,28 @@
;; block0: ;; block0:
;; ld a4,8(a2) ;; ld a4,8(a2)
;; uge a4,a0,a4##ty=i64 ;; uge a4,a0,a4##ty=i64
;; bne a4,zero,taken(label1),not_taken(label2) ;; bne a4,zero,taken(label3),not_taken(label1)
;; block2:
;; ld a6,0(a2)
;; add a6,a6,a0
;; sb a1,0(a6)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld a5,0(a2)
;; add a5,a5,a0
;; sb a1,0(a5)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
;; block0: ;; block0:
;; ld a4,8(a1) ;; ld a4,8(a1)
;; uge a4,a0,a4##ty=i64 ;; uge a4,a0,a4##ty=i64
;; bne a4,zero,taken(label1),not_taken(label2) ;; bne a4,zero,taken(label3),not_taken(label1)
;; block2:
;; ld a6,0(a1)
;; add a6,a6,a0
;; lbu a0,0(a6)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld a5,0(a1)
;; add a5,a5,a0
;; lbu a0,0(a5)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

40
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
View File

@@ -46,17 +46,17 @@
;; addi t3,t3,4095 ;; addi t3,t3,4095
;; add t1,t4,t3 ;; add t1,t4,t3
;; ugt t4,a0,t1##ty=i64 ;; ugt t4,a0,t1##ty=i64
;; bne t4,zero,taken(label1),not_taken(label2) ;; bne t4,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t1,0(a2)
;; add t1,t1,a0
;; lui t0,1
;; add t2,t1,t0
;; sb a1,0(t2)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t0,0(a2)
;; add t0,t0,a0
;; lui t4,1
;; add t1,t0,t4
;; sb a1,0(t1)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
@@ -66,15 +66,15 @@
;; addi t3,t3,4095 ;; addi t3,t3,4095
;; add t1,t4,t3 ;; add t1,t4,t3
;; ugt t4,a0,t1##ty=i64 ;; ugt t4,a0,t1##ty=i64
;; bne t4,zero,taken(label1),not_taken(label2) ;; bne t4,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t1,0(a1)
;; add t1,t1,a0
;; lui t0,1
;; add t2,t1,t0
;; lbu a0,0(t2)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t0,0(a1)
;; add t0,t0,a0
;; lui t4,1
;; add t1,t0,t4
;; lbu a0,0(t1)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

40
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
View File

@@ -47,17 +47,17 @@
;; trap_if t1,heap_oob ;; trap_if t1,heap_oob
;; ld t0,8(a2) ;; ld t0,8(a2)
;; ugt t0,t4,t0##ty=i64 ;; ugt t0,t4,t0##ty=i64
;; bne t0,zero,taken(label1),not_taken(label2) ;; bne t0,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t2,0(a2)
;; add t2,t2,a0
;; auipc t1,0; ld t1,12(t1); j 12; .8byte 0xffff0000
;; add a0,t2,t1
;; sb a1,0(a0)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t1,0(a2)
;; add t1,t1,a0
;; auipc t0,0; ld t0,12(t0); j 12; .8byte 0xffff0000
;; add t2,t1,t0
;; sb a1,0(t2)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
@@ -68,15 +68,15 @@
;; trap_if t1,heap_oob ;; trap_if t1,heap_oob
;; ld t0,8(a1) ;; ld t0,8(a1)
;; ugt t0,t4,t0##ty=i64 ;; ugt t0,t4,t0##ty=i64
;; bne t0,zero,taken(label1),not_taken(label2) ;; bne t0,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t2,0(a1)
;; add t2,t2,a0
;; auipc t1,0; ld t1,12(t1); j 12; .8byte 0xffff0000
;; add a0,t2,t1
;; lbu a0,0(a0)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t1,0(a1)
;; add t1,t1,a0
;; auipc t0,0; ld t0,12(t0); j 12; .8byte 0xffff0000
;; add t2,t1,t0
;; lbu a0,0(t2)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

32
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
View File

@@ -44,15 +44,15 @@
;; ld a5,8(a2) ;; ld a5,8(a2)
;; addi a5,a5,-4 ;; addi a5,a5,-4
;; ugt a5,a0,a5##ty=i64 ;; ugt a5,a0,a5##ty=i64
;; bne a5,zero,taken(label1),not_taken(label2) ;; bne a5,zero,taken(label3),not_taken(label1)
;; block2:
;; ld a7,0(a2)
;; add a7,a7,a0
;; sw a1,0(a7)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld a6,0(a2)
;; add a6,a6,a0
;; sw a1,0(a6)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
@@ -60,13 +60,13 @@
;; ld a5,8(a1) ;; ld a5,8(a1)
;; addi a5,a5,-4 ;; addi a5,a5,-4
;; ugt a5,a0,a5##ty=i64 ;; ugt a5,a0,a5##ty=i64
;; bne a5,zero,taken(label1),not_taken(label2) ;; bne a5,zero,taken(label3),not_taken(label1)
;; block2:
;; ld a7,0(a1)
;; add a7,a7,a0
;; lw a0,0(a7)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld a6,0(a1)
;; add a6,a6,a0
;; lw a0,0(a6)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

40
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
View File

@@ -46,17 +46,17 @@
;; addi t3,t3,4092 ;; addi t3,t3,4092
;; add t1,t4,t3 ;; add t1,t4,t3
;; ugt t4,a0,t1##ty=i64 ;; ugt t4,a0,t1##ty=i64
;; bne t4,zero,taken(label1),not_taken(label2) ;; bne t4,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t1,0(a2)
;; add t1,t1,a0
;; lui t0,1
;; add t2,t1,t0
;; sw a1,0(t2)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t0,0(a2)
;; add t0,t0,a0
;; lui t4,1
;; add t1,t0,t4
;; sw a1,0(t1)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
@@ -66,15 +66,15 @@
;; addi t3,t3,4092 ;; addi t3,t3,4092
;; add t1,t4,t3 ;; add t1,t4,t3
;; ugt t4,a0,t1##ty=i64 ;; ugt t4,a0,t1##ty=i64
;; bne t4,zero,taken(label1),not_taken(label2) ;; bne t4,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t1,0(a1)
;; add t1,t1,a0
;; lui t0,1
;; add t2,t1,t0
;; lw a0,0(t2)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t0,0(a1)
;; add t0,t0,a0
;; lui t4,1
;; add t1,t0,t4
;; lw a0,0(t1)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

40
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
View File

@@ -47,17 +47,17 @@
;; trap_if t1,heap_oob ;; trap_if t1,heap_oob
;; ld t0,8(a2) ;; ld t0,8(a2)
;; ugt t0,t4,t0##ty=i64 ;; ugt t0,t4,t0##ty=i64
;; bne t0,zero,taken(label1),not_taken(label2) ;; bne t0,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t2,0(a2)
;; add t2,t2,a0
;; auipc t1,0; ld t1,12(t1); j 12; .8byte 0xffff0000
;; add a0,t2,t1
;; sw a1,0(a0)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t1,0(a2)
;; add t1,t1,a0
;; auipc t0,0; ld t0,12(t0); j 12; .8byte 0xffff0000
;; add t2,t1,t0
;; sw a1,0(t2)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
@@ -68,15 +68,15 @@
;; trap_if t1,heap_oob ;; trap_if t1,heap_oob
;; ld t0,8(a1) ;; ld t0,8(a1)
;; ugt t0,t4,t0##ty=i64 ;; ugt t0,t4,t0##ty=i64
;; bne t0,zero,taken(label1),not_taken(label2) ;; bne t0,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t2,0(a1)
;; add t2,t2,a0
;; auipc t1,0; ld t1,12(t1); j 12; .8byte 0xffff0000
;; add a0,t2,t1
;; lw a0,0(a0)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t1,0(a1)
;; add t1,t1,a0
;; auipc t0,0; ld t0,12(t0); j 12; .8byte 0xffff0000
;; add t2,t1,t0
;; lw a0,0(t2)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

32
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
View File

@@ -43,28 +43,28 @@
;; block0: ;; block0:
;; ld a4,8(a2) ;; ld a4,8(a2)
;; uge a4,a0,a4##ty=i64 ;; uge a4,a0,a4##ty=i64
;; bne a4,zero,taken(label1),not_taken(label2) ;; bne a4,zero,taken(label3),not_taken(label1)
;; block2:
;; ld a6,0(a2)
;; add a6,a6,a0
;; sb a1,0(a6)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld a5,0(a2)
;; add a5,a5,a0
;; sb a1,0(a5)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
;; block0: ;; block0:
;; ld a4,8(a1) ;; ld a4,8(a1)
;; uge a4,a0,a4##ty=i64 ;; uge a4,a0,a4##ty=i64
;; bne a4,zero,taken(label1),not_taken(label2) ;; bne a4,zero,taken(label3),not_taken(label1)
;; block2:
;; ld a6,0(a1)
;; add a6,a6,a0
;; lbu a0,0(a6)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld a5,0(a1)
;; add a5,a5,a0
;; lbu a0,0(a5)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

40
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
View File

@@ -46,17 +46,17 @@
;; addi t3,t3,4095 ;; addi t3,t3,4095
;; add t1,t4,t3 ;; add t1,t4,t3
;; ugt t4,a0,t1##ty=i64 ;; ugt t4,a0,t1##ty=i64
;; bne t4,zero,taken(label1),not_taken(label2) ;; bne t4,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t1,0(a2)
;; add t1,t1,a0
;; lui t0,1
;; add t2,t1,t0
;; sb a1,0(t2)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t0,0(a2)
;; add t0,t0,a0
;; lui t4,1
;; add t1,t0,t4
;; sb a1,0(t1)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
@@ -66,15 +66,15 @@
;; addi t3,t3,4095 ;; addi t3,t3,4095
;; add t1,t4,t3 ;; add t1,t4,t3
;; ugt t4,a0,t1##ty=i64 ;; ugt t4,a0,t1##ty=i64
;; bne t4,zero,taken(label1),not_taken(label2) ;; bne t4,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t1,0(a1)
;; add t1,t1,a0
;; lui t0,1
;; add t2,t1,t0
;; lbu a0,0(t2)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t0,0(a1)
;; add t0,t0,a0
;; lui t4,1
;; add t1,t0,t4
;; lbu a0,0(t1)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

40
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
View File

@@ -47,17 +47,17 @@
;; trap_if t1,heap_oob ;; trap_if t1,heap_oob
;; ld t0,8(a2) ;; ld t0,8(a2)
;; ugt t0,t4,t0##ty=i64 ;; ugt t0,t4,t0##ty=i64
;; bne t0,zero,taken(label1),not_taken(label2) ;; bne t0,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t2,0(a2)
;; add t2,t2,a0
;; auipc t1,0; ld t1,12(t1); j 12; .8byte 0xffff0000
;; add a0,t2,t1
;; sb a1,0(a0)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t1,0(a2)
;; add t1,t1,a0
;; auipc t0,0; ld t0,12(t0); j 12; .8byte 0xffff0000
;; add t2,t1,t0
;; sb a1,0(t2)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
@@ -68,15 +68,15 @@
;; trap_if t1,heap_oob ;; trap_if t1,heap_oob
;; ld t0,8(a1) ;; ld t0,8(a1)
;; ugt t0,t4,t0##ty=i64 ;; ugt t0,t4,t0##ty=i64
;; bne t0,zero,taken(label1),not_taken(label2) ;; bne t0,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t2,0(a1)
;; add t2,t2,a0
;; auipc t1,0; ld t1,12(t1); j 12; .8byte 0xffff0000
;; add a0,t2,t1
;; lbu a0,0(a0)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t1,0(a1)
;; add t1,t1,a0
;; auipc t0,0; ld t0,12(t0); j 12; .8byte 0xffff0000
;; add t2,t1,t0
;; lbu a0,0(t2)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

32
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat
View File

@@ -44,15 +44,15 @@
;; lui a6,65536 ;; lui a6,65536
;; addi a6,a6,4092 ;; addi a6,a6,4092
;; ugt t4,t3,a6##ty=i64 ;; ugt t4,t3,a6##ty=i64
;; bne t4,zero,taken(label1),not_taken(label2) ;; bne t4,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t4,0(a2)
;; add t4,t4,t3
;; sw a1,0(t4)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t4,0(a2)
;; add t3,t4,t3
;; sw a1,0(t3)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
@@ -62,13 +62,13 @@
;; lui a6,65536 ;; lui a6,65536
;; addi a6,a6,4092 ;; addi a6,a6,4092
;; ugt t4,t3,a6##ty=i64 ;; ugt t4,t3,a6##ty=i64
;; bne t4,zero,taken(label1),not_taken(label2) ;; bne t4,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t4,0(a1)
;; add t4,t4,t3
;; lw a0,0(t4)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t4,0(a1)
;; add t3,t4,t3
;; lw a0,0(t3)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

40
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
View File

@@ -44,17 +44,17 @@
;; lui t3,65535 ;; lui t3,65535
;; addi t3,t3,4092 ;; addi t3,t3,4092
;; ugt t1,t0,t3##ty=i64 ;; ugt t1,t0,t3##ty=i64
;; bne t1,zero,taken(label1),not_taken(label2) ;; bne t1,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t1,0(a2)
;; add t1,t1,t0
;; lui t0,1
;; add t2,t1,t0
;; sw a1,0(t2)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t1,0(a2)
;; add t0,t1,t0
;; lui t4,1
;; add t1,t0,t4
;; sw a1,0(t1)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
@@ -64,15 +64,15 @@
;; lui t3,65535 ;; lui t3,65535
;; addi t3,t3,4092 ;; addi t3,t3,4092
;; ugt t1,t0,t3##ty=i64 ;; ugt t1,t0,t3##ty=i64
;; bne t1,zero,taken(label1),not_taken(label2) ;; bne t1,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t1,0(a1)
;; add t1,t1,t0
;; lui t0,1
;; add t2,t1,t0
;; lw a0,0(t2)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t1,0(a1)
;; add t0,t1,t0
;; lui t4,1
;; add t1,t0,t4
;; lw a0,0(t1)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

32
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat
View File

@@ -44,15 +44,15 @@
;; lui a6,65536 ;; lui a6,65536
;; addi a6,a6,4095 ;; addi a6,a6,4095
;; ugt t4,t3,a6##ty=i64 ;; ugt t4,t3,a6##ty=i64
;; bne t4,zero,taken(label1),not_taken(label2) ;; bne t4,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t4,0(a2)
;; add t4,t4,t3
;; sb a1,0(t4)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t4,0(a2)
;; add t3,t4,t3
;; sb a1,0(t3)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
@@ -62,13 +62,13 @@
;; lui a6,65536 ;; lui a6,65536
;; addi a6,a6,4095 ;; addi a6,a6,4095
;; ugt t4,t3,a6##ty=i64 ;; ugt t4,t3,a6##ty=i64
;; bne t4,zero,taken(label1),not_taken(label2) ;; bne t4,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t4,0(a1)
;; add t4,t4,t3
;; lbu a0,0(t4)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t4,0(a1)
;; add t3,t4,t3
;; lbu a0,0(t3)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

40
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
View File

@@ -44,17 +44,17 @@
;; lui t3,65535 ;; lui t3,65535
;; addi t3,t3,4095 ;; addi t3,t3,4095
;; ugt t1,t0,t3##ty=i64 ;; ugt t1,t0,t3##ty=i64
;; bne t1,zero,taken(label1),not_taken(label2) ;; bne t1,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t1,0(a2)
;; add t1,t1,t0
;; lui t0,1
;; add t2,t1,t0
;; sb a1,0(t2)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t1,0(a2)
;; add t0,t1,t0
;; lui t4,1
;; add t1,t0,t4
;; sb a1,0(t1)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
@@ -64,15 +64,15 @@
;; lui t3,65535 ;; lui t3,65535
;; addi t3,t3,4095 ;; addi t3,t3,4095
;; ugt t1,t0,t3##ty=i64 ;; ugt t1,t0,t3##ty=i64
;; bne t1,zero,taken(label1),not_taken(label2) ;; bne t1,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t1,0(a1)
;; add t1,t1,t0
;; lui t0,1
;; add t2,t1,t0
;; lbu a0,0(t2)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t1,0(a1)
;; add t0,t1,t0
;; lui t4,1
;; add t1,t0,t4
;; lbu a0,0(t1)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

32
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat
View File

@@ -42,15 +42,15 @@
;; lui a4,65536 ;; lui a4,65536
;; addi a4,a4,4092 ;; addi a4,a4,4092
;; ugt a7,a0,a4##ty=i64 ;; ugt a7,a0,a4##ty=i64
;; bne a7,zero,taken(label1),not_taken(label2) ;; bne a7,zero,taken(label3),not_taken(label1)
;; block2:
;; ld a7,0(a2)
;; add a7,a7,a0
;; sw a1,0(a7)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld a6,0(a2)
;; add a6,a6,a0
;; sw a1,0(a6)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
@@ -58,13 +58,13 @@
;; lui a4,65536 ;; lui a4,65536
;; addi a4,a4,4092 ;; addi a4,a4,4092
;; ugt a7,a0,a4##ty=i64 ;; ugt a7,a0,a4##ty=i64
;; bne a7,zero,taken(label1),not_taken(label2) ;; bne a7,zero,taken(label3),not_taken(label1)
;; block2:
;; ld a7,0(a1)
;; add a7,a7,a0
;; lw a0,0(a7)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld a6,0(a1)
;; add a6,a6,a0
;; lw a0,0(a6)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

40
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
View File

@@ -42,17 +42,17 @@
;; lui a6,65535 ;; lui a6,65535
;; addi a6,a6,4092 ;; addi a6,a6,4092
;; ugt t4,a0,a6##ty=i64 ;; ugt t4,a0,a6##ty=i64
;; bne t4,zero,taken(label1),not_taken(label2) ;; bne t4,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t4,0(a2)
;; add t4,t4,a0
;; lui t3,1
;; add t0,t4,t3
;; sw a1,0(t0)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t3,0(a2)
;; add t3,t3,a0
;; lui a7,1
;; add t4,t3,a7
;; sw a1,0(t4)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
@@ -60,15 +60,15 @@
;; lui a6,65535 ;; lui a6,65535
;; addi a6,a6,4092 ;; addi a6,a6,4092
;; ugt t4,a0,a6##ty=i64 ;; ugt t4,a0,a6##ty=i64
;; bne t4,zero,taken(label1),not_taken(label2) ;; bne t4,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t4,0(a1)
;; add t4,t4,a0
;; lui t3,1
;; add t0,t4,t3
;; lw a0,0(t0)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t3,0(a1)
;; add t3,t3,a0
;; lui a7,1
;; add t4,t3,a7
;; lw a0,0(t4)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

32
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat
View File

@@ -42,15 +42,15 @@
;; lui a4,65536 ;; lui a4,65536
;; addi a4,a4,4095 ;; addi a4,a4,4095
;; ugt a7,a0,a4##ty=i64 ;; ugt a7,a0,a4##ty=i64
;; bne a7,zero,taken(label1),not_taken(label2) ;; bne a7,zero,taken(label3),not_taken(label1)
;; block2:
;; ld a7,0(a2)
;; add a7,a7,a0
;; sb a1,0(a7)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld a6,0(a2)
;; add a6,a6,a0
;; sb a1,0(a6)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
@@ -58,13 +58,13 @@
;; lui a4,65536 ;; lui a4,65536
;; addi a4,a4,4095 ;; addi a4,a4,4095
;; ugt a7,a0,a4##ty=i64 ;; ugt a7,a0,a4##ty=i64
;; bne a7,zero,taken(label1),not_taken(label2) ;; bne a7,zero,taken(label3),not_taken(label1)
;; block2:
;; ld a7,0(a1)
;; add a7,a7,a0
;; lbu a0,0(a7)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld a6,0(a1)
;; add a6,a6,a0
;; lbu a0,0(a6)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

40
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
View File

@@ -42,17 +42,17 @@
;; lui a6,65535 ;; lui a6,65535
;; addi a6,a6,4095 ;; addi a6,a6,4095
;; ugt t4,a0,a6##ty=i64 ;; ugt t4,a0,a6##ty=i64
;; bne t4,zero,taken(label1),not_taken(label2) ;; bne t4,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t4,0(a2)
;; add t4,t4,a0
;; lui t3,1
;; add t0,t4,t3
;; sb a1,0(t0)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t3,0(a2)
;; add t3,t3,a0
;; lui a7,1
;; add t4,t3,a7
;; sb a1,0(t4)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
@@ -60,15 +60,15 @@
;; lui a6,65535 ;; lui a6,65535
;; addi a6,a6,4095 ;; addi a6,a6,4095
;; ugt t4,a0,a6##ty=i64 ;; ugt t4,a0,a6##ty=i64
;; bne t4,zero,taken(label1),not_taken(label2) ;; bne t4,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t4,0(a1)
;; add t4,t4,a0
;; lui t3,1
;; add t0,t4,t3
;; lbu a0,0(t0)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t3,0(a1)
;; add t3,t3,a0
;; lui a7,1
;; add t4,t3,a7
;; lbu a0,0(t4)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

32
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
View File

@@ -42,15 +42,15 @@
;; lui a4,65536 ;; lui a4,65536
;; addi a4,a4,4092 ;; addi a4,a4,4092
;; ugt a7,a0,a4##ty=i64 ;; ugt a7,a0,a4##ty=i64
;; bne a7,zero,taken(label1),not_taken(label2) ;; bne a7,zero,taken(label3),not_taken(label1)
;; block2:
;; ld a7,0(a2)
;; add a7,a7,a0
;; sw a1,0(a7)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld a6,0(a2)
;; add a6,a6,a0
;; sw a1,0(a6)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
@@ -58,13 +58,13 @@
;; lui a4,65536 ;; lui a4,65536
;; addi a4,a4,4092 ;; addi a4,a4,4092
;; ugt a7,a0,a4##ty=i64 ;; ugt a7,a0,a4##ty=i64
;; bne a7,zero,taken(label1),not_taken(label2) ;; bne a7,zero,taken(label3),not_taken(label1)
;; block2:
;; ld a7,0(a1)
;; add a7,a7,a0
;; lw a0,0(a7)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld a6,0(a1)
;; add a6,a6,a0
;; lw a0,0(a6)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

40
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
View File

@@ -42,17 +42,17 @@
;; lui a6,65535 ;; lui a6,65535
;; addi a6,a6,4092 ;; addi a6,a6,4092
;; ugt t4,a0,a6##ty=i64 ;; ugt t4,a0,a6##ty=i64
;; bne t4,zero,taken(label1),not_taken(label2) ;; bne t4,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t4,0(a2)
;; add t4,t4,a0
;; lui t3,1
;; add t0,t4,t3
;; sw a1,0(t0)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t3,0(a2)
;; add t3,t3,a0
;; lui a7,1
;; add t4,t3,a7
;; sw a1,0(t4)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
@@ -60,15 +60,15 @@
;; lui a6,65535 ;; lui a6,65535
;; addi a6,a6,4092 ;; addi a6,a6,4092
;; ugt t4,a0,a6##ty=i64 ;; ugt t4,a0,a6##ty=i64
;; bne t4,zero,taken(label1),not_taken(label2) ;; bne t4,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t4,0(a1)
;; add t4,t4,a0
;; lui t3,1
;; add t0,t4,t3
;; lw a0,0(t0)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t3,0(a1)
;; add t3,t3,a0
;; lui a7,1
;; add t4,t3,a7
;; lw a0,0(t4)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

32
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
View File

@@ -42,15 +42,15 @@
;; lui a4,65536 ;; lui a4,65536
;; addi a4,a4,4095 ;; addi a4,a4,4095
;; ugt a7,a0,a4##ty=i64 ;; ugt a7,a0,a4##ty=i64
;; bne a7,zero,taken(label1),not_taken(label2) ;; bne a7,zero,taken(label3),not_taken(label1)
;; block2:
;; ld a7,0(a2)
;; add a7,a7,a0
;; sb a1,0(a7)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld a6,0(a2)
;; add a6,a6,a0
;; sb a1,0(a6)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
@@ -58,13 +58,13 @@
;; lui a4,65536 ;; lui a4,65536
;; addi a4,a4,4095 ;; addi a4,a4,4095
;; ugt a7,a0,a4##ty=i64 ;; ugt a7,a0,a4##ty=i64
;; bne a7,zero,taken(label1),not_taken(label2) ;; bne a7,zero,taken(label3),not_taken(label1)
;; block2:
;; ld a7,0(a1)
;; add a7,a7,a0
;; lbu a0,0(a7)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld a6,0(a1)
;; add a6,a6,a0
;; lbu a0,0(a6)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

40
cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
View File

@@ -42,17 +42,17 @@
;; lui a6,65535 ;; lui a6,65535
;; addi a6,a6,4095 ;; addi a6,a6,4095
;; ugt t4,a0,a6##ty=i64 ;; ugt t4,a0,a6##ty=i64
;; bne t4,zero,taken(label1),not_taken(label2) ;; bne t4,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t4,0(a2)
;; add t4,t4,a0
;; lui t3,1
;; add t0,t4,t3
;; sb a1,0(t0)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t3,0(a2)
;; add t3,t3,a0
;; lui a7,1
;; add t4,t3,a7
;; sb a1,0(t4)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob
;; ;;
;; function u0:1: ;; function u0:1:
@@ -60,15 +60,15 @@
;; lui a6,65535 ;; lui a6,65535
;; addi a6,a6,4095 ;; addi a6,a6,4095
;; ugt t4,a0,a6##ty=i64 ;; ugt t4,a0,a6##ty=i64
;; bne t4,zero,taken(label1),not_taken(label2) ;; bne t4,zero,taken(label3),not_taken(label1)
;; block2:
;; ld t4,0(a1)
;; add t4,t4,a0
;; lui t3,1
;; add t0,t4,t3
;; lbu a0,0(t0)
;; j label3
;; block3:
;; ret
;; block1: ;; block1:
;; ld t3,0(a1)
;; add t3,t3,a0
;; lui a7,1
;; add t4,t3,a7
;; lbu a0,0(t4)
;; j label2
;; block2:
;; ret
;; block3:
;; udf##trap_code=heap_oob ;; udf##trap_code=heap_oob

12
cranelift/filetests/filetests/isa/s390x/condbr.clif
View File

@@ -38,23 +38,23 @@ block2:
; VCode: ; VCode:
; block0: ; block0:
; clgr %r2, %r3 ; clgr %r2, %r3
; jge label1 ; jg label2 ; jge label2 ; jg label1
; block1: ; block1:
; lghi %r2, 1 ; lghi %r2, 2
; br %r14 ; br %r14
; block2: ; block2:
; lghi %r2, 2 ; lghi %r2, 1
; br %r14 ; br %r14
; ;
; Disassembled: ; Disassembled:
; block0: ; offset 0x0 ; block0: ; offset 0x0
; clgr %r2, %r3 ; clgr %r2, %r3
; jgne 0x10 ; jge 0x10
; block1: ; offset 0xa ; block1: ; offset 0xa
; lghi %r2, 1 ; lghi %r2, 2
; br %r14 ; br %r14
; block2: ; offset 0x10 ; block2: ; offset 0x10
; lghi %r2, 2 ; lghi %r2, 1
; br %r14 ; br %r14
function %f(i64, i64) -> i64 { function %f(i64, i64) -> i64 {

57
cranelift/filetests/filetests/isa/s390x/jumptable.clif
View File

@@ -30,30 +30,22 @@ block5(v5: i32):
; block0: ; block0:
; llgfr %r3, %r2 ; llgfr %r3, %r2
; clgfi %r3, 3 ; clgfi %r3, 3
; jghe label1 ; jghe label4
; sllg %r3, %r3, 2 ; sllg %r3, %r3, 2
; larl %r1, 14 ; agf %r1, 0(%r1, %r3) ; br %r1 ; jt_entries label3 label5 label7 ; larl %r1, 14 ; agf %r1, 0(%r1, %r3) ; br %r1 ; jt_entries label3 label2 label1
; block1: ; block1:
; lhi %r5, 4 ; lhi %r5, 3
; jg label2 ; jg label5
; block2: ; block2:
; jg label9 ; lhi %r5, 2
; jg label5
; block3: ; block3:
; lhi %r5, 1 ; lhi %r5, 1
; jg label4 ; jg label5
; block4: ; block4:
; jg label9 ; lhi %r5, 4
; jg label5
; block5: ; block5:
; lhi %r5, 2
; jg label6
; block6:
; jg label9
; block7:
; lhi %r5, 3
; jg label8
; block8:
; jg label9
; block9:
; ar %r2, %r5 ; ar %r2, %r5
; br %r14 ; br %r14
; ;
@@ -61,32 +53,29 @@ block5(v5: i32):
; block0: ; offset 0x0 ; block0: ; offset 0x0
; llgfr %r3, %r2 ; llgfr %r3, %r2
; clgfi %r3, 3 ; clgfi %r3, 3
; jghe 0x30 ; jghe 0x4e
; sllg %r3, %r3, 2 ; sllg %r3, %r3, 2
; larl %r1, 0x24 ; larl %r1, 0x24
; agf %r1, 0(%r3, %r1) ; agf %r1, 0(%r3, %r1)
; br %r1 ; br %r1
; .byte 0x00, 0x00 ; .byte 0x00, 0x00
; .byte 0x00, 0x16
; .byte 0x00, 0x00
; .byte 0x00, 0x20 ; .byte 0x00, 0x20
; .byte 0x00, 0x00 ; .byte 0x00, 0x00
; .byte 0x00, 0x2a ; .byte 0x00, 0x16
; .byte 0x00, 0x00
; .byte 0x00, 0x0c
; block1: ; offset 0x30 ; block1: ; offset 0x30
; lhi %r5, 4
; block2: ; offset 0x34
; jg 0x52
; block3: ; offset 0x3a
; lhi %r5, 1
; block4: ; offset 0x3e
; jg 0x52
; block5: ; offset 0x44
; lhi %r5, 2
; block6: ; offset 0x48
; jg 0x52
; block7: ; offset 0x4e
; lhi %r5, 3 ; lhi %r5, 3
; block8: ; offset 0x52 ; jg 0x52
; block2: ; offset 0x3a
; lhi %r5, 2
; jg 0x52
; block3: ; offset 0x44
; lhi %r5, 1
; jg 0x52
; block4: ; offset 0x4e
; lhi %r5, 4
; block5: ; offset 0x52
; ar %r2, %r5 ; ar %r2, %r5
; br %r14 ; br %r14

24
cranelift/filetests/filetests/isa/s390x/reftypes.clif
View File

@@ -106,20 +106,16 @@ block3(v7: r64, v8: r64):
; stg %r4, 0(%r5) ; stg %r4, 0(%r5)
; lbr %r2, %r2 ; lbr %r2, %r2
; chi %r2, 0 ; chi %r2, 0
; jglh label1 ; jg label3 ; jglh label2 ; jg label1
; block1: ; block1:
; jg label2 ; lgr %r3, %r4
; lg %r2, 176(%r15)
; jg label3
; block2: ; block2:
; lgr %r2, %r4 ; lgr %r2, %r4
; lg %r3, 176(%r15) ; lg %r3, 176(%r15)
; jg label5 ; jg label3
; block3: ; block3:
; jg label4
; block4:
; lgr %r3, %r4
; lg %r2, 176(%r15)
; jg label5
; block5:
; la %r4, 160(%r15) ; la %r4, 160(%r15)
; lg %r4, 0(%r4) ; lg %r4, 0(%r4)
; lmg %r14, %r15, 296(%r15) ; lmg %r14, %r15, 296(%r15)
@@ -144,14 +140,14 @@ block3(v7: r64, v8: r64):
; stg %r4, 0(%r5) ; stg %r4, 0(%r5)
; lbr %r2, %r2 ; lbr %r2, %r2
; chi %r2, 0 ; chi %r2, 0
; jgnlh 0x58 ; jglh 0x58
; block2: ; offset 0x48 ; block2: ; offset 0x48
; lgr %r2, %r4
; lg %r3, 0xb0(%r15)
; jg 0x62
; block3: ; offset 0x58
; lgr %r3, %r4 ; lgr %r3, %r4
; lg %r2, 0xb0(%r15) ; lg %r2, 0xb0(%r15)
; jg 0x62
; block3: ; offset 0x58
; lgr %r2, %r4
; lg %r3, 0xb0(%r15)
; block4: ; offset 0x62 ; block4: ; offset 0x62
; la %r4, 0xa0(%r15) ; la %r4, 0xa0(%r15)
; lg %r4, 0(%r4) ; lg %r4, 0(%r4)

18
cranelift/filetests/filetests/isa/s390x/traps.clif
View File

@@ -42,10 +42,10 @@ block0(v0: i64):
; VCode: ; VCode:
; block0: ; block0:
; clgfi %r2, 42 ; clgfi %r2, 42
; jge label1 ; jg label2 ; jge label2 ; jg label1
; block1:
; br %r14
; block2: ; block2:
; br %r14
; block1:
; trap ; trap
; ;
; Disassembled: ; Disassembled:
@@ -68,10 +68,10 @@ block0(v0: i64):
; VCode: ; VCode:
; block0: ; block0:
; clgfi %r2, 42 ; clgfi %r2, 42
; jge label1 ; jg label2 ; jge label2 ; jg label1
; block2:
; br %r14
; block1: ; block1:
; br %r14
; block2:
; trap ; trap
; ;
; Disassembled: ; Disassembled:
@@ -94,10 +94,10 @@ block0(v0: i64):
; VCode: ; VCode:
; block0: ; block0:
; clgfi %r2, 42 ; clgfi %r2, 42
; jge label1 ; jg label2 ; jge label2 ; jg label1
; block2:
; br %r14
; block1: ; block1:
; br %r14
; block2:
; trap ; trap
; ;
; Disassembled: ; Disassembled:

24
cranelift/filetests/filetests/isa/s390x/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat
View File

@@ -47,14 +47,14 @@
;; lghi %r2, -4 ;; lghi %r2, -4
;; ag %r2, 8(%r4) ;; ag %r2, 8(%r4)
;; clgr %r5, %r2 ;; clgr %r5, %r2
;; jgh label1 ; jg label2 ;; jgh label3 ; jg label1
;; block2: ;; block1:
;; lg %r4, 0(%r4) ;; lg %r4, 0(%r4)
;; strv %r3, 0(%r5,%r4) ;; strv %r3, 0(%r5,%r4)
;; jg label3 ;; jg label2
;; block3: ;; block2:
;; br %r14 ;; br %r14
;; block1: ;; block3:
;; trap ;; trap
;; ;;
;; function u0:1: ;; function u0:1:
@@ -65,12 +65,12 @@
;; lghi %r2, -4 ;; lghi %r2, -4
;; ag %r2, 8(%r3) ;; ag %r2, 8(%r3)
;; clgr %r5, %r2 ;; clgr %r5, %r2
;; jgh label1 ; jg label2 ;; jgh label3 ; jg label1
;; block2:
;; lg %r4, 0(%r3)
;; lrv %r2, 0(%r5,%r4)
;; jg label3
;; block3:
;; br %r14
;; block1: ;; block1:
;; lg %r3, 0(%r3)
;; lrv %r2, 0(%r5,%r3)
;; jg label2
;; block2:
;; br %r14
;; block3:
;; trap ;; trap

Some files were not shown because too many files have changed in this diff Show More