* cranelift-wasm: translate Wasm loads into lower-level CLIF operations
Rather than using `heap_{load,store,addr}`.
* cranelift: Remove the `heap_{addr,load,store}` instructions
These are now legalized in the `cranelift-wasm` frontend.
* cranelift: Remove the `ir::Heap` entity from CLIF
* Port basic memory operation tests to .wat filetests
* Remove test for verifying CLIF heaps
* Remove `heap_addr` from replace_branching_instructions_and_cfg_predecessors.clif test
* Remove `heap_addr` from readonly.clif test
* Remove `heap_addr` from `table_addr.clif` test
* Remove `heap_addr` from the simd-fvpromote_low.clif test
* Remove `heap_addr` from simd-fvdemote.clif test
* Remove `heap_addr` from the load-op-store.clif test
* Remove the CLIF heap runtest
* Remove `heap_addr` from the global_value.clif test
* Remove `heap_addr` from fpromote.clif runtests
* Remove `heap_addr` from fdemote.clif runtests
* Remove `heap_addr` from memory.clif parser test
* Remove `heap_addr` from reject_load_readonly.clif test
* Remove `heap_addr` from reject_load_notrap.clif test
* Remove `heap_addr` from load_readonly_notrap.clif test
* Remove `static-heap-without-guard-pages.clif` test
Will be subsumed when we port `make-heap-load-store-tests.sh` to generating
`.wat` tests.
* Remove `static-heap-with-guard-pages.clif` test
Will be subsumed when we port `make-heap-load-store-tests.sh` over to `.wat`
tests.
* Remove more heap tests
These will be subsumed by porting `make-heap-load-store-tests.sh` over to `.wat`
tests.
* Remove `heap_addr` from `simple-alias.clif` test
* Remove `heap_addr` from partial-redundancy.clif test
* Remove `heap_addr` from multiple-blocks.clif test
* Remove `heap_addr` from fence.clif test
* Remove `heap_addr` from extends.clif test
* Remove runtests that rely on heaps
Heaps are not a thing in CLIF or the interpreter anymore
* Add generated load/store `.wat` tests
* Enable memory-related wasm features in `.wat` tests
* Remove CLIF heap from fcmp-mem-bug.clif test
* Add a mode for compiling `.wat` all the way to assembly in filetests
* Also generate WAT to assembly tests in `make-load-store-tests.sh`
* cargo fmt
* Reinstate `f{de,pro}mote.clif` tests without the heap bits
* Remove undefined doc link
* Remove outdated SVG and dot file from docs
* Add docs about `None` returns for base address computation helpers
* Factor out `env.heap_access_spectre_mitigation()` to a local
* Expand docs for `FuncEnvironment::heaps` trait method
* Restore f{de,pro}mote+load clif runtests with stack memory
106 lines
3.5 KiB
Rust
106 lines
3.5 KiB
Rust
//! Test command for interpreting CLIF files and verifying their results
|
|
//!
|
|
//! The `interpret` test command interprets each function on the host machine
|
|
//! using [RunCommand](cranelift_reader::RunCommand)s.
|
|
|
|
use crate::runone::FileUpdate;
|
|
use crate::subtest::SubTest;
|
|
use anyhow::Context;
|
|
use cranelift_codegen::ir::Function;
|
|
use cranelift_codegen::isa::TargetIsa;
|
|
use cranelift_codegen::settings::Flags;
|
|
use cranelift_codegen::{self, ir};
|
|
use cranelift_interpreter::environment::FunctionStore;
|
|
use cranelift_interpreter::interpreter::{Interpreter, InterpreterState};
|
|
use cranelift_interpreter::step::ControlFlow;
|
|
use cranelift_reader::{parse_run_command, Details, TestCommand, TestFile};
|
|
use log::{info, trace};
|
|
use std::borrow::Cow;
|
|
|
|
struct TestInterpret;
|
|
|
|
pub fn subtest(parsed: &TestCommand) -> anyhow::Result<Box<dyn SubTest>> {
|
|
assert_eq!(parsed.command, "interpret");
|
|
if !parsed.options.is_empty() {
|
|
anyhow::bail!("No options allowed on {}", parsed);
|
|
}
|
|
Ok(Box::new(TestInterpret))
|
|
}
|
|
|
|
impl SubTest for TestInterpret {
|
|
fn name(&self) -> &'static str {
|
|
"interpret"
|
|
}
|
|
|
|
fn is_mutating(&self) -> bool {
|
|
false
|
|
}
|
|
|
|
fn needs_isa(&self) -> bool {
|
|
false
|
|
}
|
|
|
|
/// Runs the entire subtest for a given target, invokes [Self::run] for running
|
|
/// individual tests.
|
|
fn run_target<'a>(
|
|
&self,
|
|
testfile: &TestFile,
|
|
_: &mut FileUpdate,
|
|
_: &'a str,
|
|
_: &'a Flags,
|
|
_: Option<&'a dyn TargetIsa>,
|
|
) -> anyhow::Result<()> {
|
|
// We can build the FunctionStore once and reuse it
|
|
let mut func_store = FunctionStore::default();
|
|
for (func, _) in &testfile.functions {
|
|
func_store.add(func.name.to_string(), &func);
|
|
}
|
|
|
|
for (func, details) in &testfile.functions {
|
|
info!("Test: {}({}) interpreter", self.name(), func.name);
|
|
|
|
run_test(&func_store, func, details).context(self.name())?;
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
_func: Cow<ir::Function>,
|
|
_context: &crate::subtest::Context,
|
|
) -> anyhow::Result<()> {
|
|
unreachable!()
|
|
}
|
|
}
|
|
|
|
fn run_test(func_store: &FunctionStore, func: &Function, details: &Details) -> anyhow::Result<()> {
|
|
for comment in details.comments.iter() {
|
|
if let Some(command) = parse_run_command(comment.text, &func.signature)? {
|
|
trace!("Parsed run command: {}", command);
|
|
|
|
command
|
|
.run(|func_name, run_args| {
|
|
// Rebuild the interpreter state on every run to ensure that we don't accidentally depend on
|
|
// some leftover state
|
|
let state = InterpreterState::default().with_function_store(func_store.clone());
|
|
|
|
let mut args = Vec::with_capacity(run_args.len());
|
|
args.extend_from_slice(run_args);
|
|
|
|
// Because we have stored function names with a leading %, we need to re-add it.
|
|
let func_name = &format!("%{}", func_name);
|
|
match Interpreter::new(state).call_by_name(func_name, &args) {
|
|
Ok(ControlFlow::Return(results)) => Ok(results.to_vec()),
|
|
Ok(e) => {
|
|
panic!("Unexpected returned control flow: {:?}", e)
|
|
}
|
|
Err(t) => Err(format!("unexpected trap: {:?}", t)),
|
|
}
|
|
})
|
|
.map_err(|e| anyhow::anyhow!("{}", e))?;
|
|
}
|
|
}
|
|
Ok(())
|
|
}
|