Skip to content

Commit 6d288c6

Browse files
authored
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 a7f9aca + e130e9c commit 6d288c6

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
@@ -2149,11 +2149,14 @@ dependencies = [
21492149

21502150
[[package]]
21512151
name = "measureme"
2152-
version = "9.0.0"
2152+
version = "9.1.0"
21532153
source = "registry+https://github.com/rust-lang/crates.io-index"
2154-
checksum = "22bf8d885d073610aee20e7fa205c4341ed32a761dbde96da5fd96301a8d3e82"
2154+
checksum = "4a98e07fe802486895addb2b5467f33f205e82c426bfaf350f5d8109b137767c"
21552155
dependencies = [
2156+
"log",
2157+
"memmap",
21562158
"parking_lot",
2159+
"perf-event-open-sys",
21572160
"rustc-hash",
21582161
"smallvec 1.6.1",
21592162
]
@@ -2550,6 +2553,15 @@ version = "2.1.0"
25502553
source = "registry+https://github.com/rust-lang/crates.io-index"
25512554
checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
25522555

2556+
[[package]]
2557+
name = "perf-event-open-sys"
2558+
version = "1.0.1"
2559+
source = "registry+https://github.com/rust-lang/crates.io-index"
2560+
checksum = "ce9bedf5da2c234fdf2391ede2b90fabf585355f33100689bc364a3ea558561a"
2561+
dependencies = [
2562+
"libc",
2563+
]
2564+
25532565
[[package]]
25542566
name = "pest"
25552567
version = "2.1.3"

compiler/rustc_codegen_llvm/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ doctest = false
1212
bitflags = "1.0"
1313
cstr = "0.2"
1414
libc = "0.2"
15-
measureme = "9.0.0"
15+
measureme = "9.1.0"
1616
snap = "1"
1717
tracing = "0.1"
1818
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
@@ -132,6 +132,7 @@ const PERMITTED_DEPENDENCIES: &[&str] = &[
132132
"parking_lot",
133133
"parking_lot_core",
134134
"pathdiff",
135+
"perf-event-open-sys",
135136
"pkg-config",
136137
"polonius-engine",
137138
"ppv-lite86",

0 commit comments

Comments
 (0)