@zigc/lib 0.16.0-dev.3091 → 0.16.0-dev.3128

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (132) hide show
  1. package/c/math.zig +121 -30
  2. package/compiler/build_runner.zig +1 -0
  3. package/compiler/test_runner.zig +191 -59
  4. package/compiler_rt/cos.zig +141 -52
  5. package/compiler_rt/long_double.zig +37 -0
  6. package/compiler_rt/rem_pio2l.zig +173 -0
  7. package/compiler_rt/sin.zig +140 -55
  8. package/compiler_rt/sincos.zig +279 -72
  9. package/compiler_rt/tan.zig +118 -47
  10. package/compiler_rt/trig.zig +256 -6
  11. package/fuzzer.zig +855 -307
  12. package/package.json +1 -1
  13. package/std/Build/Fuzz.zig +6 -19
  14. package/std/Build/Step/Run.zig +530 -68
  15. package/std/Build/abi.zig +39 -7
  16. package/std/Build.zig +3 -0
  17. package/std/compress/flate/Compress.zig +3 -3
  18. package/std/debug/Info.zig +4 -0
  19. package/std/heap/ArenaAllocator.zig +145 -154
  20. package/std/mem/Allocator.zig +4 -5
  21. package/std/mem.zig +48 -0
  22. package/std/priority_dequeue.zig +13 -12
  23. package/std/priority_queue.zig +5 -4
  24. package/std/zig/Client.zig +8 -3
  25. package/std/zig/Server.zig +26 -0
  26. package/libc/mingw/complex/cabs.c +0 -48
  27. package/libc/mingw/complex/cabsf.c +0 -48
  28. package/libc/mingw/complex/cacos.c +0 -50
  29. package/libc/mingw/complex/cacosf.c +0 -50
  30. package/libc/mingw/complex/carg.c +0 -48
  31. package/libc/mingw/complex/cargf.c +0 -48
  32. package/libc/mingw/complex/casin.c +0 -50
  33. package/libc/mingw/complex/casinf.c +0 -50
  34. package/libc/mingw/complex/catan.c +0 -50
  35. package/libc/mingw/complex/catanf.c +0 -50
  36. package/libc/mingw/complex/ccos.c +0 -50
  37. package/libc/mingw/complex/ccosf.c +0 -50
  38. package/libc/mingw/complex/cexp.c +0 -48
  39. package/libc/mingw/complex/cexpf.c +0 -48
  40. package/libc/mingw/complex/cimag.c +0 -48
  41. package/libc/mingw/complex/cimagf.c +0 -48
  42. package/libc/mingw/complex/clog.c +0 -48
  43. package/libc/mingw/complex/clog10.c +0 -49
  44. package/libc/mingw/complex/clog10f.c +0 -49
  45. package/libc/mingw/complex/clogf.c +0 -48
  46. package/libc/mingw/complex/conj.c +0 -48
  47. package/libc/mingw/complex/conjf.c +0 -48
  48. package/libc/mingw/complex/cpow.c +0 -48
  49. package/libc/mingw/complex/cpowf.c +0 -48
  50. package/libc/mingw/complex/cproj.c +0 -48
  51. package/libc/mingw/complex/cprojf.c +0 -48
  52. package/libc/mingw/complex/creal.c +0 -48
  53. package/libc/mingw/complex/crealf.c +0 -48
  54. package/libc/mingw/complex/csin.c +0 -50
  55. package/libc/mingw/complex/csinf.c +0 -50
  56. package/libc/mingw/complex/csqrt.c +0 -48
  57. package/libc/mingw/complex/csqrtf.c +0 -48
  58. package/libc/mingw/complex/ctan.c +0 -50
  59. package/libc/mingw/complex/ctanf.c +0 -50
  60. package/libc/mingw/math/arm/s_rint.c +0 -86
  61. package/libc/mingw/math/arm/s_rintf.c +0 -51
  62. package/libc/mingw/math/arm/sincos.S +0 -30
  63. package/libc/mingw/math/arm-common/sincosl.c +0 -13
  64. package/libc/mingw/math/arm64/rint.c +0 -12
  65. package/libc/mingw/math/arm64/rintf.c +0 -12
  66. package/libc/mingw/math/arm64/sincos.S +0 -32
  67. package/libc/mingw/math/bsd_private_base.h +0 -148
  68. package/libc/mingw/math/frexpf.c +0 -13
  69. package/libc/mingw/math/frexpl.c +0 -71
  70. package/libc/mingw/math/x86/acosf.c +0 -29
  71. package/libc/mingw/math/x86/atanf.c +0 -23
  72. package/libc/mingw/math/x86/atanl.c +0 -18
  73. package/libc/mingw/math/x86/cos.def.h +0 -65
  74. package/libc/mingw/math/x86/cosl.c +0 -46
  75. package/libc/mingw/math/x86/cosl_internal.S +0 -55
  76. package/libc/mingw/math/x86/ldexp.c +0 -23
  77. package/libc/mingw/math/x86/scalbn.S +0 -41
  78. package/libc/mingw/math/x86/scalbnf.S +0 -40
  79. package/libc/mingw/math/x86/sin.def.h +0 -65
  80. package/libc/mingw/math/x86/sinl.c +0 -46
  81. package/libc/mingw/math/x86/sinl_internal.S +0 -58
  82. package/libc/mingw/math/x86/tanl.S +0 -62
  83. package/libc/mingw/misc/btowc.c +0 -28
  84. package/libc/mingw/misc/wcstof.c +0 -66
  85. package/libc/mingw/misc/wcstoimax.c +0 -132
  86. package/libc/mingw/misc/wcstoumax.c +0 -126
  87. package/libc/mingw/misc/wctob.c +0 -29
  88. package/libc/mingw/misc/winbs_uint64.c +0 -6
  89. package/libc/mingw/misc/winbs_ulong.c +0 -6
  90. package/libc/mingw/misc/winbs_ushort.c +0 -6
  91. package/libc/mingw/stdio/_Exit.c +0 -10
  92. package/libc/mingw/stdio/_findfirst64i32.c +0 -21
  93. package/libc/mingw/stdio/_findnext64i32.c +0 -21
  94. package/libc/mingw/stdio/_fstat64i32.c +0 -37
  95. package/libc/mingw/stdio/_stat64i32.c +0 -37
  96. package/libc/mingw/stdio/_wfindfirst64i32.c +0 -21
  97. package/libc/mingw/stdio/_wfindnext64i32.c +0 -21
  98. package/libc/mingw/stdio/_wstat64i32.c +0 -37
  99. package/libc/musl/src/legacy/valloc.c +0 -8
  100. package/libc/musl/src/math/__cosl.c +0 -96
  101. package/libc/musl/src/math/__sinl.c +0 -78
  102. package/libc/musl/src/math/__tanl.c +0 -143
  103. package/libc/musl/src/math/aarch64/lrint.c +0 -10
  104. package/libc/musl/src/math/aarch64/lrintf.c +0 -10
  105. package/libc/musl/src/math/aarch64/rintf.c +0 -7
  106. package/libc/musl/src/math/cosl.c +0 -39
  107. package/libc/musl/src/math/exp_data.c +0 -182
  108. package/libc/musl/src/math/exp_data.h +0 -26
  109. package/libc/musl/src/math/finite.c +0 -7
  110. package/libc/musl/src/math/finitef.c +0 -7
  111. package/libc/musl/src/math/frexp.c +0 -23
  112. package/libc/musl/src/math/frexpf.c +0 -23
  113. package/libc/musl/src/math/frexpl.c +0 -29
  114. package/libc/musl/src/math/i386/lrint.c +0 -8
  115. package/libc/musl/src/math/i386/lrintf.c +0 -8
  116. package/libc/musl/src/math/i386/rintf.c +0 -7
  117. package/libc/musl/src/math/lrint.c +0 -72
  118. package/libc/musl/src/math/lrintf.c +0 -8
  119. package/libc/musl/src/math/pow_data.c +0 -180
  120. package/libc/musl/src/math/pow_data.h +0 -22
  121. package/libc/musl/src/math/powerpc64/lrint.c +0 -16
  122. package/libc/musl/src/math/powerpc64/lrintf.c +0 -16
  123. package/libc/musl/src/math/rintf.c +0 -30
  124. package/libc/musl/src/math/s390x/rintf.c +0 -15
  125. package/libc/musl/src/math/sincosl.c +0 -60
  126. package/libc/musl/src/math/sinl.c +0 -41
  127. package/libc/musl/src/math/tanl.c +0 -29
  128. package/libc/musl/src/math/x32/lrint.s +0 -5
  129. package/libc/musl/src/math/x32/lrintf.s +0 -5
  130. package/libc/musl/src/math/x86_64/lrint.c +0 -8
  131. package/libc/musl/src/math/x86_64/lrintf.c +0 -8
  132. package/libc/wasi/libc-bottom-half/sources/reallocarray.c +0 -14
