diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 74fbfa41be95b..88ec022159ab5 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -998,12 +998,12 @@ jobs: tool: cargo-codspeed - name: "Build benchmarks" - run: cargo codspeed build --features "codspeed,ruff_instrumented" --profile profiling --no-default-features -p ruff_benchmark --bench formatter --bench lexer --bench linter --bench parser + run: cargo codspeed build -m simulation -m memory --features "codspeed,ruff_instrumented" --profile profiling --no-default-features -p ruff_benchmark --bench formatter --bench lexer --bench linter --bench parser - name: "Run benchmarks" uses: CodSpeedHQ/action@1c8ae4843586d3ba879736b7f6b7b0c990757fab # v4.12.1 with: - mode: simulation + mode: "simulation,memory" run: cargo codspeed run benchmarks-instrumented-ty-build: @@ -1037,7 +1037,7 @@ jobs: tool: cargo-codspeed - name: "Build benchmarks" - run: cargo codspeed build -m instrumentation --features "codspeed,ty_instrumented" --profile profiling --no-default-features -p ruff_benchmark --bench ty + run: cargo codspeed build -m simulation -m memory --features "codspeed,ty_instrumented" --profile profiling --no-default-features -p ruff_benchmark --bench ty - name: "Upload benchmark binary" uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0 @@ -1048,7 +1048,7 @@ jobs: retention-days: 1 benchmarks-instrumented-ty-run: - name: "benchmarks instrumented ty (${{ matrix.benchmark }})" + name: "benchmarks instrumented ty (${{matrix.mode}}: ${{ matrix.benchmark }})" runs-on: ubuntu-24.04 needs: benchmarks-instrumented-ty-build timeout-minutes: 20 @@ -1061,6 +1061,9 @@ jobs: benchmark: - "check_file|micro|anyio" - "attrs|hydra|datetype" + mode: + - simulation + - memory steps: - name: "Checkout Branch" uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 @@ -1088,7 +1091,7 @@ jobs: - name: "Run benchmarks" uses: CodSpeedHQ/action@1c8ae4843586d3ba879736b7f6b7b0c990757fab # v4.12.1 with: - mode: simulation + mode: ${{ matrix.mode }} run: cargo codspeed run --bench ty "${{ matrix.benchmark }}" benchmarks-walltime-build: diff --git a/Cargo.lock b/Cargo.lock index 5927b9afca44b..bc162359701cd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -264,26 +264,6 @@ dependencies = [ "virtue", ] -[[package]] -name = "bindgen" -version = "0.72.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" -dependencies = [ - "bitflags 2.11.0", - "cexpr", - "clang-sys", - "itertools 0.13.0", - "log", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn", -] - [[package]] name = "bit-set" version = "0.8.0" @@ -418,15 +398,6 @@ dependencies = [ "shlex", ] -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - [[package]] name = "cfg-if" version = "1.0.3" @@ -488,17 +459,6 @@ dependencies = [ "half", ] -[[package]] -name = "clang-sys" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" -dependencies = [ - "glob", - "libc", - "libloading", -] - [[package]] name = "clap" version = "4.6.0" @@ -576,37 +536,36 @@ version = "4.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d669bb552908e336ad5681789752033b45566b7e591aeaac7a614e58e5d6d8f2" dependencies = [ - "nix 0.31.1", + "nix", "terminfo", "thiserror 2.0.18", "which", - "windows-sys 0.59.0", + "windows-sys 0.61.0", ] [[package]] name = "codspeed" -version = "4.0.4" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f62ea8934802f8b374bf691eea524c3aa444d7014f604dd4182a3667b69510" +checksum = "b684e94583e85a5ca7e1a6454a89d76a5121240f2fb67eb564129d9bafdb9db0" dependencies = [ "anyhow", - "bindgen", "cc", "colored 2.2.0", + "getrandom 0.2.16", "glob", "libc", - "nix 0.30.1", + "nix", "serde", "serde_json", "statrs", - "uuid", ] [[package]] name = "codspeed-criterion-compat" -version = "4.0.4" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87efbc015fc0ff1b2001cd87df01c442824de677e01a77230bf091534687abb" +checksum = "2e65444156eb73ad7f57618188f8d4a281726d133ef55b96d1dcff89528609ab" dependencies = [ "clap", "codspeed", @@ -617,9 +576,9 @@ dependencies = [ [[package]] name = "codspeed-criterion-compat-walltime" -version = "4.0.4" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae5713ace440123bb4f1f78dd068d46872cb8548bfe61f752e7b2ad2c06d7f00" +checksum = "96389aaa4bbb872ea4924dc0335b2bb181bcf28d6eedbe8fea29afcc5bde36a6" dependencies = [ "anes", "cast", @@ -642,9 +601,9 @@ dependencies = [ [[package]] name = "codspeed-divan-compat" -version = "4.0.4" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b4214b974f8f5206497153e89db90274e623f06b00bf4b9143eeb7735d975d" +checksum = "89e4bf8c7793c170fd0fcf3be97b9032b2ae39c2b9e8818aba3cc10ca0f0c6c0" dependencies = [ "clap", "codspeed", @@ -655,9 +614,9 @@ dependencies = [ [[package]] name = "codspeed-divan-compat-macros" -version = "4.0.4" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a53f34a16cb70ce4fd9ad57e1db016f0718e434f34179ca652006443b9a39967" +checksum = "78aae02f2a278588e16e8ca62ea1915b8ab30f8230a09926671bba19ede801a4" dependencies = [ "divan-macros", "itertools 0.14.0", @@ -669,9 +628,9 @@ dependencies = [ [[package]] name = "codspeed-divan-compat-walltime" -version = "4.0.4" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a5099050c8948dce488b8eaa2e68dc5cf571cb8f9fce99aaaecbdddb940bcd" +checksum = "59ffd32c0c59ab8b674b15be65ba7c59aebac047036cfa7fa1e11bc2c178b81f" dependencies = [ "cfg-if", "clap", @@ -710,7 +669,7 @@ version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.61.0", ] [[package]] @@ -961,7 +920,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0b1fab2ae45819af2d0731d60f2afe17227ebb1a1538a236da84c93e9a60162" dependencies = [ "dispatch2", - "nix 0.31.1", + "nix", "windows-sys 0.61.0", ] @@ -1076,7 +1035,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.59.0", + "windows-sys 0.61.0", ] [[package]] @@ -1162,7 +1121,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.0", ] [[package]] @@ -1828,7 +1787,7 @@ dependencies = [ "portable-atomic", "portable-atomic-util", "serde_core", - "windows-sys 0.52.0", + "windows-sys 0.61.0", ] [[package]] @@ -1946,16 +1905,6 @@ dependencies = [ "syn", ] -[[package]] -name = "libloading" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" -dependencies = [ - "cfg-if", - "windows-link 0.2.0", -] - [[package]] name = "libmimalloc-sys" version = "0.1.44" @@ -2183,18 +2132,6 @@ dependencies = [ "uuid", ] -[[package]] -name = "nix" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6" -dependencies = [ - "bitflags 2.11.0", - "cfg-if", - "cfg_aliases", - "libc", -] - [[package]] name = "nix" version = "0.31.1" @@ -3701,7 +3638,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.61.0", ] [[package]] @@ -4109,7 +4046,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.61.0", ] [[package]] @@ -5312,7 +5249,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.61.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index a6e14800235b9..7ba54f1d18a7f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -74,7 +74,7 @@ camino = { version = "1.1.7" } clap = { version = "4.5.3", features = ["derive"] } clap_complete_command = { version = "0.6.0" } clearscreen = { version = "4.0.0" } -codspeed-criterion-compat = { version = "4.0.4", default-features = false } +codspeed-criterion-compat = { version = "4.4.1", default-features = false } colored = { version = "3.0.0" } compact_str = "0.9.0" console_error_panic_hook = { version = "0.1.7" } @@ -85,7 +85,7 @@ crossbeam = { version = "0.8.4" } csv = { version = "1.3.1" } dashmap = { version = "6.0.1" } datatest-stable = { version = "0.3.3" } -divan = { package = "codspeed-divan-compat", version = "4.0.4" } +divan = { package = "codspeed-divan-compat", version = "4.4.1" } drop_bomb = { version = "0.1.5" } dunce = { version = "1.0.5" } etcetera = { version = "0.11.0" }