authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-06-11 15:16:04-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-06-11 15:24:57-07:00
log727f1fa74316e412c32828689e569a3d1fd1981b
tree9558809eac9dbb93c50e128c417a2196d81f44d3
parent4b776ae44139fb1a3601949b60ff580f3f16e73f

update update_cpu_features tool to latest std.Progress API

closes #20261

1 files changed, 6 insertions(+), 11 deletions(-)

tools/update_cpu_features.zig+6-11
......@@ -1038,8 +1038,7 @@ pub fn main() anyerror!void {
10381038 var zig_src_dir = try fs.cwd().openDir(zig_src_root, .{});
10391039 defer zig_src_dir.close();
10401040
1041 var progress = std.Progress{};
1042 const root_progress = progress.start("", llvm_targets.len);
1041 const root_progress = std.Progress.start(.{ .estimated_total_items = llvm_targets.len });
10431042 defer root_progress.end();
10441043
10451044 if (builtin.single_threaded) {
......@@ -1074,7 +1073,7 @@ const Job = struct {
10741073 llvm_tblgen_exe: []const u8,
10751074 llvm_src_root: []const u8,
10761075 zig_src_dir: std.fs.Dir,
1077 root_progress: *std.Progress.Node,
1076 root_progress: std.Progress.Node,
10781077 llvm_target: LlvmTarget,
10791078};
10801079
......@@ -1085,12 +1084,10 @@ fn processOneTarget(job: Job) anyerror!void {
10851084 defer arena_state.deinit();
10861085 const arena = arena_state.allocator();
10871086
1088 var progress_node = job.root_progress.start(llvm_target.zig_name, 3);
1089 progress_node.activate();
1087 const progress_node = job.root_progress.start(llvm_target.zig_name, 3);
10901088 defer progress_node.end();
10911089
1092 var tblgen_progress = progress_node.start("invoke llvm-tblgen", 0);
1093 tblgen_progress.activate();
1090 const tblgen_progress = progress_node.start("invoke llvm-tblgen", 0);
10941091
10951092 const child_args = [_][]const u8{
10961093 job.llvm_tblgen_exe,
......@@ -1127,16 +1124,14 @@ fn processOneTarget(job: Job) anyerror!void {
11271124 },
11281125 };
11291126
1130 var json_parse_progress = progress_node.start("parse JSON", 0);
1131 json_parse_progress.activate();
1127 const json_parse_progress = progress_node.start("parse JSON", 0);
11321128
11331129 const parsed = try json.parseFromSlice(json.Value, arena, json_text, .{});
11341130 defer parsed.deinit();
11351131 const root_map = &parsed.value.object;
11361132 json_parse_progress.end();
11371133
1138 var render_progress = progress_node.start("render zig code", 0);
1139 render_progress.activate();
1134 const render_progress = progress_node.start("render zig code", 0);
11401135
11411136 var features_table = std.StringHashMap(Feature).init(arena);
11421137 var all_features = std.ArrayList(Feature).init(arena);