Skip to content

G
go
Commit d3026dd3 authored by Ilya Tocar's avatar Ilya Tocar Committed by Brad Fitzpatrick
Browse files
Options

cmd/compile/internal/ssa: fix GO386=387 build 

Don't generate FP ops with 1 operand in memory for 387.

Change-Id: I23b49dfa2a1e60c8778c920230e64785a3ddfbd1
Reviewed-on: https://go-review.googlesource.com/105035
Run-TryBot: Ilya Tocar <ilya.tocar@intel.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: default avatarBrad Fitzpatrick <bradfitz@golang.org>
parent 6703adde
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 24 deletions
src/cmd/compile/internal/ssa/gen/386.rules
View file @ d3026dd3
...@@ -842,8 +842,8 @@ ...@@ -842,8 +842,8 @@
// Merge load to op // Merge load to op
((ADD|AND|OR|XOR)L x l:(MOVLload [off] {sym} ptr mem)) && canMergeLoad(v, l, x) && clobber(l) -> ((ADD|AND|OR|XOR)Lmem x [off] {sym} ptr mem) ((ADD|AND|OR|XOR)L x l:(MOVLload [off] {sym} ptr mem)) && canMergeLoad(v, l, x) && clobber(l) -> ((ADD|AND|OR|XOR)Lmem x [off] {sym} ptr mem)
((ADD|SUB|MUL)SD x l:(MOVSDload [off] {sym} ptr mem)) && canMergeLoad(v, l, x) && clobber(l) -> ((ADD|SUB|MUL)SDmem x [off] {sym} ptr mem) ((ADD|SUB|MUL)SD x l:(MOVSDload [off] {sym} ptr mem)) && canMergeLoad(v, l, x) && !config.use387 && clobber(l) -> ((ADD|SUB|MUL)SDmem x [off] {sym} ptr mem)
((ADD|SUB|MUL)SS x l:(MOVSSload [off] {sym} ptr mem)) && canMergeLoad(v, l, x) && clobber(l) -> ((ADD|SUB|MUL)SSmem x [off] {sym} ptr mem) ((ADD|SUB|MUL)SS x l:(MOVSSload [off] {sym} ptr mem)) && canMergeLoad(v, l, x) && !config.use387 && clobber(l) -> ((ADD|SUB|MUL)SSmem x [off] {sym} ptr mem)
(MOVBstoreconstidx1 [x] {sym} (ADDLconst [c] ptr) idx mem) -> (MOVBstoreconstidx1 [x] {sym} (ADDLconst [c] ptr) idx mem) ->
(MOVBstoreconstidx1 [ValAndOff(x).add(c)] {sym} ptr idx mem) (MOVBstoreconstidx1 [ValAndOff(x).add(c)] {sym} ptr idx mem)
...@@ -1253,4 +1253,4 @@ ...@@ -1253,4 +1253,4 @@
// For PIC, break floating-point constant loading into two instructions so we have // For PIC, break floating-point constant loading into two instructions so we have
// a register to use for holding the address of the constant pool entry. // a register to use for holding the address of the constant pool entry.
(MOVSSconst [c]) && config.ctxt.Flag_shared -> (MOVSSconst2 (MOVSSconst1 [c])) (MOVSSconst [c]) && config.ctxt.Flag_shared -> (MOVSSconst2 (MOVSSconst1 [c]))
(MOVSDconst [c]) && config.ctxt.Flag_shared -> (MOVSDconst2 (MOVSDconst1 [c])) (MOVSDconst [c]) && config.ctxt.Flag_shared -> (MOVSDconst2 (MOVSDconst1 [c]))
\ No newline at end of file
src/cmd/compile/internal/ssa/rewrite386.go
View file @ d3026dd3
...@@ -1592,8 +1592,12 @@ func rewriteValue386_Op386ADDLmem_0(v *Value) bool { ...@@ -1592,8 +1592,12 @@ func rewriteValue386_Op386ADDLmem_0(v *Value) bool {
return false return false
} }
func rewriteValue386_Op386ADDSD_0(v *Value) bool { func rewriteValue386_Op386ADDSD_0(v *Value) bool {
b := v.Block
_ = b
config := b.Func.Config
_ = config
// match: (ADDSD x l:(MOVSDload [off] {sym} ptr mem)) // match: (ADDSD x l:(MOVSDload [off] {sym} ptr mem))
// cond: canMergeLoad(v, l, x) && clobber(l) // cond: canMergeLoad(v, l, x) && !config.use387 && clobber(l)
// result: (ADDSDmem x [off] {sym} ptr mem) // result: (ADDSDmem x [off] {sym} ptr mem)
for { for {
_ = v.Args[1] _ = v.Args[1]
...@@ -1607,7 +1611,7 @@ func rewriteValue386_Op386ADDSD_0(v *Value) bool { ...@@ -1607,7 +1611,7 @@ func rewriteValue386_Op386ADDSD_0(v *Value) bool {
_ = l.Args[1] _ = l.Args[1]
ptr := l.Args[0] ptr := l.Args[0]
mem := l.Args[1] mem := l.Args[1]
if !(canMergeLoad(v, l, x) && clobber(l)) { if !(canMergeLoad(v, l, x) && !config.use387 && clobber(l)) {
break break
} }
v.reset(Op386ADDSDmem) v.reset(Op386ADDSDmem)
...@@ -1619,7 +1623,7 @@ func rewriteValue386_Op386ADDSD_0(v *Value) bool { ...@@ -1619,7 +1623,7 @@ func rewriteValue386_Op386ADDSD_0(v *Value) bool {
return true return true
} }
// match: (ADDSD l:(MOVSDload [off] {sym} ptr mem) x) // match: (ADDSD l:(MOVSDload [off] {sym} ptr mem) x)
// cond: canMergeLoad(v, l, x) && clobber(l) // cond: canMergeLoad(v, l, x) && !config.use387 && clobber(l)
// result: (ADDSDmem x [off] {sym} ptr mem) // result: (ADDSDmem x [off] {sym} ptr mem)
for { for {
_ = v.Args[1] _ = v.Args[1]
...@@ -1633,7 +1637,7 @@ func rewriteValue386_Op386ADDSD_0(v *Value) bool { ...@@ -1633,7 +1637,7 @@ func rewriteValue386_Op386ADDSD_0(v *Value) bool {
ptr := l.Args[0] ptr := l.Args[0]
mem := l.Args[1] mem := l.Args[1]
x := v.Args[1] x := v.Args[1]
if !(canMergeLoad(v, l, x) && clobber(l)) { if !(canMergeLoad(v, l, x) && !config.use387 && clobber(l)) {
break break
} }
v.reset(Op386ADDSDmem) v.reset(Op386ADDSDmem)
...@@ -1707,8 +1711,12 @@ func rewriteValue386_Op386ADDSDmem_0(v *Value) bool { ...@@ -1707,8 +1711,12 @@ func rewriteValue386_Op386ADDSDmem_0(v *Value) bool {
return false return false
} }
func rewriteValue386_Op386ADDSS_0(v *Value) bool { func rewriteValue386_Op386ADDSS_0(v *Value) bool {
b := v.Block
_ = b
config := b.Func.Config
_ = config
// match: (ADDSS x l:(MOVSSload [off] {sym} ptr mem)) // match: (ADDSS x l:(MOVSSload [off] {sym} ptr mem))
// cond: canMergeLoad(v, l, x) && clobber(l) // cond: canMergeLoad(v, l, x) && !config.use387 && clobber(l)
// result: (ADDSSmem x [off] {sym} ptr mem) // result: (ADDSSmem x [off] {sym} ptr mem)
for { for {
_ = v.Args[1] _ = v.Args[1]
...@@ -1722,7 +1730,7 @@ func rewriteValue386_Op386ADDSS_0(v *Value) bool { ...@@ -1722,7 +1730,7 @@ func rewriteValue386_Op386ADDSS_0(v *Value) bool {
_ = l.Args[1] _ = l.Args[1]
ptr := l.Args[0] ptr := l.Args[0]
mem := l.Args[1] mem := l.Args[1]
if !(canMergeLoad(v, l, x) && clobber(l)) { if !(canMergeLoad(v, l, x) && !config.use387 && clobber(l)) {
break break
} }
v.reset(Op386ADDSSmem) v.reset(Op386ADDSSmem)
...@@ -1734,7 +1742,7 @@ func rewriteValue386_Op386ADDSS_0(v *Value) bool { ...@@ -1734,7 +1742,7 @@ func rewriteValue386_Op386ADDSS_0(v *Value) bool {
return true return true
} }
// match: (ADDSS l:(MOVSSload [off] {sym} ptr mem) x) // match: (ADDSS l:(MOVSSload [off] {sym} ptr mem) x)
// cond: canMergeLoad(v, l, x) && clobber(l) // cond: canMergeLoad(v, l, x) && !config.use387 && clobber(l)
// result: (ADDSSmem x [off] {sym} ptr mem) // result: (ADDSSmem x [off] {sym} ptr mem)
for { for {
_ = v.Args[1] _ = v.Args[1]
...@@ -1748,7 +1756,7 @@ func rewriteValue386_Op386ADDSS_0(v *Value) bool { ...@@ -1748,7 +1756,7 @@ func rewriteValue386_Op386ADDSS_0(v *Value) bool {
ptr := l.Args[0] ptr := l.Args[0]
mem := l.Args[1] mem := l.Args[1]
x := v.Args[1] x := v.Args[1]
if !(canMergeLoad(v, l, x) && clobber(l)) { if !(canMergeLoad(v, l, x) && !config.use387 && clobber(l)) {
break break
} }
v.reset(Op386ADDSSmem) v.reset(Op386ADDSSmem)
...@@ -9314,8 +9322,12 @@ func rewriteValue386_Op386MULLconst_30(v *Value) bool { ...@@ -9314,8 +9322,12 @@ func rewriteValue386_Op386MULLconst_30(v *Value) bool {
return false return false
} }
func rewriteValue386_Op386MULSD_0(v *Value) bool { func rewriteValue386_Op386MULSD_0(v *Value) bool {
b := v.Block
_ = b
config := b.Func.Config
_ = config
// match: (MULSD x l:(MOVSDload [off] {sym} ptr mem)) // match: (MULSD x l:(MOVSDload [off] {sym} ptr mem))
// cond: canMergeLoad(v, l, x) && clobber(l) // cond: canMergeLoad(v, l, x) && !config.use387 && clobber(l)
// result: (MULSDmem x [off] {sym} ptr mem) // result: (MULSDmem x [off] {sym} ptr mem)
for { for {
_ = v.Args[1] _ = v.Args[1]
...@@ -9329,7 +9341,7 @@ func rewriteValue386_Op386MULSD_0(v *Value) bool { ...@@ -9329,7 +9341,7 @@ func rewriteValue386_Op386MULSD_0(v *Value) bool {
_ = l.Args[1] _ = l.Args[1]
ptr := l.Args[0] ptr := l.Args[0]
mem := l.Args[1] mem := l.Args[1]
if !(canMergeLoad(v, l, x) && clobber(l)) { if !(canMergeLoad(v, l, x) && !config.use387 && clobber(l)) {
break break
} }
v.reset(Op386MULSDmem) v.reset(Op386MULSDmem)
...@@ -9341,7 +9353,7 @@ func rewriteValue386_Op386MULSD_0(v *Value) bool { ...@@ -9341,7 +9353,7 @@ func rewriteValue386_Op386MULSD_0(v *Value) bool {
return true return true
} }
// match: (MULSD l:(MOVSDload [off] {sym} ptr mem) x) // match: (MULSD l:(MOVSDload [off] {sym} ptr mem) x)
// cond: canMergeLoad(v, l, x) && clobber(l) // cond: canMergeLoad(v, l, x) && !config.use387 && clobber(l)
// result: (MULSDmem x [off] {sym} ptr mem) // result: (MULSDmem x [off] {sym} ptr mem)
for { for {
_ = v.Args[1] _ = v.Args[1]
...@@ -9355,7 +9367,7 @@ func rewriteValue386_Op386MULSD_0(v *Value) bool { ...@@ -9355,7 +9367,7 @@ func rewriteValue386_Op386MULSD_0(v *Value) bool {
ptr := l.Args[0] ptr := l.Args[0]
mem := l.Args[1] mem := l.Args[1]
x := v.Args[1] x := v.Args[1]
if !(canMergeLoad(v, l, x) && clobber(l)) { if !(canMergeLoad(v, l, x) && !config.use387 && clobber(l)) {
break break
} }
v.reset(Op386MULSDmem) v.reset(Op386MULSDmem)
...@@ -9429,8 +9441,12 @@ func rewriteValue386_Op386MULSDmem_0(v *Value) bool { ...@@ -9429,8 +9441,12 @@ func rewriteValue386_Op386MULSDmem_0(v *Value) bool {
return false return false
} }
func rewriteValue386_Op386MULSS_0(v *Value) bool { func rewriteValue386_Op386MULSS_0(v *Value) bool {
b := v.Block
_ = b
config := b.Func.Config
_ = config
// match: (MULSS x l:(MOVSSload [off] {sym} ptr mem)) // match: (MULSS x l:(MOVSSload [off] {sym} ptr mem))
// cond: canMergeLoad(v, l, x) && clobber(l) // cond: canMergeLoad(v, l, x) && !config.use387 && clobber(l)
// result: (MULSSmem x [off] {sym} ptr mem) // result: (MULSSmem x [off] {sym} ptr mem)
for { for {
_ = v.Args[1] _ = v.Args[1]
...@@ -9444,7 +9460,7 @@ func rewriteValue386_Op386MULSS_0(v *Value) bool { ...@@ -9444,7 +9460,7 @@ func rewriteValue386_Op386MULSS_0(v *Value) bool {
_ = l.Args[1] _ = l.Args[1]
ptr := l.Args[0] ptr := l.Args[0]
mem := l.Args[1] mem := l.Args[1]
if !(canMergeLoad(v, l, x) && clobber(l)) { if !(canMergeLoad(v, l, x) && !config.use387 && clobber(l)) {
break break
} }
v.reset(Op386MULSSmem) v.reset(Op386MULSSmem)
...@@ -9456,7 +9472,7 @@ func rewriteValue386_Op386MULSS_0(v *Value) bool { ...@@ -9456,7 +9472,7 @@ func rewriteValue386_Op386MULSS_0(v *Value) bool {
return true return true
} }
// match: (MULSS l:(MOVSSload [off] {sym} ptr mem) x) // match: (MULSS l:(MOVSSload [off] {sym} ptr mem) x)
// cond: canMergeLoad(v, l, x) && clobber(l) // cond: canMergeLoad(v, l, x) && !config.use387 && clobber(l)
// result: (MULSSmem x [off] {sym} ptr mem) // result: (MULSSmem x [off] {sym} ptr mem)
for { for {
_ = v.Args[1] _ = v.Args[1]
...@@ -9470,7 +9486,7 @@ func rewriteValue386_Op386MULSS_0(v *Value) bool { ...@@ -9470,7 +9486,7 @@ func rewriteValue386_Op386MULSS_0(v *Value) bool {
ptr := l.Args[0] ptr := l.Args[0]
mem := l.Args[1] mem := l.Args[1]
x := v.Args[1] x := v.Args[1]
if !(canMergeLoad(v, l, x) && clobber(l)) { if !(canMergeLoad(v, l, x) && !config.use387 && clobber(l)) {
break break
} }
v.reset(Op386MULSSmem) v.reset(Op386MULSSmem)
...@@ -14977,8 +14993,12 @@ func rewriteValue386_Op386SUBLmem_0(v *Value) bool { ...@@ -14977,8 +14993,12 @@ func rewriteValue386_Op386SUBLmem_0(v *Value) bool {
return false return false
} }
func rewriteValue386_Op386SUBSD_0(v *Value) bool { func rewriteValue386_Op386SUBSD_0(v *Value) bool {
b := v.Block
_ = b
config := b.Func.Config
_ = config
// match: (SUBSD x l:(MOVSDload [off] {sym} ptr mem)) // match: (SUBSD x l:(MOVSDload [off] {sym} ptr mem))
// cond: canMergeLoad(v, l, x) && clobber(l) // cond: canMergeLoad(v, l, x) && !config.use387 && clobber(l)
// result: (SUBSDmem x [off] {sym} ptr mem) // result: (SUBSDmem x [off] {sym} ptr mem)
for { for {
_ = v.Args[1] _ = v.Args[1]
...@@ -14992,7 +15012,7 @@ func rewriteValue386_Op386SUBSD_0(v *Value) bool { ...@@ -14992,7 +15012,7 @@ func rewriteValue386_Op386SUBSD_0(v *Value) bool {
_ = l.Args[1] _ = l.Args[1]
ptr := l.Args[0] ptr := l.Args[0]
mem := l.Args[1] mem := l.Args[1]
if !(canMergeLoad(v, l, x) && clobber(l)) { if !(canMergeLoad(v, l, x) && !config.use387 && clobber(l)) {
break break
} }
v.reset(Op386SUBSDmem) v.reset(Op386SUBSDmem)
...@@ -15066,8 +15086,12 @@ func rewriteValue386_Op386SUBSDmem_0(v *Value) bool { ...@@ -15066,8 +15086,12 @@ func rewriteValue386_Op386SUBSDmem_0(v *Value) bool {
return false return false
} }
func rewriteValue386_Op386SUBSS_0(v *Value) bool { func rewriteValue386_Op386SUBSS_0(v *Value) bool {
b := v.Block
_ = b
config := b.Func.Config
_ = config
// match: (SUBSS x l:(MOVSSload [off] {sym} ptr mem)) // match: (SUBSS x l:(MOVSSload [off] {sym} ptr mem))
// cond: canMergeLoad(v, l, x) && clobber(l) // cond: canMergeLoad(v, l, x) && !config.use387 && clobber(l)
// result: (SUBSSmem x [off] {sym} ptr mem) // result: (SUBSSmem x [off] {sym} ptr mem)
for { for {
_ = v.Args[1] _ = v.Args[1]
...@@ -15081,7 +15105,7 @@ func rewriteValue386_Op386SUBSS_0(v *Value) bool { ...@@ -15081,7 +15105,7 @@ func rewriteValue386_Op386SUBSS_0(v *Value) bool {
_ = l.Args[1] _ = l.Args[1]
ptr := l.Args[0] ptr := l.Args[0]
mem := l.Args[1] mem := l.Args[1]
if !(canMergeLoad(v, l, x) && clobber(l)) { if !(canMergeLoad(v, l, x) && !config.use387 && clobber(l)) {
break break
} }
v.reset(Op386SUBSSmem) v.reset(Op386SUBSSmem)
...@@ -21409,4 +21433,4 @@ func rewriteBlock386(b *Block) bool { ...@@ -21409,4 +21433,4 @@ func rewriteBlock386(b *Block) bool {
} }
} }
return false return false
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7