2024-01-01 14:58:21 -05:00
|
|
|
// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
|
2023-07-28 11:27:10 -04:00
|
|
|
|
|
|
|
use crate::args::BenchFlags;
|
|
|
|
use crate::args::Flags;
|
|
|
|
use crate::colors;
|
|
|
|
use crate::display::write_json_to_stdout;
|
|
|
|
use crate::factory::CliFactory;
|
|
|
|
use crate::graph_util::has_graph_root_local_dependent_changed;
|
|
|
|
use crate::ops;
|
|
|
|
use crate::tools::test::format_test_error;
|
|
|
|
use crate::tools::test::TestFilter;
|
|
|
|
use crate::util::file_watcher;
|
|
|
|
use crate::util::fs::collect_specifiers;
|
2023-09-17 02:50:30 -04:00
|
|
|
use crate::util::path::is_script_ext;
|
2024-03-07 20:16:32 -05:00
|
|
|
use crate::util::path::matches_pattern_or_exact_path;
|
2023-07-28 11:27:10 -04:00
|
|
|
use crate::worker::CliMainWorkerFactory;
|
|
|
|
|
2024-07-05 17:53:09 -04:00
|
|
|
use deno_config::glob::WalkEntry;
|
2023-07-28 11:27:10 -04:00
|
|
|
use deno_core::error::generic_error;
|
|
|
|
use deno_core::error::AnyError;
|
|
|
|
use deno_core::error::JsError;
|
|
|
|
use deno_core::futures::future;
|
|
|
|
use deno_core::futures::stream;
|
|
|
|
use deno_core::futures::StreamExt;
|
|
|
|
use deno_core::serde_v8;
|
2023-08-23 19:03:05 -04:00
|
|
|
use deno_core::unsync::spawn;
|
|
|
|
use deno_core::unsync::spawn_blocking;
|
2023-07-28 11:27:10 -04:00
|
|
|
use deno_core::v8;
|
|
|
|
use deno_core::ModuleSpecifier;
|
2023-12-13 10:07:26 -05:00
|
|
|
use deno_core::PollEventLoopOptions;
|
2024-06-06 23:37:53 -04:00
|
|
|
use deno_runtime::deno_permissions::Permissions;
|
|
|
|
use deno_runtime::deno_permissions::PermissionsContainer;
|
2024-09-16 16:39:37 -04:00
|
|
|
use deno_runtime::permissions::RuntimePermissionDescriptorParser;
|
2023-07-28 11:27:10 -04:00
|
|
|
use deno_runtime::tokio_util::create_and_run_current_thread;
|
2024-04-24 15:45:49 -04:00
|
|
|
use deno_runtime::WorkerExecutionMode;
|
2023-07-28 11:27:10 -04:00
|
|
|
use indexmap::IndexMap;
|
|
|
|
use indexmap::IndexSet;
|
|
|
|
use log::Level;
|
|
|
|
use serde::Deserialize;
|
|
|
|
use serde::Serialize;
|
|
|
|
use std::collections::HashSet;
|
|
|
|
use std::path::Path;
|
|
|
|
use std::sync::Arc;
|
2023-12-05 11:26:06 -05:00
|
|
|
use std::time::Duration;
|
2023-07-28 11:27:10 -04:00
|
|
|
use tokio::sync::mpsc::unbounded_channel;
|
|
|
|
use tokio::sync::mpsc::UnboundedSender;
|
|
|
|
|
|
|
|
mod mitata;
|
|
|
|
mod reporters;
|
|
|
|
|
|
|
|
use reporters::BenchReporter;
|
|
|
|
use reporters::ConsoleReporter;
|
|
|
|
use reporters::JsonReporter;
|
|
|
|
|
|
|
|
#[derive(Debug, Clone)]
|
|
|
|
struct BenchSpecifierOptions {
|
|
|
|
filter: TestFilter,
|
|
|
|
json: bool,
|
|
|
|
log_level: Option<log::Level>,
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Debug, Clone, Eq, PartialEq, Deserialize)]
|
|
|
|
#[serde(rename_all = "camelCase")]
|
|
|
|
pub struct BenchPlan {
|
|
|
|
pub total: usize,
|
|
|
|
pub origin: String,
|
|
|
|
pub used_only: bool,
|
|
|
|
pub names: Vec<String>,
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Debug, Clone, Deserialize)]
|
|
|
|
#[serde(rename_all = "camelCase")]
|
|
|
|
pub enum BenchEvent {
|
|
|
|
Plan(BenchPlan),
|
|
|
|
Output(String),
|
|
|
|
Register(BenchDescription),
|
|
|
|
Wait(usize),
|
|
|
|
Result(usize, BenchResult),
|
2023-12-05 11:26:06 -05:00
|
|
|
UncaughtError(String, Box<JsError>),
|
2023-07-28 11:27:10 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Debug, Clone, Deserialize, Serialize)]
|
|
|
|
#[serde(rename_all = "camelCase")]
|
|
|
|
pub enum BenchResult {
|
|
|
|
Ok(BenchStats),
|
|
|
|
Failed(Box<JsError>),
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Debug, Clone)]
|
|
|
|
pub struct BenchReport {
|
|
|
|
pub total: usize,
|
|
|
|
pub failed: usize,
|
|
|
|
pub failures: Vec<(BenchDescription, Box<JsError>)>,
|
|
|
|
pub measurements: Vec<(BenchDescription, BenchStats)>,
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Debug, Clone, PartialEq, Deserialize, Eq, Hash)]
|
|
|
|
pub struct BenchDescription {
|
|
|
|
pub id: usize,
|
|
|
|
pub name: String,
|
|
|
|
pub origin: String,
|
|
|
|
pub baseline: bool,
|
|
|
|
pub group: Option<String>,
|
|
|
|
pub ignore: bool,
|
|
|
|
pub only: bool,
|
|
|
|
pub warmup: bool,
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
fix(bench): explicit timers don't force high precision measurements (#20272)
Disables `BenchContext::start()` and `BenchContext::end()` for low
precision benchmarks (less than 0.01s per iteration). Prints a warning
when they are used in such benchmarks, suggesting to remove them.
```ts
Deno.bench("noop", { group: "noops" }, () => {});
Deno.bench("noop with start/end", { group: "noops" }, (b) => {
b.start();
b.end();
});
```
Before:
```
cpu: 12th Gen Intel(R) Core(TM) i9-12900K
runtime: deno 1.36.2 (x86_64-unknown-linux-gnu)
file:///home/nayeem/projects/deno/temp3.ts
benchmark time (avg) iter/s (min … max) p75 p99 p995
----------------------------------------------------------------------------- -----------------------------
noop 2.63 ns/iter 380,674,131.4 (2.45 ns … 27.78 ns) 2.55 ns 4.03 ns 5.33 ns
noop with start and end 302.47 ns/iter 3,306,146.0 (200 ns … 151.2 µs) 300 ns 400 ns 400 ns
summary
noop
115.14x faster than noop with start and end
```
After:
```
cpu: 12th Gen Intel(R) Core(TM) i9-12900K
runtime: deno 1.36.1 (x86_64-unknown-linux-gnu)
file:///home/nayeem/projects/deno/temp3.ts
benchmark time (avg) iter/s (min … max) p75 p99 p995
----------------------------------------------------------------------------- -----------------------------
noop 3.01 ns/iter 332,565,561.7 (2.73 ns … 29.54 ns) 2.93 ns 5.29 ns 7.45 ns
noop with start and end 7.73 ns/iter 129,291,091.5 (6.61 ns … 46.76 ns) 7.87 ns 13.12 ns 15.32 ns
Warning start() and end() calls in "noop with start and end" are ignored because it averages less than 0.01s per iteration. Remove them for better results.
summary
noop
2.57x faster than noop with start and end
```
2023-08-26 05:29:45 -04:00
|
|
|
#[serde(rename_all = "camelCase")]
|
2023-07-28 11:27:10 -04:00
|
|
|
pub struct BenchStats {
|
|
|
|
pub n: u64,
|
|
|
|
pub min: f64,
|
|
|
|
pub max: f64,
|
|
|
|
pub avg: f64,
|
|
|
|
pub p75: f64,
|
|
|
|
pub p99: f64,
|
|
|
|
pub p995: f64,
|
|
|
|
pub p999: f64,
|
fix(bench): explicit timers don't force high precision measurements (#20272)
Disables `BenchContext::start()` and `BenchContext::end()` for low
precision benchmarks (less than 0.01s per iteration). Prints a warning
when they are used in such benchmarks, suggesting to remove them.
```ts
Deno.bench("noop", { group: "noops" }, () => {});
Deno.bench("noop with start/end", { group: "noops" }, (b) => {
b.start();
b.end();
});
```
Before:
```
cpu: 12th Gen Intel(R) Core(TM) i9-12900K
runtime: deno 1.36.2 (x86_64-unknown-linux-gnu)
file:///home/nayeem/projects/deno/temp3.ts
benchmark time (avg) iter/s (min … max) p75 p99 p995
----------------------------------------------------------------------------- -----------------------------
noop 2.63 ns/iter 380,674,131.4 (2.45 ns … 27.78 ns) 2.55 ns 4.03 ns 5.33 ns
noop with start and end 302.47 ns/iter 3,306,146.0 (200 ns … 151.2 µs) 300 ns 400 ns 400 ns
summary
noop
115.14x faster than noop with start and end
```
After:
```
cpu: 12th Gen Intel(R) Core(TM) i9-12900K
runtime: deno 1.36.1 (x86_64-unknown-linux-gnu)
file:///home/nayeem/projects/deno/temp3.ts
benchmark time (avg) iter/s (min … max) p75 p99 p995
----------------------------------------------------------------------------- -----------------------------
noop 3.01 ns/iter 332,565,561.7 (2.73 ns … 29.54 ns) 2.93 ns 5.29 ns 7.45 ns
noop with start and end 7.73 ns/iter 129,291,091.5 (6.61 ns … 46.76 ns) 7.87 ns 13.12 ns 15.32 ns
Warning start() and end() calls in "noop with start and end" are ignored because it averages less than 0.01s per iteration. Remove them for better results.
summary
noop
2.57x faster than noop with start and end
```
2023-08-26 05:29:45 -04:00
|
|
|
pub high_precision: bool,
|
|
|
|
pub used_explicit_timers: bool,
|
2023-07-28 11:27:10 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
impl BenchReport {
|
|
|
|
pub fn new() -> Self {
|
|
|
|
Self {
|
|
|
|
total: 0,
|
|
|
|
failed: 0,
|
|
|
|
failures: Vec::new(),
|
|
|
|
measurements: Vec::new(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn create_reporter(
|
|
|
|
show_output: bool,
|
|
|
|
json: bool,
|
|
|
|
) -> Box<dyn BenchReporter + Send> {
|
|
|
|
if json {
|
|
|
|
return Box::new(JsonReporter::new());
|
|
|
|
}
|
|
|
|
Box::new(ConsoleReporter::new(show_output))
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Run a single specifier as an executable bench module.
|
|
|
|
async fn bench_specifier(
|
|
|
|
worker_factory: Arc<CliMainWorkerFactory>,
|
2024-09-16 16:39:37 -04:00
|
|
|
permissions_container: PermissionsContainer,
|
2023-07-28 11:27:10 -04:00
|
|
|
specifier: ModuleSpecifier,
|
|
|
|
sender: UnboundedSender<BenchEvent>,
|
|
|
|
filter: TestFilter,
|
2023-12-05 11:26:06 -05:00
|
|
|
) -> Result<(), AnyError> {
|
|
|
|
match bench_specifier_inner(
|
|
|
|
worker_factory,
|
2024-09-16 16:39:37 -04:00
|
|
|
permissions_container,
|
2023-12-05 11:26:06 -05:00
|
|
|
specifier.clone(),
|
|
|
|
&sender,
|
|
|
|
filter,
|
|
|
|
)
|
|
|
|
.await
|
|
|
|
{
|
|
|
|
Ok(()) => Ok(()),
|
|
|
|
Err(error) => {
|
|
|
|
if error.is::<JsError>() {
|
|
|
|
sender.send(BenchEvent::UncaughtError(
|
|
|
|
specifier.to_string(),
|
|
|
|
Box::new(error.downcast::<JsError>().unwrap()),
|
|
|
|
))?;
|
|
|
|
Ok(())
|
|
|
|
} else {
|
|
|
|
Err(error)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Run a single specifier as an executable bench module.
|
|
|
|
async fn bench_specifier_inner(
|
|
|
|
worker_factory: Arc<CliMainWorkerFactory>,
|
2024-09-16 16:39:37 -04:00
|
|
|
permissions_container: PermissionsContainer,
|
2023-12-05 11:26:06 -05:00
|
|
|
specifier: ModuleSpecifier,
|
|
|
|
sender: &UnboundedSender<BenchEvent>,
|
|
|
|
filter: TestFilter,
|
2023-07-28 11:27:10 -04:00
|
|
|
) -> Result<(), AnyError> {
|
|
|
|
let mut worker = worker_factory
|
|
|
|
.create_custom_worker(
|
2024-04-24 15:45:49 -04:00
|
|
|
WorkerExecutionMode::Bench,
|
2023-07-28 11:27:10 -04:00
|
|
|
specifier.clone(),
|
2024-09-16 16:39:37 -04:00
|
|
|
permissions_container,
|
2023-07-28 11:27:10 -04:00
|
|
|
vec![ops::bench::deno_bench::init_ops(sender.clone())],
|
|
|
|
Default::default(),
|
|
|
|
)
|
|
|
|
.await?;
|
|
|
|
|
|
|
|
// We execute the main module as a side module so that import.meta.main is not set.
|
|
|
|
worker.execute_side_module_possibly_with_npm().await?;
|
|
|
|
|
|
|
|
let mut worker = worker.into_main_worker();
|
2023-12-05 11:26:06 -05:00
|
|
|
|
|
|
|
// Ensure that there are no pending exceptions before we start running tests
|
|
|
|
worker.run_up_to_duration(Duration::from_millis(0)).await?;
|
|
|
|
|
2024-04-15 14:08:33 -04:00
|
|
|
worker.dispatch_load_event()?;
|
2023-07-28 11:27:10 -04:00
|
|
|
|
|
|
|
let benchmarks = {
|
|
|
|
let state_rc = worker.js_runtime.op_state();
|
|
|
|
let mut state = state_rc.borrow_mut();
|
|
|
|
std::mem::take(&mut state.borrow_mut::<ops::bench::BenchContainer>().0)
|
|
|
|
};
|
|
|
|
let (only, no_only): (Vec<_>, Vec<_>) =
|
|
|
|
benchmarks.into_iter().partition(|(d, _)| d.only);
|
|
|
|
let used_only = !only.is_empty();
|
|
|
|
let benchmarks = if used_only { only } else { no_only };
|
|
|
|
let mut benchmarks = benchmarks
|
|
|
|
.into_iter()
|
fix(bench): Fix group header printing logic + don't filter out the warmup benchmark (#23083)
Fixes #23053.
Two small bugs here:
- the existing condition for printing out the group header was broken.
it worked in the reproducer (in the issue above) without filtering only
by accident, due to setting `self.has_ungrouped = true` once we see the
warmup bench. Knowing that we sort benchmarks to put ungrouped benches
first, there are only two cases: 1) we are starting the first group 2)
we are ending the previous group and starting a new group
- when you passed `--filter` we were applying that filter to the warmup
bench (which is not visible to users), so we suffered from jit bias if
you were filtering (unless your filter was `<warmup>`)
TLDR;
Running
```bash
deno bench main.js --filter="G"
```
```js
// main.js
Deno.bench({
group: "G1",
name: "G1-A",
fn() {},
});
Deno.bench({
group: "G1",
name: "G1-B",
fn() {},
});
```
Before this PR:
```
benchmark time (avg) iter/s (min … max) p75 p99 p995
--------------------------------------------------------------- -----------------------------
G1-A 303.52 ps/iter3,294,726,102.1 (254.2 ps … 7.8 ns) 287.5 ps 391.7 ps 437.5 ps
G1-B 3.8 ns/iter 263,360,635.9 (2.24 ns … 8.36 ns) 3.84 ns 4.73 ns 4.94 ns
summary
G1-A
12.51x faster than G1-B
```
After this PR:
```
benchmark time (avg) iter/s (min … max) p75 p99 p995
--------------------------------------------------------------- -----------------------------
group G1
G1-A 3.85 ns/iter 259,822,096.0 (2.42 ns … 9.03 ns) 3.83 ns 4.62 ns 4.83 ns
G1-B 3.84 ns/iter 260,458,274.5 (3.55 ns … 7.05 ns) 3.83 ns 4.45 ns 4.7 ns
summary
G1-B
1x faster than G1-A
```
2024-03-26 12:19:24 -04:00
|
|
|
.filter(|(d, _)| d.warmup || filter.includes(&d.name) && !d.ignore)
|
2023-07-28 11:27:10 -04:00
|
|
|
.collect::<Vec<_>>();
|
|
|
|
let mut groups = IndexSet::<Option<String>>::new();
|
|
|
|
// make sure ungrouped benchmarks are placed above grouped
|
|
|
|
groups.insert(None);
|
|
|
|
for (desc, _) in &benchmarks {
|
|
|
|
groups.insert(desc.group.clone());
|
|
|
|
}
|
|
|
|
benchmarks.sort_by(|(d1, _), (d2, _)| {
|
|
|
|
groups
|
|
|
|
.get_index_of(&d1.group)
|
|
|
|
.unwrap()
|
|
|
|
.partial_cmp(&groups.get_index_of(&d2.group).unwrap())
|
|
|
|
.unwrap()
|
|
|
|
});
|
|
|
|
sender.send(BenchEvent::Plan(BenchPlan {
|
|
|
|
origin: specifier.to_string(),
|
|
|
|
total: benchmarks.len(),
|
|
|
|
used_only,
|
|
|
|
names: benchmarks.iter().map(|(d, _)| d.name.clone()).collect(),
|
|
|
|
}))?;
|
|
|
|
for (desc, function) in benchmarks {
|
|
|
|
sender.send(BenchEvent::Wait(desc.id))?;
|
2023-12-13 10:07:26 -05:00
|
|
|
let call = worker.js_runtime.call(&function);
|
|
|
|
let result = worker
|
|
|
|
.js_runtime
|
|
|
|
.with_event_loop_promise(call, PollEventLoopOptions::default())
|
|
|
|
.await?;
|
2023-07-28 11:27:10 -04:00
|
|
|
let scope = &mut worker.js_runtime.handle_scope();
|
|
|
|
let result = v8::Local::new(scope, result);
|
|
|
|
let result = serde_v8::from_v8::<BenchResult>(scope, result)?;
|
|
|
|
sender.send(BenchEvent::Result(desc.id, result))?;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Ignore `defaultPrevented` of the `beforeunload` event. We don't allow the
|
|
|
|
// event loop to continue beyond what's needed to await results.
|
2024-04-15 14:08:33 -04:00
|
|
|
worker.dispatch_beforeunload_event()?;
|
2024-04-16 09:45:41 -04:00
|
|
|
worker.dispatch_process_beforeexit_event()?;
|
2024-04-15 14:08:33 -04:00
|
|
|
worker.dispatch_unload_event()?;
|
2024-04-16 09:45:41 -04:00
|
|
|
worker.dispatch_process_exit_event()?;
|
2023-12-05 11:26:06 -05:00
|
|
|
|
|
|
|
// Ensure the worker has settled so we can catch any remaining unhandled rejections. We don't
|
|
|
|
// want to wait forever here.
|
|
|
|
worker.run_up_to_duration(Duration::from_millis(0)).await?;
|
|
|
|
|
2023-07-28 11:27:10 -04:00
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Test a collection of specifiers with test modes concurrently.
|
|
|
|
async fn bench_specifiers(
|
|
|
|
worker_factory: Arc<CliMainWorkerFactory>,
|
|
|
|
permissions: &Permissions,
|
2024-09-16 16:39:37 -04:00
|
|
|
permissions_desc_parser: &Arc<RuntimePermissionDescriptorParser>,
|
2023-07-28 11:27:10 -04:00
|
|
|
specifiers: Vec<ModuleSpecifier>,
|
|
|
|
options: BenchSpecifierOptions,
|
|
|
|
) -> Result<(), AnyError> {
|
|
|
|
let (sender, mut receiver) = unbounded_channel::<BenchEvent>();
|
|
|
|
let log_level = options.log_level;
|
|
|
|
let option_for_handles = options.clone();
|
|
|
|
|
|
|
|
let join_handles = specifiers.into_iter().map(move |specifier| {
|
|
|
|
let worker_factory = worker_factory.clone();
|
2024-09-16 16:39:37 -04:00
|
|
|
let permissions_container = PermissionsContainer::new(
|
|
|
|
permissions_desc_parser.clone(),
|
|
|
|
permissions.clone(),
|
|
|
|
);
|
2023-07-28 11:27:10 -04:00
|
|
|
let sender = sender.clone();
|
|
|
|
let options = option_for_handles.clone();
|
|
|
|
spawn_blocking(move || {
|
|
|
|
let future = bench_specifier(
|
|
|
|
worker_factory,
|
2024-09-16 16:39:37 -04:00
|
|
|
permissions_container,
|
2023-07-28 11:27:10 -04:00
|
|
|
specifier,
|
|
|
|
sender,
|
|
|
|
options.filter,
|
|
|
|
);
|
|
|
|
create_and_run_current_thread(future)
|
|
|
|
})
|
|
|
|
});
|
|
|
|
|
|
|
|
let join_stream = stream::iter(join_handles)
|
|
|
|
.buffer_unordered(1)
|
|
|
|
.collect::<Vec<Result<Result<(), AnyError>, tokio::task::JoinError>>>();
|
|
|
|
|
|
|
|
let handler = {
|
|
|
|
spawn(async move {
|
|
|
|
let mut used_only = false;
|
|
|
|
let mut report = BenchReport::new();
|
|
|
|
let mut reporter =
|
|
|
|
create_reporter(log_level != Some(Level::Error), options.json);
|
|
|
|
let mut benches = IndexMap::new();
|
|
|
|
|
|
|
|
while let Some(event) = receiver.recv().await {
|
|
|
|
match event {
|
|
|
|
BenchEvent::Plan(plan) => {
|
|
|
|
report.total += plan.total;
|
|
|
|
if plan.used_only {
|
|
|
|
used_only = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
reporter.report_plan(&plan);
|
|
|
|
}
|
|
|
|
|
|
|
|
BenchEvent::Register(desc) => {
|
|
|
|
reporter.report_register(&desc);
|
|
|
|
benches.insert(desc.id, desc);
|
|
|
|
}
|
|
|
|
|
|
|
|
BenchEvent::Wait(id) => {
|
|
|
|
reporter.report_wait(benches.get(&id).unwrap());
|
|
|
|
}
|
|
|
|
|
|
|
|
BenchEvent::Output(output) => {
|
|
|
|
reporter.report_output(&output);
|
|
|
|
}
|
|
|
|
|
|
|
|
BenchEvent::Result(id, result) => {
|
|
|
|
let desc = benches.get(&id).unwrap();
|
|
|
|
reporter.report_result(desc, &result);
|
|
|
|
match result {
|
|
|
|
BenchResult::Ok(stats) => {
|
|
|
|
report.measurements.push((desc.clone(), stats));
|
|
|
|
}
|
|
|
|
|
|
|
|
BenchResult::Failed(failure) => {
|
|
|
|
report.failed += 1;
|
|
|
|
report.failures.push((desc.clone(), failure));
|
|
|
|
}
|
|
|
|
};
|
|
|
|
}
|
2023-12-05 11:26:06 -05:00
|
|
|
|
|
|
|
BenchEvent::UncaughtError(origin, error) => {
|
|
|
|
report.failed += 1;
|
|
|
|
reporter.report_uncaught_error(&origin, error);
|
|
|
|
}
|
2023-07-28 11:27:10 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
reporter.report_end(&report);
|
|
|
|
|
|
|
|
if used_only {
|
|
|
|
return Err(generic_error(
|
|
|
|
"Bench failed because the \"only\" option was used",
|
|
|
|
));
|
|
|
|
}
|
|
|
|
|
|
|
|
if report.failed > 0 {
|
|
|
|
return Err(generic_error("Bench failed"));
|
|
|
|
}
|
|
|
|
|
|
|
|
Ok(())
|
|
|
|
})
|
|
|
|
};
|
|
|
|
|
|
|
|
let (join_results, result) = future::join(join_stream, handler).await;
|
|
|
|
|
|
|
|
// propagate any errors
|
|
|
|
for join_result in join_results {
|
|
|
|
join_result??;
|
|
|
|
}
|
|
|
|
|
|
|
|
result??;
|
|
|
|
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Checks if the path has a basename and extension Deno supports for benches.
|
2024-03-07 20:16:32 -05:00
|
|
|
fn is_supported_bench_path(entry: WalkEntry) -> bool {
|
|
|
|
if !is_script_ext(entry.path) {
|
2024-01-08 12:18:42 -05:00
|
|
|
false
|
2024-03-07 20:16:32 -05:00
|
|
|
} else if has_supported_bench_path_name(entry.path) {
|
2024-01-08 12:18:42 -05:00
|
|
|
true
|
2024-03-07 20:16:32 -05:00
|
|
|
} else if let Some(include) = &entry.patterns.include {
|
2024-01-08 12:18:42 -05:00
|
|
|
// allow someone to explicitly specify a path
|
2024-03-07 20:16:32 -05:00
|
|
|
matches_pattern_or_exact_path(include, entry.path)
|
|
|
|
} else {
|
|
|
|
false
|
2024-01-08 12:18:42 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn has_supported_bench_path_name(path: &Path) -> bool {
|
2023-07-28 11:27:10 -04:00
|
|
|
if let Some(name) = path.file_stem() {
|
|
|
|
let basename = name.to_string_lossy();
|
2024-01-08 12:18:42 -05:00
|
|
|
basename.ends_with("_bench")
|
2023-07-28 11:27:10 -04:00
|
|
|
|| basename.ends_with(".bench")
|
2024-01-08 12:18:42 -05:00
|
|
|
|| basename == "bench"
|
2023-07-28 11:27:10 -04:00
|
|
|
} else {
|
|
|
|
false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub async fn run_benchmarks(
|
2024-07-23 19:00:48 -04:00
|
|
|
flags: Arc<Flags>,
|
2023-07-28 11:27:10 -04:00
|
|
|
bench_flags: BenchFlags,
|
|
|
|
) -> Result<(), AnyError> {
|
2024-07-23 19:00:48 -04:00
|
|
|
let factory = CliFactory::from_flags(flags);
|
|
|
|
let cli_options = factory.cli_options()?;
|
2024-07-03 20:54:33 -04:00
|
|
|
let workspace_bench_options =
|
|
|
|
cli_options.resolve_workspace_bench_options(&bench_flags);
|
2023-07-28 11:27:10 -04:00
|
|
|
// Various bench files should not share the same permissions in terms of
|
|
|
|
// `PermissionsContainer` - otherwise granting/revoking permissions in one
|
|
|
|
// file would have impact on other files, which is undesirable.
|
2024-09-16 16:39:37 -04:00
|
|
|
let permission_desc_parser = factory.permission_desc_parser()?.clone();
|
|
|
|
let permissions = Permissions::from_options(
|
|
|
|
permission_desc_parser.as_ref(),
|
|
|
|
&cli_options.permissions_options(),
|
|
|
|
)?;
|
2023-07-28 11:27:10 -04:00
|
|
|
|
2024-07-03 20:54:33 -04:00
|
|
|
let members_with_bench_options =
|
|
|
|
cli_options.resolve_bench_options_for_members(&bench_flags)?;
|
|
|
|
let specifiers = members_with_bench_options
|
|
|
|
.iter()
|
|
|
|
.map(|(_, bench_options)| {
|
|
|
|
collect_specifiers(
|
|
|
|
bench_options.files.clone(),
|
|
|
|
cli_options.vendor_dir_path().map(ToOwned::to_owned),
|
|
|
|
is_supported_bench_path,
|
|
|
|
)
|
|
|
|
})
|
|
|
|
.collect::<Result<Vec<_>, _>>()?
|
|
|
|
.into_iter()
|
|
|
|
.flatten()
|
|
|
|
.collect::<Vec<_>>();
|
2023-07-28 11:27:10 -04:00
|
|
|
|
|
|
|
if specifiers.is_empty() {
|
|
|
|
return Err(generic_error("No bench modules found"));
|
|
|
|
}
|
|
|
|
|
2024-05-16 03:09:35 -04:00
|
|
|
let main_graph_container = factory.main_module_graph_container().await?;
|
|
|
|
main_graph_container.check_specifiers(&specifiers).await?;
|
2023-07-28 11:27:10 -04:00
|
|
|
|
2024-07-03 20:54:33 -04:00
|
|
|
if workspace_bench_options.no_run {
|
2023-07-28 11:27:10 -04:00
|
|
|
return Ok(());
|
|
|
|
}
|
|
|
|
|
|
|
|
let log_level = cli_options.log_level();
|
|
|
|
let worker_factory =
|
|
|
|
Arc::new(factory.create_cli_main_worker_factory().await?);
|
|
|
|
bench_specifiers(
|
|
|
|
worker_factory,
|
|
|
|
&permissions,
|
2024-09-16 16:39:37 -04:00
|
|
|
&permission_desc_parser,
|
2023-07-28 11:27:10 -04:00
|
|
|
specifiers,
|
|
|
|
BenchSpecifierOptions {
|
2024-07-03 20:54:33 -04:00
|
|
|
filter: TestFilter::from_flag(&workspace_bench_options.filter),
|
|
|
|
json: workspace_bench_options.json,
|
2023-07-28 11:27:10 -04:00
|
|
|
log_level,
|
|
|
|
},
|
|
|
|
)
|
|
|
|
.await?;
|
|
|
|
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
|
|
|
// TODO(bartlomieju): heavy duplication of code with `cli/tools/test.rs`
|
|
|
|
pub async fn run_benchmarks_with_watch(
|
2024-07-23 19:00:48 -04:00
|
|
|
flags: Arc<Flags>,
|
2023-07-28 11:27:10 -04:00
|
|
|
bench_flags: BenchFlags,
|
|
|
|
) -> Result<(), AnyError> {
|
|
|
|
file_watcher::watch_func(
|
|
|
|
flags,
|
2023-10-30 20:25:58 -04:00
|
|
|
file_watcher::PrintConfig::new(
|
|
|
|
"Bench",
|
|
|
|
bench_flags
|
2023-07-28 11:27:10 -04:00
|
|
|
.watch
|
|
|
|
.as_ref()
|
|
|
|
.map(|w| !w.no_clear_screen)
|
|
|
|
.unwrap_or(true),
|
2023-10-30 20:25:58 -04:00
|
|
|
),
|
2023-10-19 01:05:00 -04:00
|
|
|
move |flags, watcher_communicator, changed_paths| {
|
2023-07-28 11:27:10 -04:00
|
|
|
let bench_flags = bench_flags.clone();
|
|
|
|
Ok(async move {
|
2024-07-23 19:00:48 -04:00
|
|
|
let factory = CliFactory::from_flags_for_watcher(
|
|
|
|
flags,
|
|
|
|
watcher_communicator.clone(),
|
|
|
|
);
|
|
|
|
let cli_options = factory.cli_options()?;
|
2024-07-03 20:54:33 -04:00
|
|
|
let workspace_bench_options =
|
|
|
|
cli_options.resolve_workspace_bench_options(&bench_flags);
|
2023-07-28 11:27:10 -04:00
|
|
|
|
2023-10-19 01:05:00 -04:00
|
|
|
let _ = watcher_communicator.watch_paths(cli_options.watch_paths());
|
2023-07-28 11:27:10 -04:00
|
|
|
|
|
|
|
let graph_kind = cli_options.type_check_mode().as_graph_kind();
|
2024-02-20 16:29:57 -05:00
|
|
|
let module_graph_creator = factory.module_graph_creator().await?;
|
2024-07-03 20:54:33 -04:00
|
|
|
let members_with_bench_options =
|
|
|
|
cli_options.resolve_bench_options_for_members(&bench_flags)?;
|
|
|
|
let watch_paths = members_with_bench_options
|
|
|
|
.iter()
|
|
|
|
.filter_map(|(_, bench_options)| {
|
|
|
|
bench_options
|
|
|
|
.files
|
|
|
|
.include
|
|
|
|
.as_ref()
|
|
|
|
.map(|set| set.base_paths())
|
|
|
|
})
|
|
|
|
.flatten()
|
|
|
|
.collect::<Vec<_>>();
|
|
|
|
let _ = watcher_communicator.watch_paths(watch_paths);
|
|
|
|
let collected_bench_modules = members_with_bench_options
|
|
|
|
.iter()
|
|
|
|
.map(|(_, bench_options)| {
|
|
|
|
collect_specifiers(
|
|
|
|
bench_options.files.clone(),
|
|
|
|
cli_options.vendor_dir_path().map(ToOwned::to_owned),
|
|
|
|
is_supported_bench_path,
|
|
|
|
)
|
|
|
|
})
|
|
|
|
.collect::<Result<Vec<_>, _>>()?
|
|
|
|
.into_iter()
|
|
|
|
.flatten()
|
|
|
|
.collect::<Vec<_>>();
|
2023-07-28 11:27:10 -04:00
|
|
|
|
|
|
|
// Various bench files should not share the same permissions in terms of
|
|
|
|
// `PermissionsContainer` - otherwise granting/revoking permissions in one
|
|
|
|
// file would have impact on other files, which is undesirable.
|
2024-09-16 16:39:37 -04:00
|
|
|
let permission_desc_parser = factory.permission_desc_parser()?.clone();
|
|
|
|
let permissions = Permissions::from_options(
|
|
|
|
permission_desc_parser.as_ref(),
|
|
|
|
&cli_options.permissions_options(),
|
|
|
|
)?;
|
2023-07-28 11:27:10 -04:00
|
|
|
|
2024-02-20 16:29:57 -05:00
|
|
|
let graph = module_graph_creator
|
2024-07-03 20:54:33 -04:00
|
|
|
.create_graph(graph_kind, collected_bench_modules.clone())
|
2023-07-28 11:27:10 -04:00
|
|
|
.await?;
|
2024-03-07 11:30:30 -05:00
|
|
|
module_graph_creator.graph_valid(&graph)?;
|
|
|
|
let bench_modules = &graph.roots;
|
2023-07-28 11:27:10 -04:00
|
|
|
|
|
|
|
let bench_modules_to_reload = if let Some(changed_paths) = changed_paths
|
|
|
|
{
|
2024-01-08 12:18:42 -05:00
|
|
|
let changed_paths = changed_paths.into_iter().collect::<HashSet<_>>();
|
2024-06-05 11:04:16 -04:00
|
|
|
let mut result = IndexSet::with_capacity(bench_modules.len());
|
2023-07-28 11:27:10 -04:00
|
|
|
for bench_module_specifier in bench_modules {
|
|
|
|
if has_graph_root_local_dependent_changed(
|
|
|
|
&graph,
|
2024-03-07 11:30:30 -05:00
|
|
|
bench_module_specifier,
|
2024-01-08 12:18:42 -05:00
|
|
|
&changed_paths,
|
2023-07-28 11:27:10 -04:00
|
|
|
) {
|
2024-06-05 11:04:16 -04:00
|
|
|
result.insert(bench_module_specifier.clone());
|
2023-07-28 11:27:10 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
result
|
|
|
|
} else {
|
|
|
|
bench_modules.clone()
|
|
|
|
};
|
|
|
|
|
|
|
|
let worker_factory =
|
|
|
|
Arc::new(factory.create_cli_main_worker_factory().await?);
|
|
|
|
|
2024-07-03 20:54:33 -04:00
|
|
|
let specifiers = collected_bench_modules
|
|
|
|
.into_iter()
|
|
|
|
.filter(|specifier| bench_modules_to_reload.contains(specifier))
|
|
|
|
.collect::<Vec<ModuleSpecifier>>();
|
2023-07-28 11:27:10 -04:00
|
|
|
|
2024-05-16 03:09:35 -04:00
|
|
|
factory
|
|
|
|
.main_module_graph_container()
|
|
|
|
.await?
|
|
|
|
.check_specifiers(&specifiers)
|
2023-07-28 11:27:10 -04:00
|
|
|
.await?;
|
|
|
|
|
2024-07-03 20:54:33 -04:00
|
|
|
if workspace_bench_options.no_run {
|
2023-07-28 11:27:10 -04:00
|
|
|
return Ok(());
|
|
|
|
}
|
|
|
|
|
|
|
|
let log_level = cli_options.log_level();
|
|
|
|
bench_specifiers(
|
|
|
|
worker_factory,
|
|
|
|
&permissions,
|
2024-09-16 16:39:37 -04:00
|
|
|
&permission_desc_parser,
|
2023-07-28 11:27:10 -04:00
|
|
|
specifiers,
|
|
|
|
BenchSpecifierOptions {
|
2024-07-03 20:54:33 -04:00
|
|
|
filter: TestFilter::from_flag(&workspace_bench_options.filter),
|
|
|
|
json: workspace_bench_options.json,
|
2023-07-28 11:27:10 -04:00
|
|
|
log_level,
|
|
|
|
},
|
|
|
|
)
|
|
|
|
.await?;
|
|
|
|
|
|
|
|
Ok(())
|
|
|
|
})
|
|
|
|
},
|
|
|
|
)
|
|
|
|
.await?;
|
|
|
|
|
|
|
|
Ok(())
|
|
|
|
}
|