authorgravatar for robin@voetter.nlRobin Voetter <robin@voetter.nl> 2023-10-07 22:11:10+02:00
committergravatar for robin@voetter.nlRobin Voetter <robin@voetter.nl> 2023-10-15 14:00:01+02:00
log0a3e566f57063c42146aa2d64481a7eb1361f96f
tree5d673f65f500bb26e0cc664b2d9ad7afb07ee4cd
parentc6c5fb40deaa104226581d79b3b9332315e11309
signaturebadge-check Signed by SSH key SHA256:CQ99aPxq+RueiL9u7z0FEki5Fm7V6T8q4PrEGmINrA4

spirv: make bitcasts between the same spirv type a no-op

2 files changed, 7 insertions(+), 5 deletions(-)

src/codegen/spirv.zig+7-1
...@@ -2527,7 +2527,12 @@ const DeclGen = struct {...@@ -2527,7 +2527,12 @@ const DeclGen = struct {
2527 src_id: IdRef,2527 src_id: IdRef,
2528 ) !IdRef {2528 ) !IdRef {
2529 const mod = self.module;2529 const mod = self.module;
2530 const src_ty_ref = try self.resolveType(src_ty, .direct);
2530 const dst_ty_ref = try self.resolveType(dst_ty, .direct);2531 const dst_ty_ref = try self.resolveType(dst_ty, .direct);
2532 if (src_ty_ref == dst_ty_ref) {
2533 return src_id;
2534 }
2535
2531 const result_id = self.spv.allocId();2536 const result_id = self.spv.allocId();
25322537
2533 // TODO: Some more cases are missing here2538 // TODO: Some more cases are missing here
...@@ -2811,7 +2816,8 @@ const DeclGen = struct {...@@ -2811,7 +2816,8 @@ const DeclGen = struct {
28112816
2812 fn airSliceElemPtr(self: *DeclGen, inst: Air.Inst.Index) !?IdRef {2817 fn airSliceElemPtr(self: *DeclGen, inst: Air.Inst.Index) !?IdRef {
2813 const mod = self.module;2818 const mod = self.module;
2814 const bin_op = self.air.instructions.items(.data)[inst].bin_op;2819 const ty_pl = self.air.instructions.items(.data)[inst].ty_pl;
2820 const bin_op = self.air.extraData(Air.Bin, ty_pl.payload).data;
2815 const slice_ty = self.typeOf(bin_op.lhs);2821 const slice_ty = self.typeOf(bin_op.lhs);
2816 if (!slice_ty.isVolatilePtr(mod) and self.liveness.isUnused(inst)) return null;2822 if (!slice_ty.isVolatilePtr(mod) and self.liveness.isUnused(inst)) return null;
28172823
test/behavior/for.zig-4
...@@ -70,7 +70,6 @@ test "basic for loop" {...@@ -70,7 +70,6 @@ test "basic for loop" {
70 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;70 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
71 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;71 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
72 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO72 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
73 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
7473
75 const expected_result = [_]u8{ 9, 8, 7, 6, 0, 1, 2, 3 } ** 3;74 const expected_result = [_]u8{ 9, 8, 7, 6, 0, 1, 2, 3 } ** 3;
7675
...@@ -157,7 +156,6 @@ test "for loop with pointer elem var" {...@@ -157,7 +156,6 @@ test "for loop with pointer elem var" {
157 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO156 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
158 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO157 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
159 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO158 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
160 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
161159
162 const source = "abcdefg";160 const source = "abcdefg";
163 var target: [source.len]u8 = undefined;161 var target: [source.len]u8 = undefined;
...@@ -204,7 +202,6 @@ test "for on slice with allowzero ptr" {...@@ -204,7 +202,6 @@ test "for on slice with allowzero ptr" {
204 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO202 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
205 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO203 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
206 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO204 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
207 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
208205
209 const S = struct {206 const S = struct {
210 fn doTheTest(slice: []const u8) !void {207 fn doTheTest(slice: []const u8) !void {
...@@ -344,7 +341,6 @@ test "two slices, one captured by-ref" {...@@ -344,7 +341,6 @@ test "two slices, one captured by-ref" {
344 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO341 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
345 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO342 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
346 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO343 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
347 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
348344
349 var buf: [10]u8 = undefined;345 var buf: [10]u8 = undefined;
350 const slice1: []const u8 = "blah";346 const slice1: []const u8 = "blah";