From ed660127529aa7e76c41f4d807e39dc7b6aa62df Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 6 Dec 2022 00:01:28 +0100 Subject: [PATCH] 2022: bench: criterion 0.4 --- Cargo.lock | 145 ++++++++++++++++-- aoc2022/Cargo.toml | 7 + aoc2022/aoc2022_bench/Cargo.toml | 17 -- .../benches/aoc2022_bench.rs | 0 4 files changed, 136 insertions(+), 33 deletions(-) delete mode 100644 aoc2022/aoc2022_bench/Cargo.toml rename aoc2022/{aoc2022_bench => }/benches/aoc2022_bench.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 07ae2c3..2423e93 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,12 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + [[package]] name = "anyhow" version = "1.0.66" @@ -29,7 +35,7 @@ name = "aoc2015_bench" version = "0.1.0" dependencies = [ "aoc2015", - "criterion", + "criterion 0.3.6", ] [[package]] @@ -45,7 +51,7 @@ name = "aoc2018_bench" version = "0.1.0" dependencies = [ "aoc2018", - "criterion", + "criterion 0.3.6", ] [[package]] @@ -61,7 +67,7 @@ name = "aoc2019_bench" version = "0.1.0" dependencies = [ "aoc2019", - "criterion", + "criterion 0.3.6", ] [[package]] @@ -79,7 +85,7 @@ name = "aoc2020_bench" version = "0.1.0" dependencies = [ "aoc2020", - "criterion", + "criterion 0.3.6", ] [[package]] @@ -97,7 +103,7 @@ name = "aoc2021_bench" version = "0.1.0" dependencies = [ "aoc2021", - "criterion", + "criterion 0.3.6", ] [[package]] @@ -106,14 +112,7 @@ version = "0.1.0" dependencies = [ "anyhow", "aoc", -] - -[[package]] -name = "aoc2022_bench" -version = "0.1.0" -dependencies = [ - "aoc2022", - "criterion", + "criterion 0.4.0", ] [[package]] @@ -214,6 +213,33 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "ciborium" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369" + +[[package]] +name = "ciborium-ll" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b" +dependencies = [ + "ciborium-io", + "half", +] + [[package]] name = "clap" version = "2.34.0" @@ -221,10 +247,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "bitflags", - "textwrap", + "textwrap 0.11.0", "unicode-width", ] +[[package]] +name = "clap" +version = "3.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +dependencies = [ + "bitflags", + "clap_lex", + "indexmap", + "textwrap 0.16.0", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", +] + [[package]] name = "criterion" version = "0.3.6" @@ -233,8 +280,8 @@ checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f" dependencies = [ "atty", "cast", - "clap", - "criterion-plot", + "clap 2.34.0", + "criterion-plot 0.4.5", "csv", "itertools 0.10.5", "lazy_static", @@ -251,6 +298,31 @@ dependencies = [ "walkdir", ] +[[package]] +name = "criterion" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" +dependencies = [ + "anes", + "atty", + "cast", + "ciborium", + "clap 3.2.23", + "criterion-plot 0.5.0", + "itertools 0.10.5", + "lazy_static", + "num-traits", + "oorandom", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + [[package]] name = "criterion-plot" version = "0.4.5" @@ -261,6 +333,16 @@ dependencies = [ "itertools 0.10.5", ] +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools 0.10.5", +] + [[package]] name = "crossbeam-channel" version = "0.5.6" @@ -373,6 +455,12 @@ version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -382,6 +470,16 @@ dependencies = [ "libc", ] +[[package]] +name = "indexmap" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +dependencies = [ + "autocfg", + "hashbrown", +] + [[package]] name = "itertools" version = "0.9.0" @@ -521,6 +619,12 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" +[[package]] +name = "os_str_bytes" +version = "6.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" + [[package]] name = "plotters" version = "0.3.4" @@ -679,6 +783,9 @@ name = "serde" version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "256b9932320c590e707b94576e3cc1f7c9024d0ee6612dfbcf1cb106cbe8e055" +dependencies = [ + "serde_derive", +] [[package]] name = "serde_cbor" @@ -738,6 +845,12 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "textwrap" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" + [[package]] name = "tinytemplate" version = "1.2.1" diff --git a/aoc2022/Cargo.toml b/aoc2022/Cargo.toml index 9fe9672..1f0e257 100644 --- a/aoc2022/Cargo.toml +++ b/aoc2022/Cargo.toml @@ -10,9 +10,16 @@ edition = "2021" aoc = { path = "../aoc" } anyhow = "1.0" +[dev-dependencies] +criterion = { version = "0.4", default-features = false, features = [ "rayon" ] } + [lib] path = "src/lib.rs" [[bin]] name = "aoc2022" path = "src/main.rs" + +[[bench]] +name = "aoc2022_bench" +harness = false diff --git a/aoc2022/aoc2022_bench/Cargo.toml b/aoc2022/aoc2022_bench/Cargo.toml deleted file mode 100644 index e5ef4bc..0000000 --- a/aoc2022/aoc2022_bench/Cargo.toml +++ /dev/null @@ -1,17 +0,0 @@ -[package] -name = "aoc2022_bench" -version = "0.1.0" -authors = ["Antoine Martin "] -edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] -aoc2022 = { path = "../" } - -[dev-dependencies] -criterion = "0.3" - -[[bench]] -name = "aoc2022_bench" -harness = false diff --git a/aoc2022/aoc2022_bench/benches/aoc2022_bench.rs b/aoc2022/benches/aoc2022_bench.rs similarity index 100% rename from aoc2022/aoc2022_bench/benches/aoc2022_bench.rs rename to aoc2022/benches/aoc2022_bench.rs