cranelift: Add some libcalls to test interpret

afonso360 · Oct 21, 2023 · 00b1325 · 00b1325
1 parent ed68661
commit 00b1325
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cranelift/filetests/Cargo.toml b/cranelift/filetests/Cargo.toml
@@ -26,11 +26,12 @@ num_cpus = "1.8.0"
 target-lexicon = { workspace = true }
 thiserror = { workspace = true }
 anyhow = { workspace = true }
-similar ={ workspace = true }
+similar = { workspace = true }
 wat.workspace = true
 toml = { workspace = true }
 serde = { workspace = true }
 serde_derive = { workspace = true }
 cranelift-wasm.workspace = true
 wasmparser.workspace = true
 cranelift.workspace = true
+smallvec = { workspace = true }
diff --git a/cranelift/filetests/filetests/runtests/call_libcall.clif b/cranelift/filetests/filetests/runtests/call_libcall.clif
@@ -1,6 +1,9 @@
+test interpret
 test run
 target x86_64
-; AArch64 Does not have these libcalls
+target aarch64
+target aarch64 sign_return_address
+target aarch64 has_pauth sign_return_address
 target s390x
 target riscv64
 target riscv64 has_c has_zcb

diff --git a/cranelift/filetests/src/test_interpret.rs b/cranelift/filetests/src/test_interpret.rs
@@ -6,15 +6,17 @@
 use crate::runone::FileUpdate;
 use crate::subtest::SubTest;
 use anyhow::Context;
-use cranelift_codegen::ir::Function;
+use cranelift_codegen::data_value::DataValue;
+use cranelift_codegen::ir::{Function, LibCall};
 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::interpreter::{Interpreter, InterpreterState, LibCallValues};
 use cranelift_interpreter::step::ControlFlow;
 use cranelift_reader::{parse_run_command, Details, TestCommand, TestFile};
 use log::{info, trace};
+use smallvec::smallvec;
 use std::borrow::Cow;
 
 struct TestInterpret;
@@ -83,7 +85,20 @@ fn run_test(func_store: &FunctionStore, func: &Function, details: &Details) -> a
                 .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 state = InterpreterState::default()
+                        .with_function_store(func_store.clone())
+                        .with_libcall_handler(|libcall: LibCall, args: LibCallValues| {
+                            use LibCall::*;
+                            Ok(smallvec![match (libcall, &args[..]) {
+                                (CeilF32, [DataValue::F32(a)]) => DataValue::F32(a.ceil()),
+                                (CeilF64, [DataValue::F64(a)]) => DataValue::F64(a.ceil()),
+                                (FloorF32, [DataValue::F32(a)]) => DataValue::F32(a.floor()),
+                                (FloorF64, [DataValue::F64(a)]) => DataValue::F64(a.floor()),
+                                (TruncF32, [DataValue::F32(a)]) => DataValue::F32(a.trunc()),
+                                (TruncF64, [DataValue::F64(a)]) => DataValue::F64(a.trunc()),
+                                _ => unreachable!(),
+                            }])
+                        });
 
                     let mut args = Vec::with_capacity(run_args.len());
                     args.extend_from_slice(run_args);