authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-11-05 18:45:21-05:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2023-11-05 18:45:21-05:00
log1b0b46a8a9f5ed3ebaf35e3018fd5402957552ae
tree65d2ee6cb564d8c6696dd066963c62d8aced9e4d
parent702b809ea3e9b9dbdc1fd6efe9306442487e7103
parent0ea7189c236ce0a3151cfe52f845f4ba16fd8f38
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #17871 from jacobly0/x86_64

x86_64: get a compiler compiled with the x86_64 backend passing x86_64 backend tests

6 files changed, 20 insertions(+), 14 deletions(-)

build.zig+4
......@@ -224,6 +224,10 @@ pub fn build(b: *std.Build) !void {
224224 check_case_exe.want_lto = false;
225225 }
226226
227 const use_llvm = b.option(bool, "use-llvm", "Use the llvm backend");
228 exe.use_llvm = use_llvm;
229 exe.use_lld = use_llvm;
230
227231 const exe_options = b.addOptions();
228232 exe.addOptions("build_options", exe_options);
229233
src/Module.zig+1-1
......@@ -4120,7 +4120,7 @@ pub fn embedFile(
41204120 }
41214121 return error.ImportOutsideModulePath;
41224122 };
4123 errdefer gpa.free(sub_file_path);
4123 defer gpa.free(sub_file_path);
41244124
41254125 return newEmbedFile(mod, cur_file.mod, sub_file_path, resolved_path, gop, src_loc);
41264126}
src/Sema.zig+1
......@@ -23488,6 +23488,7 @@ fn zirSelect(sema: *Sema, block: *Block, extended: Zir.Inst.Extended.InstData) C
2348823488 if (b_val.isUndef(mod)) return mod.undefRef(vec_ty);
2348923489
2349023490 const elems = try sema.gpa.alloc(InternPool.Index, vec_len);
23491 defer sema.gpa.free(elems);
2349123492 for (elems, 0..) |*elem, i| {
2349223493 const pred_elem_val = try pred_val.elemValue(mod, i);
2349323494 const should_choose_a = pred_elem_val.toBool();
src/arch/x86_64/CodeGen.zig+13-12
......@@ -585,7 +585,7 @@ const InstTracking = struct {
585585 tracking_log.debug("%{d} => {} (spilled)", .{ inst, self.* });
586586 }
587587
588 fn verifyMaterialize(self: *InstTracking, target: InstTracking) void {
588 fn verifyMaterialize(self: InstTracking, target: InstTracking) void {
589589 switch (self.long) {
590590 .none,
591591 .unreach,
......@@ -634,7 +634,7 @@ const InstTracking = struct {
634634 }
635635
636636 fn materializeUnsafe(
637 self: *InstTracking,
637 self: InstTracking,
638638 function: *Self,
639639 inst: Air.Inst.Index,
640640 target: InstTracking,
......@@ -688,7 +688,7 @@ const InstTracking = struct {
688688 }
689689
690690 fn liveOut(self: *InstTracking, function: *Self, inst: Air.Inst.Index) void {
691 for (self.short.getRegs()) |reg| {
691 for (self.getRegs()) |reg| {
692692 if (function.register_manager.isRegFree(reg)) {
693693 tracking_log.debug("%{d} => {} (live-out)", .{ inst, self.* });
694694 continue;
......@@ -701,7 +701,7 @@ const InstTracking = struct {
701701 // Disable death.
702702 var found_reg = false;
703703 var remaining_reg: Register = .none;
704 for (tracking.short.getRegs()) |tracked_reg| if (tracked_reg.id() == reg.id()) {
704 for (tracking.getRegs()) |tracked_reg| if (tracked_reg.id() == reg.id()) {
705705 assert(!found_reg);
706706 found_reg = true;
707707 } else {
......@@ -10885,12 +10885,12 @@ fn airRet(self: *Self, inst: Air.Inst.Index) !void {
1088510885 else => unreachable,
1088610886 }
1088710887 self.ret_mcv.liveOut(self, inst);
10888 try self.finishAir(inst, .unreach, .{ un_op, .none, .none });
1088810889
1088910890 // TODO optimization opportunity: figure out when we can emit this as a 2 byte instruction
1089010891 // which is available if the jump is 127 bytes or less forward.
1089110892 const jmp_reloc = try self.asmJmpReloc(undefined);
1089210893 try self.exitlude_jump_relocs.append(self.gpa, jmp_reloc);
10893 return self.finishAir(inst, .unreach, .{ un_op, .none, .none });
1089410894}
1089510895
1089610896fn airRetLoad(self: *Self, inst: Air.Inst.Index) !void {
......@@ -10905,12 +10905,12 @@ fn airRetLoad(self: *Self, inst: Air.Inst.Index) !void {
1090510905 else => unreachable,
1090610906 }
1090710907 self.ret_mcv.liveOut(self, inst);
10908 try self.finishAir(inst, .unreach, .{ un_op, .none, .none });
1090810909
1090910910 // TODO optimization opportunity: figure out when we can emit this as a 2 byte instruction
1091010911 // which is available if the jump is 127 bytes or less forward.
1091110912 const jmp_reloc = try self.asmJmpReloc(undefined);
1091210913 try self.exitlude_jump_relocs.append(self.gpa, jmp_reloc);
10913 return self.finishAir(inst, .unreach, .{ un_op, .none, .none });
1091410914}
1091510915
1091610916fn airCmp(self: *Self, inst: Air.Inst.Index, op: math.CompareOperator) !void {
......@@ -11991,7 +11991,6 @@ fn performReloc(self: *Self, reloc: Mir.Inst.Index) !void {
1199111991fn airBr(self: *Self, inst: Air.Inst.Index) !void {
1199211992 const mod = self.bin_file.options.module.?;
1199311993 const br = self.air.instructions.items(.data)[inst].br;
11994 const src_mcv = try self.resolveInst(br.operand);
1199511994
1199611995 const block_ty = self.typeOfIndex(br.block_inst);
1199711996 const block_unused =
......@@ -12002,15 +12001,17 @@ fn airBr(self: *Self, inst: Air.Inst.Index) !void {
1200212001 const block_result = result: {
1200312002 if (block_unused) break :result .none;
1200412003
12004 if (!first_br) try self.getValue(block_tracking.short, null);
12005 const src_mcv = try self.resolveInst(br.operand);
12006
1200512007 if (self.reuseOperandAdvanced(inst, br.operand, 0, src_mcv, br.block_inst)) {
1200612008 if (first_br) break :result src_mcv;
1200712009
12008 for (block_tracking.getRegs()) |block_reg|
12009 try self.register_manager.getReg(block_reg, br.block_inst);
12010 try self.getValue(block_tracking.short, br.block_inst);
1201012011 // .long = .none to avoid merging operand and block result stack frames.
12011 var current_tracking = InstTracking{ .long = .none, .short = src_mcv };
12012 const current_tracking: InstTracking = .{ .long = .none, .short = src_mcv };
1201212013 try current_tracking.materializeUnsafe(self, br.block_inst, block_tracking.*);
12013 for (src_mcv.getRegs()) |src_reg| self.register_manager.freeReg(src_reg);
12014 for (current_tracking.getRegs()) |src_reg| self.register_manager.freeReg(src_reg);
1201412015 break :result block_tracking.short;
1201512016 }
1201612017
......@@ -12018,7 +12019,7 @@ fn airBr(self: *Self, inst: Air.Inst.Index) !void {
1201812019 try self.getValue(block_tracking.short, br.block_inst);
1201912020 break :dst block_tracking.short;
1202012021 };
12021 try self.genCopy(block_ty, dst_mcv, src_mcv);
12022 try self.genCopy(block_ty, dst_mcv, try self.resolveInst(br.operand));
1202212023 break :result dst_mcv;
1202312024 };
1202412025
src/link/Elf.zig+1
......@@ -392,6 +392,7 @@ pub fn deinit(self: *Elf) void {
392392 self.copy_rel.deinit(gpa);
393393 self.rela_dyn.deinit(gpa);
394394 self.rela_plt.deinit(gpa);
395 self.zig_got.deinit(gpa);
395396}
396397
397398pub fn getDeclVAddr(self: *Elf, decl_index: Module.Decl.Index, reloc_info: link.File.RelocInfo) !u64 {
test/behavior/packed-struct.zig-1
......@@ -1016,7 +1016,6 @@ test "modify nested packed struct aligned field" {
10161016 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
10171017 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest;
10181018 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
1019 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
10201019
10211020 const Options = packed struct {
10221021 foo: bool = false,