diff --git a/Cargo.toml b/Cargo.toml index ea6c1ed..9ab374a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ more-asserts = "0.3.1" snap = "1.1.0" serde_json = "1.0.91" proptest = "1.0.0" -binggan = { version = "0.12.0"} +binggan = { version = "0.14.0"} jemallocator = "0.5.4" [dev-dependencies.lz-fear] diff --git a/benches/binggan_bench.rs b/benches/binggan_bench.rs index b15ba54..9d15d21 100644 --- a/benches/binggan_bench.rs +++ b/benches/binggan_bench.rs @@ -51,7 +51,7 @@ fn main() { fn frame_decompress(data_sets: &[(String, Vec)]) { let mut runner = BenchRunner::with_name("frame_decompress"); runner - .add_plugin(PerfCounterPlugin::default()) + //.add_plugin(PerfCounterPlugin::default()) .add_plugin(PeakMemAllocPlugin::new(&GLOBAL)); for (name, data_set) in data_sets { let compressed_independent = lz4_cpp_frame_compress(data_set, true).unwrap(); @@ -62,24 +62,24 @@ fn frame_decompress(data_sets: &[(String, Vec)]) { group.set_input_size(data_set.len()); group.register_with_input("lz4 flex independent", &compressed_independent, move |i| { - black_box(lz4_flex_frame_decompress(i).unwrap()); - Some(()) + let out = black_box(lz4_flex_frame_decompress(i).unwrap()); + out.len() }); group.register_with_input("lz4 c90 independent", &compressed_independent, move |i| { - black_box(lz4_cpp_frame_decompress(i).unwrap()); - Some(()) + let out = black_box(lz4_cpp_frame_decompress(i).unwrap()); + out.len() }); group.register_with_input("lz4 flex linked", &compressed_linked, move |i| { - black_box(lz4_flex_frame_decompress(i).unwrap()); - Some(()) + let out = black_box(lz4_flex_frame_decompress(i).unwrap()); + out.len() }); group.register_with_input("lz4 c90 linked", &compressed_linked, move |i| { - black_box(lz4_cpp_frame_decompress(i).unwrap()); - Some(()) + let out = black_box(lz4_cpp_frame_decompress(i).unwrap()); + out.len() }); group.register_with_input("snap", &comp_snap, move |i| { - black_box(decompress_snap_frame(i)); - Some(()) + let out = black_box(decompress_snap_frame(i)); + out.len() }); group.run(); @@ -97,26 +97,26 @@ fn frame_compress(mut runner: InputGroup, usize>) { frame_info.block_size = lz4_flex::frame::BlockSize::Max256KB; frame_info.block_mode = lz4_flex::frame::BlockMode::Independent; let out = black_box(lz4_flex_frame_compress_with(frame_info, i).unwrap()); - Some(out.len()) + out.len() }); runner.register("lz4 c90 indep", move |i| { let out = black_box(lz4_cpp_frame_compress(i, true).unwrap()); - Some(out.len()) + out.len() }); runner.register("lz4 flex linked", move |i| { let mut frame_info = lz4_flex::frame::FrameInfo::new(); frame_info.block_size = lz4_flex::frame::BlockSize::Max256KB; frame_info.block_mode = lz4_flex::frame::BlockMode::Linked; let out = black_box(lz4_flex_frame_compress_with(frame_info, i).unwrap()); - Some(out.len()) + out.len() }); runner.register("lz4 c90 linked", move |i| { let out = black_box(lz4_cpp_frame_compress(i, false).unwrap()); - Some(out.len()) + out.len() }); runner.register("snap", move |i| { let out = compress_snap_frame(i); - Some(out.len()) + out.len() }); runner.run(); @@ -130,15 +130,15 @@ fn block_compress(mut runner: InputGroup, usize>) { runner.throughput(|data| data.len()); runner.register("lz4 flex", move |i| { let out = black_box(lz4_flex::compress(i)); - Some(out.len()) + out.len() }); runner.register("lz4 c90", move |i| { let out = black_box(lz4_cpp_block_compress(i).unwrap()); - Some(out.len()) + out.len() }); runner.register("snap", move |i| { let out = black_box(compress_snap(i)); - Some(out.len()) + out.len() }); runner.run(); @@ -148,6 +148,7 @@ fn block_decompress() { let mut runner = BenchRunner::with_name("block_decompress"); // Set the peak mem allocator. This will enable peak memory reporting. runner.add_plugin(PeakMemAllocPlugin::new(&GLOBAL)); + runner.add_plugin(CacheTrasher::default()); for data_uncomp in ALL { let comp_lz4 = lz4_cpp_block_compress(data_uncomp).unwrap(); let bundle = (comp_lz4, data_uncomp.len()); @@ -159,11 +160,11 @@ fn block_decompress() { group.register_with_input("lz4 flex", &bundle, move |i| { let size = black_box(lz4_flex::decompress(&i.0, i.1).unwrap()); - Some(size.len()) + size.len() }); group.register_with_input("lz4 c90", &bundle, move |i| { let size = black_box(lz4_cpp_block_decompress(&i.0, i.1).unwrap()); - Some(size.len()) + size.len() }); group.run();