mirror of
https://github.com/oven-sh/bun
synced 2026-02-02 15:08:46 +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>
168 lines
4.5 KiB
TypeScript
168 lines
4.5 KiB
TypeScript
import { $ } from "bun";
|
|
import { dirname, join, relative } from "path";
|
|
|
|
// Check for local changes in git before proceeding
|
|
const statusOutput = await $`git status --porcelain --untracked-files=normal`.text();
|
|
|
|
if (statusOutput.trim().length > 0) {
|
|
console.error("There are local changes in git. Please commit or stash them before running this command.");
|
|
console.error("Git status:");
|
|
console.error(statusOutput);
|
|
process.exit(1);
|
|
}
|
|
|
|
async function revertUnstagedChanges() {
|
|
// Discard ONLY worktree changes; keep index (staged) intact.
|
|
// Prefer `git restore` (Git ≥2.23), fall back to `git checkout` for older Git.
|
|
try {
|
|
const restore = Bun.spawn({
|
|
cmd: ["git", "restore", "--worktree", "--", "."],
|
|
stdio: ["ignore", "ignore", "inherit"],
|
|
});
|
|
await restore.exited;
|
|
if (restore.exitCode !== 0) {
|
|
const checkout = Bun.spawn({
|
|
cmd: ["git", "checkout", "--", "."],
|
|
stdio: ["ignore", "ignore", "inherit"],
|
|
});
|
|
await checkout.exited;
|
|
}
|
|
} catch {
|
|
// Best-effort; ignore restore errors so the main task can still complete.
|
|
}
|
|
}
|
|
|
|
let skip = -1;
|
|
const args = process.argv.slice(2).filter((arg, i) => {
|
|
if (arg === "--listen=-") return false;
|
|
if (arg === "--zig-lib-dir") {
|
|
skip = i + 1;
|
|
return false;
|
|
}
|
|
if (skip === i) return false;
|
|
return true;
|
|
});
|
|
if (args.length === 0) {
|
|
console.error(`Usage: bun scripts/pack-codegen-for-zig-team <full crashing zig command>
|
|
|
|
The full command should be displayed in the build failure message. It should start with /path/to/zig build-obj ..... and end with --listen=-`);
|
|
process.exit(1);
|
|
}
|
|
if (!args[0].includes("zig")) {
|
|
console.error("First argument must be a zig command: ", args[0]);
|
|
process.exit(1);
|
|
}
|
|
if (args[1] === "build") {
|
|
console.error("build not supported. Expected a `zig build-obj` command.");
|
|
process.exit(1);
|
|
}
|
|
args.shift();
|
|
|
|
let resolvedZigFiles = new Set<string>();
|
|
const backmap = new Map<string, string>();
|
|
for (const arg of args) {
|
|
const [_, file] = arg.split("=");
|
|
if (!file) continue;
|
|
if (!file.includes("/")) continue;
|
|
const resolved = relative(".", file);
|
|
if (resolved.startsWith("..")) {
|
|
console.error("File is outside of the current directory: ", file);
|
|
process.exit(1);
|
|
}
|
|
resolvedZigFiles.add(resolved);
|
|
backmap.set(file, resolved);
|
|
}
|
|
|
|
for (const file of resolvedZigFiles) {
|
|
let content: string;
|
|
try {
|
|
content = await Bun.file(file).text();
|
|
} catch (e) {
|
|
console.error("Failed to read file: ", file);
|
|
resolvedZigFiles.delete(file);
|
|
continue;
|
|
}
|
|
|
|
if (!file.endsWith(".zig")) continue;
|
|
const imports = content.matchAll(/@(?:import|embedFile)\("([^"]+)"\)/g);
|
|
for (const [_, imported] of imports) {
|
|
if (!imported.includes("/") && !imported.includes(".")) continue;
|
|
const resolved = join(dirname(file), imported);
|
|
resolvedZigFiles.add(resolved);
|
|
}
|
|
}
|
|
|
|
// now, create zip
|
|
|
|
const out_args = "build/all.args";
|
|
const out = "codegen-for-zig-team.tar.gz";
|
|
try {
|
|
await Bun.file(out).delete();
|
|
} catch (e) {}
|
|
|
|
const a0 = args.shift();
|
|
await Bun.write(
|
|
out_args,
|
|
args
|
|
.filter(arg => {
|
|
if (arg === "-fsanitize-address") return false; // not available upstream
|
|
return true;
|
|
})
|
|
.map(arg => {
|
|
if (arg.includes("=")) {
|
|
const [flag, value] = arg.split("=");
|
|
return `${flag}=${backmap.get(value) ?? value}`;
|
|
}
|
|
return arg;
|
|
})
|
|
.join(" "),
|
|
);
|
|
|
|
// Prepare zig source for use with the upstream compiler
|
|
{
|
|
const fmt = Bun.spawn({
|
|
cmd: ["./vendor/zig/zig", "fmt", "--upstream", "src"],
|
|
stdio: ["inherit", "inherit", "inherit"],
|
|
});
|
|
await fmt.exited;
|
|
if (fmt.exitCode !== 0) {
|
|
await revertUnstagedChanges();
|
|
console.error("`zig fmt` failed.");
|
|
process.exit(fmt.exitCode ?? 1);
|
|
}
|
|
}
|
|
|
|
try {
|
|
const spawned = Bun.spawn({
|
|
cmd: ["tar", "--no-xattrs", "-zcf", out, out_args, ...resolvedZigFiles],
|
|
stdio: ["inherit", "inherit", "inherit"],
|
|
});
|
|
await spawned.exited;
|
|
|
|
if (spawned.exitCode !== 0) {
|
|
console.error("Failed to create zip: ", spawned.exitCode);
|
|
process.exit(1);
|
|
}
|
|
|
|
console.log(`
|
|
pack-codegen-for-zig-team
|
|
Reminder: Test that the reproduction steps work with the official Zig binary before submitting the issue.
|
|
|
|
Output file: ${out}
|
|
|
|
Reproduction steps:
|
|
|
|
Download codegen-for-zig-team.tar.gz
|
|
\`\`\`sh
|
|
cd /empty/folder
|
|
wget ....
|
|
tar -xvzf codegen-for-zig-team.tar.gz
|
|
zig ${a0} @${out_args}
|
|
\`\`\`
|
|
`);
|
|
console.log("->", out);
|
|
} finally {
|
|
// Always clean up any fmt-induced worktree changes (preserve index)
|
|
await revertUnstagedChanges();
|
|
}
|