mirror of
https://github.com/oven-sh/bun
synced 2026-02-12 11:59:00 +00:00
Fixes ENG-21287
Build times, from `bun run build && echo '//' >> src/main.zig && time
bun run build`
|Platform|0.14.1|0.15.2|Speedup|
|-|-|-|-|
|macos debug asan|126.90s|106.27s|1.19x|
|macos debug noasan|60.62s|50.85s|1.19x|
|linux debug asan|292.77s|241.45s|1.21x|
|linux debug noasan|146.58s|130.94s|1.12x|
|linux debug use_llvm=false|n/a|78.27s|1.87x|
|windows debug asan|177.13s|142.55s|1.24x|
Runtime performance:
- next build memory usage may have gone up by 5%. Otherwise seems the
same. Some code with writers may have gotten slower, especially one
instance of a counting writer and a few instances of unbuffered writers
that now have vtable overhead.
- File size reduced by 800kb (from 100.2mb to 99.4mb)
Improvements:
- `@export` hack is no longer needed for watch
- native x86_64 backend for linux builds faster. to use it, set use_llvm
false and no_link_obj false. also set `ASAN_OPTIONS=detect_leaks=0`
otherwise it will spam the output with tens of thousands of lines of
debug info errors. may need to use the zig lldb fork for debugging.
- zig test-obj, which we will be able to use for zig unit tests
Still an issue:
- false 'dependency loop' errors remain in watch mode
- watch mode crashes observed
Follow-up:
- [ ] search `comptime Writer: type` and `comptime W: type` and remove
- [ ] remove format_mode in our zig fork
- [ ] remove deprecated.zig autoFormatLabelFallback
- [ ] remove deprecated.zig autoFormatLabel
- [ ] remove deprecated.BufferedWriter and BufferedReader
- [ ] remove override_no_export_cpp_apis as it is no longer needed
- [ ] css Parser(W) -> Parser, and remove all the comptime writer: type
params
- [ ] remove deprecated writer fully
Files that add lines:
```
649 src/deprecated.zig
167 scripts/pack-codegen-for-zig-team.ts
54 scripts/cleartrace-impl.js
46 scripts/cleartrace.ts
43 src/windows.zig
18 src/fs.zig
17 src/bun.js/ConsoleObject.zig
16 src/output.zig
12 src/bun.js/test/debug.zig
12 src/bun.js/node/node_fs.zig
8 src/env_loader.zig
7 src/css/printer.zig
7 src/cli/init_command.zig
7 src/bun.js/node.zig
6 src/string/escapeRegExp.zig
6 src/install/PnpmMatcher.zig
5 src/bun.js/webcore/Blob.zig
4 src/crash_handler.zig
4 src/bun.zig
3 src/install/lockfile/bun.lock.zig
3 src/cli/update_interactive_command.zig
3 src/cli/pack_command.zig
3 build.zig
2 src/Progress.zig
2 src/install/lockfile/lockfile_json_stringify_for_debugging.zig
2 src/css/small_list.zig
2 src/bun.js/webcore/prompt.zig
1 test/internal/ban-words.test.ts
1 test/internal/ban-limits.json
1 src/watcher/WatcherTrace.zig
1 src/transpiler.zig
1 src/shell/builtin/cp.zig
1 src/js_printer.zig
1 src/io/PipeReader.zig
1 src/install/bin.zig
1 src/css/selectors/selector.zig
1 src/cli/run_command.zig
1 src/bun.js/RuntimeTranspilerStore.zig
1 src/bun.js/bindings/JSRef.zig
1 src/bake/DevServer.zig
```
Files that remove lines:
```
-1 src/test/recover.zig
-1 src/sql/postgres/SocketMonitor.zig
-1 src/sql/mysql/MySQLRequestQueue.zig
-1 src/sourcemap/CodeCoverage.zig
-1 src/css/values/color_js.zig
-1 src/compile_target.zig
-1 src/bundler/linker_context/convertStmtsForChunk.zig
-1 src/bundler/bundle_v2.zig
-1 src/bun.js/webcore/blob/read_file.zig
-1 src/ast/base.zig
-2 src/sql/postgres/protocol/ArrayList.zig
-2 src/shell/builtin/mkdir.zig
-2 src/install/PackageManager/patchPackage.zig
-2 src/install/PackageManager/PackageManagerDirectories.zig
-2 src/fmt.zig
-2 src/css/declaration.zig
-2 src/css/css_parser.zig
-2 src/collections/baby_list.zig
-2 src/bun.js/bindings/ZigStackFrame.zig
-2 src/ast/E.zig
-3 src/StandaloneModuleGraph.zig
-3 src/deps/picohttp.zig
-3 src/deps/libuv.zig
-3 src/btjs.zig
-4 src/threading/Futex.zig
-4 src/shell/builtin/touch.zig
-4 src/meta.zig
-4 src/install/lockfile.zig
-4 src/css/selectors/parser.zig
-5 src/shell/interpreter.zig
-5 src/css/error.zig
-5 src/bun.js/web_worker.zig
-5 src/bun.js.zig
-6 src/cli/test_command.zig
-6 src/bun.js/VirtualMachine.zig
-6 src/bun.js/uuid.zig
-6 src/bun.js/bindings/JSValue.zig
-9 src/bun.js/test/pretty_format.zig
-9 src/bun.js/api/BunObject.zig
-14 src/install/install_binding.zig
-14 src/fd.zig
-14 src/bun.js/node/path.zig
-14 scripts/pack-codegen-for-zig-team.sh
-17 src/bun.js/test/diff_format.zig
```
`git diff --numstat origin/main...HEAD | awk '{ print ($1-$2)"\t"$3 }' |
sort -rn`
---------
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Dylan Conway <dylan.conway567@gmail.com>
Co-authored-by: Meghan Denny <meghan@bun.com>
Co-authored-by: tayor.fish <contact@taylor.fish>
171 lines
5.9 KiB
Zig
171 lines
5.9 KiB
Zig
//! for the collection phase of test execution where we discover all the test() calls
|
|
|
|
locked: bool = false, // set to true after collection phase ends
|
|
describe_callback_queue: std.array_list.Managed(QueuedDescribe),
|
|
current_scope_callback_queue: std.array_list.Managed(QueuedDescribe),
|
|
|
|
root_scope: *DescribeScope,
|
|
active_scope: *DescribeScope,
|
|
|
|
filter_buffer: std.array_list.Managed(u8),
|
|
|
|
const QueuedDescribe = struct {
|
|
callback: jsc.Strong.Deprecated,
|
|
active_scope: *DescribeScope,
|
|
new_scope: *DescribeScope,
|
|
fn deinit(this: *QueuedDescribe) void {
|
|
this.callback.deinit();
|
|
}
|
|
};
|
|
|
|
pub fn init(gpa: std.mem.Allocator, bun_test_root: *bun_test.BunTestRoot) Collection {
|
|
group.begin(@src());
|
|
defer group.end();
|
|
|
|
const root_scope = DescribeScope.create(gpa, .{
|
|
.parent = bun_test_root.hook_scope,
|
|
.name = null,
|
|
.concurrent = false,
|
|
.mode = .normal,
|
|
.only = if (jsc.Jest.Jest.runner) |runner| if (runner.only) .contains else .no else .no,
|
|
.has_callback = false,
|
|
.test_id_for_debugger = 0,
|
|
.line_no = 0,
|
|
});
|
|
|
|
return .{
|
|
.describe_callback_queue = .init(gpa),
|
|
.current_scope_callback_queue = .init(gpa),
|
|
.root_scope = root_scope,
|
|
.active_scope = root_scope,
|
|
.filter_buffer = .init(gpa),
|
|
};
|
|
}
|
|
pub fn deinit(this: *Collection) void {
|
|
this.root_scope.destroy(this.bunTest().gpa);
|
|
for (this.describe_callback_queue.items) |*item| {
|
|
item.deinit();
|
|
}
|
|
this.describe_callback_queue.deinit();
|
|
for (this.current_scope_callback_queue.items) |*item| {
|
|
item.deinit();
|
|
}
|
|
this.current_scope_callback_queue.deinit();
|
|
this.filter_buffer.deinit();
|
|
}
|
|
|
|
fn bunTest(this: *Collection) *BunTest {
|
|
return @fieldParentPtr("collection", this);
|
|
}
|
|
|
|
pub fn enqueueDescribeCallback(this: *Collection, new_scope: *DescribeScope, callback: ?jsc.JSValue) bun.JSError!void {
|
|
group.begin(@src());
|
|
defer group.end();
|
|
|
|
bun.assert(!this.locked);
|
|
const buntest = this.bunTest();
|
|
|
|
if (callback) |cb| {
|
|
group.log("enqueueDescribeCallback / {s} / in scope: {s}", .{ new_scope.base.name orelse "(unnamed)", this.active_scope.base.name orelse "(unnamed)" });
|
|
|
|
try this.current_scope_callback_queue.append(.{
|
|
.active_scope = this.active_scope,
|
|
.callback = .init(buntest.gpa, cb),
|
|
.new_scope = new_scope,
|
|
});
|
|
}
|
|
}
|
|
|
|
pub fn runOneCompleted(this: *Collection, globalThis: *jsc.JSGlobalObject, _: ?jsc.JSValue, data: bun_test.BunTest.RefDataValue) bun.JSError!void {
|
|
group.begin(@src());
|
|
defer group.end();
|
|
|
|
var formatter = jsc.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
|
|
defer formatter.deinit();
|
|
|
|
const prev_scope: *DescribeScope = switch (data) {
|
|
.collection => |c| c.active_scope,
|
|
else => blk: {
|
|
bun.assert(false); // this probably can't happen
|
|
break :blk this.active_scope;
|
|
},
|
|
};
|
|
|
|
group.log("collection:runOneCompleted reset scope back from {s}", .{this.active_scope.base.name orelse "undefined"});
|
|
this.active_scope = prev_scope;
|
|
group.log("collection:runOneCompleted reset scope back to {s}", .{this.active_scope.base.name orelse "undefined"});
|
|
}
|
|
|
|
pub fn step(buntest_strong: bun_test.BunTestPtr, globalThis: *jsc.JSGlobalObject, data: bun_test.BunTest.RefDataValue) bun.JSError!bun_test.StepResult {
|
|
group.begin(@src());
|
|
defer group.end();
|
|
const buntest = buntest_strong.get();
|
|
const this = &buntest.collection;
|
|
|
|
if (data != .start) try this.runOneCompleted(globalThis, null, data);
|
|
|
|
var formatter = jsc.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
|
|
defer formatter.deinit();
|
|
|
|
// append queued callbacks, in reverse order because items will be pop()ed from the end
|
|
var i: usize = this.current_scope_callback_queue.items.len;
|
|
while (i > 0) {
|
|
i -= 1;
|
|
const item = &this.current_scope_callback_queue.items[i];
|
|
if (item.new_scope.failed) { // if there was an error in the describe callback, don't run any describe callbacks in this scope
|
|
item.deinit();
|
|
} else {
|
|
bun.handleOom(this.describe_callback_queue.append(item.*));
|
|
}
|
|
}
|
|
this.current_scope_callback_queue.clearRetainingCapacity();
|
|
|
|
while (this.describe_callback_queue.items.len > 0) {
|
|
group.log("runOne -> call next", .{});
|
|
var first = this.describe_callback_queue.pop().?;
|
|
defer first.deinit();
|
|
|
|
if (first.active_scope.failed) continue; // do not execute callbacks that came from a failed describe scope
|
|
|
|
const callback = first.callback;
|
|
const active_scope = first.active_scope;
|
|
const new_scope = first.new_scope;
|
|
|
|
const previous_scope = active_scope;
|
|
|
|
group.log("collection:runOne set scope from {s}", .{this.active_scope.base.name orelse "undefined"});
|
|
this.active_scope = new_scope;
|
|
group.log("collection:runOne set scope to {s}", .{this.active_scope.base.name orelse "undefined"});
|
|
|
|
if (BunTest.runTestCallback(buntest_strong, globalThis, callback.get(), false, .{
|
|
.collection = .{ .active_scope = previous_scope },
|
|
}, &.epoch)) |cfg_data| {
|
|
// the result is available immediately; queue
|
|
buntest.addResult(cfg_data);
|
|
}
|
|
|
|
return .{ .waiting = .{} };
|
|
}
|
|
return .complete;
|
|
}
|
|
|
|
pub fn handleUncaughtException(this: *Collection, _: bun_test.BunTest.RefDataValue) bun_test.HandleUncaughtExceptionResult {
|
|
group.begin(@src());
|
|
defer group.end();
|
|
|
|
this.active_scope.failed = true;
|
|
|
|
return .show_unhandled_error_in_describe; // unhandled because it needs to exit with code 1
|
|
}
|
|
|
|
const std = @import("std");
|
|
|
|
const bun = @import("bun");
|
|
const jsc = bun.jsc;
|
|
|
|
const bun_test = jsc.Jest.bun_test;
|
|
const BunTest = bun_test.BunTest;
|
|
const Collection = bun_test.Collection;
|
|
const DescribeScope = bun_test.DescribeScope;
|
|
const group = bun_test.debug.group;
|