| author |  Kendall Condon <goon.pri.low@gmail.com> 2025-06-27 13:38:54-04:00 |
| committer |  Matthew Lugg <mlugg@mlugg.co.uk> 2025-07-30 09:56:38+01:00 |
| log | f7dc9b50ab1ebc9714b1fa1b9929ae5f778fed69 |
| tree | 19272a0ab2ebb5f962d1a8cb878cca59562fb8c8 |
| parent | 4a1594fbdebfeae989ff7c74be737b4879e1916e |
llvm: fix atomic widening of packed structs
Additionally, disable failing big-endian atomic test
also improve test paramaters to catch this when condition is removed
also some other cleanups2 files changed, 14 insertions(+), 6 deletions(-)
src- codegen
- test
- behavior
src/codegen/llvm.zig+3-1
| ... | ... | @@ -4339,9 +4339,11 @@ pub const Object = struct { |
| 4339 | 4339 | /// types to work around a LLVM deficiency when targeting ARM/AArch64. |
| 4340 | 4340 | fn getAtomicAbiType(o: *Object, pt: Zcu.PerThread, ty: Type, is_rmw_xchg: bool) Allocator.Error!Builder.Type { |
| 4341 | 4341 | const zcu = pt.zcu; |
| 4342 | const ip = &zcu.intern_pool; | |
| 4342 | 4343 | const int_ty = switch (ty.zigTypeTag(zcu)) { |
| 4343 | 4344 | .int => ty, |
| 4344 | 4345 | .@"enum" => ty.intTagType(zcu), |
| 4346 | .@"struct" => Type.fromInterned(ip.loadStructType(ty.toIntern()).backingIntTypeUnordered(ip)), | |
| 4345 | 4347 | .float => { |
| 4346 | 4348 | if (!is_rmw_xchg) return .none; |
| 4347 | 4349 | return o.builder.intType(@intCast(ty.abiSize(zcu) * 8)); |
| ... | ... | @@ -11424,7 +11426,7 @@ pub const FuncGen = struct { |
| 11424 | 11426 | |
| 11425 | 11427 | if (workaround_disable_truncate) { |
| 11426 | 11428 | // see https://github.com/llvm/llvm-project/issues/64222 |
| 11427 | // disable the truncation codepath for larger that 32bits value - with this heuristic, the backend passes the test suite. | |
| 11429 | // disable the truncation codepath for larger than 32bits value - with this heuristic, the backend passes the test suite. | |
| 11428 | 11430 | return try fg.wip.load(access_kind, payload_llvm_ty, payload_ptr, payload_alignment, ""); |
| 11429 | 11431 | } |
| 11430 | 11432 |
test/behavior/atomics.zig+11-5
| ... | ... | @@ -1,7 +1,6 @@ |
| 1 | 1 | const std = @import("std"); |
| 2 | 2 | const builtin = @import("builtin"); |
| 3 | 3 | const expect = std.testing.expect; |
| 4 | const expectEqual = std.testing.expectEqual; | |
| 5 | 4 | |
| 6 | 5 | const supports_128_bit_atomics = switch (builtin.cpu.arch) { |
| 7 | 6 | // TODO: Ideally this could be sync'd with the logic in Sema. |
| ... | ... | @@ -364,25 +363,32 @@ test "atomics with different types" { |
| 364 | 363 | if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO |
| 365 | 364 | if (builtin.zig_backend == .stage2_spirv) return error.SkipZigTest; |
| 366 | 365 | if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest; |
| 366 | if (builtin.target.cpu.arch.endian() == .big) return error.SkipZigTest; // #24282 | |
| 367 | 367 | |
| 368 | 368 | try testAtomicsWithType(bool, true, false); |
| 369 | 369 | |
| 370 | 370 | try testAtomicsWithType(u1, 0, 1); |
| 371 | try testAtomicsWithType(i4, 0, 1); | |
| 372 | try testAtomicsWithType(u5, 0, 1); | |
| 373 | try testAtomicsWithType(i15, 0, 1); | |
| 374 | try testAtomicsWithType(u24, 0, 1); | |
| 371 | try testAtomicsWithType(i4, 2, 1); | |
| 372 | try testAtomicsWithType(u5, 2, 1); | |
| 373 | try testAtomicsWithType(i15, 2, 1); | |
| 374 | try testAtomicsWithType(u24, 2, 1); | |
| 375 | 375 | |
| 376 | 376 | try testAtomicsWithType(u0, 0, 0); |
| 377 | 377 | try testAtomicsWithType(i0, 0, 0); |
| 378 | 378 | |
| 379 | 379 | try testAtomicsWithType(enum(u32) { x = 1234, y = 5678 }, .x, .y); |
| 380 | try testAtomicsWithType(enum(u19) { x = 1234, y = 5678 }, .x, .y); | |
| 380 | 381 | |
| 381 | 382 | try testAtomicsWithPackedStruct( |
| 382 | 383 | packed struct { x: u7, y: u24, z: bool }, |
| 383 | 384 | .{ .x = 1, .y = 2, .z = true }, |
| 384 | 385 | .{ .x = 3, .y = 4, .z = false }, |
| 385 | 386 | ); |
| 387 | try testAtomicsWithPackedStruct( | |
| 388 | packed struct { x: u19, y: bool }, | |
| 389 | .{ .x = 1, .y = true }, | |
| 390 | .{ .x = 3, .y = false }, | |
| 391 | ); | |
| 386 | 392 | } |
| 387 | 393 | |
| 388 | 394 | fn testAtomicsWithType(comptime T: type, a: T, b: T) !void { |