Remove old tests and reexport libfuzzer from fuzzing module (#69)

* Remove unused regalloc2-test crate

This code doesn't build, and Chris says it's "a really old harness that
existed prior to building the fuzzing and was used mainly to profile and
get stats before integration with Cranelift".

* Re-export libfuzzer/arbitrary from fuzzing module

This avoids needing to keep dependencies on `arbitrary` in sync across
the three different Cargo.toml files in this project.

However, before version 0.4.2, libfuzzer-sys only supported using its
macros if it was available at the top-level `libfuzzer_sys` path, which
breaks when re-exporting it. So I'm upgrading to that version (or the
newest patch release of it).

Upgrading libfuzzer-sys in turn brings in the 1.0 release of the
arbitrary crate, with a minor API change along the way.

Author: jameysharp

Cargo.toml

@@ -20,8 +20,7 @@ slice-group-by = "0.3.0"
 serde = { version = "1.0.136", features = ["derive"], optional = true }
 
 # The below are only needed for fuzzing.
-# Keep this in sync with libfuzzer_sys's crate version:
-arbitrary = { version = "^0.4.6", optional = true }
+libfuzzer-sys = { version = "0.4.2", optional = true }
 
 # When testing regalloc2 by itself, enable debug assertions and overflow checks
 [profile.release]
@@ -39,7 +38,7 @@ checker = []
 trace-log = []
 
 # Exposes the internal API for fuzzing.
-fuzzing = ["arbitrary", "checker", "trace-log"]
+fuzzing = ["libfuzzer-sys", "checker", "trace-log"]
 
 # Enables serde for exposed types.
 enable-serde = ["serde"]

fuzz/Cargo.toml

@@ -11,8 +11,6 @@ cargo-fuzz = true
 
 [dependencies]
 regalloc2 = { path = "../", features = ["fuzzing"] }
-libfuzzer-sys = "0.3"
-arbitrary = { version = "^0.4.6", features = ["derive"] }
 log = { version = "0.4.8", default-features = false }
 env_logger = "0.8.3"
 

fuzz/fuzz_targets/domtree.rs

@@ -4,23 +4,19 @@
  */
 
 #![no_main]
-use libfuzzer_sys::arbitrary::{Arbitrary, Result, Unstructured};
-use libfuzzer_sys::fuzz_target;
+use regalloc2::fuzzing::arbitrary::{Arbitrary, Result, Unstructured};
+use regalloc2::fuzzing::{domtree, fuzz_target, postorder};
+use regalloc2::Block;
 use std::collections::HashSet;
 
-use regalloc2::{
-    fuzzing::{domtree, postorder},
-    Block,
-};
-
 #[derive(Clone, Debug)]
 struct CFG {
     num_blocks: usize,
     preds: Vec<Vec<Block>>,
     succs: Vec<Vec<Block>>,
 }
 
