Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrewrk merged 5 commits into from
Nov 5, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
803ea10
x86_64: fix tracking during `br`
jacobly0 Nov 5, 2023
8311fac
x86_64: fix indirect return of `f80`
jacobly0 Nov 5, 2023
7b9f878
build: add option to specify whether to use the llvm backend
jacobly0 Nov 5, 2023
c2cda94
src: fix memory leaks
jacobly0 Nov 5, 2023
0ea7189
behavior: enable test passing with x86_64 backend
jacobly0 Nov 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions build.zig
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,6 +224,10 @@ pub fn build(b: *std.Build) !void {
check_case_exe.want_lto = false;
}

const use_llvm = b.option(bool, "use-llvm", "Use the llvm backend");
exe.use_llvm = use_llvm;
exe.use_lld = use_llvm;

const exe_options = b.addOptions();
exe.addOptions("build_options", exe_options);

Expand Down
2 changes: 1 addition & 1 deletion src/Module.zig
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4120,7 +4120,7 @@ pub fn embedFile(
}
return error.ImportOutsideModulePath;
};
errdefer gpa.free(sub_file_path);
defer gpa.free(sub_file_path);

return newEmbedFile(mod, cur_file.mod, sub_file_path, resolved_path, gop, src_loc);
}
Expand Down
1 change: 1 addition & 0 deletions src/Sema.zig
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23488,6 +23488,7 @@ fn zirSelect(sema: *Sema, block: *Block, extended: Zir.Inst.Extended.InstData) C
if (b_val.isUndef(mod)) return mod.undefRef(vec_ty);

