| author |  Robin Voetter <robin@voetter.nl> 2023-09-17 23:18:06+02:00 |
| committer |  Andrew Kelley <andrew@ziglang.org> 2023-09-23 12:36:56-07:00 |
| log | 8d49b2ef4ef0682d1c258a5270f0646f85d7fe63 |
| tree | ef40c3325bbd9ad84026a294d22eb72f0e3cb64e |
| parent | 66b1f6c163e5fa3fddd3361a1ff4b64b3cbfc6bf |
spirv: air array_to_slice
2 files changed, 26 insertions(+), 7 deletions(-)
src/codegen/spirv.zig+26
| ... | ... | @@ -1681,6 +1681,8 @@ pub const DeclGen = struct { |
| 1681 | 1681 | .int_from_float => try self.airIntFromFloat(inst), |
| 1682 | 1682 | .not => try self.airNot(inst), |
| 1683 | 1683 | |
| 1684 | .array_to_slice => try self.airArrayToSlice(inst), | |
| 1685 | ||
| 1684 | 1686 | .slice_ptr => try self.airSliceField(inst, 0), |
| 1685 | 1687 | .slice_len => try self.airSliceField(inst, 1), |
| 1686 | 1688 | .slice_elem_ptr => try self.airSliceElemPtr(inst), |
| ... | ... | @@ -2427,6 +2429,30 @@ pub const DeclGen = struct { |
| 2427 | 2429 | return result_id; |
| 2428 | 2430 | } |
| 2429 | 2431 | |
| 2432 | fn airArrayToSlice(self: *DeclGen, inst: Air.Inst.Index) !?IdRef { | |
| 2433 | const mod = self.module; | |
| 2434 | const ty_op = self.air.instructions.items(.data)[inst].ty_op; | |
| 2435 | const array_ptr_ty = self.typeOf(ty_op.operand); | |
| 2436 | const array_ty = array_ptr_ty.childType(mod); | |
| 2437 | const elem_ty = array_ptr_ty.elemType2(mod); // use elemType() so that we get T for *[N]T. | |
| 2438 | const elem_ty_ref = try self.resolveType(elem_ty, .indirect); | |
| 2439 | const elem_ptr_ty_ref = try self.spv.ptrType(elem_ty_ref, spvStorageClass(array_ptr_ty.ptrAddressSpace(mod))); | |
| 2440 | const slice_ty = self.typeOfIndex(inst); | |
| 2441 | const slice_ty_ref = try self.resolveType(slice_ty, .direct); | |
| 2442 | const size_ty_ref = try self.sizeType(); | |
| 2443 | ||
| 2444 | const array_ptr_id = try self.resolve(ty_op.operand); | |
| 2445 | const len_id = try self.constInt(size_ty_ref, array_ty.arrayLen(mod)); | |
| 2446 | ||
| 2447 | if (!array_ty.hasRuntimeBitsIgnoreComptime(mod)) { | |
| 2448 | unreachable; // TODO | |
| 2449 | } | |
| 2450 | ||
| 2451 | // Convert the pointer-to-array to a pointer to the first element. | |
| 2452 | const elem_ptr_id = try self.accessChain(elem_ptr_ty_ref, array_ptr_id, &.{0}); | |
| 2453 | return try self.constructStruct(slice_ty_ref, &.{ elem_ptr_id, len_id }); | |
| 2454 | } | |
| 2455 | ||
| 2430 | 2456 | fn airSliceField(self: *DeclGen, inst: Air.Inst.Index, field: u32) !?IdRef { |
| 2431 | 2457 | if (self.liveness.isUnused(inst)) return null; |
| 2432 | 2458 | const ty_op = self.air.instructions.items(.data)[inst].ty_op; |
test/behavior/slice.zig-7
| ... | ... | @@ -29,7 +29,6 @@ comptime { |
| 29 | 29 | |
| 30 | 30 | test "slicing" { |
| 31 | 31 | if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO |
| 32 | if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; | |
| 33 | 32 | |
| 34 | 33 | var array: [20]i32 = undefined; |
| 35 | 34 | |
| ... | ... | @@ -346,7 +345,6 @@ test "empty array to slice" { |
| 346 | 345 | test "@ptrCast slice to pointer" { |
| 347 | 346 | if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; |
| 348 | 347 | if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO |
| 349 | if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; | |
| 350 | 348 | |
| 351 | 349 | const S = struct { |
| 352 | 350 | fn doTheTest() !void { |
| ... | ... | @@ -572,7 +570,6 @@ test "slice syntax resulting in pointer-to-array" { |
| 572 | 570 | test "slice pointer-to-array null terminated" { |
| 573 | 571 | if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO |
| 574 | 572 | if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO |
| 575 | if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; | |
| 576 | 573 | |
| 577 | 574 | comptime { |
| 578 | 575 | var array = [5:0]u8{ 1, 2, 3, 4, 5 }; |
| ... | ... | @@ -714,7 +711,6 @@ test "slice sentinel access at comptime" { |
| 714 | 711 | test "slicing array with sentinel as end index" { |
| 715 | 712 | if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; |
| 716 | 713 | if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO |
| 717 | if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; | |
| 718 | 714 | |
| 719 | 715 | const S = struct { |
| 720 | 716 | fn do() !void { |
| ... | ... | @@ -733,7 +729,6 @@ test "slicing array with sentinel as end index" { |
| 733 | 729 | test "slicing slice with sentinel as end index" { |
| 734 | 730 | if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; |
| 735 | 731 | if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO |
| 736 | if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; | |
| 737 | 732 | |
| 738 | 733 | const S = struct { |
| 739 | 734 | fn do() !void { |
| ... | ... | @@ -762,7 +757,6 @@ test "slice len modification at comptime" { |
| 762 | 757 | } |
| 763 | 758 | |
| 764 | 759 | test "slice field ptr const" { |
| 765 | if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; | |
| 766 | 760 | |
| 767 | 761 | const const_slice: []const u8 = "string"; |
| 768 | 762 | |
| ... | ... | @@ -777,7 +771,6 @@ test "slice field ptr const" { |
| 777 | 771 | |
| 778 | 772 | test "slice field ptr var" { |
| 779 | 773 | if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO |
| 780 | if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; | |
| 781 | 774 | |
| 782 | 775 | var var_slice: []const u8 = "string"; |
| 783 | 776 |