* Cranelift: remove non-egraphs optimization pipeline and `use_egraphs` option. This PR removes the LICM, GVN, and preopt passes, and associated support pieces, from `cranelift-codegen`. Not to worry, we still have optimizations: the egraph framework subsumes all of these, and has been on by default since #5181. A few decision points: - Filetests for the legacy LICM, GVN and simple_preopt were removed too. As we built optimizations in the egraph framework we wrote new tests for the equivalent functionality, and many of the old tests were testing specific behaviors in the old implementations that may not be relevant anymore. However if folks prefer I could take a different approach here and try to port over all of the tests. - The corresponding filetest modes (commands) were deleted too. The `test alias_analysis` mode remains, but no longer invokes a separate GVN first (since there is no separate GVN that will not also do alias analysis) so the tests were tweaked slightly to work with that. The egrpah testsuite also covers alias analysis. - The `divconst_magic_numbers` module is removed since it's unused without `simple_preopt`, though this is the one remaining optimization we still need to build in the egraphs framework, pending #5908. The magic numbers will live forever in git history so removing this in the meantime is not a major issue IMHO. - The `use_egraphs` setting itself was removed at both the Cranelift and Wasmtime levels. It has been marked deprecated for a few releases now (Wasmtime 6.0, 7.0, upcoming 8.0, and corresponding Cranelift versions) so I think this is probably OK. As an alternative if anyone feels strongly, we could leave the setting and make it a no-op. * Update test outputs for remaining test differences.
131 lines
3.6 KiB
Rust
131 lines
3.6 KiB
Rust
//! File tests.
|
|
//!
|
|
//! This crate contains the main test driver as well as implementations of the
|
|
//! available filetest commands.
|
|
|
|
#![deny(
|
|
missing_docs,
|
|
trivial_numeric_casts,
|
|
unused_extern_crates,
|
|
unstable_features
|
|
)]
|
|
#![warn(unused_import_braces)]
|
|
#![cfg_attr(feature = "cargo-clippy", allow(clippy::type_complexity))]
|
|
#![cfg_attr(
|
|
feature = "cargo-clippy",
|
|
warn(
|
|
clippy::mut_mut,
|
|
clippy::nonminimal_bool,
|
|
clippy::map_unwrap_or,
|
|
clippy::clippy::unicode_not_nfc,
|
|
clippy::use_self
|
|
)
|
|
)]
|
|
|
|
pub use crate::function_runner::TestFileCompiler;
|
|
use crate::runner::TestRunner;
|
|
use cranelift_reader::TestCommand;
|
|
use std::path::Path;
|
|
|
|
mod concurrent;
|
|
pub mod function_runner;
|
|
mod match_directive;
|
|
mod runner;
|
|
mod runone;
|
|
mod subtest;
|
|
|
|
mod test_alias_analysis;
|
|
mod test_cat;
|
|
mod test_compile;
|
|
mod test_dce;
|
|
mod test_domtree;
|
|
mod test_interpret;
|
|
mod test_legalizer;
|
|
mod test_optimize;
|
|
mod test_print_cfg;
|
|
mod test_run;
|
|
mod test_safepoint;
|
|
mod test_unwind;
|
|
mod test_verifier;
|
|
mod test_wasm;
|
|
|
|
/// Main entry point for `clif-util test`.
|
|
///
|
|
/// Take a list of filenames which can be either `.clif` files or directories.
|
|
///
|
|
/// Files are interpreted as test cases and executed immediately.
|
|
///
|
|
/// Directories are scanned recursively for test cases ending in `.clif`. These test cases are
|
|
/// executed on background threads.
|
|
///
|
|
pub fn run(verbose: bool, report_times: bool, files: &[String]) -> anyhow::Result<()> {
|
|
let mut runner = TestRunner::new(verbose, report_times);
|
|
|
|
for path in files.iter().map(Path::new) {
|
|
if path.is_file() {
|
|
runner.push_test(path);
|
|
} else {
|
|
runner.push_dir(path);
|
|
}
|
|
}
|
|
|
|
runner.start_threads();
|
|
runner.run()
|
|
}
|
|
|
|
/// Used for 'pass' subcommand.
|
|
/// Commands are interpreted as test and executed.
|
|
///
|
|
/// Directories are scanned recursively for test cases ending in `.clif`.
|
|
///
|
|
pub fn run_passes(
|
|
verbose: bool,
|
|
report_times: bool,
|
|
passes: &[String],
|
|
target: &str,
|
|
file: &str,
|
|
) -> anyhow::Result<()> {
|
|
let mut runner = TestRunner::new(verbose, report_times);
|
|
|
|
let path = Path::new(file);
|
|
if path == Path::new("-") || path.is_file() {
|
|
runner.push_test(path);
|
|
} else {
|
|
runner.push_dir(path);
|
|
}
|
|
|
|
runner.start_threads();
|
|
runner.run_passes(passes, target)
|
|
}
|
|
|
|
/// Create a new subcommand trait object to match `parsed.command`.
|
|
///
|
|
/// This function knows how to create all of the possible `test <foo>` commands that can appear in
|
|
/// a `.clif` test file.
|
|
fn new_subtest(parsed: &TestCommand) -> anyhow::Result<Box<dyn subtest::SubTest>> {
|
|
match parsed.command {
|
|
"alias-analysis" => test_alias_analysis::subtest(parsed),
|
|
"cat" => test_cat::subtest(parsed),
|
|
"compile" => test_compile::subtest(parsed),
|
|
"dce" => test_dce::subtest(parsed),
|
|
"domtree" => test_domtree::subtest(parsed),
|
|
"interpret" => test_interpret::subtest(parsed),
|
|
"legalizer" => test_legalizer::subtest(parsed),
|
|
"optimize" => test_optimize::subtest(parsed),
|
|
"print-cfg" => test_print_cfg::subtest(parsed),
|
|
"run" => test_run::subtest(parsed),
|
|
"safepoint" => test_safepoint::subtest(parsed),
|
|
"unwind" => test_unwind::subtest(parsed),
|
|
"verifier" => test_verifier::subtest(parsed),
|
|
_ => anyhow::bail!("unknown test command '{}'", parsed.command),
|
|
}
|
|
}
|
|
|
|
fn pretty_anyhow_error(
|
|
func: &cranelift_codegen::ir::Function,
|
|
err: cranelift_codegen::CodegenError,
|
|
) -> anyhow::Error {
|
|
let s = cranelift_codegen::print_errors::pretty_error(func, err);
|
|
anyhow::anyhow!("{}", s)
|
|
}
|