T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2473 from cfallin/fix-lowering

Browse Source 
Fix lowering instruction-sinking (load-merging) bug.
This commit is contained in:
Chris Fallin
2020-12-03 15:56:50 -08:00
committed by GitHub
parent 76d3fb61c3 3e516e784b
commit bfd10512c1
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cranelift/codegen/src/machinst/lower.rs
View File

@@ -913,6 +913,7 @@ impl<'func, I: VCodeInst> Lower<'func, I> {
// the code-motion. // the code-motion.
if self.cur_scan_entry_color.is_some() if self.cur_scan_entry_color.is_some()
&& self.value_uses[val] == 1 && self.value_uses[val] == 1
&& self.value_lowered_uses[val] == 0
&& self.num_outputs(src_inst) == 1 && self.num_outputs(src_inst) == 1
&& self && self
.side_effect_inst_entry_colors .side_effect_inst_entry_colors

15
cranelift/filetests/filetests/isa/x64/load-op.clif
View File

@@ -44,3 +44,18 @@ block0(v0: i64, v1: i8):
; nextln: addl %esi, %r12d ; nextln: addl %esi, %r12d
return v3 return v3
} }
function %no_merge_if_lookback_use(i64, i64) -> i64 {
block0(v0: i64, v1: i64):
v2 = load.i64 v0
v3 = iadd.i64 v2, v0
store.i64 v3, v1
v4 = load.i64 v3
return v4
; check: movq 0(%rdi), %r12
; nextln: movq %r12, %r13
; nextln: addq %rdi, %r13
; nextln: movq %r13, 0(%rsi)
; nextln: movq 0(%r12,%rdi,1), %r12
; nextln: movq %r12, %rax
}