Skip to content

stage2: fix @sizeOf() for vector types. #12028

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

stage2: fix @sizeOf() for vector types. #12028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/type.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3254,7 +3254,7 @@ pub const Type = extern union {

.array_u8 => return AbiSizeAdvanced{ .scalar = ty.castTag(.array_u8).?.data },
.array_u8_sentinel_0 => return AbiSizeAdvanced{ .scalar = ty.castTag(.array_u8_sentinel_0).?.data + 1 },
.array, .vector => {
.array => {
const payload = ty.cast(Payload.Array).?.data;
switch (try payload.elem_type.abiSizeAdvanced(target, strat)) {
.scalar => |elem_size| return AbiSizeAdvanced{ .scalar = payload.len * elem_size },
Expand All @@ -3265,6 +3265,7 @@ pub const Type = extern union {
},
}
},
.vector => return AbiSizeAdvanced{ .scalar = abiAlignment(ty, target) },
.array_sentinel => {
const payload = ty.castTag(.array_sentinel).?.data;
switch (try payload.elem_type.abiSizeAdvanced(target, strat)) {
Expand Down
84 changes: 84 additions & 0 deletions test/behavior/vector.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1076,6 +1076,90 @@ test "alignment of vectors" {
try expect(@alignOf(@Vector(2, u1)) == 1);
try expect(@alignOf(@Vector(1, u1)) == 1);
try expect(@alignOf(@Vector(2, u16)) == 4);

try expect(@alignOf(@Vector(7, i8)) == 8);
try expect(@alignOf(@Vector(8, i8)) == 8);
try expect(@alignOf(@Vector(9, i8)) == 16);

const specialcase_16_bytes = switch (builtin.target.cpu.arch) {
.arm, .armeb, .thumb, .thumbeb => true,
else => false,
};

try expect(@alignOf(@Vector(15, i8)) == 16);
if (specialcase_16_bytes) {
if (builtin.zig_backend == .stage1) {
try expect(@alignOf(@Vector(16, i8)) == 8);
} else {
// TODO
// https://github.com/ziglang/zig/issues/12137
}
} else {
try expect(@alignOf(@Vector(16, i8)) == 16);
}
try expect(@alignOf(@Vector(17, i8)) == 32);

try expect(@alignOf(@Vector(31, i8)) == 32);
try expect(@alignOf(@Vector(32, i8)) == 32);
try expect(@alignOf(@Vector(33, i8)) == 64);

try expect(@alignOf(@Vector(3, u16)) == 8);
try expect(@alignOf(@Vector(3, u64)) == 32);
try expect(@alignOf(@Vector(1, *u8)) == @sizeOf(*u8) * 1);
try expect(@alignOf(@Vector(2, *u8)) == @sizeOf(*u8) * 2);
try expect(@alignOf(@Vector(3, *u8)) == @sizeOf(*u8) * 4);

try expect(@alignOf(@Vector(3, f32)) == 16);
if (specialcase_16_bytes) {
if (builtin.zig_backend == .stage1) {
try expect(@alignOf(@Vector(4, f32)) == 8);
} else {
// TODO
// https://github.com/ziglang/zig/issues/12137
}
} else {
try expect(@alignOf(@Vector(4, f32)) == 16);
}
try expect(@alignOf(@Vector(5, f32)) == 32);

try expect(@alignOf(@Vector(8, bool)) == 1);
try expect(@alignOf(@Vector(8, u1)) == 1);
try expect(@alignOf(@Vector(9, u1)) == 2);
try expect(@alignOf(@Vector(32, u1)) == 4);
try expect(@alignOf(@Vector(33, u1)) == 8);
}

test "size of vectors" {
try expect(@sizeOf(@Vector(2, u8)) == 2);
try expect(@sizeOf(@Vector(2, u1)) == 1);
try expect(@sizeOf(@Vector(1, u1)) == 1);
try expect(@sizeOf(@Vector(2, u16)) == 4);

try expect(@sizeOf(@Vector(7, i8)) == 8);
try expect(@sizeOf(@Vector(8, i8)) == 8);
try expect(@sizeOf(@Vector(9, i8)) == 16);
try expect(@sizeOf(@Vector(15, i8)) == 16);
try expect(@sizeOf(@Vector(16, i8)) == 16);
try expect(@sizeOf(@Vector(17, i8)) == 32);
try expect(@sizeOf(@Vector(31, i8)) == 32);
try expect(@sizeOf(@Vector(32, i8)) == 32);
try expect(@sizeOf(@Vector(33, i8)) == 64);

try expect(@sizeOf(@Vector(3, u16)) == 8);
try expect(@sizeOf(@Vector(3, u64)) == 32);
try expect(@sizeOf(@Vector(1, *u8)) == @sizeOf(*u8) * 1);
try expect(@sizeOf(@Vector(2, *u8)) == @sizeOf(*u8) * 2);
try expect(@sizeOf(@Vector(3, *u8)) == @sizeOf(*u8) * 4);

try expect(@sizeOf(@Vector(3, f32)) == 16);
try expect(@sizeOf(@Vector(4, f32)) == 16);
try expect(@sizeOf(@Vector(5, f32)) == 32);

try expect(@sizeOf(@Vector(8, bool)) == 1);
try expect(@sizeOf(@Vector(8, u1)) == 1);
try expect(@sizeOf(@Vector(9, u1)) == 2);
try expect(@sizeOf(@Vector(32, u1)) == 4);
try expect(@sizeOf(@Vector(33, u1)) == 8);
}

test "loading the second vector from a slice of vectors" {
Expand Down