const elems = try sema.gpa.alloc(InternPool.Index, vec_len);
defer sema.gpa.free(elems);
for (elems, 0..) |*elem, i| {
const pred_elem_val = try pred_val.elemValue(mod, i);
const should_choose_a = pred_elem_val.toBool();
Expand Down
25 changes: 13 additions & 12 deletions src/arch/x86_64/CodeGen.zig
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -585,7 +585,7 @@ const InstTracking = struct {
tracking_log.debug("%{d} => {} (spilled)", .{ inst, self.* });
}

fn verifyMaterialize(self: *InstTracking, target: InstTracking) void {
fn verifyMaterialize(self: InstTracking, target: InstTracking) void {
switch (self.long) {
.none,
.unreach,
Expand DownExpand Up@@ -634,7 +634,7 @@ const InstTracking = struct {
}

fn materializeUnsafe(
self: *InstTracking,
self: InstTracking,
function: *Self,
inst: Air.Inst.Index,
target: InstTracking,
Expand DownExpand Up@@ -688,7 +688,7 @@ const InstTracking = struct {
}

fn liveOut(self: *InstTracking, function: *Self, inst: Air.Inst.Index) void {
for (self.short.getRegs()) |reg| {
for (self.getRegs()) |reg| {
if (function.register_manager.isRegFree(reg)) {
tracking_log.debug("%{d} => {} (live-out)", .{ inst, self.* });
continue;
Expand All@@ -701,7 +701,7 @@ const InstTracking = struct {
// Disable death.
var found_reg = false;
var remaining_reg: Register = .none;
for (tracking.short.getRegs()) |tracked_reg| if (tracked_reg.id() == reg.id()) {
for (tracking.getRegs()) |tracked_reg| if (tracked_reg.id() == reg.id()) {
assert(!found_reg);
found_reg = true;
} else {
Expand DownExpand Up@@ -10885,12 +10885,12 @@ fn airRet(self: *Self, inst: Air.Inst.Index) !void {
else => unreachable,
}
self.ret_mcv.liveOut(self, inst);
try self.finishAir(inst, .unreach, .{ un_op, .none, .none });

// TODO optimization opportunity: figure out when we can emit this as a 2 byte instruction
// which is available if the jump is 127 bytes or less forward.
const jmp_reloc = try self.asmJmpReloc(undefined);
try self.exitlude_jump_relocs.append(self.gpa, jmp_reloc);
return self.finishAir(inst, .unreach, .{ un_op, .none, .none });
}

fn airRetLoad(self: *Self, inst: Air.Inst.Index) !void {
Expand All@@ -10905,12 +10905,12 @@ fn airRetLoad(self: *Self, inst: Air.Inst.Index) !void {
else => unreachable,
}
self.ret_mcv.liveOut(self, inst);
try self.finishAir(inst, .unreach, .{ un_op, .none, .none });

// TODO optimization opportunity: figure out when we can emit this as a 2 byte instruction
// which is available if the jump is 127 bytes or less forward.
const jmp_reloc = try self.asmJmpReloc(undefined);
try self.exitlude_jump_relocs.append(self.gpa, jmp_reloc);
return self.finishAir(inst, .unreach, .{ un_op, .none, .none });
}

fn airCmp(self: *Self, inst: Air.Inst.Index, op: math.CompareOperator) !void {
Expand DownExpand Up@@ -11991,7 +11991,6 @@ fn performReloc(self: *Self, reloc: Mir.Inst.Index) !void {
fn airBr(self: *Self, inst: Air.Inst.Index) !void {
const mod = self.bin_file.options.module.?;
const br = self.air.instructions.items(.data)[inst].br;
const src_mcv = try self.resolveInst(br.operand);

const block_ty = self.typeOfIndex(br.block_inst);
const block_unused =
Expand All@@ -12002,23 +12001,25 @@ fn airBr(self: *Self, inst: Air.Inst.Index) !void {
const block_result = result: {
if (block_unused) break :result .none;

if (!first_br) try self.getValue(block_tracking.short, null);
const src_mcv = try self.resolveInst(br.operand);

if (self.reuseOperandAdvanced(inst, br.operand, 0, src_mcv, br.block_inst)) {
if (first_br) break :result src_mcv;

for (block_tracking.getRegs()) |block_reg|
try self.register_manager.getReg(block_reg, br.block_inst);
try self.getValue(block_tracking.short, br.block_inst);
// .long = .none to avoid merging operand and block result stack frames.
var current_tracking = InstTracking{ .long = .none, .short = src_mcv };
const current_tracking: InstTracking = .{ .long = .none, .short = src_mcv };
try current_tracking.materializeUnsafe(self, br.block_inst, block_tracking.*);
for (src_mcv.getRegs()) |src_reg| self.register_manager.freeReg(src_reg);
for (current_tracking.getRegs()) |src_reg| self.register_manager.freeReg(src_reg);
break :result block_tracking.short;
}

const dst_mcv = if (first_br) try self.allocRegOrMem(br.block_inst, true) else dst: {
try self.getValue(block_tracking.short, br.block_inst);
break :dst block_tracking.short;
};
try self.genCopy(block_ty, dst_mcv, src_mcv);
try self.genCopy(block_ty, dst_mcv, try self.resolveInst(br.operand));
break :result dst_mcv;
};

Expand Down
1 change: 1 addition & 0 deletions src/link/Elf.zig
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -392,6 +392,7 @@ pub fn deinit(self: *Elf) void {
self.copy_rel.deinit(gpa);
self.rela_dyn.deinit(gpa);
self.rela_plt.deinit(gpa);
self.zig_got.deinit(gpa);
}

pub fn getDeclVAddr(self: *Elf, decl_index: Module.Decl.Index, reloc_info: link.File.RelocInfo) !u64 {
Expand Down
1 change: 0 additions & 1 deletion test/behavior/packed-struct.zig
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1016,7 +1016,6 @@ test "modify nested packed struct aligned field" {
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;

const Options = packed struct {
foo: bool = false,
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
x86_64: get a compiler compiled with the x86_64 backend passing x86_64 backend tests by jacobly0 · Pull Request #17871 · ziglang/zig · GitHub
Skip to content
x86_64: get a compiler compiled with the x86_64 backend passing x86_64 backend tests#17871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

andrewrk
merged 5 commits into

from

Nov 5, 2023
 Merged


x86_64: get a compiler compiled with the x86_64 backend passing x86_64 backend tests
#17871
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
803ea10

x86_64: fix tracking during `br`


jacobly0 Nov 5, 2023
8311fac

x86_64: fix indirect return of `f80`


jacobly0 Nov 5, 2023
7b9f878

build: add option to specify whether to use the llvm backend


jacobly0 Nov 5, 2023
c2cda94

src: fix memory leaks


jacobly0 Nov 5, 2023
0ea7189

behavior: enable test passing with x86_64 backend


jacobly0 Nov 5, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
build.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -224,6 +224,10 @@ pub fn build(b: *std.Build) !void {
 check_case_exe.want_lto = false;
 }

 const use_llvm = b.option(bool, "use-llvm", "Use the llvm backend");
 exe.use_llvm = use_llvm;
 exe.use_lld = use_llvm;

 const exe_options = b.addOptions();
 exe.addOptions("build_options", exe_options);

Expand Down

2 changes: 1 addition & 1 deletion
src/Module.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4120,7 +4120,7 @@ pub fn embedFile(
 }
 return error.ImportOutsideModulePath;
 };
errdefer gpa.free(sub_file_path);
defer gpa.free(sub_file_path);

 return newEmbedFile(mod, cur_file.mod, sub_file_path, resolved_path, gop, src_loc);
}
Expand Down

1 change: 1 addition & 0 deletions
src/Sema.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23488,6 +23488,7 @@ fn zirSelect(sema: *Sema, block: *Block, extended: Zir.Inst.Extended.InstData) C
 if (b_val.isUndef(mod)) return mod.undefRef(vec_ty);

 const elems = try sema.gpa.alloc(InternPool.Index, vec_len);
 defer sema.gpa.free(elems);
 for (elems, 0..) |*elem, i| {
 const pred_elem_val = try pred_val.elemValue(mod, i);
 const should_choose_a = pred_elem_val.toBool();
Expand Down

25 changes: 13 additions & 12 deletions
src/arch/x86_64/CodeGen.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -585,7 +585,7 @@ const InstTracking = struct {
 tracking_log.debug("%{d} => {} (spilled)", .{ inst, self.* });
 }

 fn verifyMaterialize(self: *InstTracking, target: InstTracking) void {
 fn verifyMaterialize(self: InstTracking, target: InstTracking) void {
 switch (self.long) {
 .none,
 .unreach,
Expand DownExpand Up@@ -634,7 +634,7 @@ const InstTracking = struct {
 }

 fn materializeUnsafe(
 self: *InstTracking,
 self: InstTracking,
 function: *Self,
 inst: Air.Inst.Index,
 target: InstTracking,
Expand DownExpand Up@@ -688,7 +688,7 @@ const InstTracking = struct {
 }

 fn liveOut(self: *InstTracking, function: *Self, inst: Air.Inst.Index) void {
 for (self.short.getRegs()) |reg| {
 for (self.getRegs()) |reg| {
 if (function.register_manager.isRegFree(reg)) {
 tracking_log.debug("%{d} => {} (live-out)", .{ inst, self.* });
 continue;
Expand All@@ -701,7 +701,7 @@ const InstTracking = struct {
 // Disable death.
 var found_reg = false;
 var remaining_reg: Register = .none;
 for (tracking.short.getRegs()) |tracked_reg| if (tracked_reg.id() == reg.id()) {
 for (tracking.getRegs()) |tracked_reg| if (tracked_reg.id() == reg.id()) {
 assert(!found_reg);
 found_reg = true;
 } else {
Expand DownExpand Up@@ -10885,12 +10885,12 @@ fn airRet(self: *Self, inst: Air.Inst.Index) !void {
 else => unreachable,
 }
 self.ret_mcv.liveOut(self, inst);
 try self.finishAir(inst, .unreach, .{ un_op, .none, .none });

 // TODO optimization opportunity: figure out when we can emit this as a 2 byte instruction
 // which is available if the jump is 127 bytes or less forward.
 const jmp_reloc = try self.asmJmpReloc(undefined);
 try self.exitlude_jump_relocs.append(self.gpa, jmp_reloc);
 return self.finishAir(inst, .unreach, .{ un_op, .none, .none });
}

fn airRetLoad(self: *Self, inst: Air.Inst.Index) !void {
Expand All@@ -10905,12 +10905,12 @@ fn airRetLoad(self: *Self, inst: Air.Inst.Index) !void {
 else => unreachable,
 }
 self.ret_mcv.liveOut(self, inst);
 try self.finishAir(inst, .unreach, .{ un_op, .none, .none });

 // TODO optimization opportunity: figure out when we can emit this as a 2 byte instruction
 // which is available if the jump is 127 bytes or less forward.
 const jmp_reloc = try self.asmJmpReloc(undefined);
 try self.exitlude_jump_relocs.append(self.gpa, jmp_reloc);
 return self.finishAir(inst, .unreach, .{ un_op, .none, .none });
}

fn airCmp(self: *Self, inst: Air.Inst.Index, op: math.CompareOperator) !void {
Expand DownExpand Up@@ -11991,7 +11991,6 @@ fn performReloc(self: *Self, reloc: Mir.Inst.Index) !void {
fn airBr(self: *Self, inst: Air.Inst.Index) !void {
 const mod = self.bin_file.options.module.?;
 const br = self.air.instructions.items(.data)[inst].br;
 const src_mcv = try self.resolveInst(br.operand);

 const block_ty = self.typeOfIndex(br.block_inst);
 const block_unused =
Expand All@@ -12002,23 +12001,25 @@ fn airBr(self: *Self, inst: Air.Inst.Index) !void {
 const block_result = result: {
 if (block_unused) break :result .none;

 if (!first_br) try self.getValue(block_tracking.short, null);
 const src_mcv = try self.resolveInst(br.operand);

 if (self.reuseOperandAdvanced(inst, br.operand, 0, src_mcv, br.block_inst)) {
 if (first_br) break :result src_mcv;

 for (block_tracking.getRegs()) |block_reg|
 try self.register_manager.getReg(block_reg, br.block_inst);
 try self.getValue(block_tracking.short, br.block_inst);
 // .long = .none to avoid merging operand and block result stack frames.
var current_tracking = InstTracking{ .long = .none, .short = src_mcv };
const current_tracking: InstTracking = .{ .long = .none, .short = src_mcv };
 try current_tracking.materializeUnsafe(self, br.block_inst, block_tracking.*);
 for (src_mcv.getRegs()) |src_reg| self.register_manager.freeReg(src_reg);
 for (current_tracking.getRegs()) |src_reg| self.register_manager.freeReg(src_reg);
 break :result block_tracking.short;
 }

 const dst_mcv = if (first_br) try self.allocRegOrMem(br.block_inst, true) else dst: {
 try self.getValue(block_tracking.short, br.block_inst);
 break :dst block_tracking.short;
 };
 try self.genCopy(block_ty, dst_mcv, src_mcv);
 try self.genCopy(block_ty, dst_mcv, try self.resolveInst(br.operand));
 break :result dst_mcv;
 };

Expand Down

1 change: 1 addition & 0 deletions
src/link/Elf.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -392,6 +392,7 @@ pub fn deinit(self: *Elf) void {
 self.copy_rel.deinit(gpa);
 self.rela_dyn.deinit(gpa);
 self.rela_plt.deinit(gpa);
 self.zig_got.deinit(gpa);
}

pub fn getDeclVAddr(self: *Elf, decl_index: Module.Decl.Index, reloc_info: link.File.RelocInfo) !u64 {
Expand Down

1 change: 0 additions & 1 deletion
test/behavior/packed-struct.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1016,7 +1016,6 @@ test "modify nested packed struct aligned field" {
 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest;
 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;

 const Options = packed struct {
 foo: bool = false,
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
x86_64: get a compiler compiled with the x86_64 backend passing x86_64 backend tests by jacobly0 · Pull Request #17871 · ziglang/zig · GitHub
Skip to content
x86_64: get a compiler compiled with the x86_64 backend passing x86_64 backend tests#17871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

andrewrk
merged 5 commits into

from

Nov 5, 2023
 Merged


x86_64: get a compiler compiled with the x86_64 backend passing x86_64 backend tests
#17871
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
803ea10

x86_64: fix tracking during `br`


jacobly0 Nov 5, 2023
8311fac

x86_64: fix indirect return of `f80`


jacobly0 Nov 5, 2023
7b9f878

build: add option to specify whether to use the llvm backend


jacobly0 Nov 5, 2023
c2cda94

src: fix memory leaks


jacobly0 Nov 5, 2023
0ea7189

behavior: enable test passing with x86_64 backend


jacobly0 Nov 5, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
build.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -224,6 +224,10 @@ pub fn build(b: *std.Build) !void {
 check_case_exe.want_lto = false;
 }

 const use_llvm = b.option(bool, "use-llvm", "Use the llvm backend");
 exe.use_llvm = use_llvm;
 exe.use_lld = use_llvm;

 const exe_options = b.addOptions();
 exe.addOptions("build_options", exe_options);

Expand Down

2 changes: 1 addition & 1 deletion
src/Module.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4120,7 +4120,7 @@ pub fn embedFile(
 }
 return error.ImportOutsideModulePath;
 };
errdefer gpa.free(sub_file_path);
defer gpa.free(sub_file_path);

 return newEmbedFile(mod, cur_file.mod, sub_file_path, resolved_path, gop, src_loc);
}
Expand Down

1 change: 1 addition & 0 deletions
src/Sema.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23488,6 +23488,7 @@ fn zirSelect(sema: *Sema, block: *Block, extended: Zir.Inst.Extended.InstData) C
 if (b_val.isUndef(mod)) return mod.undefRef(vec_ty);

 const elems = try sema.gpa.alloc(InternPool.Index, vec_len);
 defer sema.gpa.free(elems);
 for (elems, 0..) |*elem, i| {
 const pred_elem_val = try pred_val.elemValue(mod, i);
 const should_choose_a = pred_elem_val.toBool();
Expand Down

25 changes: 13 additions & 12 deletions
src/arch/x86_64/CodeGen.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -585,7 +585,7 @@ const InstTracking = struct {
 tracking_log.debug("%{d} => {} (spilled)", .{ inst, self.* });
 }

 fn verifyMaterialize(self: *InstTracking, target: InstTracking) void {
 fn verifyMaterialize(self: InstTracking, target: InstTracking) void {
 switch (self.long) {
 .none,
 .unreach,
Expand DownExpand Up@@ -634,7 +634,7 @@ const InstTracking = struct {
 }

 fn materializeUnsafe(
 self: *InstTracking,
 self: InstTracking,
 function: *Self,
 inst: Air.Inst.Index,
 target: InstTracking,
Expand DownExpand Up@@ -688,7 +688,7 @@ const InstTracking = struct {
 }

 fn liveOut(self: *InstTracking, function: *Self, inst: Air.Inst.Index) void {
 for (self.short.getRegs()) |reg| {
 for (self.getRegs()) |reg| {
 if (function.register_manager.isRegFree(reg)) {
 tracking_log.debug("%{d} => {} (live-out)", .{ inst, self.* });
 continue;
Expand All@@ -701,7 +701,7 @@ const InstTracking = struct {
 // Disable death.
 var found_reg = false;
 var remaining_reg: Register = .none;
 for (tracking.short.getRegs()) |tracked_reg| if (tracked_reg.id() == reg.id()) {
 for (tracking.getRegs()) |tracked_reg| if (tracked_reg.id() == reg.id()) {
 assert(!found_reg);
 found_reg = true;
 } else {
Expand DownExpand Up@@ -10885,12 +10885,12 @@ fn airRet(self: *Self, inst: Air.Inst.Index) !void {
 else => unreachable,
 }
 self.ret_mcv.liveOut(self, inst);
 try self.finishAir(inst, .unreach, .{ un_op, .none, .none });

 // TODO optimization opportunity: figure out when we can emit this as a 2 byte instruction
 // which is available if the jump is 127 bytes or less forward.
 const jmp_reloc = try self.asmJmpReloc(undefined);
 try self.exitlude_jump_relocs.append(self.gpa, jmp_reloc);
 return self.finishAir(inst, .unreach, .{ un_op, .none, .none });
}

fn airRetLoad(self: *Self, inst: Air.Inst.Index) !void {
Expand All@@ -10905,12 +10905,12 @@ fn airRetLoad(self: *Self, inst: Air.Inst.Index) !void {
 else => unreachable,
 }
 self.ret_mcv.liveOut(self, inst);
 try self.finishAir(inst, .unreach, .{ un_op, .none, .none });

 // TODO optimization opportunity: figure out when we can emit this as a 2 byte instruction
 // which is available if the jump is 127 bytes or less forward.
 const jmp_reloc = try self.asmJmpReloc(undefined);
 try self.exitlude_jump_relocs.append(self.gpa, jmp_reloc);
 return self.finishAir(inst, .unreach, .{ un_op, .none, .none });
}

fn airCmp(self: *Self, inst: Air.Inst.Index, op: math.CompareOperator) !void {
Expand DownExpand Up@@ -11991,7 +11991,6 @@ fn performReloc(self: *Self, reloc: Mir.Inst.Index) !void {
fn airBr(self: *Self, inst: Air.Inst.Index) !void {
 const mod = self.bin_file.options.module.?;
 const br = self.air.instructions.items(.data)[inst].br;
 const src_mcv = try self.resolveInst(br.operand);

 const block_ty = self.typeOfIndex(br.block_inst);
 const block_unused =
Expand All@@ -12002,23 +12001,25 @@ fn airBr(self: *Self, inst: Air.Inst.Index) !void {
 const block_result = result: {
 if (block_unused) break :result .none;

 if (!first_br) try self.getValue(block_tracking.short, null);
 const src_mcv = try self.resolveInst(br.operand);

 if (self.reuseOperandAdvanced(inst, br.operand, 0, src_mcv, br.block_inst)) {
 if (first_br) break :result src_mcv;

 for (block_tracking.getRegs()) |block_reg|
 try self.register_manager.getReg(block_reg, br.block_inst);
 try self.getValue(block_tracking.short, br.block_inst);
 // .long = .none to avoid merging operand and block result stack frames.
var current_tracking = InstTracking{ .long = .none, .short = src_mcv };
const current_tracking: InstTracking = .{ .long = .none, .short = src_mcv };
 try current_tracking.materializeUnsafe(self, br.block_inst, block_tracking.*);
 for (src_mcv.getRegs()) |src_reg| self.register_manager.freeReg(src_reg);
 for (current_tracking.getRegs()) |src_reg| self.register_manager.freeReg(src_reg);
 break :result block_tracking.short;
 }

 const dst_mcv = if (first_br) try self.allocRegOrMem(br.block_inst, true) else dst: {
 try self.getValue(block_tracking.short, br.block_inst);
 break :dst block_tracking.short;
 };
 try self.genCopy(block_ty, dst_mcv, src_mcv);
 try self.genCopy(block_ty, dst_mcv, try self.resolveInst(br.operand));
 break :result dst_mcv;
 };

Expand Down

1 change: 1 addition & 0 deletions
src/link/Elf.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -392,6 +392,7 @@ pub fn deinit(self: *Elf) void {
 self.copy_rel.deinit(gpa);
 self.rela_dyn.deinit(gpa);
 self.rela_plt.deinit(gpa);
 self.zig_got.deinit(gpa);
}

pub fn getDeclVAddr(self: *Elf, decl_index: Module.Decl.Index, reloc_info: link.File.RelocInfo) !u64 {
Expand Down

1 change: 0 additions & 1 deletion
test/behavior/packed-struct.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1016,7 +1016,6 @@ test "modify nested packed struct aligned field" {
 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest;
 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;

 const Options = packed struct {
 foo: bool = false,
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
x86_64: get a compiler compiled with the x86_64 backend passing x86_64 backend tests by jacobly0 · Pull Request #17871 · ziglang/zig · GitHub
Skip to content
x86_64: get a compiler compiled with the x86_64 backend passing x86_64 backend tests#17871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

andrewrk
merged 5 commits into

from

Nov 5, 2023
 Merged


x86_64: get a compiler compiled with the x86_64 backend passing x86_64 backend tests
#17871
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
803ea10

x86_64: fix tracking during `br`


jacobly0 Nov 5, 2023
8311fac

x86_64: fix indirect return of `f80`


jacobly0 Nov 5, 2023
7b9f878

build: add option to specify whether to use the llvm backend


jacobly0 Nov 5, 2023
c2cda94

src: fix memory leaks


jacobly0 Nov 5, 2023
0ea7189

behavior: enable test passing with x86_64 backend


jacobly0 Nov 5, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
build.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -224,6 +224,10 @@ pub fn build(b: *std.Build) !void {
 check_case_exe.want_lto = false;
 }

 const use_llvm = b.option(bool, "use-llvm", "Use the llvm backend");
 exe.use_llvm = use_llvm;
 exe.use_lld = use_llvm;

 const exe_options = b.addOptions();
 exe.addOptions("build_options", exe_options);

Expand Down

2 changes: 1 addition & 1 deletion
src/Module.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4120,7 +4120,7 @@ pub fn embedFile(
 }
 return error.ImportOutsideModulePath;
 };
errdefer gpa.free(sub_file_path);
defer gpa.free(sub_file_path);

 return newEmbedFile(mod, cur_file.mod, sub_file_path, resolved_path, gop, src_loc);
}
Expand Down

1 change: 1 addition & 0 deletions
src/Sema.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23488,6 +23488,7 @@ fn zirSelect(sema: *Sema, block: *Block, extended: Zir.Inst.Extended.InstData) C
 if (b_val.isUndef(mod)) return mod.undefRef(vec_ty);

 const elems = try sema.gpa.alloc(InternPool.Index, vec_len);
 defer sema.gpa.free(elems);
 for (elems, 0..) |*elem, i| {
 const pred_elem_val = try pred_val.elemValue(mod, i);
 const should_choose_a = pred_elem_val.toBool();
Expand Down

25 changes: 13 additions & 12 deletions
src/arch/x86_64/CodeGen.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -585,7 +585,7 @@ const InstTracking = struct {
 tracking_log.debug("%{d} => {} (spilled)", .{ inst, self.* });
 }

 fn verifyMaterialize(self: *InstTracking, target: InstTracking) void {
 fn verifyMaterialize(self: InstTracking, target: InstTracking) void {
 switch (self.long) {
 .none,
 .unreach,
Expand DownExpand Up@@ -634,7 +634,7 @@ const InstTracking = struct {
 }

 fn materializeUnsafe(
 self: *InstTracking,
 self: InstTracking,
 function: *Self,
 inst: Air.Inst.Index,
 target: InstTracking,
Expand DownExpand Up@@ -688,7 +688,7 @@ const InstTracking = struct {
 }

 fn liveOut(self: *InstTracking, function: *Self, inst: Air.Inst.Index) void {
 for (self.short.getRegs()) |reg| {
 for (self.getRegs()) |reg| {
 if (function.register_manager.isRegFree(reg)) {
 tracking_log.debug("%{d} => {} (live-out)", .{ inst, self.* });
 continue;
Expand All@@ -701,7 +701,7 @@ const InstTracking = struct {
 // Disable death.
 var found_reg = false;
 var remaining_reg: Register = .none;
 for (tracking.short.getRegs()) |tracked_reg| if (tracked_reg.id() == reg.id()) {
 for (tracking.getRegs()) |tracked_reg| if (tracked_reg.id() == reg.id()) {
 assert(!found_reg);
 found_reg = true;
 } else {
Expand DownExpand Up@@ -10885,12 +10885,12 @@ fn airRet(self: *Self, inst: Air.Inst.Index) !void {
 else => unreachable,
 }
 self.ret_mcv.liveOut(self, inst);
 try self.finishAir(inst, .unreach, .{ un_op, .none, .none });

 // TODO optimization opportunity: figure out when we can emit this as a 2 byte instruction
 // which is available if the jump is 127 bytes or less forward.
 const jmp_reloc = try self.asmJmpReloc(undefined);
 try self.exitlude_jump_relocs.append(self.gpa, jmp_reloc);
 return self.finishAir(inst, .unreach, .{ un_op, .none, .none });
}

fn airRetLoad(self: *Self, inst: Air.Inst.Index) !void {
Expand All@@ -10905,12 +10905,12 @@ fn airRetLoad(self: *Self, inst: Air.Inst.Index) !void {
 else => unreachable,
 }
 self.ret_mcv.liveOut(self, inst);
 try self.finishAir(inst, .unreach, .{ un_op, .none, .none });

 // TODO optimization opportunity: figure out when we can emit this as a 2 byte instruction
 // which is available if the jump is 127 bytes or less forward.
 const jmp_reloc = try self.asmJmpReloc(undefined);
 try self.exitlude_jump_relocs.append(self.gpa, jmp_reloc);
 return self.finishAir(inst, .unreach, .{ un_op, .none, .none });
}

fn airCmp(self: *Self, inst: Air.Inst.Index, op: math.CompareOperator) !void {
Expand DownExpand Up@@ -11991,7 +11991,6 @@ fn performReloc(self: *Self, reloc: Mir.Inst.Index) !void {
fn airBr(self: *Self, inst: Air.Inst.Index) !void {
 const mod = self.bin_file.options.module.?;
 const br = self.air.instructions.items(.data)[inst].br;
 const src_mcv = try self.resolveInst(br.operand);

 const block_ty = self.typeOfIndex(br.block_inst);
 const block_unused =
Expand All@@ -12002,23 +12001,25 @@ fn airBr(self: *Self, inst: Air.Inst.Index) !void {
 const block_result = result: {
 if (block_unused) break :result .none;

 if (!first_br) try self.getValue(block_tracking.short, null);
 const src_mcv = try self.resolveInst(br.operand);

 if (self.reuseOperandAdvanced(inst, br.operand, 0, src_mcv, br.block_inst)) {
 if (first_br) break :result src_mcv;

 for (block_tracking.getRegs()) |block_reg|
 try self.register_manager.getReg(block_reg, br.block_inst);
 try self.getValue(block_tracking.short, br.block_inst);
 // .long = .none to avoid merging operand and block result stack frames.
var current_tracking = InstTracking{ .long = .none, .short = src_mcv };
const current_tracking: InstTracking = .{ .long = .none, .short = src_mcv };
 try current_tracking.materializeUnsafe(self, br.block_inst, block_tracking.*);
 for (src_mcv.getRegs()) |src_reg| self.register_manager.freeReg(src_reg);
 for (current_tracking.getRegs()) |src_reg| self.register_manager.freeReg(src_reg);
 break :result block_tracking.short;
 }

 const dst_mcv = if (first_br) try self.allocRegOrMem(br.block_inst, true) else dst: {
 try self.getValue(block_tracking.short, br.block_inst);
 break :dst block_tracking.short;
 };
 try self.genCopy(block_ty, dst_mcv, src_mcv);
 try self.genCopy(block_ty, dst_mcv, try self.resolveInst(br.operand));
 break :result dst_mcv;
 };

Expand Down

1 change: 1 addition & 0 deletions
src/link/Elf.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -392,6 +392,7 @@ pub fn deinit(self: *Elf) void {
 self.copy_rel.deinit(gpa);
 self.rela_dyn.deinit(gpa);
 self.rela_plt.deinit(gpa);
 self.zig_got.deinit(gpa);
}

pub fn getDeclVAddr(self: *Elf, decl_index: Module.Decl.Index, reloc_info: link.File.RelocInfo) !u64 {
Expand Down

1 change: 0 additions & 1 deletion
test/behavior/packed-struct.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1016,7 +1016,6 @@ test "modify nested packed struct aligned field" {
 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest;
 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;

 const Options = packed struct {
 foo: bool = false,
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
x86_64: get a compiler compiled with the x86_64 backend passing x86_64 backend tests by jacobly0 · Pull Request #17871 · ziglang/zig · GitHub
Skip to content
x86_64: get a compiler compiled with the x86_64 backend passing x86_64 backend tests#17871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

andrewrk
merged 5 commits into

from

Nov 5, 2023
 Merged


x86_64: get a compiler compiled with the x86_64 backend passing x86_64 backend tests
#17871
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
803ea10

x86_64: fix tracking during `br`


jacobly0 Nov 5, 2023
8311fac

x86_64: fix indirect return of `f80`


jacobly0 Nov 5, 2023
7b9f878

build: add option to specify whether to use the llvm backend


jacobly0 Nov 5, 2023
c2cda94

src: fix memory leaks


jacobly0 Nov 5, 2023
0ea7189

behavior: enable test passing with x86_64 backend


jacobly0 Nov 5, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
build.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -224,6 +224,10 @@ pub fn build(b: *std.Build) !void {
 check_case_exe.want_lto = false;
 }

 const use_llvm = b.option(bool, "use-llvm", "Use the llvm backend");
 exe.use_llvm = use_llvm;
 exe.use_lld = use_llvm;

 const exe_options = b.addOptions();
 exe.addOptions("build_options", exe_options);

Expand Down

2 changes: 1 addition & 1 deletion
src/Module.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4120,7 +4120,7 @@ pub fn embedFile(
 }
 return error.ImportOutsideModulePath;
 };
errdefer gpa.free(sub_file_path);
defer gpa.free(sub_file_path);

 return newEmbedFile(mod, cur_file.mod, sub_file_path, resolved_path, gop, src_loc);
}
Expand Down

1 change: 1 addition & 0 deletions
src/Sema.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23488,6 +23488,7 @@ fn zirSelect(sema: *Sema, block: *Block, extended: Zir.Inst.Extended.InstData) C
 if (b_val.isUndef(mod)) return mod.undefRef(vec_ty);

 const elems = try sema.gpa.alloc(InternPool.Index, vec_len);
 defer sema.gpa.free(elems);
 for (elems, 0..) |*elem, i| {
 const pred_elem_val = try pred_val.elemValue(mod, i);
 const should_choose_a = pred_elem_val.toBool();
Expand Down

25 changes: 13 additions & 12 deletions
src/arch/x86_64/CodeGen.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -585,7 +585,7 @@ const InstTracking = struct {
 tracking_log.debug("%{d} => {} (spilled)", .{ inst, self.* });
 }

 fn verifyMaterialize(self: *InstTracking, target: InstTracking) void {
 fn verifyMaterialize(self: InstTracking, target: InstTracking) void {
 switch (self.long) {
 .none,
 .unreach,
Expand DownExpand Up@@ -634,7 +634,7 @@ const InstTracking = struct {
 }

 fn materializeUnsafe(
 self: *InstTracking,
 self: InstTracking,
 function: *Self,
 inst: Air.Inst.Index,
 target: InstTracking,
Expand DownExpand Up@@ -688,7 +688,7 @@ const InstTracking = struct {
 }

 fn liveOut(self: *InstTracking, function: *Self, inst: Air.Inst.Index) void {
 for (self.short.getRegs()) |reg| {
 for (self.getRegs()) |reg| {
 if (function.register_manager.isRegFree(reg)) {
 tracking_log.debug("%{d} => {} (live-out)", .{ inst, self.* });
 continue;
Expand All@@ -701,7 +701,7 @@ const InstTracking = struct {
 // Disable death.
 var found_reg = false;
 var remaining_reg: Register = .none;
 for (tracking.short.getRegs()) |tracked_reg| if (tracked_reg.id() == reg.id()) {
 for (tracking.getRegs()) |tracked_reg| if (tracked_reg.id() == reg.id()) {
 assert(!found_reg);
 found_reg = true;
 } else {
Expand DownExpand Up@@ -10885,12 +10885,12 @@ fn airRet(self: *Self, inst: Air.Inst.Index) !void {
 else => unreachable,
 }
 self.ret_mcv.liveOut(self, inst);
 try self.finishAir(inst, .unreach, .{ un_op, .none, .none });

 // TODO optimization opportunity: figure out when we can emit this as a 2 byte instruction
 // which is available if the jump is 127 bytes or less forward.
 const jmp_reloc = try self.asmJmpReloc(undefined);
 try self.exitlude_jump_relocs.append(self.gpa, jmp_reloc);
 return self.finishAir(inst, .unreach, .{ un_op, .none, .none });
}

fn airRetLoad(self: *Self, inst: Air.Inst.Index) !void {
Expand All@@ -10905,12 +10905,12 @@ fn airRetLoad(self: *Self, inst: Air.Inst.Index) !void {
 else => unreachable,
 }
 self.ret_mcv.liveOut(self, inst);
 try self.finishAir(inst, .unreach, .{ un_op, .none, .none });

 // TODO optimization opportunity: figure out when we can emit this as a 2 byte instruction
 // which is available if the jump is 127 bytes or less forward.
 const jmp_reloc = try self.asmJmpReloc(undefined);
 try self.exitlude_jump_relocs.append(self.gpa, jmp_reloc);
 return self.finishAir(inst, .unreach, .{ un_op, .none, .none });
}

fn airCmp(self: *Self, inst: Air.Inst.Index, op: math.CompareOperator) !void {
Expand DownExpand Up@@ -11991,7 +11991,6 @@ fn performReloc(self: *Self, reloc: Mir.Inst.Index) !void {
fn airBr(self: *Self, inst: Air.Inst.Index) !void {
 const mod = self.bin_file.options.module.?;
 const br = self.air.instructions.items(.data)[inst].br;
 const src_mcv = try self.resolveInst(br.operand);

 const block_ty = self.typeOfIndex(br.block_inst);
 const block_unused =
Expand All@@ -12002,23 +12001,25 @@ fn airBr(self: *Self, inst: Air.Inst.Index) !void {
 const block_result = result: {
 if (block_unused) break :result .none;

 if (!first_br) try self.getValue(block_tracking.short, null);
 const src_mcv = try self.resolveInst(br.operand);

 if (self.reuseOperandAdvanced(inst, br.operand, 0, src_mcv, br.block_inst)) {
 if (first_br) break :result src_mcv;

 for (block_tracking.getRegs()) |block_reg|
 try self.register_manager.getReg(block_reg, br.block_inst);
 try self.getValue(block_tracking.short, br.block_inst);
 // .long = .none to avoid merging operand and block result stack frames.
var current_tracking = InstTracking{ .long = .none, .short = src_mcv };
const current_tracking: InstTracking = .{ .long = .none, .short = src_mcv };
 try current_tracking.materializeUnsafe(self, br.block_inst, block_tracking.*);
 for (src_mcv.getRegs()) |src_reg| self.register_manager.freeReg(src_reg);
 for (current_tracking.getRegs()) |src_reg| self.register_manager.freeReg(src_reg);
 break :result block_tracking.short;
 }

 const dst_mcv = if (first_br) try self.allocRegOrMem(br.block_inst, true) else dst: {
 try self.getValue(block_tracking.short, br.block_inst);
 break :dst block_tracking.short;
 };
 try self.genCopy(block_ty, dst_mcv, src_mcv);
 try self.genCopy(block_ty, dst_mcv, try self.resolveInst(br.operand));
 break :result dst_mcv;
 };

Expand Down

1 change: 1 addition & 0 deletions
src/link/Elf.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -392,6 +392,7 @@ pub fn deinit(self: *Elf) void {
 self.copy_rel.deinit(gpa);
 self.rela_dyn.deinit(gpa);
 self.rela_plt.deinit(gpa);
 self.zig_got.deinit(gpa);
}

pub fn getDeclVAddr(self: *Elf, decl_index: Module.Decl.Index, reloc_info: link.File.RelocInfo) !u64 {
Expand Down

1 change: 0 additions & 1 deletion
test/behavior/packed-struct.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1016,7 +1016,6 @@ test "modify nested packed struct aligned field" {
 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest;
 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;

 const Options = packed struct {
 foo: bool = false,
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
x86_64: get a compiler compiled with the x86_64 backend passing x86_64 backend tests by jacobly0 · Pull Request #17871 · ziglang/zig · GitHub
Skip to content
x86_64: get a compiler compiled with the x86_64 backend passing x86_64 backend tests#17871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

andrewrk
merged 5 commits into

from

Nov 5, 2023
 Merged


x86_64: get a compiler compiled with the x86_64 backend passing x86_64 backend tests
#17871
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
803ea10

x86_64: fix tracking during `br`


jacobly0 Nov 5, 2023
8311fac

x86_64: fix indirect return of `f80`


jacobly0 Nov 5, 2023
7b9f878

build: add option to specify whether to use the llvm backend


jacobly0 Nov 5, 2023
c2cda94

src: fix memory leaks


jacobly0 Nov 5, 2023
0ea7189

behavior: enable test passing with x86_64 backend


jacobly0 Nov 5, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
build.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -224,6 +224,10 @@ pub fn build(b: *std.Build) !void {
 check_case_exe.want_lto = false;
 }

 const use_llvm = b.option(bool, "use-llvm", "Use the llvm backend");
 exe.use_llvm = use_llvm;
 exe.use_lld = use_llvm;

 const exe_options = b.addOptions();
 exe.addOptions("build_options", exe_options);

Expand Down

2 changes: 1 addition & 1 deletion
src/Module.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4120,7 +4120,7 @@ pub fn embedFile(
 }
 return error.ImportOutsideModulePath;
 };
errdefer gpa.free(sub_file_path);
defer gpa.free(sub_file_path);

 return newEmbedFile(mod, cur_file.mod, sub_file_path, resolved_path, gop, src_loc);
}
Expand Down

1 change: 1 addition & 0 deletions
src/Sema.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23488,6 +23488,7 @@ fn zirSelect(sema: *Sema, block: *Block, extended: Zir.Inst.Extended.InstData) C
 if (b_val.isUndef(mod)) return mod.undefRef(vec_ty);

 const elems = try sema.gpa.alloc(InternPool.Index, vec_len);
 defer sema.gpa.free(elems);
 for (elems, 0..) |*elem, i| {
 const pred_elem_val = try pred_val.elemValue(mod, i);
 const should_choose_a = pred_elem_val.toBool();
Expand Down

25 changes: 13 additions & 12 deletions
src/arch/x86_64/CodeGen.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -585,7 +585,7 @@ const InstTracking = struct {
 tracking_log.debug("%{d} => {} (spilled)", .{ inst, self.* });
 }

 fn verifyMaterialize(self: *InstTracking, target: InstTracking) void {
 fn verifyMaterialize(self: InstTracking, target: InstTracking) void {
 switch (self.long) {
 .none,
 .unreach,
Expand DownExpand Up@@ -634,7 +634,7 @@ const InstTracking = struct {
 }

 fn materializeUnsafe(
 self: *InstTracking,
 self: InstTracking,
 function: *Self,
 inst: Air.Inst.Index,
 target: InstTracking,
Expand DownExpand Up@@ -688,7 +688,7 @@ const InstTracking = struct {
 }

 fn liveOut(self: *InstTracking, function: *Self, inst: Air.Inst.Index) void {
 for (self.short.getRegs()) |reg| {
 for (self.getRegs()) |reg| {
 if (function.register_manager.isRegFree(reg)) {
 tracking_log.debug("%{d} => {} (live-out)", .{ inst, self.* });
 continue;
Expand All@@ -701,7 +701,7 @@ const InstTracking = struct {
 // Disable death.
 var found_reg = false;
 var remaining_reg: Register = .none;
 for (tracking.short.getRegs()) |tracked_reg| if (tracked_reg.id() == reg.id()) {
 for (tracking.getRegs()) |tracked_reg| if (tracked_reg.id() == reg.id()) {
 assert(!found_reg);
 found_reg = true;
 } else {
Expand DownExpand Up@@ -10885,12 +10885,12 @@ fn airRet(self: *Self, inst: Air.Inst.Index) !void {
 else => unreachable,
 }
 self.ret_mcv.liveOut(self, inst);
 try self.finishAir(inst, .unreach, .{ un_op, .none, .none });

 // TODO optimization opportunity: figure out when we can emit this as a 2 byte instruction
 // which is available if the jump is 127 bytes or less forward.
 const jmp_reloc = try self.asmJmpReloc(undefined);
 try self.exitlude_jump_relocs.append(self.gpa, jmp_reloc);
 return self.finishAir(inst, .unreach, .{ un_op, .none, .none });
}

fn airRetLoad(self: *Self, inst: Air.Inst.Index) !void {
Expand All@@ -10905,12 +10905,12 @@ fn airRetLoad(self: *Self, inst: Air.Inst.Index) !void {
 else => unreachable,
 }
 self.ret_mcv.liveOut(self, inst);
 try self.finishAir(inst, .unreach, .{ un_op, .none, .none });

 // TODO optimization opportunity: figure out when we can emit this as a 2 byte instruction
 // which is available if the jump is 127 bytes or less forward.
 const jmp_reloc = try self.asmJmpReloc(undefined);
 try self.exitlude_jump_relocs.append(self.gpa, jmp_reloc);
 return self.finishAir(inst, .unreach, .{ un_op, .none, .none });
}

fn airCmp(self: *Self, inst: Air.Inst.Index, op: math.CompareOperator) !void {
Expand DownExpand Up@@ -11991,7 +11991,6 @@ fn performReloc(self: *Self, reloc: Mir.Inst.Index) !void {
fn airBr(self: *Self, inst: Air.Inst.Index) !void {
 const mod = self.bin_file.options.module.?;
 const br = self.air.instructions.items(.data)[inst].br;
 const src_mcv = try self.resolveInst(br.operand);

 const block_ty = self.typeOfIndex(br.block_inst);
 const block_unused =
Expand All@@ -12002,23 +12001,25 @@ fn airBr(self: *Self, inst: Air.Inst.Index) !void {
 const block_result = result: {
 if (block_unused) break :result .none;

 if (!first_br) try self.getValue(block_tracking.short, null);
 const src_mcv = try self.resolveInst(br.operand);

 if (self.reuseOperandAdvanced(inst, br.operand, 0, src_mcv, br.block_inst)) {
 if (first_br) break :result src_mcv;

 for (block_tracking.getRegs()) |block_reg|
 try self.register_manager.getReg(block_reg, br.block_inst);
 try self.getValue(block_tracking.short, br.block_inst);
 // .long = .none to avoid merging operand and block result stack frames.
var current_tracking = InstTracking{ .long = .none, .short = src_mcv };
const current_tracking: InstTracking = .{ .long = .none, .short = src_mcv };
 try current_tracking.materializeUnsafe(self, br.block_inst, block_tracking.*);
 for (src_mcv.getRegs()) |src_reg| self.register_manager.freeReg(src_reg);
 for (current_tracking.getRegs()) |src_reg| self.register_manager.freeReg(src_reg);
 break :result block_tracking.short;
 }

 const dst_mcv = if (first_br) try self.allocRegOrMem(br.block_inst, true) else dst: {
 try self.getValue(block_tracking.short, br.block_inst);
 break :dst block_tracking.short;
 };
 try self.genCopy(block_ty, dst_mcv, src_mcv);
 try self.genCopy(block_ty, dst_mcv, try self.resolveInst(br.operand));
 break :result dst_mcv;
 };

Expand Down

1 change: 1 addition & 0 deletions
src/link/Elf.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -392,6 +392,7 @@ pub fn deinit(self: *Elf) void {
 self.copy_rel.deinit(gpa);
 self.rela_dyn.deinit(gpa);
 self.rela_plt.deinit(gpa);
 self.zig_got.deinit(gpa);
}

pub fn getDeclVAddr(self: *Elf, decl_index: Module.Decl.Index, reloc_info: link.File.RelocInfo) !u64 {
Expand Down

1 change: 0 additions & 1 deletion
test/behavior/packed-struct.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1016,7 +1016,6 @@ test "modify nested packed struct aligned field" {
 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest;
 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;

 const Options = packed struct {
 foo: bool = false,
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
})();
x86_64: get a compiler compiled with the x86_64 backend passing x86_64 backend tests by jacobly0 · Pull Request #17871 · ziglang/zig · GitHub
Skip to content
x86_64: get a compiler compiled with the x86_64 backend passing x86_64 backend tests#17871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

andrewrk
merged 5 commits into

from

Nov 5, 2023
 Merged


x86_64: get a compiler compiled with the x86_64 backend passing x86_64 backend tests
#17871
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
803ea10

x86_64: fix tracking during `br`


jacobly0 Nov 5, 2023
8311fac

x86_64: fix indirect return of `f80`


jacobly0 Nov 5, 2023
7b9f878

build: add option to specify whether to use the llvm backend


jacobly0 Nov 5, 2023
c2cda94

src: fix memory leaks


jacobly0 Nov 5, 2023
0ea7189

behavior: enable test passing with x86_64 backend


jacobly0 Nov 5, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
build.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -224,6 +224,10 @@ pub fn build(b: *std.Build) !void {
 check_case_exe.want_lto = false;
 }

 const use_llvm = b.option(bool, "use-llvm", "Use the llvm backend");
 exe.use_llvm = use_llvm;
 exe.use_lld = use_llvm;

 const exe_options = b.addOptions();
 exe.addOptions("build_options", exe_options);

Expand Down

2 changes: 1 addition & 1 deletion
src/Module.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4120,7 +4120,7 @@ pub fn embedFile(
 }
 return error.ImportOutsideModulePath;
 };
errdefer gpa.free(sub_file_path);
defer gpa.free(sub_file_path);

 return newEmbedFile(mod, cur_file.mod, sub_file_path, resolved_path, gop, src_loc);
}
Expand Down

1 change: 1 addition & 0 deletions
src/Sema.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23488,6 +23488,7 @@ fn zirSelect(sema: *Sema, block: *Block, extended: Zir.Inst.Extended.InstData) C
 if (b_val.isUndef(mod)) return mod.undefRef(vec_ty);

 const elems = try sema.gpa.alloc(InternPool.Index, vec_len);
 defer sema.gpa.free(elems);
 for (elems, 0..) |*elem, i| {
 const pred_elem_val = try pred_val.elemValue(mod, i);
 const should_choose_a = pred_elem_val.toBool();
Expand Down

25 changes: 13 additions & 12 deletions
src/arch/x86_64/CodeGen.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -585,7 +585,7 @@ const InstTracking = struct {
 tracking_log.debug("%{d} => {} (spilled)", .{ inst, self.* });
 }

 fn verifyMaterialize(self: *InstTracking, target: InstTracking) void {
 fn verifyMaterialize(self: InstTracking, target: InstTracking) void {
 switch (self.long) {
 .none,
 .unreach,
Expand DownExpand Up@@ -634,7 +634,7 @@ const InstTracking = struct {
 }

 fn materializeUnsafe(
 self: *InstTracking,
 self: InstTracking,
 function: *Self,
 inst: Air.Inst.Index,
 target: InstTracking,
Expand DownExpand Up@@ -688,7 +688,7 @@ const InstTracking = struct {
 }

 fn liveOut(self: *InstTracking, function: *Self, inst: Air.Inst.Index) void {
 for (self.short.getRegs()) |reg| {
 for (self.getRegs()) |reg| {
 if (function.register_manager.isRegFree(reg)) {
 tracking_log.debug("%{d} => {} (live-out)", .{ inst, self.* });
 continue;
Expand All@@ -701,7 +701,7 @@ const InstTracking = struct {
 // Disable death.
 var found_reg = false;
 var remaining_reg: Register = .none;
 for (tracking.short.getRegs()) |tracked_reg| if (tracked_reg.id() == reg.id()) {
 for (tracking.getRegs()) |tracked_reg| if (tracked_reg.id() == reg.id()) {
 assert(!found_reg);
 found_reg = true;
 } else {
Expand DownExpand Up@@ -10885,12 +10885,12 @@ fn airRet(self: *Self, inst: Air.Inst.Index) !void {
 else => unreachable,
 }
 self.ret_mcv.liveOut(self, inst);
 try self.finishAir(inst, .unreach, .{ un_op, .none, .none });

 // TODO optimization opportunity: figure out when we can emit this as a 2 byte instruction
 // which is available if the jump is 127 bytes or less forward.
 const jmp_reloc = try self.asmJmpReloc(undefined);
 try self.exitlude_jump_relocs.append(self.gpa, jmp_reloc);
 return self.finishAir(inst, .unreach, .{ un_op, .none, .none });
}

fn airRetLoad(self: *Self, inst: Air.Inst.Index) !void {
Expand All@@ -10905,12 +10905,12 @@ fn airRetLoad(self: *Self, inst: Air.Inst.Index) !void {
 else => unreachable,
 }
 self.ret_mcv.liveOut(self, inst);
 try self.finishAir(inst, .unreach, .{ un_op, .none, .none });

 // TODO optimization opportunity: figure out when we can emit this as a 2 byte instruction
 // which is available if the jump is 127 bytes or less forward.
 const jmp_reloc = try self.asmJmpReloc(undefined);
 try self.exitlude_jump_relocs.append(self.gpa, jmp_reloc);
 return self.finishAir(inst, .unreach, .{ un_op, .none, .none });
}

fn airCmp(self: *Self, inst: Air.Inst.Index, op: math.CompareOperator) !void {
Expand DownExpand Up@@ -11991,7 +11991,6 @@ fn performReloc(self: *Self, reloc: Mir.Inst.Index) !void {
fn airBr(self: *Self, inst: Air.Inst.Index) !void {
 const mod = self.bin_file.options.module.?;
 const br = self.air.instructions.items(.data)[inst].br;
 const src_mcv = try self.resolveInst(br.operand);

 const block_ty = self.typeOfIndex(br.block_inst);
 const block_unused =
Expand All@@ -12002,23 +12001,25 @@ fn airBr(self: *Self, inst: Air.Inst.Index) !void {
 const block_result = result: {
 if (block_unused) break :result .none;

 if (!first_br) try self.getValue(block_tracking.short, null);
 const src_mcv = try self.resolveInst(br.operand);

 if (self.reuseOperandAdvanced(inst, br.operand, 0, src_mcv, br.block_inst)) {
 if (first_br) break :result src_mcv;

 for (block_tracking.getRegs()) |block_reg|
 try self.register_manager.getReg(block_reg, br.block_inst);
 try self.getValue(block_tracking.short, br.block_inst);
 // .long = .none to avoid merging operand and block result stack frames.
var current_tracking = InstTracking{ .long = .none, .short = src_mcv };
const current_tracking: InstTracking = .{ .long = .none, .short = src_mcv };
 try current_tracking.materializeUnsafe(self, br.block_inst, block_tracking.*);
 for (src_mcv.getRegs()) |src_reg| self.register_manager.freeReg(src_reg);
 for (current_tracking.getRegs()) |src_reg| self.register_manager.freeReg(src_reg);
 break :result block_tracking.short;
 }

 const dst_mcv = if (first_br) try self.allocRegOrMem(br.block_inst, true) else dst: {
 try self.getValue(block_tracking.short, br.block_inst);
 break :dst block_tracking.short;
 };
 try self.genCopy(block_ty, dst_mcv, src_mcv);
 try self.genCopy(block_ty, dst_mcv, try self.resolveInst(br.operand));
 break :result dst_mcv;
 };

Expand Down

1 change: 1 addition & 0 deletions
src/link/Elf.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -392,6 +392,7 @@ pub fn deinit(self: *Elf) void {
 self.copy_rel.deinit(gpa);
 self.rela_dyn.deinit(gpa);
 self.rela_plt.deinit(gpa);
 self.zig_got.deinit(gpa);
}

pub fn getDeclVAddr(self: *Elf, decl_index: Module.Decl.Index, reloc_info: link.File.RelocInfo) !u64 {
Expand Down

1 change: 0 additions & 1 deletion
test/behavior/packed-struct.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1016,7 +1016,6 @@ test "modify nested packed struct aligned field" {
 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest;
 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;

 const Options = packed struct {
 foo: bool = false,
Expand Down