* cranelift: Add ability to auto-update test expectations
One of the problems of the current `*.clif` testing is that the files
are difficult to update when widespread changes are made (such as
removing modification of the frame pointer). Additionally when changing
register allocation or similar it can cause a large number of changes in
tests but the tests themselves didn't actually break. For this reason
this commit adds the ability to automatically update test expectations.
The idea behind this commit is that tests of the form `test compile` can
also optionally be flagged with the `precise-output` flag:
test compile precise-output
and when doing so the compiled form of each function is asserted to 100%
match the following comments and their test expectations. If a match is
not found then a `BLESS=1` environment variable can be used to
automatically rewrite the test file itself with the correct assertion.
If the environment variable isn't present and the expectation doesn't
match then the test fails.
It's hoped that, if approved, a follow-up commit can add
`precise-output` to all current `test compile` tests (or make it the
default) and all tests can be mass-updated. When developing locally test
expectations need not be written and instead tests can be run with
`BLESS=1` and the output can be manually verified. The environment
variable will not be present on CI which means that changes to the
output which don't also change the test expectation will cause CI to
fail. Furthermore this should still make updates to the test output
easily readable in review on CI because the test expectations are
intended to look the same as before.
Closes #1539
* Use raw vcode output in tests
* Fix a merge conflict
* Review comments
279 lines
9.4 KiB
Rust
279 lines
9.4 KiB
Rust
//! Run the tests in a single test file.
|
|
|
|
use crate::new_subtest;
|
|
use crate::subtest::{Context, SubTest};
|
|
use anyhow::{bail, Context as _, Result};
|
|
use cranelift_codegen::ir::Function;
|
|
use cranelift_codegen::isa::TargetIsa;
|
|
use cranelift_codegen::print_errors::pretty_verifier_error;
|
|
use cranelift_codegen::settings::Flags;
|
|
use cranelift_codegen::timing;
|
|
use cranelift_codegen::verify_function;
|
|
use cranelift_reader::{parse_test, Feature, IsaSpec, Location, ParseOptions, TestFile};
|
|
use log::info;
|
|
use std::borrow::Cow;
|
|
use std::cell::Cell;
|
|
use std::fs;
|
|
use std::path::{Path, PathBuf};
|
|
use std::str::Lines;
|
|
use std::time;
|
|
|
|
/// Skip the tests which define features and for which there's a feature mismatch.
|
|
///
|
|
/// When a test must be skipped, returns an Option with a string containing an explanation why;
|
|
/// otherwise, return None.
|
|
fn skip_feature_mismatches(testfile: &TestFile) -> Option<&'static str> {
|
|
let mut has_experimental_arm32 = false;
|
|
|
|
for feature in &testfile.features {
|
|
if let Feature::With(name) = feature {
|
|
match *name {
|
|
"experimental_arm32" => has_experimental_arm32 = true,
|
|
_ => {}
|
|
}
|
|
}
|
|
}
|
|
|
|
// Don't run tests if the experimental support for arm32 is disabled.
|
|
#[cfg(not(feature = "experimental_arm32"))]
|
|
if has_experimental_arm32 {
|
|
return Some("missing support for experimental_arm32");
|
|
}
|
|
|
|
None
|
|
}
|
|
|
|
/// Load `path` and run the test in it.
|
|
///
|
|
/// If running this test causes a panic, it will propagate as normal.
|
|
pub fn run(
|
|
path: &Path,
|
|
passes: Option<&[String]>,
|
|
target: Option<&str>,
|
|
) -> anyhow::Result<time::Duration> {
|
|
let _tt = timing::process_file();
|
|
info!("---\nFile: {}", path.to_string_lossy());
|
|
let started = time::Instant::now();
|
|
let buffer =
|
|
fs::read_to_string(path).with_context(|| format!("failed to read {}", path.display()))?;
|
|
let options = ParseOptions {
|
|
target,
|
|
passes,
|
|
..ParseOptions::default()
|
|
};
|
|
|
|
let testfile = match parse_test(&buffer, options) {
|
|
Ok(testfile) => testfile,
|
|
Err(e) => {
|
|
if e.is_warning {
|
|
println!(
|
|
"skipping test {:?} (line {}): {}",
|
|
path, e.location.line_number, e.message
|
|
);
|
|
return Ok(started.elapsed());
|
|
}
|
|
return Err(e)
|
|
.context(format!("failed to parse {}", path.display()))
|
|
.into();
|
|
}
|
|
};
|
|
|
|
if let Some(msg) = skip_feature_mismatches(&testfile) {
|
|
println!("skipped {:?}: {}", path, msg);
|
|
return Ok(started.elapsed());
|
|
}
|
|
|
|
if testfile.functions.is_empty() {
|
|
anyhow::bail!("no functions found");
|
|
}
|
|
|
|
// Parse the test commands.
|
|
let mut tests = testfile
|
|
.commands
|
|
.iter()
|
|
.map(new_subtest)
|
|
.collect::<anyhow::Result<Vec<_>>>()?;
|
|
|
|
// Flags to use for those tests that don't need an ISA.
|
|
// This is the cumulative effect of all the `set` commands in the file.
|
|
let flags = match testfile.isa_spec {
|
|
IsaSpec::None(ref f) => f,
|
|
IsaSpec::Some(ref v) => v.last().expect("Empty ISA list").flags(),
|
|
};
|
|
|
|
// Sort the tests so the mutators are at the end, and those that don't need the verifier are at
|
|
// the front.
|
|
tests.sort_by_key(|st| (st.is_mutating(), st.needs_verifier()));
|
|
|
|
// Expand the tests into (test, flags, isa) tuples.
|
|
let mut tuples = test_tuples(&tests, &testfile.isa_spec, flags)?;
|
|
|
|
// Isolate the last test in the hope that this is the only mutating test.
|
|
// If so, we can completely avoid cloning functions.
|
|
let last_tuple = match tuples.pop() {
|
|
None => anyhow::bail!("no test commands found"),
|
|
Some(t) => t,
|
|
};
|
|
|
|
let mut file_update = FileUpdate::new(&path);
|
|
let file_path = path.to_string_lossy();
|
|
for (func, details) in testfile.functions {
|
|
let mut context = Context {
|
|
preamble_comments: &testfile.preamble_comments,
|
|
details,
|
|
verified: false,
|
|
flags,
|
|
isa: None,
|
|
file_path: file_path.as_ref(),
|
|
file_update: &mut file_update,
|
|
};
|
|
|
|
for tuple in &tuples {
|
|
run_one_test(*tuple, Cow::Borrowed(&func), &mut context)?;
|
|
}
|
|
// Run the last test with an owned function which means it won't need to clone it before
|
|
// mutating.
|
|
run_one_test(last_tuple, Cow::Owned(func), &mut context)?;
|
|
}
|
|
|
|
Ok(started.elapsed())
|
|
}
|
|
|
|
// Given a slice of tests, generate a vector of (test, flags, isa) tuples.
|
|
fn test_tuples<'a>(
|
|
tests: &'a [Box<dyn SubTest>],
|
|
isa_spec: &'a IsaSpec,
|
|
no_isa_flags: &'a Flags,
|
|
) -> anyhow::Result<Vec<(&'a dyn SubTest, &'a Flags, Option<&'a dyn TargetIsa>)>> {
|
|
let mut out = Vec::new();
|
|
for test in tests {
|
|
if test.needs_isa() {
|
|
match *isa_spec {
|
|
IsaSpec::None(_) => {
|
|
// TODO: Generate a list of default ISAs.
|
|
anyhow::bail!("test {} requires an ISA", test.name());
|
|
}
|
|
IsaSpec::Some(ref isas) => {
|
|
for isa in isas {
|
|
out.push((&**test, isa.flags(), Some(&**isa)));
|
|
}
|
|
}
|
|
}
|
|
} else {
|
|
// This test doesn't require an ISA, and we only want to run one instance of it.
|
|
// Still, give it an ISA ref if we happen to have a unique one.
|
|
// For example, `test cat` can use this to print encodings and register names.
|
|
out.push((&**test, no_isa_flags, isa_spec.unique_isa()));
|
|
}
|
|
}
|
|
Ok(out)
|
|
}
|
|
|
|
fn run_one_test<'a>(
|
|
tuple: (&'a dyn SubTest, &'a Flags, Option<&'a dyn TargetIsa>),
|
|
func: Cow<Function>,
|
|
context: &mut Context<'a>,
|
|
) -> anyhow::Result<()> {
|
|
let (test, flags, isa) = tuple;
|
|
let name = format!("{}({})", test.name(), func.name);
|
|
info!("Test: {} {}", name, isa.map_or("-", TargetIsa::name));
|
|
|
|
context.flags = flags;
|
|
context.isa = isa;
|
|
|
|
// Should we run the verifier before this test?
|
|
if !context.verified && test.needs_verifier() {
|
|
verify_function(&func, context.flags_or_isa())
|
|
.map_err(|errors| anyhow::anyhow!("{}", pretty_verifier_error(&func, None, errors)))?;
|
|
context.verified = true;
|
|
}
|
|
|
|
test.run(func, context).context(test.name())?;
|
|
Ok(())
|
|
}
|
|
|
|
/// A helper struct to update a file in-place as test expectations are
|
|
/// automatically updated.
|
|
///
|
|
/// This structure automatically handles multiple edits to one file. Our edits
|
|
/// are line-based but if editing a previous portion of the file adds lines then
|
|
/// all future edits need to know to skip over those previous lines. Note that
|
|
/// this assumes that edits are done front-to-back.
|
|
pub struct FileUpdate {
|
|
path: PathBuf,
|
|
line_diff: Cell<isize>,
|
|
last_update: Cell<usize>,
|
|
}
|
|
|
|
impl FileUpdate {
|
|
fn new(path: &Path) -> FileUpdate {
|
|
FileUpdate {
|
|
path: path.to_path_buf(),
|
|
line_diff: Cell::new(0),
|
|
last_update: Cell::new(0),
|
|
}
|
|
}
|
|
|
|
/// Updates the file that this structure references at the `location`
|
|
/// specified.
|
|
///
|
|
/// The closure `f` is given first a buffer to push the new test into along
|
|
/// with a lines iterator for the old test.
|
|
pub fn update_at(
|
|
&self,
|
|
location: &Location,
|
|
f: impl FnOnce(&mut String, &mut Lines<'_>),
|
|
) -> Result<()> {
|
|
// This is required for correctness of this update.
|
|
assert!(location.line_number > self.last_update.get());
|
|
self.last_update.set(location.line_number);
|
|
|
|
// Read the old test file and calculate thte new line number we're
|
|
// preserving up to based on how many lines prior to this have been
|
|
// removed or added.
|
|
let old_test = std::fs::read_to_string(&self.path)?;
|
|
let mut new_test = String::new();
|
|
let mut lines = old_test.lines();
|
|
let lines_to_preserve =
|
|
(((location.line_number - 1) as isize) + self.line_diff.get()) as usize;
|
|
|
|
// Push everything leading up to the start of the function
|
|
for _ in 0..lines_to_preserve {
|
|
new_test.push_str(lines.next().unwrap());
|
|
new_test.push_str("\n");
|
|
}
|
|
|
|
// Push the whole function, leading up to the trailing `}`
|
|
let mut first = true;
|
|
while let Some(line) = lines.next() {
|
|
if first && !line.starts_with("function") {
|
|
bail!(
|
|
"line {} in test file {:?} did not start with `function`, \
|
|
cannot automatically update test",
|
|
location.line_number,
|
|
self.path,
|
|
);
|
|
}
|
|
first = false;
|
|
new_test.push_str(line);
|
|
new_test.push_str("\n");
|
|
if line.starts_with("}") {
|
|
break;
|
|
}
|
|
}
|
|
|
|
// Use our custom update function to further update the test.
|
|
f(&mut new_test, &mut lines);
|
|
|
|
// Record the difference in line count so future updates can be adjusted
|
|
// accordingly, and then write the file back out to the filesystem.
|
|
let old_line_count = old_test.lines().count();
|
|
let new_line_count = new_test.lines().count();
|
|
self.line_diff
|
|
.set(self.line_diff.get() + (new_line_count as isize - old_line_count as isize));
|
|
|
|
std::fs::write(&self.path, new_test)?;
|
|
Ok(())
|
|
}
|
|
}
|