Skip to content

Commit

Permalink
remove criterion-papi dependency for macos (tikv#5675)
Browse files Browse the repository at this point in the history
  • Loading branch information
YangKeao authored and zhangjinpeng87 committed Oct 19, 2019
1 parent 1ab088e commit f8c55cf
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 16 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@ rev = "7dd3d42f0c21384950afe6a46ed85352acf71625"
# See https://bheisler.github.io/criterion.rs/book/user_guide/known_limitations.html for the usage
# of `real_blackbox` feature.
criterion = "0.3"
criterion-papi = "0.1"
criterion-cpu-time = "0.1"
arrow = "0.10.0"
rand_xorshift = "0.1"
Expand All @@ -166,6 +165,7 @@ signal = "0.6"

[target.'cfg(target_os = "linux")'.dependencies]
procinfo = { git = "https://github.com/tikv/procinfo-rs" }
criterion-papi = "0.1"

[workspace]
members = [
Expand Down
51 changes: 38 additions & 13 deletions benches/coprocessor_executors/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,44 @@ fn execute<M: criterion::measurement::Measurement + 'static>(c: &mut criterion::
c.final_summary();
}

#[cfg(target_os = "linux")]
fn run_bench(measurement: &str) {
match measurement {
"TOT_INS" => {
let mut c = criterion::Criterion::default()
.with_measurement(criterion_papi::PapiMeasurement::new("PAPI_TOT_INS"))
.configure_from_args();
execute(&mut c);
}
"CPU_TIME" => {
let mut c = criterion::Criterion::default()
.with_measurement(criterion_cpu_time::PosixTime::UserTime)
.configure_from_args();
execute(&mut c);
}
_ => {
panic!("unknown measurement");
}
}
}

#[cfg(not(target_os = "linux"))]
fn run_bench(measurement: &str) {
match measurement {
"CPU_TIME" => {
let mut c = criterion::Criterion::default()
.with_measurement(criterion_cpu_time::PosixTime::UserTime)
.configure_from_args();
execute(&mut c);
}
_ => {
panic!("unknown measurement");
}
}
}

fn main() {
let measurement = std::env::var("MEASUREMENT").unwrap_or_else(|_| String::from("CPU_TIME"));
if &measurement == "TOT_INS" {
let mut c = criterion::Criterion::default()
.with_measurement(criterion_papi::PapiMeasurement::new("PAPI_TOT_INS"))
.configure_from_args();
execute(&mut c);
} else if &measurement == "CPU_TIME" {
let mut c = criterion::Criterion::default()
.with_measurement(criterion_cpu_time::PosixTime::UserTime)
.configure_from_args();
execute(&mut c);
} else {
panic!("unknown measurement");
};

run_bench(&measurement);
}

0 comments on commit f8c55cf

Please sign in to comment.