mirror of
https://github.com/oven-sh/bun
synced 2026-02-11 03:18:53 +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>
236 lines
6.9 KiB
Zig
236 lines
6.9 KiB
Zig
// TODO: figure out if we actually need this
|
|
|
|
pub const RefHashCtx = struct {
|
|
pub fn hash(_: @This(), key: Ref) u32 {
|
|
return key.hash();
|
|
}
|
|
|
|
pub fn eql(_: @This(), ref: Ref, b: Ref, _: usize) bool {
|
|
return ref.asU64() == b.asU64();
|
|
}
|
|
};
|
|
|
|
pub const RefCtx = struct {
|
|
pub fn hash(_: @This(), key: Ref) u64 {
|
|
return key.hash64();
|
|
}
|
|
|
|
pub fn eql(_: @This(), ref: Ref, b: Ref) bool {
|
|
return ref.asU64() == b.asU64();
|
|
}
|
|
};
|
|
|
|
/// In some parts of Bun, we have many different IDs pointing to different things.
|
|
/// It's easy for them to get mixed up, so we use this type to make sure we don't.
|
|
pub const Index = packed struct(u32) {
|
|
value: Int,
|
|
|
|
pub fn set(this: *Index, val: Int) void {
|
|
this.value = val;
|
|
}
|
|
|
|
/// if you are within the parser, use p.isSourceRuntime() instead, as the
|
|
/// runtime index (0) is used as the id for single-file transforms.
|
|
pub inline fn isRuntime(this: Index) bool {
|
|
return this.value == (comptime runtime.value);
|
|
}
|
|
|
|
pub const invalid = Index{ .value = std.math.maxInt(Int) };
|
|
pub const runtime = Index{ .value = 0 };
|
|
|
|
pub const bake_server_data = Index{ .value = 1 };
|
|
pub const bake_client_data = Index{ .value = 2 };
|
|
|
|
pub const Int = u32;
|
|
|
|
pub inline fn source(num: anytype) Index {
|
|
return .{ .value = @as(Int, @truncate(num)) };
|
|
}
|
|
|
|
pub inline fn part(num: anytype) Index {
|
|
return .{ .value = @as(Int, @truncate(num)) };
|
|
}
|
|
|
|
pub fn init(num: anytype) Index {
|
|
const NumType = @TypeOf(num);
|
|
if (comptime @typeInfo(NumType) == .pointer) {
|
|
return init(num.*);
|
|
}
|
|
|
|
if (comptime bun.Environment.allow_assert) {
|
|
return .{
|
|
.value = @as(Int, @intCast(num)),
|
|
};
|
|
}
|
|
|
|
return .{
|
|
.value = @as(Int, @intCast(num)),
|
|
};
|
|
}
|
|
|
|
pub inline fn isValid(this: Index) bool {
|
|
return this.value != invalid.value;
|
|
}
|
|
|
|
pub inline fn isInvalid(this: Index) bool {
|
|
return !this.isValid();
|
|
}
|
|
|
|
pub inline fn get(this: Index) Int {
|
|
return this.value;
|
|
}
|
|
};
|
|
|
|
/// -- original comment from esbuild --
|
|
///
|
|
/// Files are parsed in parallel for speed. We want to allow each parser to
|
|
/// generate symbol IDs that won't conflict with each other. We also want to be
|
|
/// able to quickly merge symbol tables from all files into one giant symbol
|
|
/// table.
|
|
///
|
|
/// We can accomplish both goals by giving each symbol ID two parts: a source
|
|
/// index that is unique to the parser goroutine, and an inner index that
|
|
/// increments as the parser generates new symbol IDs. Then a symbol map can
|
|
/// be an array of arrays indexed first by source index, then by inner index.
|
|
/// The maps can be merged quickly by creating a single outer array containing
|
|
/// all inner arrays from all parsed files.
|
|
pub const Ref = packed struct(u64) {
|
|
pub const Int = u31;
|
|
|
|
inner_index: Int = 0,
|
|
|
|
tag: enum(u2) {
|
|
invalid,
|
|
allocated_name,
|
|
source_contents_slice,
|
|
symbol,
|
|
},
|
|
|
|
source_index: Int = 0,
|
|
|
|
/// Represents a null state without using an extra bit
|
|
pub const None = Ref{ .inner_index = 0, .source_index = 0, .tag = .invalid };
|
|
|
|
comptime {
|
|
bun.assert(None.isEmpty());
|
|
}
|
|
|
|
pub inline fn isEmpty(this: Ref) bool {
|
|
return this.asU64() == 0;
|
|
}
|
|
|
|
pub const ArrayHashCtx = RefHashCtx;
|
|
pub const HashCtx = RefCtx;
|
|
|
|
pub fn isSourceIndexNull(this: anytype) bool {
|
|
return this == std.math.maxInt(Int);
|
|
}
|
|
|
|
pub fn isSymbol(this: Ref) bool {
|
|
return this.tag == .symbol;
|
|
}
|
|
|
|
pub fn format(ref: Ref, writer: *std.Io.Writer) !void {
|
|
try writer.print(
|
|
"Ref[inner={d}, src={d}, .{s}]",
|
|
.{
|
|
ref.innerIndex(),
|
|
ref.sourceIndex(),
|
|
@tagName(ref.tag),
|
|
},
|
|
);
|
|
}
|
|
|
|
pub fn dump(ref: Ref, symbol_table: anytype) std.fmt.Alt(DumpImplData, dumpImpl) {
|
|
return .{ .data = .{
|
|
.ref = ref,
|
|
.symbol = ref.getSymbol(symbol_table),
|
|
} };
|
|
}
|
|
|
|
const DumpImplData = struct { ref: Ref, symbol: *ast.Symbol };
|
|
fn dumpImpl(data: DumpImplData, writer: *std.Io.Writer) !void {
|
|
try writer.print(
|
|
"Ref[inner={d}, src={d}, .{s}; original_name={s}, uses={d}]",
|
|
.{
|
|
data.ref.inner_index,
|
|
data.ref.source_index,
|
|
@tagName(data.ref.tag),
|
|
data.symbol.original_name,
|
|
data.symbol.use_count_estimate,
|
|
},
|
|
);
|
|
}
|
|
|
|
pub fn isValid(this: Ref) bool {
|
|
return this.tag != .invalid;
|
|
}
|
|
|
|
pub inline fn sourceIndex(this: Ref) Int {
|
|
return this.source_index;
|
|
}
|
|
|
|
pub inline fn innerIndex(this: Ref) Int {
|
|
return this.inner_index;
|
|
}
|
|
|
|
pub inline fn isSourceContentsSlice(this: Ref) bool {
|
|
return this.tag == .source_contents_slice;
|
|
}
|
|
|
|
pub fn init(inner_index: Int, source_index: u32, is_source_contents_slice: bool) Ref {
|
|
return .{
|
|
.inner_index = inner_index,
|
|
.source_index = @intCast(source_index),
|
|
.tag = if (is_source_contents_slice) .source_contents_slice else .allocated_name,
|
|
};
|
|
}
|
|
|
|
pub fn initSourceEnd(old: Ref) Ref {
|
|
bun.assert(old.tag != .invalid);
|
|
return init(old.inner_index, old.source_index, old.tag == .source_contents_slice);
|
|
}
|
|
|
|
pub fn hash(key: Ref) u32 {
|
|
return @truncate(key.hash64());
|
|
}
|
|
|
|
pub inline fn asU64(key: Ref) u64 {
|
|
return @bitCast(key);
|
|
}
|
|
|
|
pub inline fn hash64(key: Ref) u64 {
|
|
return bun.hash(&@as([8]u8, @bitCast(key.asU64())));
|
|
}
|
|
|
|
pub fn eql(ref: Ref, other: Ref) bool {
|
|
return ref.asU64() == other.asU64();
|
|
}
|
|
|
|
pub const isNull = isEmpty; // deprecated
|
|
|
|
pub fn jsonStringify(self: *const Ref, writer: anytype) !void {
|
|
return try writer.write([2]u32{ self.sourceIndex(), self.innerIndex() });
|
|
}
|
|
|
|
pub fn getSymbol(ref: Ref, symbol_table: anytype) *ast.Symbol {
|
|
// Different parts of the bundler use different formats of the symbol table
|
|
// In the parser you only have one array, and .sourceIndex() is ignored.
|
|
// In the bundler, you have a 2D array where both parts of the ref are used.
|
|
const resolved_symbol_table = switch (@TypeOf(symbol_table)) {
|
|
*const std.array_list.Managed(ast.Symbol) => symbol_table.items,
|
|
*std.array_list.Managed(ast.Symbol) => symbol_table.items,
|
|
[]ast.Symbol => symbol_table,
|
|
*ast.Symbol.Map => return symbol_table.get(ref) orelse
|
|
unreachable, // ref must exist within symbol table
|
|
else => |T| @compileError("Unsupported type to Ref.getSymbol: " ++ @typeName(T)),
|
|
};
|
|
return &resolved_symbol_table[ref.innerIndex()];
|
|
}
|
|
};
|
|
|
|
const std = @import("std");
|
|
|
|
const bun = @import("bun");
|
|
const ast = bun.ast;
|