authorgravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2023-03-24 17:55:47-04:00
committergravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2023-03-24 17:57:58-04:00
log0987ed1970bc0332844a0e398b3c981b38627ed6
tree83bb3d35427fb67703ce420daa29e6011386ec66
parent5e0f09168452bb099d487fd4e2fb6b9f37de5640

x86_64: detect canonicalisation hazards

1 files changed, 9 insertions(+), 2 deletions(-)

src/arch/x86_64/CodeGen.zig+9-2
......@@ -5771,6 +5771,9 @@ fn canonicaliseBranches(
57715771 comptime set_values: bool,
57725772 comptime assert_same_deaths: bool,
57735773) !void {
5774 var hazard_map = std.AutoHashMap(MCValue, void).init(self.gpa);
5775 defer hazard_map.deinit();
5776
57745777 const parent_branch =
57755778 if (update_parent) &self.branch_stack.items[self.branch_stack.items.len - 1] else undefined;
57765779
......@@ -5804,8 +5807,10 @@ fn canonicaliseBranches(
58045807 break :blk self.getResolvedInstValue(target_key).?.*;
58055808 };
58065809 log.debug("consolidating target_entry {d} {}=>{}", .{ target_key, target_value, canon_mcv });
5807 // TODO make sure the destination stack offset / register does not already have something
5810 // TODO handle the case where the destination stack offset / register has something
58085811 // going on there.
5812 assert(!hazard_map.contains(target_value));
5813 try hazard_map.putNoClobber(canon_mcv, {});
58095814 if (set_values) {
58105815 try self.setRegOrMem(self.air.typeOfIndex(target_key), canon_mcv, target_value);
58115816 } else self.getValue(canon_mcv, target_key);
......@@ -5824,8 +5829,10 @@ fn canonicaliseBranches(
58245829 if (canon_value != .dead) self.getResolvedInstValue(canon_key).?.* else undefined;
58255830 if (canon_value != .dead) {
58265831 log.debug("consolidating canon_entry {d} {}=>{}", .{ canon_key, parent_mcv, canon_value });
5827 // TODO make sure the destination stack offset / register does not already have something
5832 // TODO handle the case where the destination stack offset / register has something
58285833 // going on there.
5834 assert(!hazard_map.contains(parent_mcv));
5835 try hazard_map.putNoClobber(canon_value, {});
58295836 if (set_values) {
58305837 try self.setRegOrMem(self.air.typeOfIndex(canon_key), canon_value, parent_mcv);
58315838 } else self.getValue(canon_value, canon_key);