]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/compile: use MOVBE instruction for GOAMD64>=v3
authorwdvxdr <wdvxdr1123@gmail.com>
Tue, 19 Oct 2021 11:39:21 +0000 (19:39 +0800)
committerKeith Randall <khr@golang.org>
Tue, 19 Oct 2021 16:18:56 +0000 (16:18 +0000)
In CL 354670, I copied some existing rules for convenience but forgot
to update the last rule which broke `GOAMD64=v3 ./make.bat`

Revive CL 354670

Change-Id: Ic1e2047c603f0122482a4b293ce1ef74d806c019
Reviewed-on: https://go-review.googlesource.com/c/go/+/356810
Reviewed-by: Daniel Martí <mvdan@mvdan.cc>
Reviewed-by: Keith Randall <khr@golang.org>
Trust: Daniel Martí <mvdan@mvdan.cc>
Run-TryBot: Daniel Martí <mvdan@mvdan.cc>
TryBot-Result: Go Bot <gobot@golang.org>

src/cmd/compile/internal/amd64/ssa.go
src/cmd/compile/internal/amd64/versions_test.go
src/cmd/compile/internal/ssa/gen/AMD64.rules
src/cmd/compile/internal/ssa/gen/AMD64Ops.go
src/cmd/compile/internal/ssa/opGen.go
src/cmd/compile/internal/ssa/rewriteAMD64.go
test/codegen/memcombine.go

