From e2dcb19099606f161c6d6145ba71130579b452e2 Mon Sep 17 00:00:00 2001 From: Qinxuan Chen Date: Tue, 7 Mar 2023 23:21:48 +0800 Subject: [PATCH] deps: update criterion dependency to v0.4.0 (#5935) --- Cargo.lock | 128 +++++++----------- Cargo.toml | 2 +- cranelift/codegen/Cargo.toml | 2 +- .../codegen/benches/x64-evex-encoding.rs | 2 - 4 files changed, 53 insertions(+), 81 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 85544b31fc..ff424b79ac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -78,6 +78,12 @@ version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec8ad6edb4840b78c5c3d88de606b22252d552b55f3a4699fbb10fc070ec3049" +[[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" @@ -214,7 +220,6 @@ dependencies = [ "lazy_static", "memchr", "regex-automata", - "serde", ] [[package]] @@ -377,6 +382,33 @@ dependencies = [ "zeroize", ] +[[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 = "cipher" version = "0.3.0" @@ -386,17 +418,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "bitflags", - "textwrap 0.11.0", - "unicode-width", -] - [[package]] name = "clap" version = "3.2.8" @@ -411,7 +432,7 @@ dependencies = [ "once_cell", "strsim", "termcolor", - "textwrap 0.15.0", + "textwrap", ] [[package]] @@ -722,7 +743,7 @@ dependencies = [ name = "cranelift-serde" version = "0.95.0" dependencies = [ - "clap 3.2.8", + "clap", "cranelift-codegen", "cranelift-reader", "serde_json", @@ -735,7 +756,7 @@ dependencies = [ "anyhow", "capstone", "cfg-if", - "clap 3.2.8", + "clap", "cranelift", "cranelift-codegen", "cranelift-entity", @@ -793,15 +814,16 @@ dependencies = [ [[package]] name = "criterion" -version = "0.3.6" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f" +checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" dependencies = [ + "anes", "atty", "cast", - "clap 2.34.0", + "ciborium", + "clap", "criterion-plot", - "csv", "itertools", "lazy_static", "num-traits", @@ -810,7 +832,6 @@ dependencies = [ "rayon", "regex", "serde", - "serde_cbor", "serde_derive", "serde_json", "tinytemplate", @@ -819,9 +840,9 @@ dependencies = [ [[package]] name = "criterion-plot" -version = "0.4.5" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" dependencies = [ "cast", "itertools", @@ -904,28 +925,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "csv" -version = "1.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" -dependencies = [ - "bstr", - "csv-core", - "itoa 0.4.8", - "ryu", - "serde", -] - -[[package]] -name = "csv-core" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" -dependencies = [ - "memchr", -] - [[package]] name = "ctr" version = "0.8.0" @@ -1574,7 +1573,7 @@ dependencies = [ name = "islec" version = "0.0.0" dependencies = [ - "clap 3.2.8", + "clap", "cranelift-isle", "env_logger 0.9.0", ] @@ -1588,12 +1587,6 @@ dependencies = [ "either", ] -[[package]] -name = "itoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - [[package]] name = "itoa" version = "1.0.1" @@ -2517,7 +2510,7 @@ dependencies = [ "bitflags", "errno", "io-lifetimes", - "itoa 1.0.1", + "itoa", "libc", "linux-raw-sys", "once_cell", @@ -2566,16 +2559,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde_cbor" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" -dependencies = [ - "half", - "serde", -] - [[package]] name = "serde_derive" version = "1.0.137" @@ -2593,7 +2576,7 @@ version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f972498cf015f7c0746cac89ebe1d6ef10c293b94175a243a2d9442c163d9944" dependencies = [ - "itoa 1.0.1", + "itoa", "ryu", "serde", ] @@ -2850,15 +2833,6 @@ dependencies = [ "wat", ] -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - [[package]] name = "textwrap" version = "0.15.0" @@ -3465,7 +3439,7 @@ version = "8.0.0" dependencies = [ "anyhow", "cap-std", - "clap 3.2.8", + "clap", "shuffling-allocator", "target-lexicon", "wasi-cap-std-sync", @@ -3530,7 +3504,7 @@ dependencies = [ "anyhow", "async-trait", "bstr", - "clap 3.2.8", + "clap", "component-macro-test", "component-test-util", "criterion", @@ -3575,7 +3549,7 @@ name = "wasmtime-cli-flags" version = "8.0.0" dependencies = [ "anyhow", - "clap 3.2.8", + "clap", "file-per-thread-logger", "pretty_env_logger", "rayon", @@ -3627,7 +3601,7 @@ version = "8.0.0" dependencies = [ "anyhow", "atty", - "clap 3.2.8", + "clap", "cranelift-entity", "env_logger 0.9.0", "gimli", @@ -4058,7 +4032,7 @@ version = "0.0.0" dependencies = [ "anyhow", "capstone", - "clap 3.2.8", + "clap", "cranelift-codegen", "glob", "serde", diff --git a/Cargo.toml b/Cargo.toml index 7807bb1363..5868c414a0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,7 +58,7 @@ test-programs = { path = "crates/test-programs" } wasmtime-runtime = { workspace = true } tokio = { version = "1.8.0", features = ["rt", "time", "macros", "rt-multi-thread"] } wast = { workspace = true } -criterion = "0.3.4" +criterion = "0.4.0" num_cpus = "1.13.0" memchr = "2.4" async-trait = { workspace = true } diff --git a/cranelift/codegen/Cargo.toml b/cranelift/codegen/Cargo.toml index 9b624698fc..6ea37cbd48 100644 --- a/cranelift/codegen/Cargo.toml +++ b/cranelift/codegen/Cargo.toml @@ -35,7 +35,7 @@ sha2 = { version = "0.10.2", optional = true } # accomodated in `tests`. [dev-dependencies] -criterion = "0.3" +criterion = { version = "0.4.0", features = ["html_reports"] } similar = "2.1.0" [build-dependencies] diff --git a/cranelift/codegen/benches/x64-evex-encoding.rs b/cranelift/codegen/benches/x64-evex-encoding.rs index 550e88a0d9..831e8cb494 100644 --- a/cranelift/codegen/benches/x64-evex-encoding.rs +++ b/cranelift/codegen/benches/x64-evex-encoding.rs @@ -37,8 +37,6 @@ mod x86 { /// Using an inner module to feature-gate the benchmarks means that we must /// manually specify how to run the benchmarks (see `criterion_main!`). pub fn run_benchmarks() { - criterion::__warn_about_html_reports_feature(); - criterion::__warn_about_cargo_bench_support_feature(); benches(); Criterion::default().configure_from_args().final_summary(); }