authorgravatar for mlugg@mlugg.co.ukMatthew Lugg <mlugg@mlugg.co.uk> 2024-05-26 01:58:26+01:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-05-27 20:56:48-07:00
logd403d8cb7a147856232430afe9af8562d59de38b
tree955c952ed22ad2a734c4df49a4c54264daaff2b6
parentacdf988c24c51129ed3ad9929b6ed8482b9abe54

Module: fix and improve progress reporting

* correctly report time spent analyzing function bodies * print fully qualified decl names * also have a progress node for codegen The downside of these changes is that it's a bit flickerey, but the upside is that it's accurate; you can see what the compiler's doing!

2 files changed, 19 insertions(+), 4 deletions(-)

src/Compilation.zig+3
......@@ -3331,10 +3331,13 @@ pub fn performAllTheWork(
33313331 try reportMultiModuleErrors(mod);
33323332 try mod.flushRetryableFailures();
33333333 mod.sema_prog_node = main_progress_node.start("Semantic Analysis", 0);
3334 mod.codegen_prog_node = main_progress_node.start("Code Generation", 0);
33343335 }
33353336 defer if (comp.module) |mod| {
33363337 mod.sema_prog_node.end();
33373338 mod.sema_prog_node = undefined;
3339 mod.codegen_prog_node.end();
3340 mod.codegen_prog_node = undefined;
33383341 };
33393342
33403343 while (true) {
src/Module.zig+16-4
......@@ -66,6 +66,7 @@ root_mod: *Package.Module,
6666main_mod: *Package.Module,
6767std_mod: *Package.Module,
6868sema_prog_node: std.Progress.Node = undefined,
69codegen_prog_node: std.Progress.Node = undefined,
6970
7071/// Used by AstGen worker to load and store ZIR cache.
7172global_zir_cache: Compilation.Directory,
......@@ -3009,7 +3010,7 @@ pub fn ensureDeclAnalyzed(mod: *Module, decl_index: Decl.Index) SemaError!void {
30093010 };
30103011 }
30113012
3012 const decl_prog_node = mod.sema_prog_node.start(decl.name.toSlice(ip), 0);
3013 const decl_prog_node = mod.sema_prog_node.start((try decl.fullyQualifiedName(mod)).toSlice(ip), 0);
30133014 defer decl_prog_node.end();
30143015
30153016 break :blk mod.semaDecl(decl_index) catch |err| switch (err) {
......@@ -3215,6 +3216,9 @@ pub fn ensureFuncBodyAnalyzed(zcu: *Zcu, maybe_coerced_func_index: InternPool.In
32153216 };
32163217 }
32173218
3219 const codegen_prog_node = zcu.codegen_prog_node.start((try decl.fullyQualifiedName(zcu)).toSlice(ip), 0);
3220 defer codegen_prog_node.end();
3221
32183222 if (comp.bin_file) |lf| {
32193223 lf.updateFunc(zcu, func_index, air, liveness) catch |err| switch (err) {
32203224 error.OutOfMemory => return error.OutOfMemory,
......@@ -4500,6 +4504,9 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
45004504 log.debug("finish func name '{}'", .{(decl.fullyQualifiedName(mod) catch break :blk).fmt(ip)});
45014505 }
45024506
4507 const decl_prog_node = mod.sema_prog_ndoe.start((try decl.fullyQualifiedName(mod)).toSlice(ip), 0);
4508 defer decl_prog_node.end();
4509
45034510 mod.intern_pool.removeDependenciesForDepender(gpa, InternPool.Depender.wrap(.{ .func = func_index }));
45044511
45054512 var comptime_err_ret_trace = std.ArrayList(SrcLoc).init(gpa);
......@@ -5333,9 +5340,12 @@ pub fn populateTestFunctions(
53335340 // We have to call `ensureDeclAnalyzed` here in case `builtin.test_functions`
53345341 // was not referenced by start code.
53355342 mod.sema_prog_node = main_progress_node.start("Semantic Analysis", 0);
5343 mod.codegen_prog_node = main_progress_node.start("Code Generation", 0);
53365344 defer {
53375345 mod.sema_prog_node.end();
53385346 mod.sema_prog_node = undefined;
5347 mod.codegen_prog_node.end();
5348 mod.codegen_prog_node = undefined;
53395349 }
53405350 try mod.ensureDeclAnalyzed(decl_index);
53415351 }
......@@ -5445,15 +5455,18 @@ pub fn populateTestFunctions(
54455455pub fn linkerUpdateDecl(zcu: *Zcu, decl_index: Decl.Index) !void {
54465456 const comp = zcu.comp;
54475457
5458 const decl = zcu.declPtr(decl_index);
5459
5460 const codegen_prog_node = zcu.codegen_prog_node.start((try decl.fullyQualifiedName(zcu)).toSlice(&zcu.intern_pool), 0);
5461 defer codegen_prog_node.end();
5462
54485463 if (comp.bin_file) |lf| {
54495464 lf.updateDecl(zcu, decl_index) catch |err| switch (err) {
54505465 error.OutOfMemory => return error.OutOfMemory,
54515466 error.AnalysisFail => {
5452 const decl = zcu.declPtr(decl_index);
54535467 decl.analysis = .codegen_failure;
54545468 },
54555469 else => {
5456 const decl = zcu.declPtr(decl_index);
54575470 const gpa = zcu.gpa;
54585471 try zcu.failed_decls.ensureUnusedCapacity(gpa, 1);
54595472 zcu.failed_decls.putAssumeCapacityNoClobber(decl_index, try ErrorMsg.create(
......@@ -5471,7 +5484,6 @@ pub fn linkerUpdateDecl(zcu: *Zcu, decl_index: Decl.Index) !void {
54715484 llvm_object.updateDecl(zcu, decl_index) catch |err| switch (err) {
54725485 error.OutOfMemory => return error.OutOfMemory,
54735486 error.AnalysisFail => {
5474 const decl = zcu.declPtr(decl_index);
54755487 decl.analysis = .codegen_failure;
54765488 },
54775489 };