mirror of
https://github.com/sharkdp/hyperfine.git
synced 2026-11-01 08:50:19 +00:00
Make stddev fields optional, hide "± σ" for 1 run
This commit is contained in:
David Peter authored and David Peter committed
1 parent
bffd476128
commit
abd0d335ab
7 files changed
+106
-79
No files matched your search
+22
-22
@@ -60,7 +60,7 @@ fn table_row(entry: &BenchmarkResult, unit: Unit) -> Vec<u8> {
|
||||
| {}…{}\n",
|
||||
entry.command.replace("|", "\\|"),
|
||||
form(entry.mean).0,
|
||||
form(entry.stddev).0,
|
||||
entry.stddev.map(|s| form(s).0).unwrap_or("?".into()),
|
||||
form(entry.min).0,
|
||||
form(entry.max).0
|
||||
)
|
||||
@@ -84,14 +84,14 @@ fn test_asciidoc_header() {
|
||||
fn test_asciidoc_table_row() {
|
||||
use std::collections::BTreeMap;
|
||||
let result = BenchmarkResult::new(
|
||||
String::from("sleep 1"), // command
|
||||
0.10491992406666667, // mean
|
||||
0.00397851689425097, // stddev
|
||||
0.10491992406666667, // median
|
||||
0.005182013333333333, // user
|
||||
0.0, // system
|
||||
0.1003342584, // min
|
||||
0.10745223440000001, // max
|
||||
String::from("sleep 1"), // command
|
||||
0.10491992406666667, // mean
|
||||
Some(0.00397851689425097), // stddev
|
||||
0.10491992406666667, // median
|
||||
0.005182013333333333, // user
|
||||
0.0, // system
|
||||
0.1003342584, // min
|
||||
0.10745223440000001, // max
|
||||
vec![
|
||||
// times
|
||||
0.1003342584,
|
||||
@@ -108,7 +108,7 @@ fn test_asciidoc_table_row() {
|
||||
| {}…{}\n",
|
||||
result.command,
|
||||
Unit::MilliSecond.format(result.mean),
|
||||
Unit::MilliSecond.format(result.stddev),
|
||||
Unit::MilliSecond.format(result.stddev.unwrap()),
|
||||
Unit::MilliSecond.format(result.min),
|
||||
Unit::MilliSecond.format(result.max)
|
||||
)
|
||||
@@ -119,7 +119,7 @@ fn test_asciidoc_table_row() {
|
||||
| {}…{}\n",
|
||||
result.command,
|
||||
Unit::Second.format(result.mean),
|
||||
Unit::Second.format(result.stddev),
|
||||
Unit::Second.format(result.stddev.unwrap()),
|
||||
Unit::Second.format(result.min),
|
||||
Unit::Second.format(result.max)
|
||||
)
|
||||
@@ -137,14 +137,14 @@ fn test_asciidoc_table_row() {
|
||||
fn test_asciidoc_table_row_command_escape() {
|
||||
use std::collections::BTreeMap;
|
||||
let result = BenchmarkResult::new(
|
||||
String::from("sleep 1|"), // command
|
||||
0.10491992406666667, // mean
|
||||
0.00397851689425097, // stddev
|
||||
0.10491992406666667, // median
|
||||
0.005182013333333333, // user
|
||||
0.0, // system
|
||||
0.1003342584, // min
|
||||
0.10745223440000001, // max
|
||||
String::from("sleep 1|"), // command
|
||||
0.10491992406666667, // mean
|
||||
Some(0.00397851689425097), // stddev
|
||||
0.10491992406666667, // median
|
||||
0.005182013333333333, // user
|
||||
0.0, // system
|
||||
0.1003342584, // min
|
||||
0.10745223440000001, // max
|
||||
vec![
|
||||
// times
|
||||
0.1003342584,
|
||||
@@ -159,7 +159,7 @@ fn test_asciidoc_table_row_command_escape() {
|
||||
| {} ± {}\n\
|
||||
| {}…{}\n",
|
||||
Unit::Second.format(result.mean),
|
||||
Unit::Second.format(result.stddev),
|
||||
Unit::Second.format(result.stddev.unwrap()),
|
||||
Unit::Second.format(result.min),
|
||||
Unit::Second.format(result.max)
|
||||
)
|
||||
@@ -179,7 +179,7 @@ fn test_asciidoc() {
|
||||
BenchmarkResult::new(
|
||||
String::from("FOO=1 BAR=2 command | 1"),
|
||||
1.0,
|
||||
2.0,
|
||||
Some(2.0),
|
||||
1.0,
|
||||
3.0,
|
||||
4.0,
|
||||
@@ -197,7 +197,7 @@ fn test_asciidoc() {
|
||||
BenchmarkResult::new(
|
||||
String::from("FOO=1 BAR=7 command | 2"),
|
||||
11.0,
|
||||
12.0,
|
||||
Some(12.0),
|
||||
11.0,
|
||||
13.0,
|
||||
14.0,
|
||||
|
||||
+9
-3
@@ -33,7 +33,13 @@ impl Exporter for CsvExporter {
|
||||
for res in results {
|
||||
let mut fields = vec![Cow::Borrowed(res.command.as_bytes())];
|
||||
for f in &[
|
||||
res.mean, res.stddev, res.median, res.user, res.system, res.min, res.max,
|
||||
res.mean,
|
||||
res.stddev.unwrap_or(0.0),
|
||||
res.median,
|
||||
res.user,
|
||||
res.system,
|
||||
res.min,
|
||||
res.max,
|
||||
] {
|
||||
fields.push(Cow::Owned(f.to_string().into_bytes()))
|
||||
}
|
||||
@@ -59,7 +65,7 @@ fn test_csv() {
|
||||
BenchmarkResult::new(
|
||||
String::from("FOO=one BAR=two command | 1"),
|
||||
1.0,
|
||||
2.0,
|
||||
Some(2.0),
|
||||
1.0,
|
||||
3.0,
|
||||
4.0,
|
||||
@@ -77,7 +83,7 @@ fn test_csv() {
|
||||
BenchmarkResult::new(
|
||||
String::from("FOO=one BAR=seven command | 2"),
|
||||
11.0,
|
||||
12.0,
|
||||
Some(12.0),
|
||||
11.0,
|
||||
13.0,
|
||||
14.0,
|
||||
|
||||
+19
-11
@@ -53,19 +53,27 @@ fn start_table(unit: Unit) -> Vec<u8> {
|
||||
fn add_table_row(dest: &mut Vec<u8>, entry: &BenchmarkResultWithRelativeSpeed, unit: Unit) {
|
||||
let result = &entry.result;
|
||||
let mean_str = format_duration_value(result.mean, Some(unit)).0;
|
||||
let stddev_str = format_duration_value(result.stddev, Some(unit)).0;
|
||||
let stddev_str = if let Some(stddev) = result.stddev {
|
||||
format!(" ± {}", format_duration_value(stddev, Some(unit)).0)
|
||||
} else {
|
||||
"".into()
|
||||
};
|
||||
let min_str = format_duration_value(result.min, Some(unit)).0;
|
||||
let max_str = format_duration_value(result.max, Some(unit)).0;
|
||||
let rel_str = format!("{:.2}", entry.relative_speed);
|
||||
let rel_stddev_str = if entry.is_fastest {
|
||||
"".into()
|
||||
} else {
|
||||
format!(" ± {:.2}", entry.relative_speed_stddev)
|
||||
if let Some(stddev) = entry.relative_speed_stddev {
|
||||
format!(" ± {:.2}", stddev)
|
||||
} else {
|
||||
"".into()
|
||||
}
|
||||
};
|
||||
|
||||
dest.extend(
|
||||
format!(
|
||||
"| `{command}` | {mean} ± {stddev} | {min} | {max} | {rel}{rel_stddev} |\n",
|
||||
"| `{command}` | {mean}{stddev} | {min} | {max} | {rel}{rel_stddev} |\n",
|
||||
command = result.command.replace("|", "\\|"),
|
||||
mean = mean_str,
|
||||
stddev = stddev_str,
|
||||
@@ -93,7 +101,7 @@ fn test_markdown_format_ms() {
|
||||
BenchmarkResult::new(
|
||||
String::from("sleep 0.1"),
|
||||
0.1057, // mean
|
||||
0.0016, // std dev
|
||||
Some(0.0016), // std dev
|
||||
0.1057, // median
|
||||
0.0009, // user_mean
|
||||
0.0011, // system_mean
|
||||
@@ -106,7 +114,7 @@ fn test_markdown_format_ms() {
|
||||
BenchmarkResult::new(
|
||||
String::from("sleep 2"),
|
||||
2.0050, // mean
|
||||
0.0020, // std dev
|
||||
Some(0.0020), // std dev
|
||||
2.0050, // median
|
||||
0.0009, // user_mean
|
||||
0.0012, // system_mean
|
||||
@@ -142,7 +150,7 @@ fn test_markdown_format_s() {
|
||||
BenchmarkResult::new(
|
||||
String::from("sleep 2"),
|
||||
2.0050, // mean
|
||||
0.0020, // std dev
|
||||
Some(0.0020), // std dev
|
||||
2.0050, // median
|
||||
0.0009, // user_mean
|
||||
0.0012, // system_mean
|
||||
@@ -155,7 +163,7 @@ fn test_markdown_format_s() {
|
||||
BenchmarkResult::new(
|
||||
String::from("sleep 0.1"),
|
||||
0.1057, // mean
|
||||
0.0016, // std dev
|
||||
Some(0.0016), // std dev
|
||||
0.1057, // median
|
||||
0.0009, // user_mean
|
||||
0.0011, // system_mean
|
||||
@@ -190,7 +198,7 @@ fn test_markdown_format_time_unit_s() {
|
||||
BenchmarkResult::new(
|
||||
String::from("sleep 0.1"),
|
||||
0.1057, // mean
|
||||
0.0016, // std dev
|
||||
Some(0.0016), // std dev
|
||||
0.1057, // median
|
||||
0.0009, // user_mean
|
||||
0.0011, // system_mean
|
||||
@@ -203,7 +211,7 @@ fn test_markdown_format_time_unit_s() {
|
||||
BenchmarkResult::new(
|
||||
String::from("sleep 2"),
|
||||
2.0050, // mean
|
||||
0.0020, // std dev
|
||||
Some(0.0020), // std dev
|
||||
2.0050, // median
|
||||
0.0009, // user_mean
|
||||
0.0012, // system_mean
|
||||
@@ -244,7 +252,7 @@ fn test_markdown_format_time_unit_ms() {
|
||||
BenchmarkResult::new(
|
||||
String::from("sleep 2"),
|
||||
2.0050, // mean
|
||||
0.0020, // std dev
|
||||
Some(0.0020), // std dev
|
||||
2.0050, // median
|
||||
0.0009, // user_mean
|
||||
0.0012, // system_mean
|
||||
@@ -257,7 +265,7 @@ fn test_markdown_format_time_unit_ms() {
|
||||
BenchmarkResult::new(
|
||||
String::from("sleep 0.1"),
|
||||
0.1057, // mean
|
||||
0.0016, // std dev
|
||||
Some(0.0016), // std dev
|
||||
0.1057, // median
|
||||
0.0009, // user_mean
|
||||
0.0011, // system_mean
|
||||
|
||||
Reference in new issue
Block a user