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

cranelift: Rework block instructions to use BlockCall (#5464)

Browse Source 
Add a new type BlockCall that represents the pair of a block name with arguments to be passed to it. (The mnemonic here is that it looks a bit like a function call.) Rework the implementation of jump, brz, and brnz to use BlockCall instead of storing the block arguments as varargs in the instruction's ValueList.

To ensure that we're processing block arguments from BlockCall values in instructions, three new functions have been introduced on DataFlowGraph that both sets of arguments:

inst_values - returns an iterator that traverses values in the instruction and block arguments
map_inst_values - applies a function to each value in the instruction and block arguments
overwrite_inst_values - overwrite all values in an instruction and block arguments with values from the iterator

Co-authored-by: Jamey Sharp <jamey@minilop.net>
This commit is contained in:
Trevor Elliott
2023-01-17 16:31:15 -08:00
committed by GitHub
parent 3a2ca67570
commit 1e6c13d83e
32 changed files with 475 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
cranelift/codegen/src/verifier/mod.rs
View File

@@ -562,7 +562,7 @@ impl<'a> Verifier<'a> {
) -> VerifierStepResult<()> {
use crate::ir::instructions::InstructionData::*;
for &arg in self.func.dfg.inst_args(inst) {
for arg in self.func.dfg.inst_values(inst) {
self.verify_inst_arg(inst, arg, errors)?;
// All used values must be attached to something.
@@ -584,18 +584,8 @@ impl<'a> Verifier<'a> {
MultiAry { ref args, .. } => {
self.verify_value_list(inst, args, errors)?;
}
Jump {
destination,
ref args,
..
}
| Branch {
destination,
ref args,
..
} => {
self.verify_block(inst, destination, errors)?;
self.verify_value_list(inst, args, errors)?;
Jump { destination, .. } | Branch { destination, .. } => {
self.verify_block(inst, destination.block(&self.func.dfg.value_lists), errors)?;
}
BranchTable {
table, destination, ..
@@ -1295,20 +1285,23 @@ impl<'a> Verifier<'a> {
Ok(())
}
/// Typecheck both instructions that contain variable arguments like calls, and those that
/// include references to basic blocks with their arguments.
fn typecheck_variable_args(
&self,
inst: Inst,
errors: &mut VerifierErrors,
) -> VerifierStepResult<()> {
match self.func.dfg.analyze_branch(inst) {
BranchInfo::SingleDest(block, _) => {
BranchInfo::SingleDest(block) => {
let iter = self
.func
.dfg
.block_params(block)
.block_params(block.block(&self.func.dfg.value_lists))
.iter()
.map(|&v| self.func.dfg.value_type(v));
self.typecheck_variable_args_iterator(inst, iter, errors)?;
let args = block.args_slice(&self.func.dfg.value_lists);
self.typecheck_variable_args_iterator(inst, iter, args, errors)?;
}
BranchInfo::Table(table, block) => {
if let Some(block) = block {
@@ -1342,20 +1335,20 @@ impl<'a> Verifier<'a> {
}
match self.func.dfg.insts[inst].analyze_call(&self.func.dfg.value_lists) {
CallInfo::Direct(func_ref, _) => {
CallInfo::Direct(func_ref, args) => {
let sig_ref = self.func.dfg.ext_funcs[func_ref].signature;
let arg_types = self.func.dfg.signatures[sig_ref]
.params
.iter()
.map(|a| a.value_type);
self.typecheck_variable_args_iterator(inst, arg_types, errors)?;
self.typecheck_variable_args_iterator(inst, arg_types, args, errors)?;
}
CallInfo::Indirect(sig_ref, _) => {
CallInfo::Indirect(sig_ref, args) => {
let arg_types = self.func.dfg.signatures[sig_ref]
.params
.iter()
.map(|a| a.value_type);
self.typecheck_variable_args_iterator(inst, arg_types, errors)?;
self.typecheck_variable_args_iterator(inst, arg_types, args, errors)?;
}
CallInfo::NotACall => {}
}
@@ -1366,9 +1359,9 @@ impl<'a> Verifier<'a> {
&self,
inst: Inst,
iter: I,
variable_args: &[Value],
errors: &mut VerifierErrors,
) -> VerifierStepResult<()> {
let variable_args = self.func.dfg.inst_variable_args(inst);
let mut i = 0;
for expected_type in iter {
@@ -1743,7 +1736,6 @@ impl<'a> Verifier<'a> {
#[cfg(test)]
mod tests {
use super::{Verifier, VerifierError, VerifierErrors};
use crate::entity::EntityList;
use crate::ir::instructions::{InstructionData, Opcode};
use crate::ir::{types, AbiParam, Function};
use crate::settings;
@@ -1785,11 +1777,11 @@ mod tests {
imm: 0.into(),
});
func.layout.append_inst(nullary_with_bad_opcode, block0);
let destination = func.dfg.block_call(block0, &[]);
func.stencil.layout.append_inst(
func.stencil.dfg.make_inst(InstructionData::Jump {
opcode: Opcode::Jump,
destination: block0,
args: EntityList::default(),
destination,
}),
block0,
);