Skip to content

Commit 7785834

Browse files
borsbors
committed
Auto merge of #67777 - Zoxc:time-refactor, r=wesleywiser
Use self profile infrastructure for -Z time and -Z time-passes There's no longer indentation for -Z time and -Z time-passes and duplicate timers between self profiling and -Z time-passes have been removed. r? @wesleywiser
2 parents 093241d + 5a485ce commit 7785834

File tree

25 files changed

+472
-477
lines changed

25 files changed

+472
-477
lines changed

‎src/librustc/hir/map/mod.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ use crate::hir::print::Nested;
1111
use crate::hir::*;
1212
use crate::middle::cstore::CrateStoreDyn;
1313
use crate::ty::query::Providers;
14-
use crate::util::common::time;
15-
1614
use rustc_data_structures::fx::FxHashMap;
1715
use rustc_data_structures::svh::Svh;
1816
use rustc_index::vec::IndexVec;
@@ -1245,7 +1243,7 @@ pub fn map_crate<'hir>(
12451243
definitions,
12461244
};
12471245

1248-
time(sess, "validate HIR map", || {
1246+
sess.time("validate HIR map", || {
12491247
hir_id_validator::check_crate(&map);
12501248
});
12511249

‎src/librustc/lib.rs

-2
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@
6666
extern crate bitflags;
6767
#[macro_use]
6868
extern crate scoped_tls;
69-
#[cfg(windows)]
70-
extern crate libc;
7169
#[macro_use]
7270
extern crate rustc_macros;
7371
#[macro_use]

‎src/librustc/ty/query/on_disk_cache.rs

+14-16
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ use crate::session::{CrateDisambiguator, Session};
99
use crate::ty::codec::{self as ty_codec, TyDecoder, TyEncoder};
1010
use crate::ty::context::TyCtxt;
1111
use crate::ty::{self, Ty};
12-
use crate::util::common::{time, time_ext};
1312

1413
use errors::Diagnostic;
1514
use rustc_data_structures::fx::FxHashMap;
@@ -200,7 +199,7 @@ impl<'sess> OnDiskCache<'sess> {
200199
// Encode query results.
201200
let mut query_result_index = EncodedQueryResultIndex::new();
202201

203-
time(tcx.sess, "encode query results", || {
202+
tcx.sess.time("encode query results", || {
204203
let enc = &mut encoder;
205204
let qri = &mut query_result_index;
206205

@@ -1056,23 +1055,22 @@ where
10561055
E: 'a + TyEncoder,
10571056
{
10581057
let desc = &format!("encode_query_results for {}", ::std::any::type_name::<Q>());
1058+
let _timer = tcx.sess.prof.generic_pass(desc);
10591059

1060-
time_ext(tcx.sess.time_extended(), desc, || {
1061-
let shards = Q::query_cache(tcx).lock_shards();
1062-
assert!(shards.iter().all(|shard| shard.active.is_empty()));
1063-
for (key, entry) in shards.iter().flat_map(|shard| shard.results.iter()) {
1064-
if Q::cache_on_disk(tcx, key.clone(), Some(&entry.value)) {
1065-
let dep_node = SerializedDepNodeIndex::new(entry.index.index());
1060+
let shards = Q::query_cache(tcx).lock_shards();
1061+
assert!(shards.iter().all(|shard| shard.active.is_empty()));
1062+
for (key, entry) in shards.iter().flat_map(|shard| shard.results.iter()) {
1063+
if Q::cache_on_disk(tcx, key.clone(), Some(&entry.value)) {
1064+
let dep_node = SerializedDepNodeIndex::new(entry.index.index());
10661065

1067-
// Record position of the cache entry.
1068-
query_result_index.push((dep_node, AbsoluteBytePos::new(encoder.position())));
1066+
// Record position of the cache entry.
1067+
query_result_index.push((dep_node, AbsoluteBytePos::new(encoder.position())));
10691068

1070-
// Encode the type check tables with the `SerializedDepNodeIndex`
1071-
// as tag.
1072-
encoder.encode_tagged(dep_node, &entry.value)?;
1073-
}
1069+
// Encode the type check tables with the `SerializedDepNodeIndex`
1070+
// as tag.
1071+
encoder.encode_tagged(dep_node, &entry.value)?;
10741072
}
1073+
}
10751074

1076-
Ok(())
1077-
})
1075+
Ok(())
10781076
}

‎src/librustc/util/common.rs

-133
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22

33
use rustc_data_structures::sync::Lock;
44

5-
use std::cell::Cell;
65
use std::fmt::Debug;
76
use std::time::{Duration, Instant};
87

9-
use crate::session::Session;
108
use rustc_span::symbol::{sym, Symbol};
119

1210
#[cfg(test)]
@@ -17,85 +15,6 @@ pub const FN_OUTPUT_NAME: Symbol = sym::Output;
1715

1816
pub use errors::ErrorReported;
1917

20-
thread_local!(static TIME_DEPTH: Cell<usize> = Cell::new(0));
21-
22-
#[allow(nonstandard_style)]
23-
#[derive(Clone, Debug, PartialEq, Eq)]
24-
pub struct QueryMsg {
25-
pub query: &'static str,
26-
pub msg: Option<String>,
27-
}
28-
29-
/// Read the current depth of `time()` calls. This is used to
30-
/// encourage indentation across threads.
31-
pub fn time_depth() -> usize {
32-
TIME_DEPTH.with(|slot| slot.get())
33-
}
34-
35-
/// Sets the current depth of `time()` calls. The idea is to call
36-
/// `set_time_depth()` with the result from `time_depth()` in the
37-
/// parent thread.
38-
pub fn set_time_depth(depth: usize) {
39-
TIME_DEPTH.with(|slot| slot.set(depth));
40-
}
41-
42-
pub fn time<T, F>(sess: &Session, what: &str, f: F) -> T
43-
where
44-
F: FnOnce() -> T,
45-
{
46-
time_ext(sess.time_passes(), what, f)
47-
}
48-
49-
pub fn time_ext<T, F>(do_it: bool, what: &str, f: F) -> T
50-
where
51-
F: FnOnce() -> T,
52-
{
53-
if !do_it {
54-
return f();
55-
}
56-
57-
let old = TIME_DEPTH.with(|slot| {
58-
let r = slot.get();
59-
slot.set(r + 1);
60-
r
61-
});
62-
63-
let start = Instant::now();
64-
let rv = f();
65-
let dur = start.elapsed();
66-
67-
print_time_passes_entry(true, what, dur);
68-
69-
TIME_DEPTH.with(|slot| slot.set(old));
70-
71-
rv
72-
}
73-
74-
pub fn print_time_passes_entry(do_it: bool, what: &str, dur: Duration) {
75-
if !do_it {
76-
return;
77-
}
78-
79-
let indentation = TIME_DEPTH.with(|slot| slot.get());
80-
81-
let mem_string = match get_resident() {
82-
Some(n) => {
83-
let mb = n as f64 / 1_000_000.0;
84-
format!("; rss: {}MB", mb.round() as usize)
85-
}
86-
None => String::new(),
87-
};
88-
println!(
89-
"{}time: {}{}\t{}",
90-
" ".repeat(indentation),
91-
duration_to_secs_str(dur),
92-
mem_string,
93-
what
94-
);
95-
}
96-
97-
pub use rustc_session::utils::duration_to_secs_str;
98-
9918
pub fn to_readable_str(mut val: usize) -> String {
10019
let mut groups = vec![];
10120
loop {
@@ -128,58 +47,6 @@ where
12847
rv
12948
}
13049

131-
// Memory reporting
132-
#[cfg(unix)]
133-
fn get_resident() -> Option<usize> {
134-
use std::fs;
135-
136-
let field = 1;
137-
let contents = fs::read("/proc/self/statm").ok()?;
138-
let contents = String::from_utf8(contents).ok()?;
139-
let s = contents.split_whitespace().nth(field)?;
140-
let npages = s.parse::<usize>().ok()?;
141-
Some(npages * 4096)
142-
}
143-
144-
#[cfg(windows)]
145-
fn get_resident() -> Option<usize> {
146-
type BOOL = i32;
147-
type DWORD = u32;
148-
type HANDLE = *mut u8;
149-
use libc::size_t;
150-
use std::mem;
151-
#[repr(C)]
152-
#[allow(non_snake_case)]
153-
struct PROCESS_MEMORY_COUNTERS {
154-
cb: DWORD,
155-
PageFaultCount: DWORD,
156-
PeakWorkingSetSize: size_t,
157-
WorkingSetSize: size_t,
158-
QuotaPeakPagedPoolUsage: size_t,
159-
QuotaPagedPoolUsage: size_t,
160-
QuotaPeakNonPagedPoolUsage: size_t,
161-
QuotaNonPagedPoolUsage: size_t,
162-
PagefileUsage: size_t,
163-
PeakPagefileUsage: size_t,
164-
}
165-
type PPROCESS_MEMORY_COUNTERS = *mut PROCESS_MEMORY_COUNTERS;
166-
#[link(name = "psapi")]
167-
extern "system" {
168-
fn GetCurrentProcess() -> HANDLE;
169-
fn GetProcessMemoryInfo(
170-
Process: HANDLE,
171-
ppsmemCounters: PPROCESS_MEMORY_COUNTERS,
172-
cb: DWORD,
173-
) -> BOOL;
174-
}
175-
let mut pmc: PROCESS_MEMORY_COUNTERS = unsafe { mem::zeroed() };
176-
pmc.cb = mem::size_of_val(&pmc) as DWORD;
177-
match unsafe { GetProcessMemoryInfo(GetCurrentProcess(), &mut pmc, pmc.cb) } {
178-
0 => None,
179-
_ => Some(pmc.WorkingSetSize as usize),
180-
}
181-
}
182-
18350
pub fn indent<R, F>(op: F) -> R
18451
where
18552
R: Debug,

‎src/librustc_codegen_llvm/back/lto.rs

+5-7
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ use rustc::dep_graph::WorkProduct;
1111
use rustc::hir::def_id::LOCAL_CRATE;
1212
use rustc::middle::exported_symbols::SymbolExportLevel;
1313
use rustc::session::config::{self, Lto};
14-
use rustc::util::common::time_ext;
1514
use rustc_codegen_ssa::back::lto::{LtoModuleCodegen, SerializedModule, ThinModule, ThinShared};
1615
use rustc_codegen_ssa::back::symbol_export;
1716
use rustc_codegen_ssa::back::write::{CodegenContext, FatLTOInput, ModuleConfig};
@@ -121,7 +120,7 @@ fn prepare_lto(
121120
info!("adding bytecode {}", name);
122121
let bc_encoded = data.data();
123122

124-
let (bc, id) = time_ext(cgcx.time_passes, &format!("decode {}", name), || {
123+
let (bc, id) = cgcx.prof.generic_pass(&format!("decode {}", name)).run(|| {
125124
match DecodedBytecode::new(bc_encoded) {
126125
Ok(b) => Ok((b.bytecode(), b.identifier().to_string())),
127126
Err(e) => Err(diag_handler.fatal(&e)),
@@ -281,9 +280,8 @@ fn fat_lto(
281280
// save and persist everything with the original module.
282281
let mut linker = Linker::new(llmod);
283282
for (bc_decoded, name) in serialized_modules {
284-
let _timer = cgcx.prof.generic_activity("LLVM_fat_lto_link_module");
285283
info!("linking {:?}", name);
286-
time_ext(cgcx.time_passes, &format!("ll link {:?}", name), || {
284+
cgcx.prof.generic_pass(&format!("ll link {:?}", name)).run(|| {
287285
let data = bc_decoded.data();
288286
linker.add(&data).map_err(|()| {
289287
let msg = format!("failed to load bc of {:?}", name);
@@ -634,9 +632,9 @@ pub(crate) fn run_pass_manager(
634632
llvm::LLVMRustAddPass(pm, pass.unwrap());
635633
}
636634

637-
time_ext(cgcx.time_passes, "LTO passes", || {
638-
llvm::LLVMRunPassManager(pm, module.module_llvm.llmod())
639-
});
635+
cgcx.prof
636+
.generic_pass("LTO passes")
637+
.run(|| llvm::LLVMRunPassManager(pm, module.module_llvm.llmod()));
640638

641639
llvm::LLVMDisposePassManager(pm);
642640
}

0 commit comments

Comments
 (0)