Move integration tests into src/tools/tests.
The integration tests use both libcretonne and libreader, so moving them avoids the circular dev-dependency. Also go back to building everything under src/tools/target to avoid rebuilding the libraries when cargo is invoked in different subdirectories. This speeds up test-all.sh quite a bit. Finally, skip the pure debug build. We build "cargo test" and "cargo build --release" which should cover everything we need.
This commit is contained in:
146
src/tools/tests/cfg_traversal.rs
Normal file
146
src/tools/tests/cfg_traversal.rs
Normal file
@@ -0,0 +1,146 @@
|
||||
extern crate cretonne;
|
||||
extern crate cton_reader;
|
||||
|
||||
use self::cton_reader::parser::Parser;
|
||||
use self::cretonne::ir::entities::Ebb;
|
||||
use self::cretonne::cfg::ControlFlowGraph;
|
||||
use self::cretonne::entity_map::EntityMap;
|
||||
|
||||
fn test_reverse_postorder_traversal(function_source: &str, ebb_order: Vec<u32>) {
|
||||
let func = &Parser::parse(function_source).unwrap()[0];
|
||||
let cfg = ControlFlowGraph::new(&func);
|
||||
let ebbs = ebb_order.iter().map(|n| Ebb::with_number(*n).unwrap())
|
||||
.collect::<Vec<Ebb>>();
|
||||
|
||||
let mut postorder_ebbs = cfg.postorder_ebbs();
|
||||
let mut postorder_map = EntityMap::with_capacity(postorder_ebbs.len());
|
||||
for (i, ebb) in postorder_ebbs.iter().enumerate() {
|
||||
postorder_map[ebb.clone()] = i + 1;
|
||||
}
|
||||
postorder_ebbs.reverse();
|
||||
|
||||
assert_eq!(postorder_ebbs.len(), ebbs.len());
|
||||
for ebb in postorder_ebbs {
|
||||
assert_eq!(ebb, ebbs[ebbs.len() - postorder_map[ebb]]);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn simple_traversal() {
|
||||
test_reverse_postorder_traversal("
|
||||
function test(i32) {
|
||||
ebb0(v0: i32):
|
||||
brz v0, ebb1
|
||||
jump ebb2
|
||||
ebb1:
|
||||
jump ebb3
|
||||
ebb2:
|
||||
v1 = iconst.i32 1
|
||||
v2 = iadd v1, v0
|
||||
brz v2, ebb2
|
||||
v3 = iadd v1, v2
|
||||
brz v3, ebb1
|
||||
v4 = iadd v1, v3
|
||||
brz v4, ebb4
|
||||
jump ebb5
|
||||
ebb3:
|
||||
trap
|
||||
ebb4:
|
||||
trap
|
||||
ebb5:
|
||||
trap
|
||||
}
|
||||
", vec![0, 2, 1, 3, 4, 5]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn loops_one() {
|
||||
test_reverse_postorder_traversal("
|
||||
function test(i32) {
|
||||
ebb0(v0: i32):
|
||||
jump ebb1
|
||||
ebb1:
|
||||
brnz v0, ebb3
|
||||
jump ebb2
|
||||
ebb2:
|
||||
jump ebb3
|
||||
ebb3:
|
||||
return
|
||||
}
|
||||
", vec![0, 1, 2, 3]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn loops_two() {
|
||||
test_reverse_postorder_traversal("
|
||||
function test(i32) {
|
||||
ebb0(v0: i32):
|
||||
brz v0, ebb1
|
||||
jump ebb2
|
||||
ebb1:
|
||||
jump ebb3
|
||||
ebb2:
|
||||
brz v0, ebb4
|
||||
jump ebb5
|
||||
ebb3:
|
||||
jump ebb4
|
||||
ebb4:
|
||||
brz v0, ebb3
|
||||
jump ebb5
|
||||
ebb5:
|
||||
brz v0, ebb4
|
||||
return
|
||||
}
|
||||
", vec![0, 1, 2, 5, 4, 3]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn loops_three() {
|
||||
test_reverse_postorder_traversal("
|
||||
function test(i32) {
|
||||
ebb0(v0: i32):
|
||||
brz v0, ebb1
|
||||
jump ebb2
|
||||
ebb1:
|
||||
jump ebb3
|
||||
ebb2:
|
||||
brz v0, ebb4
|
||||
jump ebb5
|
||||
ebb3:
|
||||
jump ebb4
|
||||
ebb4:
|
||||
brz v0, ebb3
|
||||
brnz v0, ebb5
|
||||
jump ebb6
|
||||
ebb5:
|
||||
brz v0, ebb4
|
||||
trap
|
||||
ebb6:
|
||||
jump ebb7
|
||||
ebb7:
|
||||
return
|
||||
}
|
||||
", vec![0, 1, 2, 5, 4, 3, 6, 7]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn back_edge_one() {
|
||||
test_reverse_postorder_traversal("
|
||||
function test(i32) {
|
||||
ebb0(v0: i32):
|
||||
brz v0, ebb1
|
||||
jump ebb2
|
||||
ebb1:
|
||||
jump ebb3
|
||||
ebb2:
|
||||
brz v0, ebb0
|
||||
jump ebb4
|
||||
ebb3:
|
||||
brz v0, ebb2
|
||||
brnz v0, ebb0
|
||||
return
|
||||
ebb4:
|
||||
trap
|
||||
}
|
||||
", vec![0, 1, 3, 2, 4]);
|
||||
}
|
||||
60
src/tools/tests/dominator_tree.rs
Normal file
60
src/tools/tests/dominator_tree.rs
Normal file
@@ -0,0 +1,60 @@
|
||||
extern crate cretonne;
|
||||
extern crate cton_reader;
|
||||
|
||||
use self::cton_reader::parser::Parser;
|
||||
use self::cretonne::ir::entities::Ebb;
|
||||
use self::cretonne::cfg::ControlFlowGraph;
|
||||
use self::cretonne::dominator_tree::DominatorTree;
|
||||
|
||||
fn test_dominator_tree(function_source: &str, idoms: Vec<u32>) {
|
||||
let func = &Parser::parse(function_source).unwrap()[0];
|
||||
let cfg = ControlFlowGraph::new(&func);
|
||||
let dtree = DominatorTree::new(&cfg);
|
||||
assert_eq!(dtree.ebbs().collect::<Vec<_>>().len(), idoms.len());
|
||||
for (i, j) in idoms.iter().enumerate() {
|
||||
let ebb = Ebb::with_number(i.clone() as u32);
|
||||
let idom = Ebb::with_number(*j);
|
||||
assert_eq!(dtree.idom(ebb.unwrap()), idom);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn basic() {
|
||||
test_dominator_tree("
|
||||
function test(i32) {
|
||||
ebb0(v0: i32):
|
||||
jump ebb1
|
||||
ebb1:
|
||||
brz v0, ebb3
|
||||
jump ebb2
|
||||
ebb2:
|
||||
jump ebb3
|
||||
ebb3:
|
||||
return
|
||||
}
|
||||
", vec![0, 0, 1, 1]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn loops() {
|
||||
test_dominator_tree("
|
||||
function test(i32) {
|
||||
ebb0(v0: i32):
|
||||
brz v0, ebb1
|
||||
jump ebb2
|
||||
ebb1:
|
||||
jump ebb3
|
||||
ebb2:
|
||||
brz v0, ebb4
|
||||
jump ebb5
|
||||
ebb3:
|
||||
jump ebb4
|
||||
ebb4:
|
||||
brz v0, ebb3
|
||||
jump ebb5
|
||||
ebb5:
|
||||
brz v0, ebb4
|
||||
return
|
||||
}
|
||||
", vec![0, 0, 0, 0, 0, 0]);
|
||||
}
|
||||
2
src/tools/tests/lib.rs
Normal file
2
src/tools/tests/lib.rs
Normal file
@@ -0,0 +1,2 @@
|
||||
pub mod cfg_traversal;
|
||||
pub mod dominator_tree;
|
||||
Reference in New Issue
Block a user