authorgravatar for david@vortan.devDavid Rubin <david@vortan.dev> 2024-04-16 22:44:55-07:00
committergravatar for david@vortan.devDavid Rubin <david@vortan.dev> 2024-05-11 02:17:24-07:00
logffb63a05a3327e64bcf8ec7fd05c6aab8d304480
tree5284c825f8126f35d756599f524a2f612620ddd4
parent2fd83d8c0a8dd28c2474b26ead8cb24d6bde0901

riscv: finally fix bug + `airAggregateInit`

i just hadn't realized that I placed the `riscv_start` branch in the non-simplified starts

28 files changed, 139 insertions(+), 66 deletions(-)

lib/std/start.zig+20-6
......@@ -22,7 +22,8 @@ pub const simplified_logic =
2222 builtin.zig_backend == .stage2_arm or
2323 builtin.zig_backend == .stage2_sparc64 or
2424 builtin.cpu.arch == .spirv32 or
25 builtin.cpu.arch == .spirv64;
25 builtin.cpu.arch == .spirv64 or
26 builtin.zig_backend == .stage2_riscv64;
2627
2728comptime {
2829 // No matter what, we import the root file, so that any export, test, comptime
......@@ -42,6 +43,10 @@ comptime {
4243 } else if (builtin.os.tag == .opencl) {
4344 if (@hasDecl(root, "main"))
4445 @export(spirvMain2, .{ .name = "main" });
46 } else if (native_arch.isRISCV()) {
47 if (!@hasDecl(root, "_start")) {
48 @export(riscv_start, .{ .name = "_start" });
49 }
4550 } else {
4651 if (!@hasDecl(root, "_start")) {
4752 @export(_start2, .{ .name = "_start" });
......@@ -60,10 +65,6 @@ comptime {
6065 } else if (@typeInfo(@TypeOf(root.main)).Fn.calling_convention != .C) {
6166 @export(main, .{ .name = "main" });
6267 }
63 } else if (native_arch.isRISCV()) {
64 if (!@hasDecl(root, "_start")) {
65 @export(riscv_start, .{ .name = "_start" });
66 }
6768 } else if (native_os == .windows) {
6869 if (!@hasDecl(root, "WinMain") and !@hasDecl(root, "WinMainCRTStartup") and
6970 !@hasDecl(root, "wWinMain") and !@hasDecl(root, "wWinMainCRTStartup"))
......@@ -208,7 +209,20 @@ fn wasi_start() callconv(.C) void {
208209}
209210
210211fn riscv_start() callconv(.C) noreturn {
211 std.process.exit(@call(.always_inline, callMain, .{}));
212 std.process.exit(switch (@typeInfo(@typeInfo(@TypeOf(root.main)).Fn.return_type.?)) {
213 .NoReturn => root.main(),
214 .Void => ret: {
215 root.main();
216 break :ret 0;
217 },
218 .Int => |info| ret: {
219 if (info.bits != 8 or info.signedness == .signed) {
220 @compileError(bad_main_ret);
221 }
222 break :ret root.main();
223 },
224 else => @compileError("expected return type of main to be 'void', 'noreturn', 'u8'"),
225 });
212226}
213227
214228fn EfiMain(handle: uefi.Handle, system_table: *uefi.tables.SystemTable) callconv(.C) usize {
lib/std/testing.zig+1-1
......@@ -22,7 +22,7 @@ pub var base_allocator_instance = std.heap.FixedBufferAllocator.init("");
2222pub var log_level = std.log.Level.warn;
2323
2424// Disable printing in tests for simple backends.
25pub const backend_can_print = builtin.zig_backend != .stage2_spirv64 and builtin.zig_backend != .stage2_riscv64;
25pub const backend_can_print = !(builtin.zig_backend == .stage2_spirv64 or builtin.zig_backend == .stage2_riscv64);
2626
2727fn print(comptime fmt: []const u8, args: anytype) void {
2828 if (@inComptime()) {
src/arch/riscv64/CodeGen.zig+65-21
......@@ -43,6 +43,8 @@ const callee_preserved_regs = abi.callee_preserved_regs;
4343const gp = abi.RegisterClass.gp;
4444/// Function Args
4545const fa = abi.RegisterClass.fa;
46/// Function Returns
47const fr = abi.RegisterClass.fr;
4648/// Temporary Use
4749const tp = abi.RegisterClass.tp;
4850
......@@ -1083,8 +1085,8 @@ fn genBody(self: *Self, body: []const Air.Inst.Index) InnerError!void {
10831085 .mod => try self.airMod(inst),
10841086 .shl, .shl_exact => try self.airShl(inst),
10851087 .shl_sat => try self.airShlSat(inst),
1086 .min => try self.airMin(inst),
1087 .max => try self.airMax(inst),
1088 .min => try self.airMinMax(inst, .min),
1089 .max => try self.airMinMax(inst, .max),
10881090 .slice => try self.airSlice(inst),
10891091
10901092 .sqrt,
......@@ -1672,7 +1674,6 @@ fn airAlloc(self: *Self, inst: Air.Inst.Index) !void {
16721674
16731675fn airRetPtr(self: *Self, inst: Air.Inst.Index) !void {
16741676 const result: MCValue = switch (self.ret_mcv.long) {
1675 else => unreachable,
16761677 .none => .{ .lea_frame = .{ .index = try self.allocMemPtr(inst) } },
16771678 .load_frame => .{ .register_offset = .{
16781679 .reg = (try self.copyToNewRegister(
......@@ -1681,6 +1682,7 @@ fn airRetPtr(self: *Self, inst: Air.Inst.Index) !void {
16811682 )).register,
16821683 .off = self.ret_mcv.short.indirect.off,
16831684 } },
1685 else => |t| return self.fail("TODO: airRetPtr {s}", .{@tagName(t)}),
16841686 };
16851687 return self.finishAir(inst, result, .{ .none, .none, .none });
16861688}
......@@ -1799,7 +1801,14 @@ fn airNot(self: *Self, inst: Air.Inst.Index) !void {
17991801 return self.finishAir(inst, result, .{ ty_op.operand, .none, .none });
18001802}
18011803
1802fn airMin(self: *Self, inst: Air.Inst.Index) !void {
1804fn airMinMax(
1805 self: *Self,
1806 inst: Air.Inst.Index,
1807 comptime tag: enum {
1808 max,
1809 min,
1810 },
1811) !void {
18031812 const zcu = self.bin_file.comp.module.?;
18041813 const bin_op = self.air.instructions.items(.data)[@intFromEnum(inst)].bin_op;
18051814
......@@ -1882,7 +1891,7 @@ fn airMin(self: *Self, inst: Air.Inst.Index) !void {
18821891 .ops = .rrr,
18831892 .data = .{ .r_type = .{
18841893 .rd = result_reg,
1885 .rs1 = rhs_reg,
1894 .rs1 = if (tag == .min) rhs_reg else lhs_reg,
18861895 .rs2 = mask_reg,
18871896 } },
18881897 });
......@@ -1892,12 +1901,6 @@ fn airMin(self: *Self, inst: Air.Inst.Index) !void {
18921901 return self.finishAir(inst, result, .{ bin_op.lhs, bin_op.rhs, .none });
18931902}
18941903
1895fn airMax(self: *Self, inst: Air.Inst.Index) !void {
1896 const bin_op = self.air.instructions.items(.data)[@intFromEnum(inst)].bin_op;
1897 const result: MCValue = if (self.liveness.isUnused(inst)) .unreach else return self.fail("TODO implement max for {}", .{self.target.cpu.arch});
1898 return self.finishAir(inst, result, .{ bin_op.lhs, bin_op.rhs, .none });
1899}
1900
19011904fn airSlice(self: *Self, inst: Air.Inst.Index) !void {
19021905 const ty_pl = self.air.instructions.items(.data)[@intFromEnum(inst)].ty_pl;
19031906 const bin_op = self.air.extraData(Air.Bin, ty_pl.payload).data;
......@@ -3577,10 +3580,10 @@ fn genCall(
35773580 const func_key = zcu.intern_pool.indexToKey(func_value.ip_index);
35783581 switch (switch (func_key) {
35793582 else => func_key,
3580 .ptr => |ptr| switch (ptr.addr) {
3583 .ptr => |ptr| if (ptr.byte_offset == 0) switch (ptr.base_addr) {
35813584 .decl => |decl| zcu.intern_pool.indexToKey(zcu.declPtr(decl).val.toIntern()),
35823585 else => func_key,
3583 },
3586 } else func_key,
35843587 }) {
35853588 .func => |func| {
35863589 if (self.bin_file.cast(link.File.Elf)) |elf_file| {
......@@ -4174,8 +4177,7 @@ fn performReloc(self: *Self, inst: Mir.Inst.Index) void {
41744177 .bne,
41754178 .beq,
41764179 => self.mir_instructions.items(.data)[inst].b_type.inst = target,
4177 .jal,
4178 => self.mir_instructions.items(.data)[inst].j_type.inst = target,
4180 .jal => self.mir_instructions.items(.data)[inst].j_type.inst = target,
41794181 .pseudo => switch (ops) {
41804182 .pseudo_j => self.mir_instructions.items(.data)[inst].inst = target,
41814183 else => std.debug.panic("TODO: performReloc {s}", .{@tagName(ops)}),
......@@ -5021,13 +5023,36 @@ fn airReduce(self: *Self, inst: Air.Inst.Index) !void {
50215023
50225024fn airAggregateInit(self: *Self, inst: Air.Inst.Index) !void {
50235025 const zcu = self.bin_file.comp.module.?;
5024 const vector_ty = self.typeOfIndex(inst);
5025 const len = vector_ty.vectorLen(zcu);
5026 const result_ty = self.typeOfIndex(inst);
5027 const len: usize = @intCast(result_ty.arrayLen(zcu));
50265028 const ty_pl = self.air.instructions.items(.data)[@intFromEnum(inst)].ty_pl;
50275029 const elements: []const Air.Inst.Ref = @ptrCast(self.air.extra[ty_pl.payload..][0..len]);
5028 const result: MCValue = res: {
5029 if (self.liveness.isUnused(inst)) break :res .unreach;
5030 return self.fail("TODO implement airAggregateInit for riscv64", .{});
5030 const result: MCValue = result: {
5031 switch (result_ty.zigTypeTag(zcu)) {
5032 .Struct => {
5033 const frame_index = try self.allocFrameIndex(FrameAlloc.initSpill(result_ty, zcu));
5034
5035 if (result_ty.containerLayout(zcu) == .@"packed") {} else for (elements, 0..) |elem, elem_i| {
5036 if ((try result_ty.structFieldValueComptime(zcu, elem_i)) != null) continue;
5037
5038 const elem_ty = result_ty.structFieldType(elem_i, zcu);
5039 const elem_off: i32 = @intCast(result_ty.structFieldOffset(elem_i, zcu));
5040 const elem_mcv = try self.resolveInst(elem);
5041
5042 const elem_frame: FrameAddr = .{
5043 .index = frame_index,
5044 .off = elem_off,
5045 };
5046 try self.genSetStack(
5047 elem_ty,
5048 elem_frame,
5049 elem_mcv,
5050 );
5051 }
5052 },
5053 else => return self.fail("TODO: airAggregateInit {}", .{result_ty.fmt(zcu)}),
5054 }
5055 break :result .{ .register = .zero };
50315056 };
50325057
50335058 if (elements.len <= Liveness.bpi - 1) {
......@@ -5189,12 +5214,24 @@ fn resolveCallingConventionValues(
51895214
51905215 for (classes) |class| switch (class) {
51915216 .integer => {
5192 const ret_int_reg = abi.function_arg_regs[ret_int_reg_i];
5217 const ret_int_reg = abi.function_ret_regs[ret_int_reg_i];
51935218 ret_int_reg_i += 1;
51945219
51955220 ret_tracking[ret_tracking_i] = InstTracking.init(.{ .register = ret_int_reg });
51965221 ret_tracking_i += 1;
51975222 },
5223 .memory => {
5224 const ret_int_reg = abi.function_ret_regs[ret_int_reg_i];
5225 ret_int_reg_i += 1;
5226 const ret_indirect_reg = abi.function_arg_regs[param_int_reg_i];
5227 param_int_reg_i += 1;
5228
5229 ret_tracking[ret_tracking_i] = .{
5230 .short = .{ .indirect = .{ .reg = ret_int_reg } },
5231 .long = .{ .indirect = .{ .reg = ret_indirect_reg } },
5232 };
5233 ret_tracking_i += 1;
5234 },
51985235 else => return self.fail("TODO: C calling convention return class {}", .{class}),
51995236 };
52005237
......@@ -5226,6 +5263,13 @@ fn resolveCallingConventionValues(
52265263 arg_mcv[arg_mcv_i] = .{ .register = param_int_reg };
52275264 arg_mcv_i += 1;
52285265 },
5266 .memory => {
5267 const param_int_regs = abi.function_arg_regs;
5268 const param_int_reg = param_int_regs[param_int_reg_i];
5269
5270 arg_mcv[arg_mcv_i] = .{ .indirect = .{ .reg = param_int_reg } };
5271 arg_mcv_i += 1;
5272 },
52295273 else => return self.fail("TODO: C calling convention arg class {}", .{class}),
52305274 } else {
52315275 arg.* = switch (arg_mcv_i) {
src/arch/riscv64/abi.zig+16-9
......@@ -96,7 +96,6 @@ pub fn classifyType(ty: Type, mod: *Module) Class {
9696/// There are a maximum of 8 possible return slots. Returned values are in
9797/// the beginning of the array; unused slots are filled with .none.
9898pub fn classifySystem(ty: Type, zcu: *Module) [8]Class {
99 const ip = zcu.intern_pool;
10099 var result = [1]Class{.none} ** 8;
101100 const memory_class = [_]Class{
102101 .memory, .none, .none, .none,
......@@ -158,22 +157,17 @@ pub fn classifySystem(ty: Type, zcu: *Module) [8]Class {
158157 std.debug.panic("TODO: classifySystem ErrorUnion > 64 bit payload", .{});
159158 },
160159 .Struct => {
161 const loaded_struct = ip.loadStructType(ty.toIntern());
160 const layout = ty.containerLayout(zcu);
162161 const ty_size = ty.abiSize(zcu);
163162
164 if (loaded_struct.layout == .@"packed") {
163 if (layout == .@"packed") {
165164 assert(ty_size <= 16);
166165 result[0] = .integer;
167166 if (ty_size > 8) result[1] = .integer;
168167 return result;
169168 }
170 if (ty_size > 64)
171 return memory_class;
172169
173 var byte_offset: u64 = 0;
174 classifyStruct(&result, &byte_offset, loaded_struct, zcu);
175
176 return result;
170 return memory_class;
177171 },
178172 else => |bad_ty| std.debug.panic("classifySystem {s}", .{@tagName(bad_ty)}),
179173 }
......@@ -245,6 +239,10 @@ pub const function_arg_regs = [_]Register{
245239 .a0, .a1, .a2, .a3, .a4, .a5, .a6, .a7,
246240};
247241
242pub const function_ret_regs = [_]Register{
243 .a0, .a1,
244};
245
248246pub const temporary_regs = [_]Register{
249247 .t0, .t1, .t2, .t3, .t4, .t5, .t6,
250248};
......@@ -273,6 +271,15 @@ pub const RegisterClass = struct {
273271 break :blk set;
274272 };
275273
274 pub const fr: RegisterBitSet = blk: {
275 var set = RegisterBitSet.initEmpty();
276 set.setRangeValue(.{
277 .start = callee_preserved_regs.len,
278 .end = callee_preserved_regs.len + function_ret_regs.len,
279 }, true);
280 break :blk set;
281 };
282
276283 pub const tp: RegisterBitSet = blk: {
277284 var set = RegisterBitSet.initEmpty();
278285 set.setRangeValue(.{
test/behavior/align.zig-1
......@@ -388,7 +388,6 @@ test "function align expression depends on generic parameter" {
388388 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
389389 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
390390 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
391 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
392391
393392 // function alignment is a compile error on wasm32/wasm64
394393 if (native_arch == .wasm32 or native_arch == .wasm64) return error.SkipZigTest;
test/behavior/basic.zig+1
......@@ -593,6 +593,7 @@ test "equality compare fn ptrs" {
593593
594594test "self reference through fn ptr field" {
595595 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
596 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
596597
597598 const S = struct {
598599 const A = struct {
test/behavior/bitcast.zig+2
......@@ -541,6 +541,7 @@ test "@bitCast of packed struct containing pointer" {
541541 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
542542 if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
543543 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
544 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
544545
545546 const S = struct {
546547 const A = packed struct {
......@@ -570,6 +571,7 @@ test "@bitCast of extern struct containing pointer" {
570571 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
571572 if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
572573 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
574 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
573575
574576 const S = struct {
575577 const A = extern struct {
test/behavior/cast.zig-1
......@@ -2713,7 +2713,6 @@ test "bitcast vector" {
27132713 if (builtin.zig_backend == .stage2_x86) return error.SkipZigTest; // TODO
27142714 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
27152715 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
2716 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
27172716
27182717 const u8x32 = @Vector(32, u8);
27192718 const u32x8 = @Vector(8, u32);
test/behavior/comptime_memory.zig+6-2
......@@ -32,6 +32,8 @@ test "type pun signed and unsigned as array pointer" {
3232}
3333
3434test "type pun signed and unsigned as offset many pointer" {
35 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
36
3537 comptime {
3638 var x: [11]u32 = undefined;
3739 var y: [*]i32 = @ptrCast(&x[10]);
......@@ -42,6 +44,8 @@ test "type pun signed and unsigned as offset many pointer" {
4244}
4345
4446test "type pun signed and unsigned as array pointer with pointer arithemtic" {
47 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
48
4549 comptime {
4650 var x: [11]u32 = undefined;
4751 const y = @as([*]i32, @ptrCast(&x[10])) - 10;
......@@ -289,6 +293,8 @@ test "dance on linker values" {
289293}
290294
291295test "offset array ptr by element size" {
296 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
297
292298 comptime {
293299 const VirtualStruct = struct { x: u32 };
294300 var arr: [4]VirtualStruct = .{
......@@ -418,8 +424,6 @@ test "dereference undefined pointer to zero-bit type" {
418424}
419425
420426test "type pun extern struct" {
421 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
422
423427 const S = extern struct { f: u8 };
424428 comptime var s = S{ .f = 123 };
425429 @as(*u8, @ptrCast(&s)).* = 72;
test/behavior/enum.zig-2
......@@ -1246,8 +1246,6 @@ test "auto-numbered enum with signed tag type" {
12461246}
12471247
12481248test "lazy initialized field" {
1249 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
1250
12511249 try std.testing.expectEqual(@as(u8, @alignOf(struct {})), getLazyInitialized(.a));
12521250}
12531251
test/behavior/error.zig+1
......@@ -1102,6 +1102,7 @@ test "result location initialization of error union with OPV payload" {
11021102 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
11031103 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
11041104 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
1105 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
11051106
11061107 const S = struct {
11071108 x: u0,
test/behavior/eval.zig-2
......@@ -1705,8 +1705,6 @@ test "early exit in container level const" {
17051705}
17061706
17071707test "@inComptime" {
1708 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
1709
17101708 const S = struct {
17111709 fn inComptime() bool {
17121710 return @inComptime();
test/behavior/fn.zig+3-2
......@@ -191,6 +191,7 @@ test "function with complex callconv and return type expressions" {
191191
192192test "pass by non-copying value" {
193193 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
194 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
194195
195196 try expect(addPointCoords(Point{ .x = 1, .y = 2 }) == 3);
196197}
......@@ -218,6 +219,7 @@ fn addPointCoordsVar(pt: anytype) !i32 {
218219
219220test "pass by non-copying value as method" {
220221 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
222 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
221223
222224 var pt = Point2{ .x = 1, .y = 2 };
223225 try expect(pt.addPointCoords() == 3);
......@@ -234,6 +236,7 @@ const Point2 = struct {
234236
235237test "pass by non-copying value as method, which is generic" {
236238 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
239 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
237240
238241 var pt = Point3{ .x = 1, .y = 2 };
239242 try expect(pt.addPointCoords(i32) == 3);
......@@ -624,8 +627,6 @@ test "comptime parameters don't have to be marked comptime if only called at com
624627}
625628
626629test "inline function with comptime-known comptime-only return type called at runtime" {
627 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
628
629630 const S = struct {
630631 inline fn foo(x: *i32, y: *const i32) type {
631632 x.* = y.*;
test/behavior/fn_delegation.zig+1
......@@ -34,6 +34,7 @@ fn custom(comptime T: type, comptime num: u64) fn (T) u64 {
3434test "fn delegation" {
3535 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
3636 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
37 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
3738
3839 const foo = Foo{};
3940 try expect(foo.one() == 11);
test/behavior/generics.zig+1
......@@ -395,6 +395,7 @@ test "extern function used as generic parameter" {
395395
396396test "generic struct as parameter type" {
397397 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
398 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
398399
399400 const S = struct {
400401 fn doTheTest(comptime Int: type, thing: struct { int: Int }) !void {
test/behavior/if.zig-2
......@@ -179,8 +179,6 @@ fn returnTrue() bool {
179179}
180180
181181test "if value shouldn't be load-elided if used later (structs)" {
182 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
183
184182 const Foo = struct { x: i32 };
185183
186184 var a = Foo{ .x = 1 };
test/behavior/maximum_minimum.zig-6
......@@ -160,8 +160,6 @@ test "@min/@max on lazy values" {
160160}
161161
162162test "@min/@max more than two arguments" {
163 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
164
165163 const x: u32 = 30;
166164 const y: u32 = 10;
167165 const z: u32 = 20;
......@@ -187,7 +185,6 @@ test "@min/@max notices bounds" {
187185 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
188186 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
189187 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
190 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
191188
192189 var x: u16 = 20;
193190 const y = 30;
......@@ -239,7 +236,6 @@ test "@min/@max notices bounds from types" {
239236 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
240237 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
241238 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
242 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
243239
244240 var x: u16 = 123;
245241 var y: u32 = 456;
......@@ -325,8 +321,6 @@ test "@min/@max notices bounds from vector types when element of comptime-known
325321}
326322
327323test "@min/@max of signed and unsigned runtime integers" {
328 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
329
330324 var x: i32 = -1;
331325 var y: u31 = 1;
332326 _ = .{ &x, &y };
test/behavior/optional.zig+1
......@@ -640,6 +640,7 @@ test "result location initialization of optional with OPV payload" {
640640 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
641641 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
642642 if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
643 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
643644
644645 const S = struct {
645646 x: u0,
test/behavior/packed-struct.zig-2
......@@ -124,7 +124,6 @@ test "correct sizeOf and offsets in packed structs" {
124124 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
125125 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
126126 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
127 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
128127
129128 const PStruct = packed struct {
130129 bool_a: bool,
......@@ -193,7 +192,6 @@ test "nested packed structs" {
193192 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
194193 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
195194 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
196 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
197195
198196 const S1 = packed struct { a: u8, b: u8, c: u8 };
199197
test/behavior/packed-union.zig+2
......@@ -177,6 +177,8 @@ test "assigning to non-active field at comptime" {
177177}
178178
179179test "comptime packed union of pointers" {
180 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
181
180182 const U = packed union {
181183 a: *const u32,
182184 b: *const [1]u32,
test/behavior/packed_struct_explicit_backing_int.zig-1
......@@ -10,7 +10,6 @@ test "packed struct explicit backing integer" {
1010 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
1111 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
1212 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
13 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
1413
1514 const S1 = packed struct { a: u8, b: u8, c: u8 };
1615
test/behavior/pointers.zig+4
......@@ -640,6 +640,8 @@ test "cast pointers with zero sized elements" {
640640}
641641
642642test "comptime pointer equality through distinct fields with well-defined layout" {
643 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
644
643645 const A = extern struct {
644646 x: u32,
645647 z: u16,
......@@ -664,6 +666,8 @@ test "comptime pointer equality through distinct fields with well-defined layout
664666}
665667
666668test "comptime pointer equality through distinct elements with well-defined layout" {
669 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
670
667671 const buf: [2]u32 = .{ 123, 456 };
668672
669673 const ptr: *const [2]u32 = &buf;
test/behavior/ptrcast.zig+4
......@@ -298,6 +298,8 @@ test "comptime @ptrCast with packed struct leaves value unmodified" {
298298}
299299
300300test "@ptrCast restructures comptime-only array" {
301 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
302
301303 {
302304 const a3a2: [3][2]comptime_int = .{
303305 .{ 1, 2 },
......@@ -340,6 +342,8 @@ test "@ptrCast restructures comptime-only array" {
340342}
341343
342344test "@ptrCast restructures sliced comptime-only array" {
345 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
346
343347 const a3a2: [4][2]comptime_int = .{
344348 .{ 1, 2 },
345349 .{ 3, 4 },
test/behavior/sizeof_and_typeof.zig+1
......@@ -412,6 +412,7 @@ test "Extern function calls, dereferences and field access in @TypeOf" {
412412 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
413413 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
414414 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
415 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
415416
416417 const Test = struct {
417418 fn test_fn_1(a: c_long) @TypeOf(c_fopen("test", "r").*) {
test/behavior/struct.zig+7-3
......@@ -176,6 +176,7 @@ const MemberFnTestFoo = struct {
176176
177177test "call member function directly" {
178178 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
179 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
179180
180181 const instance = MemberFnTestFoo{ .x = 1234 };
181182 const result = MemberFnTestFoo.member(instance);
......@@ -184,6 +185,7 @@ test "call member function directly" {
184185
185186test "store member function in variable" {
186187 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
188 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
187189
188190 const instance = MemberFnTestFoo{ .x = 1234 };
189191 const memberFn = MemberFnTestFoo.member;
......@@ -1559,6 +1561,7 @@ test "discarded struct initialization works as expected" {
15591561test "function pointer in struct returns the struct" {
15601562 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
15611563 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
1564 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
15621565
15631566 const A = struct {
15641567 const A = @This();
......@@ -1699,7 +1702,6 @@ test "struct field pointer has correct alignment" {
16991702 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
17001703 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
17011704 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
1702 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
17031705
17041706 const S = struct {
17051707 fn doTheTest() !void {
......@@ -1781,6 +1783,8 @@ fn countFields(v: anytype) usize {
17811783}
17821784
17831785test "struct init with no result pointer sets field result types" {
1786 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
1787
17841788 const S = struct {
17851789 // A function parameter has a result type, but no result pointer.
17861790 fn f(s: struct { x: u32 }) u32 {
......@@ -1928,6 +1932,8 @@ test "circular dependency through pointer field of a struct" {
19281932}
19291933
19301934test "field calls do not force struct field init resolution" {
1935 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
1936
19311937 const S = struct {
19321938 x: u32 = blk: {
19331939 _ = @TypeOf(make().dummyFn()); // runtime field call - S not fully resolved - dummyFn call should not force field init resolution
......@@ -1958,7 +1964,6 @@ test "extern struct fields are aligned to 1" {
19581964 if (builtin.zig_backend == .stage2_x86) return error.SkipZigTest; // TODO
19591965 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
19601966 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
1961 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
19621967
19631968 const Foo = extern struct {
19641969 a: u8 align(1),
......@@ -2090,7 +2095,6 @@ test "struct field default value is a call" {
20902095 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
20912096 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
20922097 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
2093 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
20942098
20952099 const Z = packed struct {
20962100 a: u32,
test/behavior/tuple.zig-1
......@@ -451,7 +451,6 @@ test "tuple pointer is indexable" {
451451 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
452452 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
453453 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
454 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
455454
456455 const S = struct { u32, bool };
457456
test/behavior/type.zig+3-1
......@@ -203,6 +203,7 @@ test "Type.Opaque" {
203203 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
204204 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
205205 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
206 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
206207
207208 const Opaque = @Type(.{
208209 .Opaque = .{
......@@ -348,7 +349,6 @@ test "Type.Struct" {
348349test "Type.Enum" {
349350 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
350351 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
351 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
352352
353353 const Foo = @Type(.{
354354 .Enum = .{
......@@ -763,6 +763,8 @@ test "matching captures causes opaque equivalence" {
763763}
764764
765765test "reify enum where fields refers to part of array" {
766 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
767
766768 const fields: [3]std.builtin.Type.EnumField = .{
767769 .{ .name = "foo", .value = 0 },
768770 .{ .name = "bar", .value = 1 },
test/behavior/union.zig-3
......@@ -1622,7 +1622,6 @@ test "defined-layout union field pointer has correct alignment" {
16221622 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
16231623 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
16241624 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
1625 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
16261625
16271626 const S = struct {
16281627 fn doTheTest(comptime U: type) !void {
......@@ -1658,7 +1657,6 @@ test "undefined-layout union field pointer has correct alignment" {
16581657 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
16591658 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
16601659 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
1661 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
16621660
16631661 const S = struct {
16641662 fn doTheTest(comptime U: type) !void {
......@@ -1694,7 +1692,6 @@ test "packed union field pointer has correct alignment" {
16941692 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
16951693 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
16961694 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
1697 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
16981695
16991696 const U = packed union { x: u20 };
17001697 const S = packed struct(u24) { a: u2, u: U, b: u2 };