package/std/Build/abi.zig CHANGED
@@ -162,15 +162,39 @@ pub const fuzz = struct {
162
162
  pub extern fn fuzzer_init(cache_dir_path: Slice) void;
163
163
  /// `fuzzer_init` must be called first.
164
164
  pub extern fn fuzzer_coverage() Coverage;
165
+ pub extern fn fuzzer_unslide_address(addr: usize) usize;
166
+
167
+ /// Performs all the fuzzing work and selects tests to run
168
+ ///
165
169
  /// `fuzzer_init` must be called first.
166
- pub extern fn fuzzer_set_test(test_one: TestOne, unit_test_name: Slice) void;
167
- /// `fuzzer_set_test` must be called first.
168
- /// The callee owns the memory of bytes and must not free it until `fuzzer_main` returns
170
+ pub extern fn fuzzer_main(
171
+ n_tests: u32,
172
+ seed: u32,
173
+ limit_kind: LimitKind,
174
+ amount_or_instance: u64,
175
+ ) void;
176
+ pub extern fn runner_test_run(i: u32) void;
177
+ pub extern fn runner_test_name(i: u32) Slice;
178
+ // Since the runner owns the `std.zig.Server` instance, it also controls the
179
+ // concurrent Io instance so reads can be canceled. As such, the fuzzer has
180
+ // to call into the runner for any zig server / concurrent operation.
181
+ pub extern fn runner_start_input_poller() void;
182
+ pub extern fn runner_stop_input_poller() void;
183
+ /// Returns if cancelation has been indicated.
184
+ pub extern fn runner_futex_wait(*const u32, expected: u32) bool;
185
+ pub extern fn runner_futex_wake(*const u32, waiters: u32) void;
186
+ pub extern fn runner_broadcast_input(test_i: u32, bytes: Slice) void;
187
+ /// `fuzzer_main` must be called first.
188
+ ///
189
+ /// Called concurrently with `fuzzer_main`. Returns if cancelation has been indicated.
190
+ pub extern fn fuzzer_receive_input(test_i: u32, bytes: Slice) bool;
191
+
192
+ /// Must be called from inside a test function
193
+ pub extern fn fuzzer_set_test(test_one: TestOne) void;
194
+ /// Must be called from inside a test function where `fuzzer_set_test` has been called first.
169
195
  pub extern fn fuzzer_new_input(bytes: Slice) void;
170
- /// `fuzzer_set_test` must be called first.
171
- /// Resets the fuzzer's state to that of `fuzzer_init`.
172
- pub extern fn fuzzer_main(limit_kind: LimitKind, amount: u64) void;
173
- pub extern fn fuzzer_unslide_address(addr: usize) usize;
196
+ /// Must be called from inside a test function where `fuzzer_set_test` has been called first.
197
+ pub extern fn fuzzer_start_test() void;
174
198
 
175
199
  pub extern fn fuzzer_int(uid: Uid, weights: Weights) u64;
176
200
  pub extern fn fuzzer_eos(uid: Uid, weights: Weights) bool;
@@ -337,6 +361,14 @@ pub const fuzz = struct {
337
361
  }
338
362
  };
