diff --git a/src/Compilation.zig b/src/Compilation.zig index 83b0f7ff2b206b23c947437fc514ca1c1cefed6a..d62856b0111be20def4ebf322ee0f58831995161 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -2911,7 +2911,20 @@ pub fn update(comp: *Compilation, main_progress_node: std.Progress.Node) UpdateE // The linker progress node is set up here instead of in `performAllTheWork`, because // we also want it around during `flush`. if (comp.bin_file) |lf| { - comp.link_prog_node = main_progress_node.start("Linking", 0); + // mirrors logic in `Compilation.flush`: + // Always: linker flush + var initial_estimated_total: usize = 1; + const llvm = if (comp.zcu) |zcu| zcu.llvm_object != null else false; + // For llvm: "LLVM Emit Object" and "Parse Object" with the zcu object + if (llvm) { + initial_estimated_total += 2; + } + // Prelink + if (!lf.post_prelink or llvm) { + initial_estimated_total += 1; + } + + comp.link_prog_node = main_progress_node.start("Linking", initial_estimated_total); lf.startProgress(comp.link_prog_node); } defer if (comp.bin_file) |lf| { diff --git a/src/Zcu/PerThread.zig b/src/Zcu/PerThread.zig index cabb5ea749fc8a939ac67f624e25cae8cee87546..b1292e6dedb38753832091e60c5535343dfef0c2 100644 --- a/src/Zcu/PerThread.zig +++ b/src/Zcu/PerThread.zig @@ -876,6 +876,7 @@ fn updateZirRefs(pt: Zcu.PerThread) (Io.Cancelable || Allocator.Error)!void { const old_line = old_zir.getDeclaration(old_inst).src_line; const new_line = new_zir.getDeclaration(new_inst).src_line; if (old_line != new_line) { + comp.link_prog_node.increaseEstimatedTotalItems(1); try comp.link_queue.enqueueZcu(comp, pt.tid, .{ .debug_update_line_number = tracked_inst_index }); } }, diff --git a/src/link.zig b/src/link.zig index 075924712c1d71b2dc0eaa133591247b34a2de3c..84cbcbdcb78ea45a0e9e93242686f7f8f0f01748 100644 --- a/src/link.zig +++ b/src/link.zig @@ -1242,7 +1242,7 @@ pub const File = struct { dev.check(tag.devFeature()); try @as(*tag.Type(), @fieldParentPtr("base", base)).prelink(base.comp.link_prog_node); }, - else => {}, + else => base.comp.link_prog_node.completeOne(), } base.post_prelink = true; diff --git a/src/link/Coff.zig b/src/link/Coff.zig index 1f756a5bf1bfd130f2fdc62c7d990e1a9320ff62..ad85216499ff793a0737fa4082814bfbd1a001e4 100644 --- a/src/link/Coff.zig +++ b/src/link/Coff.zig @@ -5370,7 +5370,9 @@ fn loadDll(coff: *Coff, path: std.Build.Cache.Path, fr: *Io.File.Reader) LoadInp } pub fn prelink(coff: *Coff, prog_node: std.Progress.Node) link.Error!void { - _ = prog_node; + const sub_prog_node = prog_node.start("COFF Prelink", 0); + defer sub_prog_node.end(); + const base = coff.base; const comp = base.comp; @@ -5886,7 +5888,9 @@ pub fn flush( prog_node: std.Progress.Node, ) link.Error!void { _ = arena; - _ = prog_node; + const sub_prog_node = prog_node.start("COFF Flush", 0); + defer sub_prog_node.end(); + const comp = coff.base.comp; // TODO: When https://github.com/ziglang/zig/issues/23617 is in, diff --git a/src/link/Elf2.zig b/src/link/Elf2.zig index 128dbe9edb835fdd75409ea96eeb646d60882ff2..71298617402c6a939aea5f13a71ba205789e3e18 100644 --- a/src/link/Elf2.zig +++ b/src/link/Elf2.zig @@ -5267,7 +5267,7 @@ fn loadObject( .first_symbol_reloc = .none, .first_got_reloc = .none, }; - elf.synth_prog_node.increaseEstimatedTotalItems(1); + elf.input_prog_node.increaseEstimatedTotalItems(1); } var symmap: std.ArrayList(Symbol.Id) = .empty; defer symmap.deinit(gpa); @@ -5812,7 +5812,9 @@ fn updateInitFiniArraySectionSize( } pub fn prelink(elf: *Elf, prog_node: std.Progress.Node) link.Error!void { - _ = prog_node; + const sub_prog_node = prog_node.start("ELF Prelink", 0); + defer sub_prog_node.end(); + const diags = &elf.base.comp.link_diags; elf.prelinkInner() catch |err| switch (err) { error.MappedFileIo => return diags.fail("failed to write output file: {t}", .{elf.mf.io_err.?}), @@ -7055,9 +7057,11 @@ pub fn flush( ) link.Error!void { const comp = elf.base.comp; const diags = &comp.link_diags; - _ = prog_node; _ = arena; + const sub_prog_node = prog_node.start("ELF Flush", 0); + defer sub_prog_node.end(); + if (comp.config.output_mode == .Exe) { var any_undef = false; for (elf.globals.strong_undef.keys()) |name| {