authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-07-03 13:33:09-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-07-03 13:33:09-07:00
logb6981686649ab74b91ebb27bec8a29658b3d3923
tree810f4e48b4e4612a110ef0d31f89eda9bf9ad4b8
parent15f111a085dcd2da7b91da8e29b89def24cb3c6a

stage2: update vector alignment logic

This follows LLVM14's lead on vector alignment, which computes byte count based on the length premultiplied by bits. This commit also disables behavior tests regressed by LLVM 14, only for stage1. stage2 fortunately does not trip the regression.

2 files changed, 15 insertions(+), 3 deletions(-)

src/type.zig+2-2
......@@ -2909,8 +2909,8 @@ pub const Type = extern union {
29092909 .vector => {
29102910 const len = ty.arrayLen();
29112911 const bits = try bitSizeAdvanced(ty.elemType(), target, sema_kit);
2912 const bytes = (bits + 7) / 8;
2913 const alignment = std.math.ceilPowerOfTwoAssert(u64, bytes * len);
2912 const bytes = ((bits * len) + 7) / 8;
2913 const alignment = std.math.ceilPowerOfTwoAssert(u64, bytes);
29142914 return AbiAlignmentAdvanced{ .scalar = @intCast(u32, alignment) };
29152915 },
29162916
test/behavior/vector.zig+13-1
......@@ -5,6 +5,12 @@ const math = std.math;
55const expect = std.testing.expect;
66
77test "implicit cast vector to array - bool" {
8 if (builtin.zig_backend == .stage1) {
9 // Regressed in LLVM 14:
10 // https://github.com/llvm/llvm-project/issues/55522
11 return error.SkipZigTest;
12 }
13
814 if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
915 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
1016 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
......@@ -391,6 +397,12 @@ test "initialize vector which is a struct field" {
391397}
392398
393399test "vector comparison operators" {
400 if (builtin.zig_backend == .stage1) {
401 // Regressed in LLVM 14:
402 // https://github.com/llvm/llvm-project/issues/55522
403 return error.SkipZigTest;
404 }
405
394406 if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
395407 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
396408 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
......@@ -1051,7 +1063,7 @@ test "@shlWithOverflow" {
10511063
10521064test "alignment of vectors" {
10531065 try expect(@alignOf(@Vector(2, u8)) == 2);
1054 try expect(@alignOf(@Vector(2, u1)) == 2);
1066 try expect(@alignOf(@Vector(2, u1)) == 1);
10551067 try expect(@alignOf(@Vector(1, u1)) == 1);
10561068 try expect(@alignOf(@Vector(2, u16)) == 4);
10571069}