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>
233 lines
9.0 KiB
Zig
233 lines
9.0 KiB
Zig
const LineOffsetTable = @This();
|
|
|
|
/// The source map specification is very loose and does not specify what
|
|
/// column numbers actually mean. The popular "source-map" library from Mozilla
|
|
/// appears to interpret them as counts of UTF-16 code units, so we generate
|
|
/// those too for compatibility.
|
|
///
|
|
/// We keep mapping tables around to accelerate conversion from byte offsets
|
|
/// to UTF-16 code unit counts. However, this mapping takes up a lot of memory
|
|
/// and takes up a lot of memory. Since most JavaScript is ASCII and the
|
|
/// mapping for ASCII is 1:1, we avoid creating a table for ASCII-only lines
|
|
/// as an optimization.
|
|
///
|
|
columns_for_non_ascii: BabyList(i32) = .{},
|
|
byte_offset_to_first_non_ascii: u32 = 0,
|
|
byte_offset_to_start_of_line: u32 = 0,
|
|
|
|
pub const List = bun.MultiArrayList(LineOffsetTable);
|
|
|
|
pub fn findLine(byte_offsets_to_start_of_line: []const u32, loc: Logger.Loc) i32 {
|
|
assert(loc.start > -1); // checked by caller
|
|
var original_line: usize = 0;
|
|
const loc_start = @as(usize, @intCast(loc.start));
|
|
|
|
{
|
|
var count = @as(usize, @truncate(byte_offsets_to_start_of_line.len));
|
|
var i: usize = 0;
|
|
while (count > 0) {
|
|
const step = count / 2;
|
|
i = original_line + step;
|
|
if (byte_offsets_to_start_of_line[i] <= loc_start) {
|
|
original_line = i + 1;
|
|
count = count - step - 1;
|
|
} else {
|
|
count = step;
|
|
}
|
|
}
|
|
}
|
|
|
|
return @as(i32, @intCast(original_line)) - 1;
|
|
}
|
|
|
|
pub fn findIndex(byte_offsets_to_start_of_line: []const u32, loc: Logger.Loc) ?usize {
|
|
assert(loc.start > -1); // checked by caller
|
|
var original_line: usize = 0;
|
|
const loc_start = @as(usize, @intCast(loc.start));
|
|
|
|
var count = @as(usize, @truncate(byte_offsets_to_start_of_line.len));
|
|
var i: usize = 0;
|
|
while (count > 0) {
|
|
const step = count / 2;
|
|
i = original_line + step;
|
|
const byte_offset = byte_offsets_to_start_of_line[i];
|
|
if (byte_offset == loc_start) {
|
|
return i;
|
|
}
|
|
if (i + 1 < byte_offsets_to_start_of_line.len) {
|
|
const next_byte_offset = byte_offsets_to_start_of_line[i + 1];
|
|
if (byte_offset < loc_start and loc_start < next_byte_offset) {
|
|
return i;
|
|
}
|
|
}
|
|
|
|
if (byte_offset < loc_start) {
|
|
original_line = i + 1;
|
|
count = count - step - 1;
|
|
} else {
|
|
count = step;
|
|
}
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
pub fn generate(allocator: std.mem.Allocator, contents: []const u8, approximate_line_count: i32) List {
|
|
var list = List{};
|
|
// Preallocate the top-level table using the approximate line count from the lexer
|
|
list.ensureUnusedCapacity(allocator, @as(usize, @intCast(@max(approximate_line_count, 1)))) catch unreachable;
|
|
var column: i32 = 0;
|
|
var byte_offset_to_first_non_ascii: u32 = 0;
|
|
var column_byte_offset: u32 = 0;
|
|
var line_byte_offset: u32 = 0;
|
|
|
|
// the idea here is:
|
|
// we want to avoid re-allocating this array _most_ of the time
|
|
// when lines _do_ have unicode characters, they probably still won't be longer than 255 much
|
|
var stack_fallback = std.heap.stackFallback(@sizeOf(i32) * 256, allocator);
|
|
var columns_for_non_ascii = std.array_list.Managed(i32).initCapacity(stack_fallback.get(), 120) catch unreachable;
|
|
const reset_end_index = stack_fallback.fixed_buffer_allocator.end_index;
|
|
const initial_columns_for_non_ascii = columns_for_non_ascii;
|
|
|
|
var remaining = contents;
|
|
while (remaining.len > 0) {
|
|
const len_ = strings.wtf8ByteSequenceLengthWithInvalid(remaining[0]);
|
|
const c = strings.decodeWTF8RuneT(remaining.ptr[0..4], len_, i32, 0);
|
|
const cp_len = @as(usize, len_);
|
|
|
|
if (column == 0) {
|
|
line_byte_offset = @as(
|
|
u32,
|
|
@truncate(@intFromPtr(remaining.ptr) - @intFromPtr(contents.ptr)),
|
|
);
|
|
}
|
|
|
|
if (c > 0x7F and columns_for_non_ascii.items.len == 0) {
|
|
assert(@intFromPtr(
|
|
remaining.ptr,
|
|
) >= @intFromPtr(
|
|
contents.ptr,
|
|
));
|
|
// we have a non-ASCII character, so we need to keep track of the
|
|
// mapping from byte offsets to UTF-16 code unit counts
|
|
columns_for_non_ascii.appendAssumeCapacity(column);
|
|
column_byte_offset = @as(
|
|
u32,
|
|
@intCast((@intFromPtr(
|
|
remaining.ptr,
|
|
) - @intFromPtr(
|
|
contents.ptr,
|
|
)) - line_byte_offset),
|
|
);
|
|
byte_offset_to_first_non_ascii = column_byte_offset;
|
|
}
|
|
|
|
// Update the per-byte column offsets
|
|
if (columns_for_non_ascii.items.len > 0) {
|
|
const line_bytes_so_far = @as(u32, @intCast(@as(
|
|
u32,
|
|
@truncate(@intFromPtr(remaining.ptr) - @intFromPtr(contents.ptr)),
|
|
))) - line_byte_offset;
|
|
columns_for_non_ascii.ensureUnusedCapacity((line_bytes_so_far - column_byte_offset) + 1) catch unreachable;
|
|
while (column_byte_offset <= line_bytes_so_far) : (column_byte_offset += 1) {
|
|
columns_for_non_ascii.appendAssumeCapacity(column);
|
|
}
|
|
} else {
|
|
switch (c) {
|
|
(@max('\r', '\n') + 1)...127 => {
|
|
// skip ahead to the next newline or non-ascii character
|
|
if (strings.indexOfNewlineOrNonASCIICheckStart(remaining, @as(u32, len_), false)) |j| {
|
|
column += @as(i32, @intCast(j));
|
|
remaining = remaining[j..];
|
|
} else {
|
|
// if there are no more lines, we are done!
|
|
column += @as(i32, @intCast(remaining.len));
|
|
remaining = remaining[remaining.len..];
|
|
}
|
|
|
|
continue;
|
|
},
|
|
else => {},
|
|
}
|
|
}
|
|
|
|
switch (c) {
|
|
'\r', '\n', 0x2028, 0x2029 => {
|
|
// windows newline
|
|
if (c == '\r' and remaining.len > 1 and remaining[1] == '\n') {
|
|
column += 1;
|
|
remaining = remaining[1..];
|
|
continue;
|
|
}
|
|
|
|
// We don't call .toOwnedSlice() because it is expensive to
|
|
// reallocate the array AND when inside an Arena, it's
|
|
// hideously expensive
|
|
var owned = columns_for_non_ascii.items;
|
|
if (stack_fallback.fixed_buffer_allocator.ownsSlice(std.mem.sliceAsBytes(owned))) {
|
|
owned = allocator.dupe(i32, owned) catch unreachable;
|
|
}
|
|
|
|
list.append(allocator, .{
|
|
.byte_offset_to_start_of_line = line_byte_offset,
|
|
.byte_offset_to_first_non_ascii = byte_offset_to_first_non_ascii,
|
|
.columns_for_non_ascii = BabyList(i32).fromOwnedSlice(owned),
|
|
}) catch unreachable;
|
|
|
|
column = 0;
|
|
byte_offset_to_first_non_ascii = 0;
|
|
column_byte_offset = 0;
|
|
line_byte_offset = 0;
|
|
|
|
// reset the list to use the stack-allocated memory
|
|
stack_fallback.fixed_buffer_allocator.reset();
|
|
stack_fallback.fixed_buffer_allocator.end_index = reset_end_index;
|
|
columns_for_non_ascii = initial_columns_for_non_ascii;
|
|
},
|
|
else => {
|
|
// Mozilla's "source-map" library counts columns using UTF-16 code units
|
|
column += @as(i32, @intFromBool(c > 0xFFFF)) + 1;
|
|
},
|
|
}
|
|
|
|
remaining = remaining[cp_len..];
|
|
}
|
|
|
|
// Mark the start of the next line
|
|
if (column == 0) {
|
|
line_byte_offset = @as(u32, @intCast(contents.len));
|
|
}
|
|
|
|
if (columns_for_non_ascii.items.len > 0) {
|
|
const line_bytes_so_far = @as(u32, @intCast(contents.len)) - line_byte_offset;
|
|
columns_for_non_ascii.ensureUnusedCapacity((line_bytes_so_far - column_byte_offset) + 1) catch unreachable;
|
|
while (column_byte_offset <= line_bytes_so_far) : (column_byte_offset += 1) {
|
|
columns_for_non_ascii.appendAssumeCapacity(column);
|
|
}
|
|
}
|
|
{
|
|
var owned = columns_for_non_ascii.toOwnedSlice() catch unreachable;
|
|
if (stack_fallback.fixed_buffer_allocator.ownsSlice(std.mem.sliceAsBytes(owned))) {
|
|
owned = allocator.dupe(i32, owned) catch unreachable;
|
|
}
|
|
list.append(allocator, .{
|
|
.byte_offset_to_start_of_line = line_byte_offset,
|
|
.byte_offset_to_first_non_ascii = byte_offset_to_first_non_ascii,
|
|
.columns_for_non_ascii = BabyList(i32).fromOwnedSlice(owned),
|
|
}) catch unreachable;
|
|
}
|
|
|
|
if (list.capacity > list.len) {
|
|
list.shrinkAndFree(allocator, list.len);
|
|
}
|
|
return list;
|
|
}
|
|
|
|
const std = @import("std");
|
|
|
|
const bun = @import("bun");
|
|
const BabyList = bun.BabyList;
|
|
const Logger = bun.logger;
|
|
const assert = bun.assert;
|
|
const strings = bun.strings;
|