Nixyri/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2024-11-24 21:30:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21688 from Snektron/spirv-fix

Browse Source 
spirv: fix some bitrot
This commit is contained in:
Robin Voetter 2024-10-13 22:33:03 +02:00 committed by GitHub
commit e2e79960d2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 45 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/codegen/spirv.zig
View File

@ -190,6 +190,7 @@ pub const Object = struct {
nav_index: InternPool.Nav.Index,
air: Air,
liveness: Liveness,
do_codegen: bool,
) !void {
const zcu = pt.zcu;
const gpa = zcu.gpa;
@ -214,7 +215,7 @@ pub const Object = struct {
};
defer nav_gen.deinit();
nav_gen.genNav() catch |err| switch (err) {
nav_gen.genNav(do_codegen) catch |err| switch (err) {
error.CodegenFail => {
try zcu.failed_codegen.put(gpa, nav_index, nav_gen.error_msg.?);
},
@ -239,7 +240,7 @@ pub const Object = struct {
) !void {
const nav = pt.zcu.funcInfo(func_index).owner_nav;
// TODO: Separate types for generating decls and functions?
try self.genNav(pt, nav, air, liveness);
try self.genNav(pt, nav, air, liveness, true);
}
pub fn updateNav(
@ -247,7 +248,7 @@ pub const Object = struct {
pt: Zcu.PerThread,
nav: InternPool.Nav.Index,
) !void {
try self.genNav(pt, nav, undefined, undefined);
try self.genNav(pt, nav, undefined, undefined, false);
}
/// Fetch or allocate a result id for nav index. This function also marks the nav as alive.
@ -2943,16 +2944,22 @@ const NavGen = struct {
try self.spv.declareEntryPoint(spv_decl_index, test_name, .Kernel);
}
fn genNav(self: *NavGen) !void {
fn genNav(self: *NavGen, do_codegen: bool) !void {
const pt = self.pt;
const zcu = pt.zcu;
const ip = &zcu.intern_pool;
const spv_decl_index = try self.object.resolveNav(zcu, self.owner_nav);
const result_id = self.spv.declPtr(spv_decl_index).result_id;
const nav = ip.getNav(self.owner_nav);
const val = zcu.navValue(self.owner_nav);
const ty = val.typeOf(zcu);
if (!do_codegen and !ty.hasRuntimeBits(zcu)) {
return;
}
const spv_decl_index = try self.object.resolveNav(zcu, self.owner_nav);
const result_id = self.spv.declPtr(spv_decl_index).result_id;
switch (self.spv.declPtr(spv_decl_index).kind) {
.func => {
const fn_info = zcu.typeToFunc(ty).?;
@ -3343,7 +3350,9 @@ const NavGen = struct {
.store, .store_safe => return self.airStore(inst),
.br => return self.airBr(inst),
.repeat => return self.fail("TODO implement `repeat`", .{}),
// For now just ignore this instruction. This effectively falls back on the old implementation,
// this doesn't change anything for us.
.repeat => return,
.breakpoint => return,
.cond_br => return self.airCondBr(inst),
.loop => return self.airLoop(inst),
@ -3356,7 +3365,7 @@ const NavGen = struct {
.dbg_stmt => return self.airDbgStmt(inst),
.dbg_inline_block => try self.airDbgInlineBlock(inst),
.dbg_var_ptr, .dbg_var_val => return self.airDbgVar(inst),
.dbg_var_ptr, .dbg_var_val, .dbg_arg_inline => return self.airDbgVar(inst),
.unwrap_errunion_err => try self.airErrUnionErr(inst),
.unwrap_errunion_payload => try self.airErrUnionPayload(inst),
@ -6535,10 +6544,6 @@ const NavGen = struct {
.id_ref_3 = params[0..n_params],
});
if (return_type == .noreturn_type) {
try self.func.body.emit(self.spv.gpa, .OpUnreachable, {});
}
if (self.liveness.isUnused(inst) or !Type.fromInterned(return_type).hasRuntimeBitsIgnoreComptime(zcu)) {
return null;
}

2
src/link/SpirV.zig
View File

@ -140,7 +140,7 @@ pub fn updateNav(self: *SpirV, pt: Zcu.PerThread, nav: InternPool.Nav.Index) !vo
}
const ip = &pt.zcu.intern_pool;
log.debug("lowering declaration {}", .{ip.getNav(nav).name.fmt(ip)});
log.debug("lowering nav {}({d})", .{ ip.getNav(nav).fqn.fmt(ip), nav });
try self.object.updateNav(pt, nav);
}

1
test/behavior/basic.zig
View File

@ -1260,6 +1260,7 @@ test "integer compare <= 64 bits" {
test "integer compare <= 128 bits" {
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
inline for (.{ u65, u96, u127, u128 }) |T| {
try testUnsignedCmp(T);

2
test/behavior/decl_literals.zig
View File

@ -73,6 +73,8 @@ test "call decl literal" {
}
test "call decl literal with error union" {
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
const S = struct {
x: u32,
fn init(err: bool) !@This() {

2
test/behavior/eval.zig
View File

@ -1618,6 +1618,8 @@ test "struct in comptime false branch is not evaluated" {
}
test "result of nested switch assigned to variable" {
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
var zds: u32 = 0;
zds = switch (zds) {
0 => switch (zds) {

1
test/behavior/inline_switch.zig
View File

@ -113,6 +113,7 @@ test "inline else enum" {
test "inline else int with gaps" {
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
var a: u8 = 0;
_ = &a;

4
test/behavior/math.zig
View File

@ -833,6 +833,8 @@ test "@addWithOverflow > 64 bits" {
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
try testAddWithOverflow(u65, 4, 105, 109, 0);
try testAddWithOverflow(u65, 1000, 100, 1100, 0);
@ -986,6 +988,7 @@ test "@mulWithOverflow bitsize 128 bits" {
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
try testMulWithOverflow(u128, 3, 0x5555555555555555_5555555555555555, 0xffffffffffffffff_ffffffffffffffff, 0);
try testMulWithOverflow(u128, 3, 0x5555555555555555_5555555555555556, 2, 1);
@ -1065,6 +1068,7 @@ test "@subWithOverflow > 64 bits" {
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
try testSubWithOverflow(u65, 4, 105, maxInt(u65) - 100, 1);
try testSubWithOverflow(u65, 1000, 100, 900, 0);

1
test/behavior/pointers.zig
View File

@ -45,6 +45,7 @@ test "pointer-integer arithmetic" {
test "pointer subtraction" {
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
{
const a: *u8 = @ptrFromInt(100);

16
test/behavior/switch.zig
View File

@ -12,6 +12,8 @@ test "switch with numbers" {
}
fn testSwitchWithNumbers(x: u32) !void {
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
const result = switch (x) {
1, 2, 3, 4...8 => false,
13 => true,
@ -22,6 +24,7 @@ fn testSwitchWithNumbers(x: u32) !void {
test "switch with all ranges" {
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
try expect(testSwitchWithAllRanges(50, 3) == 1);
try expect(testSwitchWithAllRanges(101, 0) == 2);
@ -173,6 +176,7 @@ test "undefined.u0" {
test "switch with disjoint range" {
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
var q: u8 = 0;
_ = &q;
@ -184,6 +188,8 @@ test "switch with disjoint range" {
}
test "switch variable for range and multiple prongs" {
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
const S = struct {
fn doTheTest() !void {
try doTheSwitch(16);
@ -281,6 +287,8 @@ test "switch handles all cases of number" {
}
fn testSwitchHandleAllCases() !void {
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
try expect(testSwitchHandleAllCasesExhaustive(0) == 3);
try expect(testSwitchHandleAllCasesExhaustive(1) == 2);
try expect(testSwitchHandleAllCasesExhaustive(2) == 1);
@ -497,6 +505,7 @@ test "switch prongs with error set cases make a new error set type for capture v
test "return result loc and then switch with range implicit casted to error union" {
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
const S = struct {
fn doTheTest() !void {
@ -714,6 +723,7 @@ test "switch capture copies its payload" {
test "capture of integer forwards the switch condition directly" {
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
const S = struct {
fn foo(x: u8) !void {
@ -854,6 +864,7 @@ test "inline switch range that includes the maximum value of the switched type"
test "nested break ignores switch conditions and breaks instead" {
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
const S = struct {
fn register_to_address(ident: []const u8) !u8 {
@ -901,6 +912,7 @@ test "peer type resolution on switch captures ignores unused payload bits" {
test "switch prong captures range" {
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
const S = struct {
fn a(b: []u3, c: u3) void {
@ -935,6 +947,8 @@ test "prong with inline call to unreachable" {
}
test "block error return trace index is reset between prongs" {
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
const S = struct {
fn returnError() error{TestFailed} {
return error.TestFailed;
@ -963,6 +977,8 @@ test "block error return trace index is reset between prongs" {
}
test "labeled switch with break" {
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
var six: u32 = undefined;
six = 6;