mirror of
https://github.com/oven-sh/bun
synced 2026-02-10 02:48:50 +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>
167 lines
5.9 KiB
Zig
167 lines
5.9 KiB
Zig
const ParsedSourceMap = @This();
|
|
|
|
const RefCount = bun.ptr.ThreadSafeRefCount(@This(), "ref_count", deinit, .{});
|
|
pub const ref = RefCount.ref;
|
|
pub const deref = RefCount.deref;
|
|
|
|
/// ParsedSourceMap can be acquired by different threads via the thread-safe
|
|
/// source map store (SavedSourceMap), so the reference count must be thread-safe.
|
|
ref_count: RefCount,
|
|
|
|
input_line_count: usize = 0,
|
|
mappings: Mapping.List = .{},
|
|
|
|
/// If this is empty, this implies that the source code is a single file
|
|
/// transpiled on-demand. If there are items, then it means this is a file
|
|
/// loaded without transpilation but with external sources. This array
|
|
/// maps `source_index` to the correct filename.
|
|
external_source_names: []const []const u8 = &.{},
|
|
/// In order to load source contents from a source-map after the fact,
|
|
/// a handle to the underlying source provider is stored. Within this pointer,
|
|
/// a flag is stored if it is known to be an inline or external source map.
|
|
///
|
|
/// Source contents are large, we don't preserve them in memory. This has
|
|
/// the downside of repeatedly re-decoding sourcemaps if multiple errors
|
|
/// are emitted (specifically with Bun.inspect / unhandled; the ones that
|
|
/// rely on source contents)
|
|
underlying_provider: SourceContentPtr = .none,
|
|
|
|
is_standalone_module_graph: bool = false,
|
|
|
|
const SourceProviderKind = enum(u2) { zig, bake, dev_server };
|
|
const AnySourceProvider = union(enum) {
|
|
zig: *SourceProviderMap,
|
|
bake: *BakeSourceProvider,
|
|
dev_server: *DevServerSourceProvider,
|
|
|
|
pub fn ptr(this: AnySourceProvider) *anyopaque {
|
|
return switch (this) {
|
|
.zig => @ptrCast(this.zig),
|
|
.bake => @ptrCast(this.bake),
|
|
.dev_server => @ptrCast(this.dev_server),
|
|
};
|
|
}
|
|
|
|
pub fn getSourceMap(
|
|
this: AnySourceProvider,
|
|
source_filename: []const u8,
|
|
load_hint: SourceMapLoadHint,
|
|
result: ParseUrlResultHint,
|
|
) ?SourceMap.ParseUrl {
|
|
return switch (this) {
|
|
.zig => this.zig.getSourceMap(source_filename, load_hint, result),
|
|
.bake => this.bake.getSourceMap(source_filename, load_hint, result),
|
|
.dev_server => this.dev_server.getSourceMap(source_filename, load_hint, result),
|
|
};
|
|
}
|
|
};
|
|
|
|
pub const SourceContentPtr = packed struct(u64) {
|
|
load_hint: SourceMapLoadHint,
|
|
kind: SourceProviderKind,
|
|
data: u60,
|
|
|
|
pub const none: SourceContentPtr = .{ .load_hint = .none, .kind = .zig, .data = 0 };
|
|
|
|
pub fn fromProvider(p: *SourceProviderMap) SourceContentPtr {
|
|
return .{ .load_hint = .none, .data = @intCast(@intFromPtr(p)), .kind = .zig };
|
|
}
|
|
|
|
pub fn fromBakeProvider(p: *BakeSourceProvider) SourceContentPtr {
|
|
return .{ .load_hint = .none, .data = @intCast(@intFromPtr(p)), .kind = .bake };
|
|
}
|
|
|
|
pub fn fromDevServerProvider(p: *DevServerSourceProvider) SourceContentPtr {
|
|
return .{ .load_hint = .none, .data = @intCast(@intFromPtr(p)), .kind = .dev_server };
|
|
}
|
|
|
|
pub fn provider(sc: SourceContentPtr) ?AnySourceProvider {
|
|
switch (sc.kind) {
|
|
.zig => return .{ .zig = @ptrFromInt(sc.data) },
|
|
.bake => return .{ .bake = @ptrFromInt(sc.data) },
|
|
.dev_server => return .{ .dev_server = @ptrFromInt(sc.data) },
|
|
}
|
|
}
|
|
};
|
|
|
|
pub fn isExternal(psm: *ParsedSourceMap) bool {
|
|
return psm.external_source_names.len != 0;
|
|
}
|
|
|
|
fn deinit(this: *ParsedSourceMap) void {
|
|
const allocator = bun.default_allocator;
|
|
|
|
this.mappings.deinit(allocator);
|
|
|
|
if (this.external_source_names.len > 0) {
|
|
for (this.external_source_names) |name|
|
|
allocator.free(name);
|
|
allocator.free(this.external_source_names);
|
|
}
|
|
|
|
bun.destroy(this);
|
|
}
|
|
|
|
pub fn standaloneModuleGraphData(this: *ParsedSourceMap) *bun.StandaloneModuleGraph.SerializedSourceMap.Loaded {
|
|
bun.assert(this.is_standalone_module_graph);
|
|
return @ptrFromInt(this.underlying_provider.data);
|
|
}
|
|
|
|
pub fn memoryCost(this: *const ParsedSourceMap) usize {
|
|
return @sizeOf(ParsedSourceMap) + this.mappings.memoryCost() + this.external_source_names.len * @sizeOf([]const u8);
|
|
}
|
|
|
|
pub fn writeVLQs(map: *const ParsedSourceMap, writer: anytype) !void {
|
|
var last_col: i32 = 0;
|
|
var last_src: i32 = 0;
|
|
var last_ol: i32 = 0;
|
|
var last_oc: i32 = 0;
|
|
var current_line: i32 = 0;
|
|
for (
|
|
map.mappings.generated(),
|
|
map.mappings.original(),
|
|
map.mappings.sourceIndex(),
|
|
0..,
|
|
) |gen, orig, source_index, i| {
|
|
if (current_line != gen.lines.zeroBased()) {
|
|
assert(gen.lines.zeroBased() > current_line);
|
|
const inc = gen.lines.zeroBased() - current_line;
|
|
try writer.splatByteAll(';', @intCast(inc));
|
|
current_line = gen.lines.zeroBased();
|
|
last_col = 0;
|
|
} else if (i != 0) {
|
|
try writer.writeByte(',');
|
|
}
|
|
try VLQ.encode(gen.columns.zeroBased() - last_col).writeTo(writer);
|
|
last_col = gen.columns.zeroBased();
|
|
try VLQ.encode(source_index - last_src).writeTo(writer);
|
|
last_src = source_index;
|
|
try VLQ.encode(orig.lines.zeroBased() - last_ol).writeTo(writer);
|
|
last_ol = orig.lines.zeroBased();
|
|
try VLQ.encode(orig.columns.zeroBased() - last_oc).writeTo(writer);
|
|
last_oc = orig.columns.zeroBased();
|
|
}
|
|
}
|
|
|
|
pub fn formatVLQs(map: *const ParsedSourceMap) std.fmt.Alt(*const ParsedSourceMap, formatVLQsImpl) {
|
|
return .{ .data = map };
|
|
}
|
|
|
|
fn formatVLQsImpl(map: *const ParsedSourceMap, w: *std.Io.Writer) !void {
|
|
try map.writeVLQs(w);
|
|
}
|
|
|
|
const std = @import("std");
|
|
|
|
const SourceMap = @import("./sourcemap.zig");
|
|
const BakeSourceProvider = SourceMap.BakeSourceProvider;
|
|
const DevServerSourceProvider = SourceMap.DevServerSourceProvider;
|
|
const Mapping = SourceMap.Mapping;
|
|
const ParseUrlResultHint = SourceMap.ParseUrlResultHint;
|
|
const SourceMapLoadHint = SourceMap.SourceMapLoadHint;
|
|
const SourceProviderMap = SourceMap.SourceProviderMap;
|
|
const VLQ = SourceMap.VLQ;
|
|
|
|
const bun = @import("bun");
|
|
const assert = bun.assert;
|