Skip to content

Commit 812d78f

Browse files
Rollup merge of #82537 - wesleywiser:update_measureme, r=oli-obk
Update measureme dependency to the latest version This version adds the ability to use `rdpmc` hardware-based performance counters instead of wall-clock time for measuring duration. This also introduces a dependency on the `perf-event-open-sys` crate on Linux which is used when using hardware counters. r? `@oli-obk`
2 parents 5964b43 + e130e9c commit 812d78f

File tree

5 files changed

+18
-5
lines changed

5 files changed

+18
-5
lines changed

Cargo.lock

+14-2
Original file line numberDiff line numberDiff line change
@@ -2139,11 +2139,14 @@ dependencies = [
21392139

21402140
[[package]]
21412141
name = "measureme"
2142-
version = "9.0.0"
2142+
version = "9.1.0"
21432143
source = "registry+https://github.com/rust-lang/crates.io-index"
2144-
checksum = "22bf8d885d073610aee20e7fa205c4341ed32a761dbde96da5fd96301a8d3e82"
2144+
checksum = "4a98e07fe802486895addb2b5467f33f205e82c426bfaf350f5d8109b137767c"
21452145
dependencies = [
2146+
"log",
2147+
"memmap",
21462148
"parking_lot",
2149+
"perf-event-open-sys",
21472150
"rustc-hash",
21482151
"smallvec 1.6.1",
21492152
]
@@ -2540,6 +2543,15 @@ version = "2.1.0"
25402543
source = "registry+https://github.com/rust-lang/crates.io-index"
25412544
checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
25422545

2546+
[[package]]
2547+
name = "perf-event-open-sys"
2548+
version = "1.0.1"
2549+
source = "registry+https://github.com/rust-lang/crates.io-index"
2550+
checksum = "ce9bedf5da2c234fdf2391ede2b90fabf585355f33100689bc364a3ea558561a"
2551+
dependencies = [
2552+
"libc",
2553+
]
2554+
25432555
[[package]]
25442556
name = "pest"
25452557
version = "2.1.3"

compiler/rustc_codegen_llvm/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ doctest = false
1111
[dependencies]
1212
bitflags = "1.0"
1313
libc = "0.2"
14-
measureme = "9.0.0"
14+
measureme = "9.1.0"
1515
snap = "1"
1616
tracing = "0.1"
1717
rustc_middle = { path = "../rustc_middle" }

compiler/rustc_data_structures/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ rustc-hash = "1.1.0"
2525
smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
2626
rustc_index = { path = "../rustc_index", package = "rustc_index" }
2727
bitflags = "1.2.1"
28-
measureme = "9.0.0"
28+
measureme = "9.1.0"
2929
libc = "0.2"
3030
stacker = "0.1.12"
3131
tempfile = "3.0.5"

compiler/rustc_middle/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ rustc_ast = { path = "../rustc_ast" }
2828
rustc_span = { path = "../rustc_span" }
2929
chalk-ir = "0.55.0"
3030
smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
31-
measureme = "9.0.0"
31+
measureme = "9.1.0"
3232
rustc_session = { path = "../rustc_session" }
3333
rustc_type_ir = { path = "../rustc_type_ir" }

src/tools/tidy/src/deps.rs

+1
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ const PERMITTED_DEPENDENCIES: &[&str] = &[
131131
"parking_lot",
132132
"parking_lot_core",
133133
"pathdiff",
134+
"perf-event-open-sys",
134135
"pkg-config",
135136
"polonius-engine",
136137
"ppv-lite86",

0 commit comments

Comments
 (0)