diff --git a/fuzz/fuzz_targets/domtree.rs b/fuzz/fuzz_targets/domtree.rs index 0688578..4cd8d79 100644 --- a/fuzz/fuzz_targets/domtree.rs +++ b/fuzz/fuzz_targets/domtree.rs @@ -8,7 +8,10 @@ use libfuzzer_sys::arbitrary::{Arbitrary, Result, Unstructured}; use libfuzzer_sys::fuzz_target; use std::collections::HashSet; -use regalloc2::{domtree, postorder, Block}; +use regalloc2::{ + fuzzing::{domtree, postorder}, + Block, +}; #[derive(Clone, Debug)] struct CFG { @@ -96,7 +99,10 @@ fn check_idom_violations(idom: &[Block], path: &Path) { // and false for every other block. for domblock in 0..idom.len() { let domblock = Block::new(domblock); - assert_eq!(domset.contains(&domblock), domtree::dominates(idom, domblock, *block)); + assert_eq!( + domset.contains(&domblock), + domtree::dominates(idom, domblock, *block) + ); } visited.insert(*block); } @@ -112,10 +118,7 @@ impl Arbitrary for TestCase { fn arbitrary(u: &mut Unstructured) -> Result { let cfg = CFG::arbitrary(u)?; let path = Path::choose_from_cfg(&cfg, u)?; - Ok(TestCase { - cfg, - path, - }) + Ok(TestCase { cfg, path }) } } diff --git a/fuzz/fuzz_targets/ion.rs b/fuzz/fuzz_targets/ion.rs index 288b8fb..82aee65 100644 --- a/fuzz/fuzz_targets/ion.rs +++ b/fuzz/fuzz_targets/ion.rs @@ -12,5 +12,5 @@ fuzz_target!(|func: Func| { let _ = env_logger::try_init(); log::debug!("func:\n{:?}", func); let env = regalloc2::fuzzing::func::machine_env(); - let _out = regalloc2::ion::run(&func, &env, false).expect("regalloc did not succeed"); + let _out = regalloc2::fuzzing::ion::run(&func, &env, false).expect("regalloc did not succeed"); }); diff --git a/fuzz/fuzz_targets/ion_checker.rs b/fuzz/fuzz_targets/ion_checker.rs index f6e8cd5..950d4d7 100644 --- a/fuzz/fuzz_targets/ion_checker.rs +++ b/fuzz/fuzz_targets/ion_checker.rs @@ -7,7 +7,7 @@ use libfuzzer_sys::arbitrary::{Arbitrary, Result, Unstructured}; use libfuzzer_sys::fuzz_target; -use regalloc2::checker::Checker; +use regalloc2::fuzzing::checker::Checker; use regalloc2::fuzzing::func::{Func, Options}; #[derive(Clone, Debug)] @@ -40,7 +40,7 @@ fuzz_target!(|testcase: TestCase| { let _ = env_logger::try_init(); log::debug!("func:\n{:?}", func); let env = regalloc2::fuzzing::func::machine_env(); - let out = regalloc2::ion::run(&func, &env, true).expect("regalloc did not succeed"); + let out = regalloc2::fuzzing::ion::run(&func, &env, true).expect("regalloc did not succeed"); let mut checker = Checker::new(&func); checker.prepare(&out); diff --git a/fuzz/fuzz_targets/moves.rs b/fuzz/fuzz_targets/moves.rs index 040c3e1..e62342f 100644 --- a/fuzz/fuzz_targets/moves.rs +++ b/fuzz/fuzz_targets/moves.rs @@ -7,7 +7,7 @@ use libfuzzer_sys::arbitrary::{Arbitrary, Result, Unstructured}; use libfuzzer_sys::fuzz_target; -use regalloc2::moves::ParallelMoves; +use regalloc2::fuzzing::moves::ParallelMoves; use regalloc2::{Allocation, PReg, RegClass}; use std::collections::HashSet; diff --git a/fuzz/fuzz_targets/ssagen.rs b/fuzz/fuzz_targets/ssagen.rs index d68d672..bed2253 100644 --- a/fuzz/fuzz_targets/ssagen.rs +++ b/fuzz/fuzz_targets/ssagen.rs @@ -7,9 +7,9 @@ use libfuzzer_sys::arbitrary::{Arbitrary, Result, Unstructured}; use libfuzzer_sys::fuzz_target; -use regalloc2::cfg::CFGInfo; +use regalloc2::fuzzing::cfg::CFGInfo; use regalloc2::fuzzing::func::{Func, Options}; -use regalloc2::ssa::validate_ssa; +use regalloc2::fuzzing::ssa::validate_ssa; #[derive(Debug)] struct TestCase { diff --git a/src/fuzzing/mod.rs b/src/fuzzing/mod.rs index ae548d9..e6a225e 100644 --- a/src/fuzzing/mod.rs +++ b/src/fuzzing/mod.rs @@ -6,3 +6,27 @@ //! Utilities for fuzzing. pub mod func; + +// Re-exports for fuzz targets. + +pub mod domtree { + pub use crate::domtree::*; +} +pub mod postorder { + pub use crate::postorder::*; +} +pub mod moves { + pub use crate::moves::*; +} +pub mod cfg { + pub use crate::cfg::*; +} +pub mod ssa { + pub use crate::ssa::*; +} +pub mod ion { + pub use crate::ion::*; +} +pub mod checker { + pub use crate::checker::*; +} diff --git a/src/lib.rs b/src/lib.rs index 92dd1f5..ee5afb2 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -12,16 +12,16 @@ #![allow(dead_code)] -pub mod bitvec; -pub mod cfg; -pub mod domtree; -pub mod ion; -pub mod moves; -pub mod postorder; -pub mod ssa; +pub(crate) mod bitvec; +pub(crate) mod cfg; +pub(crate) mod domtree; +pub(crate) mod ion; +pub(crate) mod moves; +pub(crate) mod postorder; +pub(crate) mod ssa; #[macro_use] -pub mod index; +mod index; pub use index::{Block, Inst, InstRange, InstRangeIter}; pub mod checker;