-impl Arbitrary for CFG {
+impl Arbitrary<'_> for CFG {
     fn arbitrary(u: &mut Unstructured) -> Result<CFG> {
         let num_blocks = u.int_in_range(1..=1000)?;
         let mut succs = vec![];
@@ -111,7 +107,7 @@ struct TestCase {
     path: Path,
 }
 
-impl Arbitrary for TestCase {
+impl Arbitrary<'_> for TestCase {
     fn arbitrary(u: &mut Unstructured) -> Result<TestCase> {
         let cfg = CFG::arbitrary(u)?;
         let path = Path::choose_from_cfg(&cfg, u)?;

fuzz/fuzz_targets/ion.rs

@@ -4,9 +4,8 @@
  */
 
 #![no_main]
-use libfuzzer_sys::fuzz_target;
-
 use regalloc2::fuzzing::func::Func;
+use regalloc2::fuzzing::fuzz_target;
 
 fuzz_target!(|func: Func| {
     let _ = env_logger::try_init();

fuzz/fuzz_targets/ion_checker.rs

@@ -4,18 +4,17 @@
  */
 
 #![no_main]
-use libfuzzer_sys::arbitrary::{Arbitrary, Result, Unstructured};
-use libfuzzer_sys::fuzz_target;
-
+use regalloc2::fuzzing::arbitrary::{Arbitrary, Result, Unstructured};
 use regalloc2::fuzzing::checker::Checker;
 use regalloc2::fuzzing::func::{Func, Options};
+use regalloc2::fuzzing::fuzz_target;
 
 #[derive(Clone, Debug)]
 struct TestCase {
     func: Func,
 }
 
-impl Arbitrary for TestCase {
+impl Arbitrary<'_> for TestCase {
     fn arbitrary(u: &mut Unstructured) -> Result<TestCase> {
         Ok(TestCase {
             func: Func::arbitrary_with_options(

fuzz/fuzz_targets/moves.rs

@@ -4,9 +4,8 @@
  */
 
 #![no_main]
-use libfuzzer_sys::arbitrary::{Arbitrary, Result, Unstructured};
-use libfuzzer_sys::fuzz_target;
-
+use regalloc2::fuzzing::arbitrary::{Arbitrary, Result, Unstructured};
+use regalloc2::fuzzing::fuzz_target;
 use regalloc2::fuzzing::moves::{MoveAndScratchResolver, ParallelMoves};
 use regalloc2::{Allocation, PReg, RegClass, SpillSlot};
 use std::collections::{HashMap, HashSet};
@@ -17,7 +16,7 @@ struct TestCase {
     available_pregs: Vec<Allocation>,
 }
 
-impl Arbitrary for TestCase {
+impl Arbitrary<'_> for TestCase {
     fn arbitrary(u: &mut Unstructured) -> Result<Self> {
         let mut ret = TestCase {
             moves: vec![],

fuzz/fuzz_targets/ssagen.rs

@@ -4,19 +4,18 @@
  */
 
 #![no_main]
-use libfuzzer_sys::arbitrary::{Arbitrary, Result, Unstructured};
-use libfuzzer_sys::fuzz_target;
-
+use regalloc2::fuzzing::arbitrary::{Arbitrary, Result, Unstructured};
 use regalloc2::fuzzing::cfg::CFGInfo;
 use regalloc2::fuzzing::func::{Func, Options};
+use regalloc2::fuzzing::fuzz_target;
 use regalloc2::fuzzing::ssa::validate_ssa;
 
 #[derive(Debug)]
 struct TestCase {
     f: Func,
 }
 
-impl Arbitrary for TestCase {
+impl Arbitrary<'_> for TestCase {
     fn arbitrary(u: &mut Unstructured) -> Result<Self> {
         Ok(TestCase {
             f: Func::arbitrary_with_options(

src/fuzzing/func.rs

@@ -8,8 +8,8 @@ use crate::{
     OperandConstraint, OperandKind, OperandPos, PReg, PRegSet, RegClass, VReg,
 };
 
-use arbitrary::Result as ArbitraryResult;
-use arbitrary::{Arbitrary, Unstructured};
+use super::arbitrary::Result as ArbitraryResult;
+use super::arbitrary::{Arbitrary, Unstructured};
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum InstOpcode {
@@ -235,7 +235,7 @@ impl FuncBuilder {
     }
 }
 
-impl Arbitrary for OperandConstraint {
+impl Arbitrary<'_> for OperandConstraint {
     fn arbitrary(u: &mut Unstructured) -> ArbitraryResult<Self> {
         Ok(*u.choose(&[OperandConstraint::Any, OperandConstraint::Reg])?)
     }
@@ -293,7 +293,7 @@ impl std::default::Default for Options {
     }
 }
 
-impl Arbitrary for Func {
+impl Arbitrary<'_> for Func {
     fn arbitrary(u: &mut Unstructured) -> ArbitraryResult<Func> {
         Func::arbitrary_with_options(u, &Options::default())
     }

src/fuzzing/mod.rs

@@ -28,3 +28,5 @@ pub mod ion {
 pub mod checker {
     pub use crate::checker::*;
 }
+
+pub use libfuzzer_sys::{arbitrary, fuzz_target};