Cranelift: Add heap_load and heap_store instructions (#5300)
* Cranelift: Define `heap_load` and `heap_store` instructions
* Cranelift: Implement interpreter support for `heap_load` and `heap_store`
* Cranelift: Add a suite runtests for `heap_{load,store}`
There are so many knobs we can twist for heaps and I wanted to exhaustively test
all of them, so I wrote a script to generate the tests. I've checked in the
script in case we want to make any changes in the future, but I don't think it
is worth adding this to CI to check that scripts are up to date or anything like
that.
* Review feedback
This commit is contained in:
@@ -16,6 +16,8 @@ pub(crate) struct Formats {
|
||||
pub(crate) float_compare: Rc<InstructionFormat>,
|
||||
pub(crate) func_addr: Rc<InstructionFormat>,
|
||||
pub(crate) heap_addr: Rc<InstructionFormat>,
|
||||
pub(crate) heap_load: Rc<InstructionFormat>,
|
||||
pub(crate) heap_store: Rc<InstructionFormat>,
|
||||
pub(crate) int_compare: Rc<InstructionFormat>,
|
||||
pub(crate) int_compare_imm: Rc<InstructionFormat>,
|
||||
pub(crate) int_add_trap: Rc<InstructionFormat>,
|
||||
@@ -206,6 +208,17 @@ impl Formats {
|
||||
.imm_with_name("size", &imm.uimm8)
|
||||
.build(),
|
||||
|
||||
heap_load: Builder::new("HeapLoad").imm(&imm.heap_imm).value().build(),
|
||||
|
||||
heap_store: Builder::new("HeapStore")
|
||||
// We have more fields for this instruction than
|
||||
// `InstructionData` can hold without growing in size, so we
|
||||
// push the immediates out into a side table.
|
||||
.imm(&imm.heap_imm)
|
||||
.value()
|
||||
.value()
|
||||
.build(),
|
||||
|
||||
// Accessing a WebAssembly table.
|
||||
table_addr: Builder::new("TableAddr")
|
||||
.imm(&entities.table)
|
||||
|
||||
@@ -59,6 +59,9 @@ pub(crate) struct Immediates {
|
||||
/// Flags for memory operations like `load` and `store`.
|
||||
pub memflags: OperandKind,
|
||||
|
||||
/// A reference to out-of-line immediates for heap accesses.
|
||||
pub heap_imm: OperandKind,
|
||||
|
||||
/// A trap code indicating the reason for trapping.
|
||||
///
|
||||
/// The Rust enum type also has a `User(u16)` variant for user-provided trap codes.
|
||||
@@ -182,6 +185,13 @@ impl Immediates {
|
||||
},
|
||||
|
||||
memflags: new_imm("flags", "ir::MemFlags", "Memory operation flags"),
|
||||
|
||||
heap_imm: new_imm(
|
||||
"heap_imm",
|
||||
"ir::HeapImm",
|
||||
"Reference to out-of-line heap access immediates",
|
||||
),
|
||||
|
||||
trapcode: {
|
||||
let mut trapcode_values = HashMap::new();
|
||||
trapcode_values.insert("stk_ovf", "StackOverflow");
|
||||
|
||||
@@ -1155,6 +1155,55 @@ pub(crate) fn define(
|
||||
.operands_out(vec![addr]),
|
||||
);
|
||||
|
||||
let heap_imm = &Operand::new("heap_imm", &imm.heap_imm);
|
||||
let index =
|
||||
&Operand::new("index", HeapOffset).with_doc("Dynamic index (in bytes) into the heap");
|
||||
let a = &Operand::new("a", Mem).with_doc("The value loaded from the heap");
|
||||
|
||||
ig.push(
|
||||
Inst::new(
|
||||
"heap_load",
|
||||
r#"
|
||||
Load a value from the given heap at address ``index + offset``,
|
||||
trapping on out-of-bounds accesses.
|
||||
|
||||
Checks that ``index + offset .. index + offset + sizeof(a)`` is
|
||||
within the heap's bounds, trapping if it is not. Otherwise, when
|
||||
that range is in bounds, loads the value from the heap.
|
||||
|
||||
Traps on ``index + offset + sizeof(a)`` overflow.
|
||||
"#,
|
||||
&formats.heap_load,
|
||||
)
|
||||
.operands_in(vec![heap_imm, index])
|
||||
.operands_out(vec![a])
|
||||
.can_load(true)
|
||||
.can_trap(true),
|
||||
);
|
||||
|
||||
let a = &Operand::new("a", Mem).with_doc("The value stored into the heap");
|
||||
|
||||
ig.push(
|
||||
Inst::new(
|
||||
"heap_store",
|
||||
r#"
|
||||
Store ``a`` into the given heap at address ``index + offset``,
|
||||
trapping on out-of-bounds accesses.
|
||||
|
||||
Checks that ``index + offset .. index + offset + sizeof(a)`` is
|
||||
within the heap's bounds, trapping if it is not. Otherwise, when
|
||||
that range is in bounds, stores the value into the heap.
|
||||
|
||||
Traps on ``index + offset + sizeof(a)`` overflow.
|
||||
"#,
|
||||
&formats.heap_store,
|
||||
)
|
||||
.operands_in(vec![heap_imm, index, a])
|
||||
.operands_out(vec![])
|
||||
.can_store(true)
|
||||
.can_trap(true),
|
||||
);
|
||||
|
||||
// Note this instruction is marked as having other side-effects, so GVN won't try to hoist it,
|
||||
// which would result in it being subject to spilling. While not hoisting would generally hurt
|
||||
// performance, since a computed value used many times may need to be regenerated before each
|
||||
|
||||
Reference in New Issue
Block a user