authorgravatar for alichraghi@proton.meAli Chraghi <alichraghi@proton.me> 2024-02-08 02:02:33+03:30
committergravatar for alichraghi@proton.meAli Chraghi <alichraghi@proton.me> 2024-02-09 09:27:08+03:30
log37b0aa600ad47872d3a03f9e9fb60316fc3587c5
treef10a2241876fdd27135a62a6112d0d98d0a5f8ef
parenteb2d61d02e503f01070c05e2e1fc87e827124d94

spirv: make rusticl the primary testing implementation

13 files changed, 21 insertions(+), 15 deletions(-)

src/codegen/spirv/Module.zig+6-7
......@@ -407,12 +407,12 @@ pub fn flush(self: *Module, file: std.fs.File, target: std.Target) !void {
407407 var types_constants = try self.cache.materialize(self);
408408 defer types_constants.deinit(self.gpa);
409409
410 // TODO: Vulkan doesn't support initializer kernel
411 var init_func = if (target.os.tag != .vulkan)
412 try self.initializer(&entry_points)
413 else
414 Section{};
415 defer init_func.deinit(self.gpa);
410 // // TODO: Pass global variables as function parameters
411 // var init_func = if (target.os.tag != .vulkan)
412 // try self.initializer(&entry_points)
413 // else
414 // Section{};
415 // defer init_func.deinit(self.gpa);
416416
417417 const header = [_]Word{
418418 spec.magic_number,
......@@ -458,7 +458,6 @@ pub fn flush(self: *Module, file: std.fs.File, target: std.Target) !void {
458458 self.sections.types_globals_constants.toWords(),
459459 globals.toWords(),
460460 self.sections.functions.toWords(),
461 init_func.toWords(),
462461 };
463462
464463 var iovc_buffers: [buffers.len]std.os.iovec_const = undefined;
test/behavior/basic.zig-2
......@@ -756,7 +756,6 @@ test "extern variable with non-pointer opaque type" {
756756 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
757757 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
758758 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
759 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
760759 if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
761760
762761 @export(var_to_export, .{ .name = "opaque_extern_var" });
......@@ -1195,7 +1194,6 @@ test "integer compare" {
11951194
11961195test "reference to inferred local variable works as expected" {
11971196 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
1198 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
11991197
12001198 const Crasher = struct {
12011199 lets_crash: u64 = 0,
test/behavior/byval_arg_var.zig+1
......@@ -5,6 +5,7 @@ var result: []const u8 = "wrong";
55
66test "pass string literal byvalue to a generic var param" {
77 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
8 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
89
910 start();
1011 blowUpStack(10);
test/behavior/cast.zig+1
......@@ -1262,6 +1262,7 @@ test "implicit cast from *T to ?*anyopaque" {
12621262 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
12631263 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
12641264 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
1265 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
12651266
12661267 var a: u8 = 1;
12671268 incrementVoidPtrValue(&a);
test/behavior/error.zig+2
......@@ -124,6 +124,7 @@ test "debug info for optional error set" {
124124
125125test "implicit cast to optional to error union to return result loc" {
126126 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
127 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
127128
128129 const S = struct {
129130 fn entry() !void {
......@@ -950,6 +951,7 @@ test "returning an error union containing a type with no runtime bits" {
950951test "try used in recursive function with inferred error set" {
951952 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
952953 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
954 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
953955
954956 const Value = union(enum) {
955957 values: []const @This(),
test/behavior/floatop.zig+2
......@@ -127,6 +127,7 @@ test "cmp f16" {
127127test "cmp f32/f64" {
128128 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
129129 if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
130 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
130131
131132 try testCmp(f32);
132133 try comptime testCmp(f32);
......@@ -978,6 +979,7 @@ test "@abs f32/f64" {
978979 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
979980 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
980981 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
982 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
981983
982984 try testFabs(f32);
983985 try comptime testFabs(f32);
test/behavior/globals.zig-1
......@@ -50,7 +50,6 @@ test "global loads can affect liveness" {
5050 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
5151 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
5252 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest;
53 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
5453
5554 const S = struct {
5655 const ByRef = struct {
test/behavior/optional.zig+3
......@@ -28,6 +28,7 @@ pub const EmptyStruct = struct {};
2828
2929test "optional pointer to size zero struct" {
3030 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
31 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
3132
3233 var e = EmptyStruct{};
3334 const o: ?*EmptyStruct = &e;
......@@ -35,6 +36,8 @@ test "optional pointer to size zero struct" {
3536}
3637
3738test "equality compare optional pointers" {
39 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
40
3841 try testNullPtrsEql();
3942 try comptime testNullPtrsEql();
4043}
test/behavior/pointers.zig+1
......@@ -216,6 +216,7 @@ test "assign null directly to C pointer and test null equality" {
216216 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
217217 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
218218 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
219 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
219220
220221 var x: [*c]i32 = null;
221222 _ = &x;
test/behavior/typename.zig-5
......@@ -41,7 +41,6 @@ test "anon field init" {
4141 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
4242 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
4343 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
44 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
4544
4645 const Foo = .{
4746 .T1 = struct {},
......@@ -90,7 +89,6 @@ test "top level decl" {
9089 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
9190 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
9291 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
93 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
9492
9593 try expectEqualStrings(
9694 "behavior.typename.A_Struct",
......@@ -140,7 +138,6 @@ test "fn param" {
140138 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
141139 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
142140 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
143 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
144141
145142 // https://github.com/ziglang/zig/issues/675
146143 try expectEqualStrings(
......@@ -211,7 +208,6 @@ test "local variable" {
211208 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
212209 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
213210 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
214 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
215211
216212 const Foo = struct { a: u32 };
217213 const Bar = union { a: u32 };
......@@ -239,7 +235,6 @@ test "anon name strategy used in sub expression" {
239235 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
240236 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
241237 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
242 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
243238
244239 const S = struct {
245240 fn getTheName() []const u8 {
test/behavior/undefined.zig+1
......@@ -104,6 +104,7 @@ test "returned undef is 0xaa bytes when runtime safety is enabled" {
104104 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
105105 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
106106 if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
107 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
107108
108109 const Rect = struct {
109110 x: f32,
test/behavior/vector.zig+2
......@@ -372,6 +372,7 @@ test "load vector elements via comptime index" {
372372 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
373373 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
374374 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
375 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
375376
376377 const S = struct {
377378 fn doTheTest() !void {
......@@ -393,6 +394,7 @@ test "store vector elements via comptime index" {
393394 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
394395 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
395396 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
397 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
396398
397399 const S = struct {
398400 fn doTheTest() !void {
test/behavior/while.zig+2
......@@ -38,6 +38,8 @@ fn staticWhileLoop2() i32 {
3838}
3939
4040test "while with continue expression" {
41 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
42
4143 var sum: i32 = 0;
4244 {
4345 var i: i32 = 0;