index 0e7457442249b95d4e762e95bdd9881824790cca..b0e5c34030f32b9d6b62159a7fef03e4dc3a5e80 100644 (file)
@@ -772,7 +772,9 @@ func ssaGenValue(s *ssagen.State, v *ssa.Value) {
                p.From.Val = math.Float64frombits(uint64(v.AuxInt))
                p.To.Type = obj.TYPE_REG
                p.To.Reg = x
-       case ssa.OpAMD64MOVQload, ssa.OpAMD64MOVSSload, ssa.OpAMD64MOVSDload, ssa.OpAMD64MOVLload, ssa.OpAMD64MOVWload, ssa.OpAMD64MOVBload, ssa.OpAMD64MOVBQSXload, ssa.OpAMD64MOVWQSXload, ssa.OpAMD64MOVLQSXload, ssa.OpAMD64MOVOload:
+       case ssa.OpAMD64MOVQload, ssa.OpAMD64MOVLload, ssa.OpAMD64MOVWload, ssa.OpAMD64MOVBload, ssa.OpAMD64MOVOload,
+               ssa.OpAMD64MOVSSload, ssa.OpAMD64MOVSDload, ssa.OpAMD64MOVBQSXload, ssa.OpAMD64MOVWQSXload, ssa.OpAMD64MOVLQSXload,
+               ssa.OpAMD64MOVBEQload, ssa.OpAMD64MOVBELload:
                p := s.Prog(v.Op.Asm())
                p.From.Type = obj.TYPE_MEM
                p.From.Reg = v.Args[0].Reg()
@@ -788,7 +790,8 @@ func ssaGenValue(s *ssagen.State, v *ssa.Value) {
                p.To.Reg = v.Reg()
        case ssa.OpAMD64MOVQstore, ssa.OpAMD64MOVSSstore, ssa.OpAMD64MOVSDstore, ssa.OpAMD64MOVLstore, ssa.OpAMD64MOVWstore, ssa.OpAMD64MOVBstore, ssa.OpAMD64MOVOstore,
                ssa.OpAMD64ADDQmodify, ssa.OpAMD64SUBQmodify, ssa.OpAMD64ANDQmodify, ssa.OpAMD64ORQmodify, ssa.OpAMD64XORQmodify,
-               ssa.OpAMD64ADDLmodify, ssa.OpAMD64SUBLmodify, ssa.OpAMD64ANDLmodify, ssa.OpAMD64ORLmodify, ssa.OpAMD64XORLmodify:
+               ssa.OpAMD64ADDLmodify, ssa.OpAMD64SUBLmodify, ssa.OpAMD64ANDLmodify, ssa.OpAMD64ORLmodify, ssa.OpAMD64XORLmodify,
+               ssa.OpAMD64MOVBEQstore, ssa.OpAMD64MOVBELstore:
                p := s.Prog(v.Op.Asm())
                p.From.Type = obj.TYPE_REG
                p.From.Reg = v.Args[1].Reg()
index de677f3a69dfd325f372a58267274470e905d225..ee1a8ca3aa0ec73cd21abf9c38a09a6d99741429 100644 (file)
@@ -53,7 +53,9 @@ func TestGoAMD64v1(t *testing.T) {
        opcodes := map[string]bool{}
        var features []string
        for feature, opcodeList := range featureToOpcodes {
-               features = append(features, fmt.Sprintf("cpu.%s=off", feature))
+               if runtimeFeatures[feature] {
+                       features = append(features, fmt.Sprintf("cpu.%s=off", feature))
+               }
                for _, op := range opcodeList {
                        opcodes[op] = true
                }
@@ -204,14 +206,28 @@ func clobber(t *testing.T, src string, dst *os.File, opcodes map[string]bool) {
        f.Close()
 }
 
+func setOf(keys ...string) map[string]bool {
+       m := make(map[string]bool, len(keys))
+       for _, key := range keys {
+               m[key] = true
+       }
+       return m
+}
+
+var runtimeFeatures = setOf(
+       "adx", "aes", "avx", "avx2", "bmi1", "bmi2", "erms", "fma",
+       "pclmulqdq", "popcnt", "rdtscp", "sse3", "sse41", "sse42", "ssse3",
+)
+
 var featureToOpcodes = map[string][]string{
        // Note: we include *q, *l, and plain opcodes here.
        // go tool objdump doesn't include a [QL] on popcnt instructions, until CL 351889
        // native objdump doesn't include [QL] on linux.
-       "popcnt": []string{"popcntq", "popcntl", "popcnt"},
-       "bmi1":   []string{"andnq", "andnl", "andn", "blsiq", "blsil", "blsi", "blsmskq", "blsmskl", "blsmsk", "blsrq", "blsrl", "blsr", "tzcntq", "tzcntl", "tzcnt"},
-       "sse41":  []string{"roundsd"},
-       "fma":    []string{"vfmadd231sd"},
+       "popcnt": {"popcntq", "popcntl", "popcnt"},
+       "bmi1":   {"andnq", "andnl", "andn", "blsiq", "blsil", "blsi", "blsmskq", "blsmskl", "blsmsk", "blsrq", "blsrl", "blsr", "tzcntq", "tzcntl", "tzcnt"},
+       "sse41":  {"roundsd"},
+       "fma":    {"vfmadd231sd"},
+       "movbe":  {"movbeqq", "movbeq", "movbell", "movbel", "movbe"},
 }
 
 // Test to use POPCNT instruction, if available
@@ -364,5 +380,4 @@ func TestFMA(t *testing.T) {
                        t.Errorf("FMA(%f,%f,%f) = %f, want %f", tt.x, tt.y, tt.z, got, tt.want)
                }
        }
-
 }
index 8b73ee14ea7a36f5aa657d0ea7a34b70bac59dbb..47a6af003c9ecd9b6d9f376d608e646cdc8d0296 100644 (file)
 (AND(Q|L) x (ADD(Q|L)const [-1] x)) && buildcfg.GOAMD64 >= 3 => (BLSR(Q|L) x)
 
 (BSWAP(Q|L) (BSWAP(Q|L) p)) => p
+
+// CPUID feature: MOVBE.
+(MOV(Q|L)store [i] {s} p x:(BSWAP(Q|L) w) mem) && x.Uses == 1 && buildcfg.GOAMD64 >= 3 => (MOVBE(Q|L)store [i] {s} p w mem)
+(BSWAP(Q|L) x:(MOV(Q|L)load [i] {s} p mem))    && x.Uses == 1 && buildcfg.GOAMD64 >= 3 => (MOVBE(Q|L)load [i] {s} p mem)
+(BSWAP(Q|L) (MOVBE(Q|L)load [i] {s} p m))    => (MOV(Q|L)load [i] {s} p m)
+(MOVBE(Q|L)store [i] {s} p (BSWAP(Q|L) x) m) => (MOV(Q|L)store [i] {s} p x m)
+
+(ORQ                   x0:(MOVBELload [i0] {s} p mem)
+    sh:(SHLQconst [32] x1:(MOVBELload [i1] {s} p mem)))
+  && i0 == i1+4
+  && x0.Uses == 1
+  && x1.Uses == 1
+  && sh.Uses == 1
+  && mergePoint(b,x0,x1) != nil
+  && clobber(x0, x1, sh)
+  => @mergePoint(b,x0,x1) (MOVBEQload [i1] {s} p mem)
+
+(ORQ                   x0:(MOVBELload [i] {s} p0 mem)
+    sh:(SHLQconst [32] x1:(MOVBELload [i] {s} p1 mem)))
+  && x0.Uses == 1
+  && x1.Uses == 1
+  && sh.Uses == 1
+  && sequentialAddresses(p1, p0, 4)
+  && mergePoint(b,x0,x1) != nil
+  && clobber(x0, x1, sh)
+  => @mergePoint(b,x0,x1) (MOVBEQload [i] {s} p1 mem)
index 731454c761fe3ca5ca7bbd18d37f2d898f77ffda..e3c94e4b2eca0a4e925fad46d07781a9e284b717 100644 (file)
@@ -922,6 +922,12 @@ func init() {
                // and BSFQ(0) is undefined. Same for TZCNTL(0)==32
                {name: "TZCNTQ", argLength: 1, reg: gp11, asm: "TZCNTQ", clobberFlags: true},
                {name: "TZCNTL", argLength: 1, reg: gp11, asm: "TZCNTL", clobberFlags: true},
+
+               // CPUID feature: MOVBE
+               {name: "MOVBELload", argLength: 2, reg: gpload, asm: "MOVBEL", aux: "SymOff", typ: "UInt32", faultOnNilArg0: true, symEffect: "Read"}, // load and swap 4 bytes from arg0+auxint+aux. arg1=mem.  Zero extend.
+               {name: "MOVBELstore", argLength: 3, reg: gpstore, asm: "MOVBEL", aux: "SymOff", typ: "Mem", faultOnNilArg0: true, symEffect: "Write"}, // swap and store 4 bytes in arg1 to arg0+auxint+aux. arg2=mem
+               {name: "MOVBEQload", argLength: 2, reg: gpload, asm: "MOVBEQ", aux: "SymOff", typ: "UInt64", faultOnNilArg0: true, symEffect: "Read"}, // load and swap 8 bytes from arg0+auxint+aux. arg1=mem
+               {name: "MOVBEQstore", argLength: 3, reg: gpstore, asm: "MOVBEQ", aux: "SymOff", typ: "Mem", faultOnNilArg0: true, symEffect: "Write"}, // swap and store 8 bytes in arg1 to arg0+auxint+aux. arg2=mem
        }
 
        var AMD64blocks = []blockData{
index 640e517fe767923f31ca4762de7e740606f0ac2e..091f43f40a6deb525144ad4094367d8895e00e45 100644 (file)
@@ -1043,6 +1043,10 @@ const (
        OpAMD64BLSRL
        OpAMD64TZCNTQ
        OpAMD64TZCNTL
+       OpAMD64MOVBELload
+       OpAMD64MOVBELstore
+       OpAMD64MOVBEQload
+       OpAMD64MOVBEQstore
 
        OpARMADD
        OpARMADDconst
@@ -13780,6 +13784,66 @@ var opcodeTable = [...]opInfo{
                        },
                },
        },
+       {
+               name:           "MOVBELload",
+               auxType:        auxSymOff,
+               argLen:         2,
+               faultOnNilArg0: true,
+               symEffect:      SymRead,
+               asm:            x86.AMOVBEL,
+               reg: regInfo{
+                       inputs: []inputInfo{
+                               {0, 4295032831}, // AX CX DX BX SP BP SI DI R8 R9 R10 R11 R12 R13 g R15 SB
+                       },
+                       outputs: []outputInfo{
+                               {0, 49135}, // AX CX DX BX BP SI DI R8 R9 R10 R11 R12 R13 R15
+                       },
+               },
+       },
+       {
+               name:           "MOVBELstore",
+               auxType:        auxSymOff,
+               argLen:         3,
+               faultOnNilArg0: true,
+               symEffect:      SymWrite,
+               asm:            x86.AMOVBEL,
+               reg: regInfo{
+                       inputs: []inputInfo{
+                               {1, 49151},      // AX CX DX BX SP BP SI DI R8 R9 R10 R11 R12 R13 R15
+                               {0, 4295032831}, // AX CX DX BX SP BP SI DI R8 R9 R10 R11 R12 R13 g R15 SB
+                       },
+               },
+       },
+       {
+               name:           "MOVBEQload",
+               auxType:        auxSymOff,
+               argLen:         2,
+               faultOnNilArg0: true,
+               symEffect:      SymRead,
+               asm:            x86.AMOVBEQ,
+               reg: regInfo{
+                       inputs: []inputInfo{
+                               {0, 4295032831}, // AX CX DX BX SP BP SI DI R8 R9 R10 R11 R12 R13 g R15 SB
+                       },
+                       outputs: []outputInfo{
+                               {0, 49135}, // AX CX DX BX BP SI DI R8 R9 R10 R11 R12 R13 R15
+                       },
+               },
+       },
+       {
+               name:           "MOVBEQstore",
+               auxType:        auxSymOff,
+               argLen:         3,
+               faultOnNilArg0: true,
+               symEffect:      SymWrite,
+               asm:            x86.AMOVBEQ,
+               reg: regInfo{
+                       inputs: []inputInfo{
+                               {1, 49151},      // AX CX DX BX SP BP SI DI R8 R9 R10 R11 R12 R13 R15
+                               {0, 4295032831}, // AX CX DX BX SP BP SI DI R8 R9 R10 R11 R12 R13 g R15 SB
+                       },
+               },
+       },
 
        {
                name:        "ADD",
index 201fbf29542f766cc254c8d31e8a0467afe218bc..0c789d6b496477c66c4213b220d1cd9d4a2e6708 100644 (file)
@@ -222,6 +222,10 @@ func rewriteValueAMD64(v *Value) bool {
                return rewriteValueAMD64_OpAMD64LEAQ4(v)
        case OpAMD64LEAQ8:
                return rewriteValueAMD64_OpAMD64LEAQ8(v)
+       case OpAMD64MOVBELstore:
+               return rewriteValueAMD64_OpAMD64MOVBELstore(v)
+       case OpAMD64MOVBEQstore:
+               return rewriteValueAMD64_OpAMD64MOVBEQstore(v)
        case OpAMD64MOVBQSX:
                return rewriteValueAMD64_OpAMD64MOVBQSX(v)
        case OpAMD64MOVBQSXload:
@@ -3623,6 +3627,43 @@ func rewriteValueAMD64_OpAMD64BSWAPL(v *Value) bool {
                v.copyOf(p)
                return true
        }
+       // match: (BSWAPL x:(MOVLload [i] {s} p mem))
+       // cond: x.Uses == 1 && buildcfg.GOAMD64 >= 3
+       // result: (MOVBELload [i] {s} p mem)
+       for {
+               x := v_0
+               if x.Op != OpAMD64MOVLload {
+                       break
+               }
+               i := auxIntToInt32(x.AuxInt)
+               s := auxToSym(x.Aux)
+               mem := x.Args[1]
+               p := x.Args[0]
+               if !(x.Uses == 1 && buildcfg.GOAMD64 >= 3) {
+                       break
+               }
+               v.reset(OpAMD64MOVBELload)
+               v.AuxInt = int32ToAuxInt(i)
+               v.Aux = symToAux(s)
+               v.AddArg2(p, mem)
+               return true
+       }
+       // match: (BSWAPL (MOVBELload [i] {s} p m))
+       // result: (MOVLload [i] {s} p m)
+       for {
+               if v_0.Op != OpAMD64MOVBELload {
+                       break
+               }
+               i := auxIntToInt32(v_0.AuxInt)
+               s := auxToSym(v_0.Aux)
+               m := v_0.Args[1]
+               p := v_0.Args[0]
+               v.reset(OpAMD64MOVLload)
+               v.AuxInt = int32ToAuxInt(i)
+               v.Aux = symToAux(s)
+               v.AddArg2(p, m)
+               return true
+       }
        return false
 }
 func rewriteValueAMD64_OpAMD64BSWAPQ(v *Value) bool {
@@ -3637,6 +3678,43 @@ func rewriteValueAMD64_OpAMD64BSWAPQ(v *Value) bool {
                v.copyOf(p)
                return true
        }
+       // match: (BSWAPQ x:(MOVQload [i] {s} p mem))
+       // cond: x.Uses == 1 && buildcfg.GOAMD64 >= 3
+       // result: (MOVBEQload [i] {s} p mem)
+       for {
+               x := v_0
+               if x.Op != OpAMD64MOVQload {
+                       break
+               }
+               i := auxIntToInt32(x.AuxInt)
+               s := auxToSym(x.Aux)
+               mem := x.Args[1]
+               p := x.Args[0]
+               if !(x.Uses == 1 && buildcfg.GOAMD64 >= 3) {
+                       break
+               }
+               v.reset(OpAMD64MOVBEQload)
+               v.AuxInt = int32ToAuxInt(i)
+               v.Aux = symToAux(s)
+               v.AddArg2(p, mem)
+               return true
+       }
+       // match: (BSWAPQ (MOVBEQload [i] {s} p m))
+       // result: (MOVQload [i] {s} p m)
+       for {
+               if v_0.Op != OpAMD64MOVBEQload {
+                       break
+               }
+               i := auxIntToInt32(v_0.AuxInt)
+               s := auxToSym(v_0.Aux)
+               m := v_0.Args[1]
+               p := v_0.Args[0]
+               v.reset(OpAMD64MOVQload)
+               v.AuxInt = int32ToAuxInt(i)
+               v.Aux = symToAux(s)
+               v.AddArg2(p, m)
+               return true
+       }
        return false
 }
 func rewriteValueAMD64_OpAMD64BTCLconst(v *Value) bool {
@@ -9395,6 +9473,52 @@ func rewriteValueAMD64_OpAMD64LEAQ8(v *Value) bool {
        }
        return false
 }
+func rewriteValueAMD64_OpAMD64MOVBELstore(v *Value) bool {
+       v_2 := v.Args[2]
+       v_1 := v.Args[1]
+       v_0 := v.Args[0]
+       // match: (MOVBELstore [i] {s} p (BSWAPL x) m)
+       // result: (MOVLstore [i] {s} p x m)
+       for {
+               i := auxIntToInt32(v.AuxInt)
+               s := auxToSym(v.Aux)
+               p := v_0
+               if v_1.Op != OpAMD64BSWAPL {
+                       break
+               }
+               x := v_1.Args[0]
+               m := v_2
+               v.reset(OpAMD64MOVLstore)
+               v.AuxInt = int32ToAuxInt(i)
+               v.Aux = symToAux(s)
+               v.AddArg3(p, x, m)
+               return true
+       }
+       return false
+}
+func rewriteValueAMD64_OpAMD64MOVBEQstore(v *Value) bool {
+       v_2 := v.Args[2]
+       v_1 := v.Args[1]
+       v_0 := v.Args[0]
+       // match: (MOVBEQstore [i] {s} p (BSWAPQ x) m)
+       // result: (MOVQstore [i] {s} p x m)
+       for {
+               i := auxIntToInt32(v.AuxInt)
+               s := auxToSym(v.Aux)
+               p := v_0
+               if v_1.Op != OpAMD64BSWAPQ {
+                       break
+               }
+               x := v_1.Args[0]
+               m := v_2
+               v.reset(OpAMD64MOVQstore)
+               v.AuxInt = int32ToAuxInt(i)
+               v.Aux = symToAux(s)
+               v.AddArg3(p, x, m)
+               return true
+       }
+       return false
+}
 func rewriteValueAMD64_OpAMD64MOVBQSX(v *Value) bool {
        v_0 := v.Args[0]
        b := v.Block
@@ -12225,6 +12349,28 @@ func rewriteValueAMD64_OpAMD64MOVLstore(v *Value) bool {
                v.AddArg3(ptr, val, mem)
                return true
        }
+       // match: (MOVLstore [i] {s} p x:(BSWAPL w) mem)
+       // cond: x.Uses == 1 && buildcfg.GOAMD64 >= 3
+       // result: (MOVBELstore [i] {s} p w mem)
+       for {
+               i := auxIntToInt32(v.AuxInt)
+               s := auxToSym(v.Aux)
+               p := v_0
+               x := v_1
+               if x.Op != OpAMD64BSWAPL {
+                       break
+               }
+               w := x.Args[0]
+               mem := v_2
+               if !(x.Uses == 1 && buildcfg.GOAMD64 >= 3) {
+                       break
+               }
+               v.reset(OpAMD64MOVBELstore)
+               v.AuxInt = int32ToAuxInt(i)
+               v.Aux = symToAux(s)
+               v.AddArg3(p, w, mem)
+               return true
+       }
        return false
 }
 func rewriteValueAMD64_OpAMD64MOVLstoreconst(v *Value) bool {
@@ -13164,6 +13310,28 @@ func rewriteValueAMD64_OpAMD64MOVQstore(v *Value) bool {
                v.AddArg3(ptr, val, mem)
                return true
        }
+       // match: (MOVQstore [i] {s} p x:(BSWAPQ w) mem)
+       // cond: x.Uses == 1 && buildcfg.GOAMD64 >= 3
+       // result: (MOVBEQstore [i] {s} p w mem)
+       for {
+               i := auxIntToInt32(v.AuxInt)
+               s := auxToSym(v.Aux)
+               p := v_0
+               x := v_1
+               if x.Op != OpAMD64BSWAPQ {
+                       break
+               }
+               w := x.Args[0]
+               mem := v_2
+               if !(x.Uses == 1 && buildcfg.GOAMD64 >= 3) {
+                       break
+               }
+               v.reset(OpAMD64MOVBEQstore)
+               v.AuxInt = int32ToAuxInt(i)
+               v.Aux = symToAux(s)
+               v.AddArg3(p, w, mem)
+               return true
+       }
        return false
 }
 func rewriteValueAMD64_OpAMD64MOVQstoreconst(v *Value) bool {
@@ -18657,6 +18825,81 @@ func rewriteValueAMD64_OpAMD64ORQ(v *Value) bool {
                }
                break
        }
+       // match: (ORQ x0:(MOVBELload [i0] {s} p mem) sh:(SHLQconst [32] x1:(MOVBELload [i1] {s} p mem)))
+       // cond: i0 == i1+4 && x0.Uses == 1 && x1.Uses == 1 && sh.Uses == 1 && mergePoint(b,x0,x1) != nil && clobber(x0, x1, sh)
+       // result: @mergePoint(b,x0,x1) (MOVBEQload [i1] {s} p mem)
+       for {
+               for _i0 := 0; _i0 <= 1; _i0, v_0, v_1 = _i0+1, v_1, v_0 {
+                       x0 := v_0
+                       if x0.Op != OpAMD64MOVBELload {
+                               continue
+                       }
+                       i0 := auxIntToInt32(x0.AuxInt)
+                       s := auxToSym(x0.Aux)
+                       mem := x0.Args[1]
+                       p := x0.Args[0]
+                       sh := v_1
+                       if sh.Op != OpAMD64SHLQconst || auxIntToInt8(sh.AuxInt) != 32 {
+                               continue
+                       }
+                       x1 := sh.Args[0]
+                       if x1.Op != OpAMD64MOVBELload {
+                               continue
+                       }
+                       i1 := auxIntToInt32(x1.AuxInt)
+                       if auxToSym(x1.Aux) != s {
+                               continue
+                       }
+                       _ = x1.Args[1]
+                       if p != x1.Args[0] || mem != x1.Args[1] || !(i0 == i1+4 && x0.Uses == 1 && x1.Uses == 1 && sh.Uses == 1 && mergePoint(b, x0, x1) != nil && clobber(x0, x1, sh)) {
+                               continue
+                       }
+                       b = mergePoint(b, x0, x1)
+                       v0 := b.NewValue0(x1.Pos, OpAMD64MOVBEQload, typ.UInt64)
+                       v.copyOf(v0)
+                       v0.AuxInt = int32ToAuxInt(i1)
+                       v0.Aux = symToAux(s)
+                       v0.AddArg2(p, mem)
+                       return true
+               }
+               break
+       }
+       // match: (ORQ x0:(MOVBELload [i] {s} p0 mem) sh:(SHLQconst [32] x1:(MOVBELload [i] {s} p1 mem)))
+       // cond: x0.Uses == 1 && x1.Uses == 1 && sh.Uses == 1 && sequentialAddresses(p1, p0, 4) && mergePoint(b,x0,x1) != nil && clobber(x0, x1, sh)
+       // result: @mergePoint(b,x0,x1) (MOVBEQload [i] {s} p1 mem)
+       for {
+               for _i0 := 0; _i0 <= 1; _i0, v_0, v_1 = _i0+1, v_1, v_0 {
+                       x0 := v_0
+                       if x0.Op != OpAMD64MOVBELload {
+                               continue
+                       }
+                       i := auxIntToInt32(x0.AuxInt)
+                       s := auxToSym(x0.Aux)
+                       mem := x0.Args[1]
+                       p0 := x0.Args[0]
+                       sh := v_1
+                       if sh.Op != OpAMD64SHLQconst || auxIntToInt8(sh.AuxInt) != 32 {
+                               continue
+                       }
+                       x1 := sh.Args[0]
+                       if x1.Op != OpAMD64MOVBELload || auxIntToInt32(x1.AuxInt) != i || auxToSym(x1.Aux) != s {
+                               continue
+                       }
+                       _ = x1.Args[1]
+                       p1 := x1.Args[0]
+                       if mem != x1.Args[1] || !(x0.Uses == 1 && x1.Uses == 1 && sh.Uses == 1 && sequentialAddresses(p1, p0, 4) && mergePoint(b, x0, x1) != nil && clobber(x0, x1, sh)) {
+                               continue
+                       }
+                       b = mergePoint(b, x0, x1)
+                       v0 := b.NewValue0(x1.Pos, OpAMD64MOVBEQload, typ.UInt64)
+                       v.copyOf(v0)
+                       v0.AuxInt = int32ToAuxInt(i)
+                       v0.Aux = symToAux(s)
+                       v0.AddArg2(p1, mem)
+                       return true
+               }
+               break
+       }
        return false
 }
 func rewriteValueAMD64_OpAMD64ORQconst(v *Value) bool {
index 2a0c534df0d06d3c75d6536e80a620ddfbaca259..97e1d4bdfb7ad6eff579801f1b23362c9a75e6de 100644 (file)
@@ -70,7 +70,8 @@ func load_le16_idx(b []byte, idx int) {
 }
 
 func load_be64(b []byte) {
-       // amd64:`BSWAPQ`,-`MOV[BWL]\t[^$]`,-`OR`
+       // amd64/v1,amd64/v2:`BSWAPQ`,-`MOV[BWL]\t[^$]`,-`OR`
+       // amd64/v3:`MOVBEQ`
        // s390x:`MOVD\s\(.*\),`
        // arm64:`REV`,`MOVD\s\(R[0-9]+\),`,-`MOV[BHW]`,-`REVW`,-`REV16W`
        // ppc64le:`MOVDBR`,-`MOV[BHW]Z`
@@ -78,7 +79,8 @@ func load_be64(b []byte) {
 }
 
 func load_be64_idx(b []byte, idx int) {
-       // amd64:`BSWAPQ`,-`MOV[BWL]\t[^$]`,-`OR`
+       // amd64/v1,amd64/v2:`BSWAPQ`,-`MOV[BWL]\t[^$]`,-`OR`
+       // amd64/v3: `MOVBEQ`
        // s390x:`MOVD\s\(.*\)\(.*\*1\),`
        // arm64:`REV`,`MOVD\s\(R[0-9]+\)\(R[0-9]+\),`,-`MOV[WHB]`,-`REVW`,-`REV16W`
        // ppc64le:`MOVDBR`,-`MOV[BHW]Z`
@@ -86,7 +88,8 @@ func load_be64_idx(b []byte, idx int) {
 }
 
 func load_be32(b []byte) {
-       // amd64:`BSWAPL`,-`MOV[BW]`,-`OR`
+       // amd64/v1,amd64/v2:`BSWAPL`,-`MOV[BW]`,-`OR`
+       // amd64/v3: `MOVBEL`
        // s390x:`MOVWZ\s\(.*\),`
        // arm64:`REVW`,`MOVWU\s\(R[0-9]+\),`,-`MOV[BH]`,-`REV16W`
        // ppc64le:`MOVWBR`,-`MOV[BH]Z`
@@ -94,7 +97,8 @@ func load_be32(b []byte) {
 }
 
 func load_be32_idx(b []byte, idx int) {
-       // amd64:`BSWAPL`,-`MOV[BW]`,-`OR`
+       // amd64/v1,amd64/v2:`BSWAPL`,-`MOV[BW]`,-`OR`
+       // amd64/v3: `MOVBEL`
        // s390x:`MOVWZ\s\(.*\)\(.*\*1\),`
        // arm64:`REVW`,`MOVWU\s\(R[0-9]+\)\(R[0-9]+\),`,-`MOV[HB]`,-`REV16W`
        // ppc64le:`MOVWBR`,-`MOV[BH]Z`
@@ -179,7 +183,8 @@ func load_be_byte4_uint32(s []byte) uint32 {
 
 func load_be_byte4_uint32_inv(s []byte) uint32 {
        // arm64:`MOVWU\t\(R[0-9]+\)`,`REVW`,-`ORR`,-`REV16W`,-`MOV[BH]`
-       // amd64:`MOVL\s\([A-Z]+\)`,`BSWAPL`,-`MOV[BW]`,-`OR`
+       // amd64/v1,amd64/v2:`MOVL\s\([A-Z]+\)`,`BSWAPL`,-`MOV[BW]`,-`OR`
+       // amd64/v3: `MOVBEL`
        return uint32(s[3]) | uint32(s[2])<<8 | uint32(s[1])<<16 | uint32(s[0])<<24
 }
 
@@ -191,7 +196,8 @@ func load_be_byte8_uint64(s []byte) uint64 {
 
 func load_be_byte8_uint64_inv(s []byte) uint64 {
        // arm64:`MOVD\t\(R[0-9]+\)`,`REV`,-`ORR`,-`REVW`,-`REV16W`,-`MOV[BHW]`
-       // amd64:`MOVQ\s\([A-Z]+\),\s[A-Z]+`,`BSWAPQ`,-`MOV[BWL]\t[^$]`,-`OR`
+       // amd64/v1,amd64/v2:`MOVQ\s\([A-Z]+\),\s[A-Z]+`,`BSWAPQ`,-`MOV[BWL]\t[^$]`,-`OR`
+       // amd64/v3: `MOVBEQ`
        // ppc64le:`MOVDBR\t\(R[0-9]+\)`,-`MOV[BHW]Z`
        return uint64(s[7]) | uint64(s[6])<<8 | uint64(s[5])<<16 | uint64(s[4])<<24 | uint64(s[3])<<32 | uint64(s[2])<<40 | uint64(s[1])<<48 | uint64(s[0])<<56
 }
@@ -409,7 +415,8 @@ func store_le16_idx(b []byte, idx int) {
 }
 
 func store_be64(b []byte) {
-       // amd64:`BSWAPQ`,-`SHR.`
+       // amd64/v1,amd64/v2:`BSWAPQ`,-`SHR.`
+       // amd64/v3: `MOVBEQ`
        // arm64:`MOVD`,`REV`,-`MOV[WBH]`,-`REVW`,-`REV16W`
        // ppc64le:`MOVDBR`
        // s390x:`MOVD\s.*\(.*\)$`,-`SRW\s`,-`SRD\s`
@@ -417,7 +424,8 @@ func store_be64(b []byte) {
 }
 
 func store_be64_idx(b []byte, idx int) {
-       // amd64:`BSWAPQ`,-`SHR.`
+       // amd64/v1,amd64/v2:`BSWAPQ`,-`SHR.`
+       // amd64/v3:`MOVBEQ`
        // arm64:`REV`,`MOVD\sR[0-9]+,\s\(R[0-9]+\)\(R[0-9]+\)`,-`MOV[BHW]`,-`REV16W`,-`REVW`
        // ppc64le:`MOVDBR`
        // s390x:`MOVD\s.*\(.*\)\(.*\*1\)$`,-`SRW\s`,-`SRD\s`
@@ -425,7 +433,8 @@ func store_be64_idx(b []byte, idx int) {
 }
 
 func store_be32(b []byte) {
-       // amd64:`BSWAPL`,-`SHR.`
+       // amd64/v1,amd64/v2:`BSWAPL`,-`SHR.`
+       // amd64/v3:`MOVBEL`
        // arm64:`MOVW`,`REVW`,-`MOV[BH]`,-`REV16W`
        // ppc64le:`MOVWBR`
        // s390x:`MOVW\s.*\(.*\)$`,-`SRW\s`,-`SRD\s`
@@ -445,7 +454,8 @@ func store_be32_load(b, x *[8]byte) {
 }
 
 func store_be32_idx(b []byte, idx int) {
-       // amd64:`BSWAPL`,-`SHR.`
+       // amd64/v1,amd64/v2:`BSWAPL`,-`SHR.`
+       // amd64/v3:`MOVBEL`
        // arm64:`REVW`,`MOVW\sR[0-9]+,\s\(R[0-9]+\)\(R[0-9]+\)`,-`MOV[BH]`,-`REV16W`
        // ppc64le:`MOVWBR`
        // s390x:`MOVW\s.*\(.*\)\(.*\*1\)$`,-`SRW\s`,-`SRD\s`
@@ -508,14 +518,16 @@ func store_be_byte_2(b []byte, val uint16) {
 func store_be_byte_4(b []byte, val uint32) {
        _ = b[4]
        // arm64:`REVW`,`MOVW\sR[0-9]+,\s1\(R[0-9]+\)`,-`MOVB`,-`MOVH`,-`REV16W`
-       // amd64:`MOVL\s[A-Z]+,\s1\([A-Z]+\)`,-`MOVB`,-`MOVW`
+       // amd64/v1,amd64/v2:`MOVL\s[A-Z]+,\s1\([A-Z]+\)`,-`MOVB`,-`MOVW`
+       // amd64/v3:`MOVBEL\s[A-Z]+,\s1\([A-Z]+\)`
        b[1], b[2], b[3], b[4] = byte(val>>24), byte(val>>16), byte(val>>8), byte(val)
 }
 
 func store_be_byte_8(b []byte, val uint64) {
        _ = b[8]
        // arm64:`REV`,`MOVD\sR[0-9]+,\s1\(R[0-9]+\)`,-`MOVB`,-`MOVH`,-`MOVW`,-`REV16W`,-`REVW`
-       // amd64:`MOVQ\s[A-Z]+,\s1\([A-Z]+\)`,-`MOVB`,-`MOVW`,-`MOVL`
+       // amd64/v1,amd64/v2:`MOVQ\s[A-Z]+,\s1\([A-Z]+\)`,-`MOVB`,-`MOVW`,-`MOVL`
+       // amd64/v3:`MOVBEQ\s[A-Z]+,\s1\([A-Z]+\)`, -`MOVBEL`
        b[1], b[2], b[3], b[4], b[5], b[6], b[7], b[8] = byte(val>>56), byte(val>>48), byte(val>>40), byte(val>>32), byte(val>>24), byte(val>>16), byte(val>>8), byte(val)
 }