339
363
 
364
+ /// Fields are little-endian
365
+ pub const MmapInputHeader = extern struct {
366
+ pc_digest: u64 align(4), // aligned so header does not have padding
367
+ instance_id: u32,
368
+ test_i: u32,
369
+ len: u32,
370
+ };
371
+
340
372
  /// WebSocket server->client.
341
373
  ///
342
374
  /// Sent once, when fuzzing starts, to indicate the available coverage data.
package/std/Build.zig CHANGED
@@ -128,6 +128,9 @@ pub const Graph = struct {
128
128
  random_seed: u32 = 0,
129
129
  dependency_cache: InitializedDepMap = .empty,
130
130
  allow_so_scripts: ?bool = null,
131
+ /// Steps should use `io` to limit the number of jobs, however in the case of
132
+ /// a single step spawning a fixed number of processes this can be used.
133
+ max_jobs: ?u32 = null,
131
134
  time_report: bool,
132
135
  /// Similar to the `Io.Terminal.Mode` returned by `Io.lockStderr`, but also
133
136
  /// respects the '--color' flag.
@@ -1488,7 +1488,7 @@ const PackedContainer = packed struct(u2) {
1488
1488
 
1489
1489
  test Compress {
1490
1490
  const fbufs = try testingFreqBufs();
1491
- defer if (!builtin.fuzz) std.testing.allocator.destroy(fbufs);
1491
+ defer std.testing.allocator.destroy(fbufs);
1492
1492
  try std.testing.fuzz(fbufs, testFuzzedCompressInput, .{});
1493
1493
  }
1494
1494
 
@@ -1818,7 +1818,7 @@ pub const Raw = struct {
1818
1818
 
1819
1819
  test Raw {
1820
1820
  const data_buf = try std.testing.allocator.create([4 * 65536]u8);
1821
- defer if (!builtin.fuzz) std.testing.allocator.destroy(data_buf);
1821
+ defer std.testing.allocator.destroy(data_buf);
1822
1822
  var prng: std.Random.DefaultPrng = .init(std.testing.random_seed);
1823
1823
  prng.random().bytes(data_buf);
1824
1824
  try std.testing.fuzz(data_buf, testFuzzedRawInput, .{});
@@ -2491,7 +2491,7 @@ pub const Huffman = struct {
2491
2491
 
2492
2492
  test Huffman {
2493
2493
  const fbufs = try testingFreqBufs();
2494
- defer if (!builtin.fuzz) std.testing.allocator.destroy(fbufs);
2494
+ defer std.testing.allocator.destroy(fbufs);
2495
2495
  try std.testing.fuzz(fbufs, testFuzzedHuffmanInput, .{});
2496
2496
  }
2497
2497
 
@@ -99,6 +99,10 @@ pub fn resolveAddresses(
99
99
  // due to split debug information. For now, we'll just resolve the addreses one by one.
100
100
  for (sorted_pc_addrs, output) |pc_addr, *src_loc| {
101
101
  const dwarf, const dwarf_pc_addr = mf.getDwarfForAddress(gpa, io, pc_addr) catch |err| switch (err) {
102
+ error.MissingDebugInfo => {
103
+ src_loc.* = .invalid;
104
+ continue;
105
+ },
102
106
  error.InvalidMachO, error.InvalidDwarf => return error.InvalidDebugInfo,
103
107
  else => |e| return e,
104
108
  };
@@ -358,14 +358,16 @@ fn alloc(ctx: *anyopaque, n: usize, alignment: Alignment, ret_addr: usize) ?[*]u
358
358
  const end_index = @atomicRmw(usize, &node.end_index, .Add, alignable, .acquire); // acquire any memory that may have been freed
359
359
  const aligned_index = alignedIndex(buf.ptr, end_index, alignment);
360
360
  assert(end_index + alignable >= aligned_index + n);
361
- _ = @cmpxchgStrong(
362
- usize,
363
- &node.end_index,
364
- end_index + alignable,
365
- aligned_index + n,
366
- .monotonic, // no need to release alignment padding; there's no one accessing it!
367
- .monotonic,
368
- );
361
+ if (end_index + alignable != aligned_index + n) {
362
+ _ = @cmpxchgStrong(
363
+ usize,
364
+ &node.end_index,
365
+ end_index + alignable,
366
+ aligned_index + n,
367
+ .monotonic, // no need to release alignment padding; there's no one accessing it!
368
+ .monotonic,
369
+ );
370
+ }
369
371
 
370
372
  if (aligned_index + n > buf.len) break :first_node .{ node, buf.len };
371
373
  return buf[aligned_index..][0..n].ptr;
@@ -682,45 +684,40 @@ test "reset while retaining a buffer" {
682
684
  try std.testing.expectEqual(2, arena_allocator.queryCapacity());
683
685
  }
684
686
 
685
- test "fuzz" {
687
+ test "fuzz multi threaded" {
686
688
  @disableInstrumentation();
687
689
  if (@import("builtin").single_threaded) return error.SkipZigTest;
688
690
 
689
691
  const gpa = std.heap.smp_allocator;
690
692
 
693
+ var io_instance: std.Io.Threaded = .init(gpa, .{});
694
+ defer io_instance.deinit();
695
+
691
696
  var arena_state: ArenaAllocator.State = .init;
692
697
  // No need to deinit arena_state, all allocations are in `sample_buffer`!
693
698
 
694
- const control_buffer = try gpa.alloc(u8, 64 << 10 << 10);
699
+ const buffer_size = FuzzContext.max_alloc_count * FuzzContext.max_alloc_size;
700
+
701
+ const control_buffer = try gpa.alloc(u8, buffer_size);
695
702
  defer gpa.free(control_buffer);
696
703
  var control_instance: std.heap.FixedBufferAllocator = .init(control_buffer);
697
704
 
698
- const sample_buffer = try gpa.alloc(u8, 64 << 10 << 10);
705
+ const sample_buffer = try gpa.alloc(u8, buffer_size);
699
706
  defer gpa.free(sample_buffer);
700
707
  var sample_instance: FuzzAllocator = .init(sample_buffer);
701
708
 
702
- var allocs: FuzzContext.Allocs = try .initCapacity(gpa, FuzzContext.max_alloc_count);
703
- defer allocs.deinit(gpa);
704
-
705
709
  try std.testing.fuzz(FuzzContext.Init{
706
- .gpa = gpa,
707
- .allocs = &allocs,
710
+ .threaded_instance = &io_instance,
708
711
  .arena_state = &arena_state,
709
712
  .control_instance = &control_instance,
710
713
  .sample_instance = &sample_instance,
711
- }, fuzzArenaAllocator, .{});
714
+ }, fuzzMultiThreaded, .{});
712
715
  }
713
716
 
714
- fn fuzzArenaAllocator(fuzz_init: FuzzContext.Init, smith: *std.testing.Smith) anyerror!void {
717
+ fn fuzzMultiThreaded(fuzz_init: FuzzContext.Init, smith: *std.testing.Smith) anyerror!void {
715
718
  @disableInstrumentation();
716
719
  const testing = std.testing;
717
-
718
- // We use a 'fresh' `Threaded` instance every time to reset threadlocals to
719
- // their default values.
720
-
721
- var io_instance: std.Io.Threaded = .init(fuzz_init.gpa, .{});
722
- defer io_instance.deinit();
723
- const io = io_instance.io();
720
+ const io = fuzz_init.threaded_instance.io();
724
721
 
725
722
  fuzz_init.sample_instance.prepareFailures(smith);
726
723
 
@@ -731,59 +728,57 @@ fn fuzzArenaAllocator(fuzz_init: FuzzContext.Init, smith: *std.testing.Smith) an
731
728
  defer fuzz_init.arena_state.* = arena_instance.state;
732
729
 
733
730
  var ctx: FuzzContext = .init(
734
- io,
735
731
  control_allocator,
736
732
  arena_instance.allocator(),
737
- fuzz_init.allocs,
738
733
  );
739
734
  defer ctx.deinit();
740
735
 
741
- ctx.rwl.lockUncancelable(io);
742
-
743
736
  var group: std.Io.Group = .init;
744
737
  defer group.cancel(io);
745
738
 
739
+ var n_allocs: usize = 0;
746
740
  var n_actions: usize = 0;
747
741
  while (!smith.eosWeightedSimple(99, 1) and n_actions < FuzzContext.max_action_count) {
748
742
  errdefer comptime unreachable;
749
743
 
750
- const ActionTag = @typeInfo(FuzzContext.Action).@"union".tag_type.?;
751
- const weights: []const testing.Smith.Weight = weights: {
752
- if (ctx.allocs.len == ctx.allocs.capacity)
753
- break :weights &.{
754
- .value(ActionTag, .resize, 1),
755
- .value(ActionTag, .remap, 1),
756
- .value(ActionTag, .free, 1),
757
- };
758
- break :weights testing.Smith.baselineWeights(ActionTag) ++
759
- .{testing.Smith.Weight.value(ActionTag, .alloc, 2)};
760
- };
761
- const action: FuzzContext.Action = switch (smith.valueWeighted(ActionTag, weights)) {
762
- .alloc => action: {
763
- const alloc_index = ctx.allocs.addOneBounded() catch continue;
764
- ctx.allocs.items(.len)[alloc_index] = .free;
765
- break :action .{ .alloc = .{
766
- .len = nextLen(smith),
767
- .alignment = smith.valueRangeAtMost(
744
+ const weights: []const testing.Smith.Weight = if (n_allocs == FuzzContext.max_alloc_count)
745
+ &.{
746
+ .value(FuzzContext.Action, .resize, 1),
747
+ .value(FuzzContext.Action, .remap, 1),
748
+ .value(FuzzContext.Action, .free, 1),
749
+ }
750
+ else
751
+ &.{
752
+ .value(FuzzContext.Action, .resize, 1),
753
+ .value(FuzzContext.Action, .remap, 1),
754
+ .value(FuzzContext.Action, .free, 1),
755
+ .value(FuzzContext.Action, .alloc, 3),
756
+ };
757
+ switch (smith.valueWeighted(FuzzContext.Action, weights)) {
758
+ .alloc => {
759
+ const alloc_index = n_allocs;
760
+ n_allocs += 1;
761
+ ctx.allocs[alloc_index].common.len = .free;
762
+ group.concurrent(io, FuzzContext.doOneAlloc, .{
763
+ &ctx,
764
+ nextLen(smith),
765
+ smith.valueRangeAtMost(
768
766
  Alignment,
769
767
  .@"1",
770
768
  .fromByteUnits(2 * std.heap.page_size_max),
771
769
  ),
772
- .index = alloc_index,
773
- } };
770
+ @enumFromInt(alloc_index),
771
+ }) catch unreachable;
774
772
  },
775
- .resize => .{ .resize = .{ .new_len = nextLen(smith) } },
776
- .remap => .{ .remap = .{ .new_len = nextLen(smith) } },
777
- .free => .free,
778
- };
779
- group.concurrent(io, FuzzContext.doOneAction, .{ &ctx, action }) catch break;
773
+ .resize => group.concurrent(io, FuzzContext.doOneResize, .{ &ctx, nextLen(smith) }) catch unreachable,
774
+ .remap => group.concurrent(io, FuzzContext.doOneRemap, .{ &ctx, nextLen(smith) }) catch unreachable,
775
+ .free => group.concurrent(io, FuzzContext.doOneFree, .{&ctx}) catch unreachable,
776
+ }
780
777
  n_actions += 1;
781
778
  }
782
779
 
783
- ctx.rwl.unlock(io);
784
-
785
780
  try group.await(io);
786
- try ctx.check();
781
+ try ctx.check(n_allocs);
787
782
 
788
783
  // This also covers the `deinit` logic since `free_all` uses it internally.
789
784
 
@@ -806,73 +801,71 @@ fn fuzzArenaAllocator(fuzz_init: FuzzContext.Init, smith: *std.testing.Smith) an
806
801
  }
807
802
 
808
803
  fuzz_init.control_instance.reset();
809
- fuzz_init.allocs.clearRetainingCapacity();
810
- }
811
- fn nextLen(smith: *std.testing.Smith) usize {
812
- @disableInstrumentation();
813
- return usizeRange(smith, 1, 16 << 10 << 10);
814
804
  }
815
- fn usizeRange(smith: *std.testing.Smith, at_least: usize, at_most: usize) usize {
805
+ fn nextLen(smith: *std.testing.Smith) @typeInfo(FuzzContext.Alloc.Len).@"enum".tag_type {
816
806
  @disableInstrumentation();
817
- const Int = @Int(.unsigned, @min(64, @bitSizeOf(usize)));
818
- return smith.valueRangeAtMost(Int, @intCast(at_least), @intCast(at_most));
807
+ const BackingInt = @typeInfo(FuzzContext.Alloc.Len).@"enum".tag_type;
808
+ return smith.valueRangeAtMost(BackingInt, 1, FuzzContext.max_alloc_size);
819
809
  }
820
810
 
821
811
  const FuzzContext = struct {
822
- io: std.Io,
823
- rwl: std.Io.RwLock,
824
-
825
812
  control_allocator: Allocator,
826
813
  sample_allocator: Allocator,
827
814
 
828
- allocs: *Allocs,
815
+ last_alloc_index: Alloc.Index,
816
+ allocs: [max_alloc_count]Alloc,
829
817
 
830
- const max_alloc_count = 4096;
818
+ const max_alloc_count = 64;
831
819
  const max_action_count = 2 * max_alloc_count;
832
820
 
833
- const Allocs = std.MultiArrayList(struct {
821
+ const max_alloc_size = 16 << 10;
822
+
823
+ const Alloc = struct {
834
824
  control_ptr: [*]u8,
835
825
  sample_ptr: [*]u8,
836
- len: Len,
837
- alignment: Alignment,
838
- });
826
+ common: packed struct(usize) {
827
+ len: Len,
828
+ alignment: Alignment,
829
+ _: @Int(.unsigned, padding_bits) = 0,
830
+ },
831
+
832
+ const Len = enum(@Int(.unsigned, len_bits)) {
833
+ free = (1 << len_bits) - 1,
834
+ _,
835
+ };
836
+ const len_bits = @min(64, @bitSizeOf(usize)) - @bitSizeOf(Alignment);
837
+ const padding_bits = @bitSizeOf(usize) - (len_bits + @bitSizeOf(Alignment));
839
838
 
840
- const Len = enum(usize) {
841
- free = std.math.maxInt(usize),
842
- _,
839
+ const Index = enum(usize) {
840
+ none = std.math.maxInt(usize),
841
+ _,
842
+ };
843
843
  };
844
844
 
845
- const Action = union(enum(u8)) {
846
- alloc: struct { len: usize, alignment: Alignment, index: usize },
847
- resize: struct { new_len: usize },
848
- remap: struct { new_len: usize },
845
+ const Action = enum {
846
+ alloc,
847
+ resize,
848
+ remap,
849
849
  free,
850
850
  };
851
851
 
852
- threadlocal var tls_next: u8 = 0;
853
- threadlocal var tls_last_index: ?usize = null;
854
-
855
852
  const Init = struct {
856
- gpa: Allocator,
857
- allocs: *FuzzContext.Allocs,
853
+ threaded_instance: *std.Io.Threaded,
858
854
  arena_state: *ArenaAllocator.State,
859
855
  control_instance: *std.heap.FixedBufferAllocator,
860
856
  sample_instance: *FuzzAllocator,
861
857
  };
862
858
 
863
859
  fn init(
864
- io: std.Io,
865
860
  control_allocator: Allocator,
866
861
  sample_allocator: Allocator,
867
- allocs: *Allocs,
868
862
  ) FuzzContext {
869
863
  @disableInstrumentation();
870
864
  return .{
871
- .io = io,
872
- .rwl = .init,
873
865
  .control_allocator = control_allocator,
874
866
  .sample_allocator = sample_allocator,
875
- .allocs = allocs,
867
+ .last_alloc_index = .none,
868
+ .allocs = undefined,
876
869
  };
877
870
  }
878
871
 
@@ -881,35 +874,22 @@ const FuzzContext = struct {
881
874
  ctx.* = undefined;
882
875
  }
883
876
 
884
- fn check(ctx: *const FuzzContext) !void {
877
+ fn check(ctx: *const FuzzContext, n_allocs: usize) !void {
885
878
  @disableInstrumentation();
886
- for (0..ctx.allocs.len) |index| {
887
- const len: usize = switch (ctx.allocs.items(.len)[index]) {
879
+ for (ctx.allocs[0..n_allocs]) |allocation| {
880
+ const len: usize = switch (allocation.common.len) {
888
881
  .free => continue,
889
882
  _ => |len| @intFromEnum(len),
890
883
  };
891
- const control = ctx.allocs.items(.control_ptr)[index][0..len];
892
- const sample = ctx.allocs.items(.sample_ptr)[index][0..len];
884
+ const control = allocation.control_ptr[0..len];
885
+ const sample = allocation.sample_ptr[0..len];
893
886
  try std.testing.expectEqualSlices(u8, control, sample);
894
887
  }
895
888
  }
896
889
 
897
- fn doOneAction(ctx: *FuzzContext, action: Action) std.Io.Cancelable!void {
890
+ fn doOneAlloc(ctx: *FuzzContext, len: usize, alignment: Alignment, index: Alloc.Index) void {
898
891
  @disableInstrumentation();
899
- ctx.rwl.lockSharedUncancelable(ctx.io);
900
- defer ctx.rwl.unlockShared(ctx.io);
901
-
902
- switch (action) {
903
- .alloc => |act| ctx.doOneAlloc(act.len, act.alignment, act.index),
904
- .resize => |act| ctx.doOneResize(act.new_len),
905
- .remap => |act| ctx.doOneRemap(act.new_len),
906
- .free => ctx.doOneFree(),
907
- }
908
- }
909
-
910
- fn doOneAlloc(ctx: *FuzzContext, len: usize, alignment: Alignment, index: usize) void {
911
- @disableInstrumentation();
912
- assert(ctx.allocs.items(.len)[index] == .free);
892
+ assert(ctx.allocs[@intFromEnum(index)].common.len == .free);
913
893
 
914
894
  const control_ptr = ctx.control_allocator.rawAlloc(len, alignment, @returnAddress()) orelse
915
895
  return;
@@ -918,38 +898,42 @@ const FuzzContext = struct {
918
898
  return;
919
899
  };
920
900
 
921
- ctx.allocs.set(index, .{
901
+ ctx.allocs[@intFromEnum(index)] = .{
922
902
  .control_ptr = control_ptr,
923
903
  .sample_ptr = sample_ptr,
924
- .len = @enumFromInt(len),
925
- .alignment = alignment,
926
- });
927
-
928
- for (control_ptr[0..len], sample_ptr[0..len]) |*control, *sample| {
929
- control.* = tls_next;
930
- sample.* = tls_next;
931
- tls_next +%= 1;
904
+ .common = .{
905
+ .len = @enumFromInt(len),
906
+ .alignment = alignment,
907
+ },
908
+ };
909
+
910
+ for (control_ptr[0..len], sample_ptr[0..len], 0..) |*control, *sample, i| {
911
+ control.* = @truncate(i);
912
+ sample.* = @truncate(i);
932
913
  }
933
914
 
934
- tls_last_index = index;
915
+ @atomicStore(Alloc.Index, &ctx.last_alloc_index, index, .release);
935
916
  }
936
917
  fn doOneResize(ctx: *FuzzContext, new_len: usize) void {
937
918
  @disableInstrumentation();
938
- const index = tls_last_index orelse return;
939
- const len = ctx.allocs.items(.len)[index];
940
- assert(len != .free);
941
- const memory = ctx.allocs.items(.sample_ptr)[index][0..@intFromEnum(len)];
942
- const alignment = ctx.allocs.items(.alignment)[index];
943
919
 
944
- assert(alignment.check(@intFromPtr(ctx.allocs.items(.control_ptr)[index])));
945
- assert(alignment.check(@intFromPtr(ctx.allocs.items(.sample_ptr)[index])));
920
+ const index = @atomicRmw(Alloc.Index, &ctx.last_alloc_index, .Xchg, .none, .acquire);
921
+ if (index == .none) return;
922
+
923
+ const allocation = &ctx.allocs[@intFromEnum(index)];
924
+ assert(allocation.common.len != .free);
925
+ const memory = allocation.sample_ptr[0..@intFromEnum(allocation.common.len)];
926
+ const alignment = allocation.common.alignment;
927
+
928
+ assert(alignment.check(@intFromPtr(allocation.control_ptr)));
929
+ assert(alignment.check(@intFromPtr(allocation.sample_ptr)));
946
930
 
947
931
  // Since `resize` is fallible, we have to ensure that `control_allocator`
948
932
  // is always successful by reserving the memory we need beforehand.
949
933
  const new_control_ptr = ctx.control_allocator.rawAlloc(new_len, alignment, @returnAddress()) orelse
950
934
  return;
951
935
  if (ctx.sample_allocator.rawResize(memory, alignment, new_len, @returnAddress())) {
952
- const old_control = ctx.allocs.items(.control_ptr)[index][0..memory.len];
936
+ const old_control = allocation.control_ptr[0..memory.len];
953
937
  const overlap = @min(memory.len, new_len);
954
938
  @memcpy(new_control_ptr[0..overlap], old_control[0..overlap]);
955
939
  ctx.control_allocator.rawFree(old_control, alignment, @returnAddress());
@@ -958,23 +942,27 @@ const FuzzContext = struct {
958
942
  return;
959
943
  }
960
944
 
961
- ctx.allocs.set(index, .{
945
+ ctx.allocs[@intFromEnum(index)] = .{
962
946
  .control_ptr = new_control_ptr,
963
947
  .sample_ptr = memory.ptr,
964
- .len = @enumFromInt(new_len),
965
- .alignment = alignment,
966
- });
948
+ .common = .{
949
+ .len = @enumFromInt(new_len),
950
+ .alignment = alignment,
951
+ },
952
+ };
967
953
 
968
954
  if (new_len > memory.len) {
969
955
  for (
970
- ctx.allocs.items(.control_ptr)[index][memory.len..new_len],
971
- ctx.allocs.items(.sample_ptr)[index][memory.len..new_len],
972
- ) |*control, *sample| {
973
- control.* = tls_next;
974
- sample.* = tls_next;
975
- tls_next +%= 1;
956
+ allocation.control_ptr[memory.len..new_len],
957
+ allocation.sample_ptr[memory.len..new_len],
958
+ 0..,
959
+ ) |*control, *sample, i| {
960
+ control.* = @truncate(i);
961
+ sample.* = @truncate(i);
976
962
  }
977
963
  }
964
+
965
+ @atomicStore(Alloc.Index, &ctx.last_alloc_index, index, .release);
978
966
  }
979
967
  fn doOneRemap(ctx: *FuzzContext, new_len: usize) void {
980
968
  @disableInstrumentation();
@@ -982,26 +970,29 @@ const FuzzContext = struct {
982
970
  }
983
971
  fn doOneFree(ctx: *FuzzContext) void {
984
972
  @disableInstrumentation();
985
- const index = tls_last_index orelse return;
986
- const len = ctx.allocs.items(.len)[index];
987
- assert(len != .free);
988
- const memory = ctx.allocs.items(.sample_ptr)[index][0..@intFromEnum(len)];
989
- const alignment = ctx.allocs.items(.alignment)[index];
990
973
 
991
- assert(alignment.check(@intFromPtr(ctx.allocs.items(.control_ptr)[index])));
992
- assert(alignment.check(@intFromPtr(ctx.allocs.items(.sample_ptr)[index])));
974
+ const index = @atomicRmw(Alloc.Index, &ctx.last_alloc_index, .Xchg, .none, .acquire);
975
+ if (index == .none) return;
993
976
 
994
- ctx.control_allocator.rawFree(ctx.allocs.items(.control_ptr)[index][0..memory.len], alignment, @returnAddress());
995
- ctx.sample_allocator.rawFree(ctx.allocs.items(.sample_ptr)[index][0..memory.len], alignment, @returnAddress());
977
+ const allocation = &ctx.allocs[@intFromEnum(index)];
978
+ assert(allocation.common.len != .free);
979
+ const len: usize = @intFromEnum(allocation.common.len);
980
+ const alignment = allocation.common.alignment;
996
981
 
997
- ctx.allocs.set(index, .{
982
+ assert(alignment.check(@intFromPtr(allocation.control_ptr)));
983
+ assert(alignment.check(@intFromPtr(allocation.sample_ptr)));
984
+
985
+ ctx.control_allocator.rawFree(allocation.control_ptr[0..len], alignment, @returnAddress());
986
+ ctx.sample_allocator.rawFree(allocation.sample_ptr[0..len], alignment, @returnAddress());
987
+
988
+ ctx.allocs[@intFromEnum(index)] = .{
998
989
  .control_ptr = undefined,
999
990
  .sample_ptr = undefined,
1000
- .len = .free,
1001
- .alignment = undefined,
1002
- });
1003
-
1004
- tls_last_index = null;
991
+ .common = .{
992
+ .len = .free,
993
+ .alignment = .@"1",
994
+ },
995
+ };
1005
996
  }
1006
997
  };
1007
998
 
@@ -322,7 +322,7 @@ pub fn resize(self: Allocator, allocation: anytype, new_len: usize) bool {
322
322
  if (allocation.len == 0) {
323
323
  return false;
324
324
  }
325
- const old_memory = mem.sliceAsBytes(allocation);
325
+ const old_memory: []u8 = @ptrCast(@constCast(mem.absorbSentinel(allocation)));
326
326
  // I would like to use saturating multiplication here, but LLVM cannot lower it
327
327
  // on WebAssembly: https://github.com/ziglang/zig/issues/9660
328
328
  //const new_len_bytes = new_len *| @sizeOf(T);
@@ -368,7 +368,7 @@ pub fn remap(self: Allocator, allocation: anytype, new_len: usize) ?@TypeOf(allo
368
368
  new_memory.len = new_len;
369
369
  return new_memory;
370
370
  }
371
- const old_memory = mem.sliceAsBytes(allocation);
371
+ const old_memory: []u8 = @ptrCast(@constCast(mem.absorbSentinel(allocation)));
372
372
  // I would like to use saturating multiplication here, but LLVM cannot lower it
373
373
  // on WebAssembly: https://github.com/ziglang/zig/issues/9660
374
374
  //const new_len_bytes = new_len *| @sizeOf(T);
@@ -420,7 +420,7 @@ pub fn reallocAdvanced(
420
420
  return ptr;
421
421
  }
422
422
 
423
- const old_byte_slice = mem.sliceAsBytes(old_mem);
423
+ const old_byte_slice: []u8 = @ptrCast(@constCast(mem.absorbSentinel(old_mem)));
424
424
  const byte_count = math.mul(usize, @sizeOf(T), new_n) catch return error.OutOfMemory;
425
425
  // Note: can't set shrunk memory to undefined as memory shouldn't be modified on realloc failure
426
426
  if (self.rawRemap(old_byte_slice, .fromByteUnits(slice_info.alignment orelse @alignOf(T)), byte_count, return_address)) |p| {
@@ -443,8 +443,7 @@ pub fn reallocAdvanced(
443
443
  pub fn free(self: Allocator, memory: anytype) void {
444
444
  const slice_info = @typeInfo(@TypeOf(memory)).pointer;
445
445
  comptime assert(slice_info.size == .slice);
446
- const mem_with_sent = memory[0 .. memory.len + @intFromBool(slice_info.sentinel() != null)];
447
- const bytes: []u8 = @ptrCast(@constCast(mem_with_sent));
446
+ const bytes: []u8 = @ptrCast(@constCast(mem.absorbSentinel(memory)));
448
447
  if (bytes.len == 0) return;
449
448
  @memset(bytes, undefined);
450
449
  self.rawFree(bytes, .fromByteUnits(slice_info.alignment orelse @alignOf(slice_info.child)), @returnAddress());