Skip to content

Commit

Permalink
Rollup merge of rust-lang#76958 - est31:ns, r=oli-obk
Browse files Browse the repository at this point in the history
Replace manual as_nanos and as_secs_f64 reimplementations
  • Loading branch information
RalfJung authored Sep 21, 2020
2 parents 1f8ee01 + 43193dc commit fe325cc
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 10 deletions.
2 changes: 1 addition & 1 deletion compiler/rustc_codegen_llvm/src/base.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ pub fn compile_codegen_unit(

// We assume that the cost to run LLVM on a CGU is proportional to
// the time we needed for codegenning it.
let cost = time_to_codegen.as_secs() * 1_000_000_000 + time_to_codegen.subsec_nanos() as u64;
let cost = time_to_codegen.as_nanos() as u64;

fn module_codegen(tcx: TyCtxt<'_>, cgu_name: Symbol) -> ModuleCodegen<ModuleLlvm> {
let cgu = tcx.codegen_unit(cgu_name);
Expand Down
5 changes: 1 addition & 4 deletions compiler/rustc_data_structures/src/profiling.rs
Original file line number Diff line number Diff line change
Expand Up @@ -600,10 +600,7 @@ pub fn print_time_passes_entry(do_it: bool, what: &str, dur: Duration) {
// Hack up our own formatting for the duration to make it easier for scripts
// to parse (always use the same number of decimal places and the same unit).
pub fn duration_to_secs_str(dur: std::time::Duration) -> String {
const NANOS_PER_SEC: f64 = 1_000_000_000.0;
let secs = dur.as_secs() as f64 + dur.subsec_nanos() as f64 / NANOS_PER_SEC;

format!("{:.3}", secs)
format!("{:.3}", dur.as_secs_f64())
}

// Memory reporting
Expand Down
6 changes: 1 addition & 5 deletions library/test/src/bench.rs
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,6 @@ fn fmt_thousands_sep(mut n: usize, sep: char) -> String {
output
}

fn ns_from_dur(dur: Duration) -> u64 {
dur.as_secs() * 1_000_000_000 + (dur.subsec_nanos() as u64)
}

fn ns_iter_inner<T, F>(inner: &mut F, k: u64) -> u64
where
F: FnMut() -> T,
Expand All @@ -110,7 +106,7 @@ where
for _ in 0..k {
black_box(inner());
}
ns_from_dur(start.elapsed())
start.elapsed().as_nanos() as u64
}

pub fn iter<T, F>(inner: &mut F) -> stats::Summary
Expand Down

0 comments on commit fe325cc

Please sign in to comment.