| ... | ... | @@ -16,7 +16,6 @@ fn logOverride( |
| 16 | 16 | comptime format: []const u8, |
| 17 | 17 | args: anytype, |
| 18 | 18 | ) void { |
| 19 | | if (builtin.mode != .Debug) return; |
| 20 | 19 | const f = if (log_file) |f| f else f: { |
| 21 | 20 | const f = fuzzer.dir.createFile("libfuzzer.log", .{}) catch @panic("failed to open fuzzer log file"); |
| 22 | 21 | log_file = f; |
| ... | ... | @@ -27,7 +26,7 @@ fn logOverride( |
| 27 | 26 | f.writer().print(prefix1 ++ prefix2 ++ format ++ "\n", args) catch @panic("failed to write to fuzzer log"); |
| 28 | 27 | } |
| 29 | 28 | |
| 30 | | export threadlocal var __sancov_lowest_stack: usize = 0; |
| 29 | export threadlocal var __sancov_lowest_stack: usize = std.math.maxInt(usize); |
| 31 | 30 | |
| 32 | 31 | var module_count_8bc: usize = 0; |
| 33 | 32 | var module_count_pcs: usize = 0; |
| ... | ... | @@ -108,7 +107,6 @@ const Fuzzer = struct { |
| 108 | 107 | pc_counters: []u8, |
| 109 | 108 | n_runs: usize, |
| 110 | 109 | recent_cases: RunMap, |
| 111 | | deduplicated_runs: usize, |
| 112 | 110 | /// Data collected from code coverage instrumentation from one execution of |
| 113 | 111 | /// the test function. |
| 114 | 112 | coverage: Coverage, |
| ... | ... | @@ -120,6 +118,7 @@ const Fuzzer = struct { |
| 120 | 118 | |
| 121 | 119 | const SeenPcsHeader = extern struct { |
| 122 | 120 | n_runs: usize, |
| 121 | deduplicated_runs: usize, |
| 123 | 122 | pcs_len: usize, |
| 124 | 123 | lowest_stack: usize, |
| 125 | 124 | }; |
| ... | ... | @@ -229,6 +228,7 @@ const Fuzzer = struct { |
| 229 | 228 | } else { |
| 230 | 229 | const header: SeenPcsHeader = .{ |
| 231 | 230 | .n_runs = 0, |
| 231 | .deduplicated_runs = 0, |
| 232 | 232 | .pcs_len = flagged_pcs.len, |
| 233 | 233 | .lowest_stack = std.math.maxInt(usize), |
| 234 | 234 | }; |
| ... | ... | @@ -273,7 +273,8 @@ const Fuzzer = struct { |
| 273 | 273 | }); |
| 274 | 274 | if (gop.found_existing) { |
| 275 | 275 | //std.log.info("duplicate analysis: score={d} id={d}", .{ analysis.score, analysis.id }); |
| 276 | | f.deduplicated_runs += 1; |
| 276 | const header: *volatile SeenPcsHeader = @ptrCast(f.seen_pcs.items[0..@sizeOf(SeenPcsHeader)]); |
| 277 | _ = @atomicRmw(usize, &header.deduplicated_runs, .Add, 1, .monotonic); |
| 277 | 278 | if (f.input.items.len < gop.key_ptr.input.len or gop.key_ptr.score == 0) { |
| 278 | 279 | gpa.free(gop.key_ptr.input); |
| 279 | 280 | gop.key_ptr.input = try gpa.dupe(u8, f.input.items); |
| ... | ... | @@ -348,9 +349,6 @@ const Fuzzer = struct { |
| 348 | 349 | } |
| 349 | 350 | |
| 350 | 351 | fn dumpStats(f: *Fuzzer) void { |
| 351 | | std.log.info("stats: runs={d} deduplicated={d}", .{ |
| 352 | | f.n_runs, f.deduplicated_runs, |
| 353 | | }); |
| 354 | 352 | for (f.recent_cases.keys()[0..@min(f.recent_cases.entries.len, 5)], 0..) |run, i| { |
| 355 | 353 | std.log.info("best[{d}] id={x} score={d} input: '{}'", .{ |
| 356 | 354 | i, run.id, run.score, std.zig.fmtEscapes(run.input), |
| ... | ... | @@ -397,7 +395,6 @@ var fuzzer: Fuzzer = .{ |
| 397 | 395 | .flagged_pcs = undefined, |
| 398 | 396 | .pc_counters = undefined, |
| 399 | 397 | .n_runs = 0, |
| 400 | | .deduplicated_runs = 0, |
| 401 | 398 | .recent_cases = .{}, |
| 402 | 399 | .coverage = undefined, |
| 403 | 400 | .dir = undefined, |
Andrew Kelley <andrew@ziglang.org> 2024-07-29 21:59:23-07:00
lib