Skip to content

G
go
Commit 26a6131b authored by Keith Randall's avatar Keith Randall
Browse files
Options

cmd/compile: fix 4-byte unaligned load rules 

The 2-byte rule was firing before the 4-byte rule, preventing
the 4-byte rule from firing.  Update the 4-byte rule to use
the results of the 2-byte rule instead.

Add some tests to make sure we don't regress again.

Fixes #17147

Change-Id: Icfeccd9f2b96450981086a52edd76afb3191410a
Reviewed-on: https://go-review.googlesource.com/29382
Run-TryBot: Keith Randall <khr@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: default avatarCherry Zhang <cherryyz@google.com>
parent 120e9ff3
Hide whitespace changes
Inline Side-by-side
Showing with 151 additions and 225 deletions
src/cmd/compile/internal/gc/asm_test.go
View file @ 26a6131b
...@@ -20,7 +20,6 @@ import ( ...@@ -20,7 +20,6 @@ import (
// TestAssembly checks to make sure the assembly generated for // TestAssembly checks to make sure the assembly generated for
// functions contains certain expected instructions. // functions contains certain expected instructions.
// Note: this test will fail if -ssa=0.
func TestAssembly(t *testing.T) { func TestAssembly(t *testing.T) {
testenv.MustHaveGoBuild(t) testenv.MustHaveGoBuild(t)
if runtime.GOOS == "windows" { if runtime.GOOS == "windows" {
...@@ -34,7 +33,7 @@ func TestAssembly(t *testing.T) { ...@@ -34,7 +33,7 @@ func TestAssembly(t *testing.T) {
defer os.RemoveAll(dir) defer os.RemoveAll(dir)
for _, test := range asmTests { for _, test := range asmTests {
asm := compileToAsm(t, dir, test.arch, fmt.Sprintf(template, test.function)) asm := compileToAsm(t, dir, test.arch, test.os, fmt.Sprintf(template, test.function))
// Get rid of code for "".init. Also gets rid of type algorithms & other junk. // Get rid of code for "".init. Also gets rid of type algorithms & other junk.
if i := strings.Index(asm, "\n\"\".init "); i >= 0 { if i := strings.Index(asm, "\n\"\".init "); i >= 0 {
asm = asm[:i+1] asm = asm[:i+1]
...@@ -49,7 +48,7 @@ func TestAssembly(t *testing.T) { ...@@ -49,7 +48,7 @@ func TestAssembly(t *testing.T) {
// compile compiles the package pkg for architecture arch and // compile compiles the package pkg for architecture arch and
// returns the generated assembly. dir is a scratch directory. // returns the generated assembly. dir is a scratch directory.
func compileToAsm(t *testing.T, dir, arch, pkg string) string { func compileToAsm(t *testing.T, dir, goarch, goos, pkg string) string {
// Create source. // Create source.
src := filepath.Join(dir, "test.go") src := filepath.Join(dir, "test.go")
f, err := os.Create(src) f, err := os.Create(src)
...@@ -59,9 +58,27 @@ func compileToAsm(t *testing.T, dir, arch, pkg string) string { ...@@ -59,9 +58,27 @@ func compileToAsm(t *testing.T, dir, arch, pkg string) string {
f.Write([]byte(pkg)) f.Write([]byte(pkg))
f.Close() f.Close()
// First, install any dependencies we need. This builds the required export data
// for any packages that are imported.
// TODO: extract dependencies automatically?
var stdout, stderr bytes.Buffer var stdout, stderr bytes.Buffer
cmd := exec.Command(testenv.GoToolPath(t), "tool", "compile", "-S", "-o", filepath.Join(dir, "out.o"), src) cmd := exec.Command(testenv.GoToolPath(t), "build", "-o", filepath.Join(dir, "encoding/binary.a"), "encoding/binary")
cmd.Env = mergeEnvLists([]string{"GOARCH=" + arch}, os.Environ()) cmd.Env = mergeEnvLists([]string{"GOARCH=" + goarch, "GOOS=" + goos}, os.Environ())
cmd.Stdout = &stdout
cmd.Stderr = &stderr
if err := cmd.Run(); err != nil {
panic(err)
}
if s := stdout.String(); s != "" {
panic(fmt.Errorf("Stdout = %s\nWant empty", s))
}
if s := stderr.String(); s != "" {
panic(fmt.Errorf("Stderr = %s\nWant empty", s))
}
// Now, compile the individual file for which we want to see the generated assembly.
cmd = exec.Command(testenv.GoToolPath(t), "tool", "compile", "-I", dir, "-S", "-o", filepath.Join(dir, "out.o"), src)
cmd.Env = mergeEnvLists([]string{"GOARCH=" + goarch, "GOOS=" + goos}, os.Environ())
cmd.Stdout = &stdout cmd.Stdout = &stdout
cmd.Stderr = &stderr cmd.Stderr = &stderr
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
...@@ -82,6 +99,8 @@ package main ...@@ -82,6 +99,8 @@ package main
type asmTest struct { type asmTest struct {
// architecture to compile to // architecture to compile to
arch string arch string
// os to compile to
os string
// function to compile // function to compile
function string function string
// regexps that must match the generated assembly // regexps that must match the generated assembly
...@@ -89,19 +108,68 @@ type asmTest struct { ...@@ -89,19 +108,68 @@ type asmTest struct {
} }
var asmTests = [...]asmTest{ var asmTests = [...]asmTest{
{"amd64", ` {"amd64", "linux", `
func f(x int) int { func f(x int) int {
return x * 64 return x * 64
} }
`, `,
[]string{"\tSHLQ\t\\$6,"}, []string{"\tSHLQ\t\\$6,"},
}, },
{"amd64", ` {"amd64", "linux", `
func f(x int) int { func f(x int) int {
return x * 96 return x * 96
}`, }`,
[]string{"\tSHLQ\t\\$5,", "\tLEAQ\t\\(.*\\)\\(.*\\*2\\),"}, []string{"\tSHLQ\t\\$5,", "\tLEAQ\t\\(.*\\)\\(.*\\*2\\),"},
}, },
// Load-combining tests.
{"amd64", "linux", `
import "encoding/binary"
func f(b []byte) uint64 {
return binary.LittleEndian.Uint64(b)
}
`,
[]string{"\tMOVQ\t\\(.*\\),"},
},
{"amd64", "linux", `
import "encoding/binary"
func f(b []byte, i int) uint64 {
return binary.LittleEndian.Uint64(b[i:])
}
`,
[]string{"\tMOVQ\t\\(.*\\)\\(.*\\*1\\),"},
},
{"amd64", "linux", `
import "encoding/binary"
func f(b []byte) uint32 {
return binary.LittleEndian.Uint32(b)
}
`,
[]string{"\tMOVL\t\\(.*\\),"},
},
{"amd64", "linux", `
import "encoding/binary"
func f(b []byte, i int) uint32 {
return binary.LittleEndian.Uint32(b[i:])
}
`,
[]string{"\tMOVL\t\\(.*\\)\\(.*\\*1\\),"},
},
{"386", "linux", `
import "encoding/binary"
func f(b []byte) uint32 {
return binary.LittleEndian.Uint32(b)
}
`,
[]string{"\tMOVL\t\\(.*\\),"},
},
{"386", "linux", `
import "encoding/binary"
func f(b []byte, i int) uint32 {
return binary.LittleEndian.Uint32(b[i:])
}
`,
[]string{"\tMOVL\t\\(.*\\)\\(.*\\*1\\),"},
},
} }
// mergeEnvLists merges the two environment lists such that // mergeEnvLists merges the two environment lists such that
......
src/cmd/compile/internal/ssa/gen/386.rules
View file @ 26a6131b
...@@ -1123,31 +1123,24 @@ ...@@ -1123,31 +1123,24 @@
&& clobber(s0) && clobber(s0)
-> @mergePoint(b,x0,x1) (MOVWload [i] {s} p mem) -> @mergePoint(b,x0,x1) (MOVWload [i] {s} p mem)
(ORL o0:(ORL o1:(ORL (ORL o0:(ORL
x0:(MOVBload [i] {s} p mem) x0:(MOVWload [i] {s} p mem)
s0:(SHLLconst [8] x1:(MOVBload [i+1] {s} p mem))) s0:(SHLLconst [16] x1:(MOVBload [i+2] {s} p mem)))
s1:(SHLLconst [16] x2:(MOVBload [i+2] {s} p mem))) s1:(SHLLconst [24] x2:(MOVBload [i+3] {s} p mem)))
s2:(SHLLconst [24] x3:(MOVBload [i+3] {s} p mem)))
&& x0.Uses == 1 && x0.Uses == 1
&& x1.Uses == 1 && x1.Uses == 1
&& x2.Uses == 1 && x2.Uses == 1
&& x3.Uses == 1
&& s0.Uses == 1 && s0.Uses == 1
&& s1.Uses == 1 && s1.Uses == 1
&& s2.Uses == 1
&& o0.Uses == 1 && o0.Uses == 1
&& o1.Uses == 1 && mergePoint(b,x0,x1,x2) != nil
&& mergePoint(b,x0,x1,x2,x3) != nil
&& clobber(x0) && clobber(x0)
&& clobber(x1) && clobber(x1)
&& clobber(x2) && clobber(x2)
&& clobber(x3)
&& clobber(s0) && clobber(s0)
&& clobber(s1) && clobber(s1)
&& clobber(s2)
&& clobber(o0) && clobber(o0)
&& clobber(o1) -> @mergePoint(b,x0,x1,x2) (MOVLload [i] {s} p mem)
-> @mergePoint(b,x0,x1,x2,x3) (MOVLload [i] {s} p mem)
(ORL x0:(MOVBloadidx1 [i] {s} p idx mem) (ORL x0:(MOVBloadidx1 [i] {s} p idx mem)
s0:(SHLLconst [8] x1:(MOVBloadidx1 [i+1] {s} p idx mem))) s0:(SHLLconst [8] x1:(MOVBloadidx1 [i+1] {s} p idx mem)))
...@@ -1160,31 +1153,24 @@ ...@@ -1160,31 +1153,24 @@
&& clobber(s0) && clobber(s0)
-> @mergePoint(b,x0,x1) (MOVWloadidx1 <v.Type> [i] {s} p idx mem) -> @mergePoint(b,x0,x1) (MOVWloadidx1 <v.Type> [i] {s} p idx mem)
(ORL o0:(ORL o1:(ORL (ORL o0:(ORL
x0:(MOVBloadidx1 [i] {s} p idx mem) x0:(MOVWloadidx1 [i] {s} p idx mem)
s0:(SHLLconst [8] x1:(MOVBloadidx1 [i+1] {s} p idx mem))) s0:(SHLLconst [16] x1:(MOVBloadidx1 [i+2] {s} p idx mem)))
s1:(SHLLconst [16] x2:(MOVBloadidx1 [i+2] {s} p idx mem))) s1:(SHLLconst [24] x2:(MOVBloadidx1 [i+3] {s} p idx mem)))
s2:(SHLLconst [24] x3:(MOVBloadidx1 [i+3] {s} p idx mem)))
&& x0.Uses == 1 && x0.Uses == 1
&& x1.Uses == 1 && x1.Uses == 1
&& x2.Uses == 1 && x2.Uses == 1
&& x3.Uses == 1
&& s0.Uses == 1 && s0.Uses == 1
&& s1.Uses == 1 && s1.Uses == 1
&& s2.Uses == 1
&& o0.Uses == 1 && o0.Uses == 1
&& o1.Uses == 1 && mergePoint(b,x0,x1,x2) != nil
&& mergePoint(b,x0,x1,x2,x3) != nil
&& clobber(x0) && clobber(x0)
&& clobber(x1) && clobber(x1)
&& clobber(x2) && clobber(x2)
&& clobber(x3)
&& clobber(s0) && clobber(s0)
&& clobber(s1) && clobber(s1)
&& clobber(s2)
&& clobber(o0) && clobber(o0)
&& clobber(o1) -> @mergePoint(b,x0,x1,x2) (MOVLloadidx1 <v.Type> [i] {s} p idx mem)
-> @mergePoint(b,x0,x1,x2,x3) (MOVLloadidx1 <v.Type> [i] {s} p idx mem)
// Combine constant stores into larger (unaligned) stores. // Combine constant stores into larger (unaligned) stores.
(MOVBstoreconst [c] {s} p x:(MOVBstoreconst [a] {s} p mem)) (MOVBstoreconst [c] {s} p x:(MOVBstoreconst [a] {s} p mem))
......
src/cmd/compile/internal/ssa/gen/AMD64.rules
View file @ 26a6131b
...@@ -1331,31 +1331,24 @@ ...@@ -1331,31 +1331,24 @@
&& clobber(s0) && clobber(s0)
-> @mergePoint(b,x0,x1) (MOVWload [i] {s} p mem) -> @mergePoint(b,x0,x1) (MOVWload [i] {s} p mem)
(ORL o0:(ORL o1:(ORL (ORL o0:(ORL
x0:(MOVBload [i] {s} p mem) x0:(MOVWload [i] {s} p mem)
s0:(SHLLconst [8] x1:(MOVBload [i+1] {s} p mem))) s0:(SHLLconst [16] x1:(MOVBload [i+2] {s} p mem)))
s1:(SHLLconst [16] x2:(MOVBload [i+2] {s} p mem))) s1:(SHLLconst [24] x2:(MOVBload [i+3] {s} p mem)))
s2:(SHLLconst [24] x3:(MOVBload [i+3] {s} p mem)))
&& x0.Uses == 1 && x0.Uses == 1
&& x1.Uses == 1 && x1.Uses == 1
&& x2.Uses == 1 && x2.Uses == 1
&& x3.Uses == 1
&& s0.Uses == 1 && s0.Uses == 1
&& s1.Uses == 1 && s1.Uses == 1
&& s2.Uses == 1
&& o0.Uses == 1 && o0.Uses == 1
&& o1.Uses == 1 && mergePoint(b,x0,x1,x2) != nil
&& mergePoint(b,x0,x1,x2,x3) != nil
&& clobber(x0) && clobber(x0)
&& clobber(x1) && clobber(x1)
&& clobber(x2) && clobber(x2)
&& clobber(x3)
&& clobber(s0) && clobber(s0)
&& clobber(s1) && clobber(s1)
&& clobber(s2)
&& clobber(o0) && clobber(o0)
&& clobber(o1) -> @mergePoint(b,x0,x1,x2) (MOVLload [i] {s} p mem)
-> @mergePoint(b,x0,x1,x2,x3) (MOVLload [i] {s} p mem)
(ORQ o0:(ORQ o1:(ORQ o2:(ORQ o3:(ORQ o4:(ORQ o5:(ORQ (ORQ o0:(ORQ o1:(ORQ o2:(ORQ o3:(ORQ o4:(ORQ o5:(ORQ
x0:(MOVBload [i] {s} p mem) x0:(MOVBload [i] {s} p mem)
...@@ -1422,31 +1415,24 @@ ...@@ -1422,31 +1415,24 @@
&& clobber(s0) && clobber(s0)
-> @mergePoint(b,x0,x1) (MOVWloadidx1 <v.Type> [i] {s} p idx mem) -> @mergePoint(b,x0,x1) (MOVWloadidx1 <v.Type> [i] {s} p idx mem)
(ORL o0:(ORL o1:(ORL (ORL o0:(ORL
x0:(MOVBloadidx1 [i] {s} p idx mem) x0:(MOVWloadidx1 [i] {s} p idx mem)
s0:(SHLLconst [8] x1:(MOVBloadidx1 [i+1] {s} p idx mem))) s0:(SHLLconst [16] x1:(MOVBloadidx1 [i+2] {s} p idx mem)))
s1:(SHLLconst [16] x2:(MOVBloadidx1 [i+2] {s} p idx mem))) s1:(SHLLconst [24] x2:(MOVBloadidx1 [i+3] {s} p idx mem)))
s2:(SHLLconst [24] x3:(MOVBloadidx1 [i+3] {s} p idx mem)))
&& x0.Uses == 1 && x0.Uses == 1
&& x1.Uses == 1 && x1.Uses == 1
&& x2.Uses == 1 && x2.Uses == 1
&& x3.Uses == 1
&& s0.Uses == 1 && s0.Uses == 1
&& s1.Uses == 1 && s1.Uses == 1
&& s2.Uses == 1
&& o0.Uses == 1 && o0.Uses == 1
&& o1.Uses == 1 && mergePoint(b,x0,x1,x2) != nil
&& mergePoint(b,x0,x1,x2,x3) != nil
&& clobber(x0) && clobber(x0)
&& clobber(x1) && clobber(x1)
&& clobber(x2) && clobber(x2)
&& clobber(x3)
&& clobber(s0) && clobber(s0)
&& clobber(s1) && clobber(s1)
&& clobber(s2)
&& clobber(o0) && clobber(o0)
&& clobber(o1) -> @mergePoint(b,x0,x1,x2) (MOVLloadidx1 <v.Type> [i] {s} p idx mem)
-> @mergePoint(b,x0,x1,x2,x3) (MOVLloadidx1 <v.Type> [i] {s} p idx mem)
(ORQ o0:(ORQ o1:(ORQ o2:(ORQ o3:(ORQ o4:(ORQ o5:(ORQ (ORQ o0:(ORQ o1:(ORQ o2:(ORQ o3:(ORQ o4:(ORQ o5:(ORQ
x0:(MOVBloadidx1 [i] {s} p idx mem) x0:(MOVBloadidx1 [i] {s} p idx mem)
......
src/cmd/compile/internal/ssa/rewrite386.go
View file @ 26a6131b
...@@ -7177,38 +7177,34 @@ func rewriteValue386_Op386ORL(v *Value, config *Config) bool { ...@@ -7177,38 +7177,34 @@ func rewriteValue386_Op386ORL(v *Value, config *Config) bool {
v0.AddArg(mem) v0.AddArg(mem)
return true return true
} }
// match: (ORL o0:(ORL o1:(ORL x0:(MOVBload [i] {s} p mem) s0:(SHLLconst [8] x1:(MOVBload [i+1] {s} p mem))) s1:(SHLLconst [16] x2:(MOVBload [i+2] {s} p mem))) s2:(SHLLconst [24] x3:(MOVBload [i+3] {s} p mem))) // match: (ORL o0:(ORL x0:(MOVWload [i] {s} p mem) s0:(SHLLconst [16] x1:(MOVBload [i+2] {s} p mem))) s1:(SHLLconst [24] x2:(MOVBload [i+3] {s} p mem)))
// cond: x0.Uses == 1 && x1.Uses == 1 && x2.Uses == 1 && x3.Uses == 1 && s0.Uses == 1 && s1.Uses == 1 && s2.Uses == 1 && o0.Uses == 1 && o1.Uses == 1 && mergePoint(b,x0,x1,x2,x3) != nil && clobber(x0) && clobber(x1) && clobber(x2) && clobber(x3) && clobber(s0) && clobber(s1) && clobber(s2) && clobber(o0) && clobber(o1) // cond: x0.Uses == 1 && x1.Uses == 1 && x2.Uses == 1 && s0.Uses == 1 && s1.Uses == 1 && o0.Uses == 1 && mergePoint(b,x0,x1,x2) != nil && clobber(x0) && clobber(x1) && clobber(x2) && clobber(s0) && clobber(s1) && clobber(o0)
// result: @mergePoint(b,x0,x1,x2,x3) (MOVLload [i] {s} p mem) // result: @mergePoint(b,x0,x1,x2) (MOVLload [i] {s} p mem)
for { for {
o0 := v.Args[0] o0 := v.Args[0]
if o0.Op != Op386ORL { if o0.Op != Op386ORL {
break break
} }
o1 := o0.Args[0] x0 := o0.Args[0]
if o1.Op != Op386ORL { if x0.Op != Op386MOVWload {
break
}
x0 := o1.Args[0]
if x0.Op != Op386MOVBload {
break break
} }
i := x0.AuxInt i := x0.AuxInt
s := x0.Aux s := x0.Aux
p := x0.Args[0] p := x0.Args[0]
mem := x0.Args[1] mem := x0.Args[1]
s0 := o1.Args[1] s0 := o0.Args[1]
if s0.Op != Op386SHLLconst { if s0.Op != Op386SHLLconst {
break break
} }
if s0.AuxInt != 8 { if s0.AuxInt != 16 {
break break
} }
x1 := s0.Args[0] x1 := s0.Args[0]
if x1.Op != Op386MOVBload { if x1.Op != Op386MOVBload {
break break
} }
if x1.AuxInt != i+1 { if x1.AuxInt != i+2 {
break break
} }
if x1.Aux != s { if x1.Aux != s {
...@@ -7220,18 +7216,18 @@ func rewriteValue386_Op386ORL(v *Value, config *Config) bool { ...@@ -7220,18 +7216,18 @@ func rewriteValue386_Op386ORL(v *Value, config *Config) bool {
if mem != x1.Args[1] { if mem != x1.Args[1] {
break break
} }
s1 := o0.Args[1] s1 := v.Args[1]
if s1.Op != Op386SHLLconst { if s1.Op != Op386SHLLconst {
break break
} }
if s1.AuxInt != 16 { if s1.AuxInt != 24 {
break break
} }
x2 := s1.Args[0] x2 := s1.Args[0]
if x2.Op != Op386MOVBload { if x2.Op != Op386MOVBload {
break break
} }
if x2.AuxInt != i+2 { if x2.AuxInt != i+3 {
break break
} }
if x2.Aux != s { if x2.Aux != s {
...@@ -7243,33 +7239,10 @@ func rewriteValue386_Op386ORL(v *Value, config *Config) bool { ...@@ -7243,33 +7239,10 @@ func rewriteValue386_Op386ORL(v *Value, config *Config) bool {
if mem != x2.Args[1] { if mem != x2.Args[1] {
break break
} }
s2 := v.Args[1] if !(x0.Uses == 1 && x1.Uses == 1 && x2.Uses == 1 && s0.Uses == 1 && s1.Uses == 1 && o0.Uses == 1 && mergePoint(b, x0, x1, x2) != nil && clobber(x0) && clobber(x1) && clobber(x2) && clobber(s0) && clobber(s1) && clobber(o0)) {
if s2.Op != Op386SHLLconst {
break
}
if s2.AuxInt != 24 {
break
}
x3 := s2.Args[0]
if x3.Op != Op386MOVBload {
break
}
if x3.AuxInt != i+3 {
break
}
if x3.Aux != s {
break
}
if p != x3.Args[0] {
break break
} }
if mem != x3.Args[1] { b = mergePoint(b, x0, x1, x2)
break
}
if !(x0.Uses == 1 && x1.Uses == 1 && x2.Uses == 1 && x3.Uses == 1 && s0.Uses == 1 && s1.Uses == 1 && s2.Uses == 1 && o0.Uses == 1 && o1.Uses == 1 && mergePoint(b, x0, x1, x2, x3) != nil && clobber(x0) && clobber(x1) && clobber(x2) && clobber(x3) && clobber(s0) && clobber(s1) && clobber(s2) && clobber(o0) && clobber(o1)) {
break
}
b = mergePoint(b, x0, x1, x2, x3)
v0 := b.NewValue0(v.Line, Op386MOVLload, config.fe.TypeUInt32()) v0 := b.NewValue0(v.Line, Op386MOVLload, config.fe.TypeUInt32())
v.reset(OpCopy) v.reset(OpCopy)
v.AddArg(v0) v.AddArg(v0)
...@@ -7332,20 +7305,16 @@ func rewriteValue386_Op386ORL(v *Value, config *Config) bool { ...@@ -7332,20 +7305,16 @@ func rewriteValue386_Op386ORL(v *Value, config *Config) bool {
v0.AddArg(mem) v0.AddArg(mem)
return true return true
} }
// match: (ORL o0:(ORL o1:(ORL x0:(MOVBloadidx1 [i] {s} p idx mem) s0:(SHLLconst [8] x1:(MOVBloadidx1 [i+1] {s} p idx mem))) s1:(SHLLconst [16] x2:(MOVBloadidx1 [i+2] {s} p idx mem))) s2:(SHLLconst [24] x3:(MOVBloadidx1 [i+3] {s} p idx mem))) // match: (ORL o0:(ORL x0:(MOVWloadidx1 [i] {s} p idx mem) s0:(SHLLconst [16] x1:(MOVBloadidx1 [i+2] {s} p idx mem))) s1:(SHLLconst [24] x2:(MOVBloadidx1 [i+3] {s} p idx mem)))
// cond: x0.Uses == 1 && x1.Uses == 1 && x2.Uses == 1 && x3.Uses == 1 && s0.Uses == 1 && s1.Uses == 1 && s2.Uses == 1 && o0.Uses == 1 && o1.Uses == 1 && mergePoint(b,x0,x1,x2,x3) != nil && clobber(x0) && clobber(x1) && clobber(x2) && clobber(x3) && clobber(s0) && clobber(s1) && clobber(s2) && clobber(o0) && clobber(o1) // cond: x0.Uses == 1 && x1.Uses == 1 && x2.Uses == 1 && s0.Uses == 1 && s1.Uses == 1 && o0.Uses == 1 && mergePoint(b,x0,x1,x2) != nil && clobber(x0) && clobber(x1) && clobber(x2) && clobber(s0) && clobber(s1) && clobber(o0)
// result: @mergePoint(b,x0,x1,x2,x3) (MOVLloadidx1 <v.Type> [i] {s} p idx mem) // result: @mergePoint(b,x0,x1,x2) (MOVLloadidx1 <v.Type> [i] {s} p idx mem)
for { for {
o0 := v.Args[0] o0 := v.Args[0]
if o0.Op != Op386ORL { if o0.Op != Op386ORL {
break break
} }
o1 := o0.Args[0] x0 := o0.Args[0]
if o1.Op != Op386ORL { if x0.Op != Op386MOVWloadidx1 {
break
}
x0 := o1.Args[0]
if x0.Op != Op386MOVBloadidx1 {
break break
} }
i := x0.AuxInt i := x0.AuxInt
...@@ -7353,18 +7322,18 @@ func rewriteValue386_Op386ORL(v *Value, config *Config) bool { ...@@ -7353,18 +7322,18 @@ func rewriteValue386_Op386ORL(v *Value, config *Config) bool {
p := x0.Args[0] p := x0.Args[0]
idx := x0.Args[1] idx := x0.Args[1]
mem := x0.Args[2] mem := x0.Args[2]
s0 := o1.Args[1] s0 := o0.Args[1]
if s0.Op != Op386SHLLconst { if s0.Op != Op386SHLLconst {
break break
} }
if s0.AuxInt != 8 { if s0.AuxInt != 16 {
break break
} }
x1 := s0.Args[0] x1 := s0.Args[0]
if x1.Op != Op386MOVBloadidx1 { if x1.Op != Op386MOVBloadidx1 {
break break
} }
if x1.AuxInt != i+1 { if x1.AuxInt != i+2 {
break break
} }
if x1.Aux != s { if x1.Aux != s {
...@@ -7379,18 +7348,18 @@ func rewriteValue386_Op386ORL(v *Value, config *Config) bool { ...@@ -7379,18 +7348,18 @@ func rewriteValue386_Op386ORL(v *Value, config *Config) bool {
if mem != x1.Args[2] { if mem != x1.Args[2] {
break break
} }
s1 := o0.Args[1] s1 := v.Args[1]
if s1.Op != Op386SHLLconst { if s1.Op != Op386SHLLconst {
break break
} }
if s1.AuxInt != 16 { if s1.AuxInt != 24 {
break break
} }
x2 := s1.Args[0] x2 := s1.Args[0]
if x2.Op != Op386MOVBloadidx1 { if x2.Op != Op386MOVBloadidx1 {
break break
} }
if x2.AuxInt != i+2 { if x2.AuxInt != i+3 {
break break
} }
if x2.Aux != s { if x2.Aux != s {
...@@ -7405,36 +7374,10 @@ func rewriteValue386_Op386ORL(v *Value, config *Config) bool { ...@@ -7405,36 +7374,10 @@ func rewriteValue386_Op386ORL(v *Value, config *Config) bool {
if mem != x2.Args[2] { if mem != x2.Args[2] {
break break
} }
s2 := v.Args[1] if !(x0.Uses == 1 && x1.Uses == 1 && x2.Uses == 1 && s0.Uses == 1 && s1.Uses == 1 && o0.Uses == 1 && mergePoint(b, x0, x1, x2) != nil && clobber(x0) && clobber(x1) && clobber(x2) && clobber(s0) && clobber(s1) && clobber(o0)) {
if s2.Op != Op386SHLLconst {
break
}
if s2.AuxInt != 24 {
break
}
x3 := s2.Args[0]
if x3.Op != Op386MOVBloadidx1 {
break
}
if x3.AuxInt != i+3 {
break
}
if x3.Aux != s {
break
}
if p != x3.Args[0] {
break
}
if idx != x3.Args[1] {
break
}
if mem != x3.Args[2] {
break
}
if !(x0.Uses == 1 && x1.Uses == 1 && x2.Uses == 1 && x3.Uses == 1 && s0.Uses == 1 && s1.Uses == 1 && s2.Uses == 1 && o0.Uses == 1 && o1.Uses == 1 && mergePoint(b, x0, x1, x2, x3) != nil && clobber(x0) && clobber(x1) && clobber(x2) && clobber(x3) && clobber(s0) && clobber(s1) && clobber(s2) && clobber(o0) && clobber(o1)) {
break break
} }
b = mergePoint(b, x0, x1, x2, x3) b = mergePoint(b, x0, x1, x2)
v0 := b.NewValue0(v.Line, Op386MOVLloadidx1, v.Type) v0 := b.NewValue0(v.Line, Op386MOVLloadidx1, v.Type)
v.reset(OpCopy) v.reset(OpCopy)
v.AddArg(v0) v.AddArg(v0)
......
src/cmd/compile/internal/ssa/rewriteAMD64.go
View file @ 26a6131b
...@@ -10340,38 +10340,34 @@ func rewriteValueAMD64_OpAMD64ORL(v *Value, config *Config) bool { ...@@ -10340,38 +10340,34 @@ func rewriteValueAMD64_OpAMD64ORL(v *Value, config *Config) bool {
v0.AddArg(mem) v0.AddArg(mem)
return true return true
} }
// match: (ORL o0:(ORL o1:(ORL x0:(MOVBload [i] {s} p mem) s0:(SHLLconst [8] x1:(MOVBload [i+1] {s} p mem))) s1:(SHLLconst [16] x2:(MOVBload [i+2] {s} p mem))) s2:(SHLLconst [24] x3:(MOVBload [i+3] {s} p mem))) // match: (ORL o0:(ORL x0:(MOVWload [i] {s} p mem) s0:(SHLLconst [16] x1:(MOVBload [i+2] {s} p mem))) s1:(SHLLconst [24] x2:(MOVBload [i+3] {s} p mem)))
// cond: x0.Uses == 1 && x1.Uses == 1 && x2.Uses == 1 && x3.Uses == 1 && s0.Uses == 1 && s1.Uses == 1 && s2.Uses == 1 && o0.Uses == 1 && o1.Uses == 1 && mergePoint(b,x0,x1,x2,x3) != nil && clobber(x0) && clobber(x1) && clobber(x2) && clobber(x3) && clobber(s0) && clobber(s1) && clobber(s2) && clobber(o0) && clobber(o1) // cond: x0.Uses == 1 && x1.Uses == 1 && x2.Uses == 1 && s0.Uses == 1 && s1.Uses == 1 && o0.Uses == 1 && mergePoint(b,x0,x1,x2) != nil && clobber(x0) && clobber(x1) && clobber(x2) && clobber(s0) && clobber(s1) && clobber(o0)
// result: @mergePoint(b,x0,x1,x2,x3) (MOVLload [i] {s} p mem) // result: @mergePoint(b,x0,x1,x2) (MOVLload [i] {s} p mem)
for { for {
o0 := v.Args[0] o0 := v.Args[0]
if o0.Op != OpAMD64ORL { if o0.Op != OpAMD64ORL {
break break
} }
o1 := o0.Args[0] x0 := o0.Args[0]
if o1.Op != OpAMD64ORL { if x0.Op != OpAMD64MOVWload {
break
}
x0 := o1.Args[0]
if x0.Op != OpAMD64MOVBload {
break break
} }
i := x0.AuxInt i := x0.AuxInt
s := x0.Aux s := x0.Aux
p := x0.Args[0] p := x0.Args[0]
mem := x0.Args[1] mem := x0.Args[1]
s0 := o1.Args[1] s0 := o0.Args[1]
if s0.Op != OpAMD64SHLLconst { if s0.Op != OpAMD64SHLLconst {
break break
} }
if s0.AuxInt != 8 { if s0.AuxInt != 16 {
break break
} }
x1 := s0.Args[0] x1 := s0.Args[0]
if x1.Op != OpAMD64MOVBload { if x1.Op != OpAMD64MOVBload {
break break
} }
if x1.AuxInt != i+1 { if x1.AuxInt != i+2 {
break break
} }
if x1.Aux != s { if x1.Aux != s {
...@@ -10383,18 +10379,18 @@ func rewriteValueAMD64_OpAMD64ORL(v *Value, config *Config) bool { ...@@ -10383,18 +10379,18 @@ func rewriteValueAMD64_OpAMD64ORL(v *Value, config *Config) bool {
if mem != x1.Args[1] { if mem != x1.Args[1] {
break break
} }
s1 := o0.Args[1] s1 := v.Args[1]
if s1.Op != OpAMD64SHLLconst { if s1.Op != OpAMD64SHLLconst {
break break
} }
if s1.AuxInt != 16 { if s1.AuxInt != 24 {
break break
} }
x2 := s1.Args[0] x2 := s1.Args[0]
if x2.Op != OpAMD64MOVBload { if x2.Op != OpAMD64MOVBload {
break break
} }
if x2.AuxInt != i+2 { if x2.AuxInt != i+3 {
break break
} }
if x2.Aux != s { if x2.Aux != s {
...@@ -10406,33 +10402,10 @@ func rewriteValueAMD64_OpAMD64ORL(v *Value, config *Config) bool { ...@@ -10406,33 +10402,10 @@ func rewriteValueAMD64_OpAMD64ORL(v *Value, config *Config) bool {
if mem != x2.Args[1] { if mem != x2.Args[1] {
break break
} }
s2 := v.Args[1] if !(x0.Uses == 1 && x1.Uses == 1 && x2.Uses == 1 && s0.Uses == 1 && s1.Uses == 1 && o0.Uses == 1 && mergePoint(b, x0, x1, x2) != nil && clobber(x0) && clobber(x1) && clobber(x2) && clobber(s0) && clobber(s1) && clobber(o0)) {
if s2.Op != OpAMD64SHLLconst {
break break
} }
if s2.AuxInt != 24 { b = mergePoint(b, x0, x1, x2)
break
}
x3 := s2.Args[0]
if x3.Op != OpAMD64MOVBload {
break
}
if x3.AuxInt != i+3 {
break
}
if x3.Aux != s {
break
}
if p != x3.Args[0] {
break
}
if mem != x3.Args[1] {
break
}
if !(x0.Uses == 1 && x1.Uses == 1 && x2.Uses == 1 && x3.Uses == 1 && s0.Uses == 1 && s1.Uses == 1 && s2.Uses == 1 && o0.Uses == 1 && o1.Uses == 1 && mergePoint(b, x0, x1, x2, x3) != nil && clobber(x0) && clobber(x1) && clobber(x2) && clobber(x3) && clobber(s0) && clobber(s1) && clobber(s2) && clobber(o0) && clobber(o1)) {
break
}
b = mergePoint(b, x0, x1, x2, x3)
v0 := b.NewValue0(v.Line, OpAMD64MOVLload, config.fe.TypeUInt32()) v0 := b.NewValue0(v.Line, OpAMD64MOVLload, config.fe.TypeUInt32())
v.reset(OpCopy) v.reset(OpCopy)
v.AddArg(v0) v.AddArg(v0)
...@@ -10495,20 +10468,16 @@ func rewriteValueAMD64_OpAMD64ORL(v *Value, config *Config) bool { ...@@ -10495,20 +10468,16 @@ func rewriteValueAMD64_OpAMD64ORL(v *Value, config *Config) bool {
v0.AddArg(mem) v0.AddArg(mem)
return true return true
} }
// match: (ORL o0:(ORL o1:(ORL x0:(MOVBloadidx1 [i] {s} p idx mem) s0:(SHLLconst [8] x1:(MOVBloadidx1 [i+1] {s} p idx mem))) s1:(SHLLconst [16] x2:(MOVBloadidx1 [i+2] {s} p idx mem))) s2:(SHLLconst [24] x3:(MOVBloadidx1 [i+3] {s} p idx mem))) // match: (ORL o0:(ORL x0:(MOVWloadidx1 [i] {s} p idx mem) s0:(SHLLconst [16] x1:(MOVBloadidx1 [i+2] {s} p idx mem))) s1:(SHLLconst [24] x2:(MOVBloadidx1 [i+3] {s} p idx mem)))
// cond: x0.Uses == 1 && x1.Uses == 1 && x2.Uses == 1 && x3.Uses == 1 && s0.Uses == 1 && s1.Uses == 1 && s2.Uses == 1 && o0.Uses == 1 && o1.Uses == 1 && mergePoint(b,x0,x1,x2,x3) != nil && clobber(x0) && clobber(x1) && clobber(x2) && clobber(x3) && clobber(s0) && clobber(s1) && clobber(s2) && clobber(o0) && clobber(o1) // cond: x0.Uses == 1 && x1.Uses == 1 && x2.Uses == 1 && s0.Uses == 1 && s1.Uses == 1 && o0.Uses == 1 && mergePoint(b,x0,x1,x2) != nil && clobber(x0) && clobber(x1) && clobber(x2) && clobber(s0) && clobber(s1) && clobber(o0)
// result: @mergePoint(b,x0,x1,x2,x3) (MOVLloadidx1 <v.Type> [i] {s} p idx mem) // result: @mergePoint(b,x0,x1,x2) (MOVLloadidx1 <v.Type> [i] {s} p idx mem)
for { for {
o0 := v.Args[0] o0 := v.Args[0]
if o0.Op != OpAMD64ORL { if o0.Op != OpAMD64ORL {
break break
} }
o1 := o0.Args[0] x0 := o0.Args[0]
if o1.Op != OpAMD64ORL { if x0.Op != OpAMD64MOVWloadidx1 {
break
}
x0 := o1.Args[0]
if x0.Op != OpAMD64MOVBloadidx1 {
break break
} }
i := x0.AuxInt i := x0.AuxInt
...@@ -10516,18 +10485,18 @@ func rewriteValueAMD64_OpAMD64ORL(v *Value, config *Config) bool { ...@@ -10516,18 +10485,18 @@ func rewriteValueAMD64_OpAMD64ORL(v *Value, config *Config) bool {
p := x0.Args[0] p := x0.Args[0]
idx := x0.Args[1] idx := x0.Args[1]
mem := x0.Args[2] mem := x0.Args[2]
s0 := o1.Args[1] s0 := o0.Args[1]
if s0.Op != OpAMD64SHLLconst { if s0.Op != OpAMD64SHLLconst {
break break
} }
if s0.AuxInt != 8 { if s0.AuxInt != 16 {
break break
} }
x1 := s0.Args[0] x1 := s0.Args[0]
if x1.Op != OpAMD64MOVBloadidx1 { if x1.Op != OpAMD64MOVBloadidx1 {
break break
} }
if x1.AuxInt != i+1 { if x1.AuxInt != i+2 {
break break
} }
if x1.Aux != s { if x1.Aux != s {
...@@ -10542,18 +10511,18 @@ func rewriteValueAMD64_OpAMD64ORL(v *Value, config *Config) bool { ...@@ -10542,18 +10511,18 @@ func rewriteValueAMD64_OpAMD64ORL(v *Value, config *Config) bool {
if mem != x1.Args[2] { if mem != x1.Args[2] {
break break
} }
s1 := o0.Args[1] s1 := v.Args[1]
if s1.Op != OpAMD64SHLLconst { if s1.Op != OpAMD64SHLLconst {
break break
} }
if s1.AuxInt != 16 { if s1.AuxInt != 24 {
break break
} }
x2 := s1.Args[0] x2 := s1.Args[0]
if x2.Op != OpAMD64MOVBloadidx1 { if x2.Op != OpAMD64MOVBloadidx1 {
break break
} }
if x2.AuxInt != i+2 { if x2.AuxInt != i+3 {
break break
} }
if x2.Aux != s { if x2.Aux != s {
...@@ -10568,36 +10537,10 @@ func rewriteValueAMD64_OpAMD64ORL(v *Value, config *Config) bool { ...@@ -10568,36 +10537,10 @@ func rewriteValueAMD64_OpAMD64ORL(v *Value, config *Config) bool {
if mem != x2.Args[2] { if mem != x2.Args[2] {
break break
} }
s2 := v.Args[1] if !(x0.Uses == 1 && x1.Uses == 1 && x2.Uses == 1 && s0.Uses == 1 && s1.Uses == 1 && o0.Uses == 1 && mergePoint(b, x0, x1, x2) != nil && clobber(x0) && clobber(x1) && clobber(x2) && clobber(s0) && clobber(s1) && clobber(o0)) {
if s2.Op != OpAMD64SHLLconst {
break
}
if s2.AuxInt != 24 {
break
}
x3 := s2.Args[0]
if x3.Op != OpAMD64MOVBloadidx1 {
break
}
if x3.AuxInt != i+3 {
break
}
if x3.Aux != s {
break
}
if p != x3.Args[0] {
break
}
if idx != x3.Args[1] {
break
}
if mem != x3.Args[2] {
break
}
if !(x0.Uses == 1 && x1.Uses == 1 && x2.Uses == 1 && x3.Uses == 1 && s0.Uses == 1 && s1.Uses == 1 && s2.Uses == 1 && o0.Uses == 1 && o1.Uses == 1 && mergePoint(b, x0, x1, x2, x3) != nil && clobber(x0) && clobber(x1) && clobber(x2) && clobber(x3) && clobber(s0) && clobber(s1) && clobber(s2) && clobber(o0) && clobber(o1)) {
break break
} }
b = mergePoint(b, x0, x1, x2, x3) b = mergePoint(b, x0, x1, x2)
v0 := b.NewValue0(v.Line, OpAMD64MOVLloadidx1, v.Type) v0 := b.NewValue0(v.Line, OpAMD64MOVLloadidx1, v.Type)
v.reset(OpCopy) v.reset(OpCopy)
v.AddArg(v0) v.AddArg(v0)
......
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