user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add support for MIR opt unit tests

Browse source
This commit is contained in:
Jakob Degen 2022-04-11 15:17:52 -04:00
parent c8422403f7
commit f280a839a7
5 changed files with 52 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/tools/compiletest/src/header.rs
View file

@ -157,6 +157,8 @@ pub struct TestProps {
pub should_ice: bool,
// If true, the stderr is expected to be different across bit-widths.
pub stderr_per_bitwidth: bool,
// The MIR opt to unit test, if any
pub mir_unit_test: Option<String>,
}
mod directives {
@ -189,6 +191,7 @@ mod directives {
pub const STDERR_PER_BITWIDTH: &'static str = "stderr-per-bitwidth";
pub const INCREMENTAL: &'static str = "incremental";
pub const KNOWN_BUG: &'static str = "known-bug";
pub const MIR_UNIT_TEST: &'static str = "unit-test";
// This isn't a real directive, just one that is probably mistyped often
pub const INCORRECT_COMPILER_FLAGS: &'static str = "compiler-flags";
}
@ -232,6 +235,7 @@ impl TestProps {
assembly_output: None,
should_ice: false,
stderr_per_bitwidth: false,
mir_unit_test: None,
}
}
@ -392,6 +396,9 @@ impl TestProps {
config.set_name_directive(ln, STDERR_PER_BITWIDTH, &mut self.stderr_per_bitwidth);
config.set_name_directive(ln, INCREMENTAL, &mut self.incremental);
config.set_name_directive(ln, KNOWN_BUG, &mut self.known_bug);
config.set_name_value_directive(ln, MIR_UNIT_TEST, &mut self.mir_unit_test, |s| {
s.trim().to_string()
});
});
}

6
src/tools/compiletest/src/runtest.rs
View file

@ -1856,10 +1856,14 @@ impl<'test> TestCx<'test> {
rustc.args(&[
"-Copt-level=1",
"-Zdump-mir=all",
"-Zmir-opt-level=4",
"-Zvalidate-mir",
"-Zdump-mir-exclude-pass-number",
]);
if let Some(pass) = &self.props.mir_unit_test {
rustc.args(&["-Zmir-opt-level=0", &format!("-Zmir-enable-passes=+{}", pass)]);
} else {
rustc.arg("-Zmir-opt-level=4");
}
let mir_dump_dir = self.get_mir_dump_dir();
let _ = fs::remove_dir_all(&mir_dump_dir);