cranelift: Allow call and call_indirect in runtests (#4667)
* cranelift: Change test runner order Changes the ordering of runtests to run per target and then per function. This change doesn't do a lot by itself, but helps future refactorings of runtests. * cranelift: Rename SingleFunctionCompiler to TestCaseCompiler * cranelift: Skip runtests per target instead of per run * cranelift: Deduplicate test names With the upcoming changes to the runtest infrastructure we require unique ExtNames for all tests. Note that for test names we have a 16 character limit on test names, and must be unique within those 16 characters. * cranelift: Add TestFileCompiler to runtests TestFileCompiler allows us to compile the entire file once, and then call the trampolines for each test. The previous code was compiling the function for each invocation of a test. * cranelift: Deduplicate ExtName for avg_round tests * cranelift: Rename functions as they are defined. The JIT internally only deals with User functions, and cannot link test name funcs. This also caches trampolines by signature. * cranelift: Preserve original name when reporting errors. * cranelift: Rename aarch64 test functions * cranelift: Add `call` and `call_indirect` tests! * cranelift: Add pauth runtests for aarch64 * cranelift: Rename duplicate s390x tests * cranelift: Delete `i128_bricmp_of` function from i128-bricmp It looks like we forgot to delete it when it was moved to `i128-bricmp-overflow`, and since it didn't have a run invocation it was never compiled. However, s390x does not support this, and panics when lowering. * cranelift: Add `colocated` call tests * cranelift: Rename *more* `s390x` tests * cranelift: Add pauth + sign_return_address call tests * cranelift: Undeduplicate test names With the latest main changes we now support *unlimited* length test names. This commit reverts: 52274676ff631c630f9879dd32e756566d3e700f 7989edc172493547cdf63e180bb58365e8a43a42 25c8a8395527d98976be6a34baa3b0b214776739 792e8cfa8f748077f9d80fe7ee5e958b7124e83b * cranelift: Add LibCall tests * cranelift: Revert more test names These weren't auto reverted by the previous revert. * cranelift: Disable libcall tests for aarch64 * cranelift: Runtest fibonacci tests * cranelift: Misc cleanup
This commit is contained in:
@@ -5,7 +5,7 @@ use libfuzzer_sys::fuzz_target;
|
||||
use cranelift_codegen::data_value::DataValue;
|
||||
use cranelift_codegen::settings;
|
||||
use cranelift_codegen::settings::Configurable;
|
||||
use cranelift_filetests::function_runner::{CompiledFunction, SingleFunctionCompiler};
|
||||
use cranelift_filetests::function_runner::{TestFileCompiler, Trampoline};
|
||||
use cranelift_fuzzgen::*;
|
||||
use cranelift_interpreter::environment::FuncIndex;
|
||||
use cranelift_interpreter::environment::FunctionStore;
|
||||
@@ -46,8 +46,8 @@ fn run_in_interpreter(interpreter: &mut Interpreter, args: &[DataValue]) -> RunR
|
||||
}
|
||||
}
|
||||
|
||||
fn run_in_host(compiled_fn: &CompiledFunction, args: &[DataValue]) -> RunResult {
|
||||
let res = compiled_fn.call(args);
|
||||
fn run_in_host(trampoline: &Trampoline, args: &[DataValue]) -> RunResult {
|
||||
let res = trampoline.call(args);
|
||||
RunResult::Success(res)
|
||||
}
|
||||
|
||||
@@ -68,8 +68,14 @@ fuzz_target!(|testcase: TestCase| {
|
||||
builder.set("enable_llvm_abi_extensions", "true").unwrap();
|
||||
settings::Flags::new(builder)
|
||||
};
|
||||
let host_compiler = SingleFunctionCompiler::with_host_isa(flags).unwrap();
|
||||
let compiled_fn = host_compiler.compile(testcase.func.clone()).unwrap();
|
||||
let mut compiler = TestFileCompiler::with_host_isa(flags).unwrap();
|
||||
compiler.declare_function(&testcase.func).unwrap();
|
||||
compiler.define_function(testcase.func.clone()).unwrap();
|
||||
compiler
|
||||
.create_trampoline_for_function(&testcase.func)
|
||||
.unwrap();
|
||||
let compiled = compiler.compile().unwrap();
|
||||
let trampoline = compiled.get_trampoline(&testcase.func).unwrap();
|
||||
|
||||
for args in &testcase.inputs {
|
||||
// We rebuild the interpreter every run so that we don't accidentally carry over any state
|
||||
@@ -93,7 +99,7 @@ fuzz_target!(|testcase: TestCase| {
|
||||
RunResult::Error(_) => panic!("interpreter failed: {:?}", int_res),
|
||||
}
|
||||
|
||||
let host_res = run_in_host(&compiled_fn, args);
|
||||
let host_res = run_in_host(&trampoline, args);
|
||||
match host_res {
|
||||
RunResult::Success(_) => {}
|
||||
_ => panic!("host failed: {:?}", host_res),
|
||||
|
||||
Reference in New Issue
Block a user