test/codegen: codify bit related code generation for arm64

Also more consistently include commas after constants to increase
accuracy (i.e. "1," cannot inadvertantly match "10")

Change-Id: I480a73859d2e83354b8e9f94bc73c6563976d0e3
Reviewed-on: https://go-review.googlesource.com/c/go/+/733460
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>

diff --git a/test/codegen/bits.go b/test/codegen/bits.go
index da0745d4c0aa5afe85c0e5a3628be5efb9786d21..d9c567b0784695c745ea32a541d8246a8d1c1f92 100644 (file)
--- a/test/codegen/bits.go
+++ b/test/codegen/bits.go
@@ -13,17 +13,20 @@ import "math/bits"
 //
 
 func bitsCheckConstLeftShiftU64(a uint64) (n int) {
-       // amd64:"BTQ [$]63"
+       // amd64:"BTQ [$]63,"
+       // arm64:"TBNZ [$]63,"
        // riscv64:"MOV [$]" "AND" "BNEZ"
        if a&(1<<63) != 0 {
                return 1
        }
-       // amd64:"BTQ [$]60"
+       // amd64:"BTQ [$]60,"
+       // arm64:"TBNZ [$]60,"
        // riscv64:"MOV [$]" "AND" "BNEZ"
        if a&(1<<60) != 0 {
                return 1
        }
-       // amd64:"BTL [$]0"
+       // amd64:"BTL [$]0,"
+       // arm64:"TBZ [$]0,"
        // riscv64:"ANDI" "BEQZ"
        if a&(1<<0) != 0 {
                return 1
@@ -32,37 +35,44 @@ func bitsCheckConstLeftShiftU64(a uint64) (n int) {
 }
 
 func bitsCheckConstRightShiftU64(a [8]uint64) (n int) {
-       // amd64:"BTQ [$]63"
+       // amd64:"BTQ [$]63,"
+       // arm64:"LSR [$]63," "TBNZ [$]0,"
        // riscv64:"SRLI" "ANDI" "BNEZ"
        if (a[0]>>63)&1 != 0 {
                return 1
        }
-       // amd64:"BTQ [$]63"
+       // amd64:"BTQ [$]63,"
+       // arm64:"LSR [$]63," "CBNZ"
        // riscv64:"SRLI" "BNEZ"
        if a[1]>>63 != 0 {
                return 1
        }
-       // amd64:"BTQ [$]63"
+       // amd64:"BTQ [$]63,"
+       // arm64:"LSR [$]63," "CBZ"
        // riscv64:"SRLI" "BEQZ"
        if a[2]>>63 == 0 {
                return 1
        }
-       // amd64:"BTQ [$]60"
+       // amd64:"BTQ [$]60,"
+       // arm64:"LSR [$]60," "TBZ [$]0,"
        // riscv64:"SRLI", "ANDI" "BEQZ"
        if (a[3]>>60)&1 == 0 {
                return 1
        }
-       // amd64:"BTL [$]1"
+       // amd64:"BTL [$]1,"
+       // arm64:"LSR [$]1," "TBZ [$]0,"
        // riscv64:"SRLI" "ANDI" "BEQZ"
        if (a[4]>>1)&1 == 0 {
                return 1
        }
-       // amd64:"BTL [$]0"
+       // amd64:"BTL [$]0,"
+       // arm64:"TBZ [$]0," -"LSR"
        // riscv64:"ANDI" "BEQZ" -"SRLI"
        if (a[5]>>0)&1 == 0 {
                return 1
        }
-       // amd64:"BTL [$]7"
+       // amd64:"BTL [$]7,"
+       // arm64:"LSR [$]5," "TBNZ [$]2,"
        // riscv64:"SRLI" "ANDI" "BNEZ"
        if (a[6]>>5)&4 == 0 {
                return 1
@@ -72,12 +82,14 @@ func bitsCheckConstRightShiftU64(a [8]uint64) (n int) {
 
 func bitsCheckVarU64(a, b uint64) (n int) {
        // amd64:"BTQ"
+       // arm64:"MOVD [$]1," "LSL" "TST"
        // riscv64:"ANDI [$]63," "SLL " "AND "
        if a&(1<<(b&63)) != 0 {
                return 1
        }
-       // amd64:"BTQ" -"BT. [$]0"
-       // riscv64:"ANDI [$]63," "SRL " "ANDI [$]1,"
+       // amd64:"BTQ" -"BT. [$]0,"
+       // arm64:"LSR" "TBZ [$]0,"
+       // riscv64:"ANDI [$]63," "SRL" "ANDI [$]1,"
        if (b>>(a&63))&1 != 0 {
                return 1
        }
@@ -85,17 +97,20 @@ func bitsCheckVarU64(a, b uint64) (n int) {
 }
 
 func bitsCheckMaskU64(a uint64) (n int) {
-       // amd64:"BTQ [$]63"
+       // amd64:"BTQ [$]63,"
+       // arm64:"TBNZ [$]63,"
        // riscv64:"MOV [$]" "AND" "BNEZ"
        if a&0x8000000000000000 != 0 {
                return 1
        }
-       // amd64:"BTQ [$]59"
+       // amd64:"BTQ [$]59,"
+       // arm64:"TBNZ [$]59,"
        // riscv64:"MOV [$]" "AND" "BNEZ"
        if a&0x800000000000000 != 0 {
                return 1
        }
-       // amd64:"BTL [$]0"
+       // amd64:"BTL [$]0,"
+       // arm64:"TBZ [$]0,"
        // riscv64:"ANDI" "BEQZ"
        if a&0x1 != 0 {
                return 1
@@ -105,18 +120,22 @@ func bitsCheckMaskU64(a uint64) (n int) {
 
 func bitsSetU64(a, b uint64) (n uint64) {
        // amd64:"BTSQ"
+       // arm64:"MOVD [$]1," "LSL" "ORR"
        // riscv64:"ANDI" "SLL" "OR"
        n += b | (1 << (a & 63))
 
-       // amd64:"BTSQ [$]63"
+       // amd64:"BTSQ [$]63,"
+       // arm64:"ORR [$]-9223372036854775808,"
        // riscv64:"MOV [$]" "OR "
        n += a | (1 << 63)
 
-       // amd64:"BTSQ [$]60"
+       // amd64:"BTSQ [$]60,"
+       // arm64:"ORR [$]1152921504606846976,"
        // riscv64:"MOV [$]" "OR "
        n += a | (1 << 60)
 
-       // amd64:"ORQ [$]1"
+       // amd64:"ORQ [$]1,"
+       // arm64:"ORR [$]1,"
        // riscv64:"ORI"
        n += a | (1 << 0)
 
@@ -125,18 +144,22 @@ func bitsSetU64(a, b uint64) (n uint64) {
 
 func bitsClearU64(a, b uint64) (n uint64) {
        // amd64:"BTRQ"
+       // arm64:"MOVD [$]1," "LSL" "BIC"
        // riscv64:"ANDI" "SLL" "ANDN"
        n += b &^ (1 << (a & 63))
 
-       // amd64:"BTRQ [$]63"
+       // amd64:"BTRQ [$]63,"
+       // arm64:"AND [$]9223372036854775807,"
        // riscv64:"MOV [$]" "AND "
        n += a &^ (1 << 63)
 
-       // amd64:"BTRQ [$]60"
+       // amd64:"BTRQ [$]60,"
+       // arm64:"AND [$]-1152921504606846977,"
        // riscv64:"MOV [$]" "AND "
        n += a &^ (1 << 60)
 
        // amd64:"ANDQ [$]-2"
+       // arm64:"AND [$]-2"
        // riscv64:"ANDI [$]-2"
        n += a &^ (1 << 0)
 
@@ -144,12 +167,14 @@ func bitsClearU64(a, b uint64) (n uint64) {
 }
 
 func bitsClearLowest(x int64, y int32) (int64, int32) {
-       // amd64:"ANDQ [$]-2"
-       // riscv64:"ANDI [$]-2"
+       // amd64:"ANDQ [$]-2,"
+       // arm64:"AND [$]-2,"
+       // riscv64:"ANDI [$]-2,"
        a := (x >> 1) << 1
 
-       // amd64:"ANDL [$]-2"
-       // riscv64:"ANDI [$]-2"
+       // amd64:"ANDL [$]-2,"
+       // arm64:"AND [$]-2,"
+       // riscv64:"ANDI [$]-2,"
        b := (y >> 1) << 1
 
        return a, b
@@ -157,19 +182,23 @@ func bitsClearLowest(x int64, y int32) (int64, int32) {
 
 func bitsFlipU64(a, b uint64) (n uint64) {
        // amd64:"BTCQ"
+       // arm64:"MOVD [$]1," "LSL" "EOR"
        // riscv64:"ANDI" "SLL" "XOR "
        n += b ^ (1 << (a & 63))
 
-       // amd64:"BTCQ [$]63"
+       // amd64:"BTCQ [$]63,"
+       // arm64:"EOR [$]-9223372036854775808,"
        // riscv64:"MOV [$]" "XOR "
        n += a ^ (1 << 63)
 
-       // amd64:"BTCQ [$]60"
+       // amd64:"BTCQ [$]60,"
+       // arm64:"EOR [$]1152921504606846976,"
        // riscv64:"MOV [$]" "XOR "
        n += a ^ (1 << 60)
 
-       // amd64:"XORQ [$]1"
-       // riscv64:"XORI [$]1"
+       // amd64:"XORQ [$]1,"
+       // arm64:"EOR [$]1,"
+       // riscv64:"XORI [$]1,"
        n += a ^ (1 << 0)
 
        return n
@@ -180,17 +209,20 @@ func bitsFlipU64(a, b uint64) (n uint64) {
 //
 
 func bitsCheckConstShiftLeftU32(a uint32) (n int) {
-       // amd64:"BTL [$]31"
+       // amd64:"BTL [$]31,"
+       // arm64:"TBNZ [$]31,"
        // riscv64:"MOV [$]" "AND" "BNEZ"
        if a&(1<<31) != 0 {
                return 1
        }
-       // amd64:"BTL [$]28"
+       // amd64:"BTL [$]28,"
+       // arm64:"TBNZ [$]28,"
        // riscv64:"ANDI" "BNEZ"
        if a&(1<<28) != 0 {
                return 1
        }
-       // amd64:"BTL [$]0"
+       // amd64:"BTL [$]0,"
+       // arm64:"TBZ [$]0,"
        // riscv64:"ANDI" "BEQZ"
        if a&(1<<0) != 0 {
                return 1
@@ -199,37 +231,44 @@ func bitsCheckConstShiftLeftU32(a uint32) (n int) {
 }
 
 func bitsCheckConstRightShiftU32(a [8]uint32) (n int) {
-       // amd64:"BTL [$]31"
+       // amd64:"BTL [$]31,"
+       // arm64:"UBFX [$]31," "CBNZW"
        // riscv64:"SRLI" "ANDI" "BNEZ"
        if (a[0]>>31)&1 != 0 {
                return 1
        }
-       // amd64:"BTL [$]31"
+       // amd64:"BTL [$]31,"
+       // arm64:"UBFX [$]31," "CBNZW"
        // riscv64:"SRLI" "BNEZ"
        if a[1]>>31 != 0 {
                return 1
        }
-       // amd64:"BTL [$]31"
+       // amd64:"BTL [$]31,"
+       // arm64:"UBFX [$]31," "CBZW"
        // riscv64:"SRLI" "BEQZ"
        if a[2]>>31 == 0 {
                return 1
        }
-       // amd64:"BTL [$]28"
+       // amd64:"BTL [$]28,"
+       // arm64:"UBFX [$]28," "TBZ"
        // riscv64:"SRLI" "ANDI" "BEQZ"
        if (a[3]>>28)&1 == 0 {
                return 1
        }
-       // amd64:"BTL [$]1"
+       // amd64:"BTL [$]1,"
+       // arm64:"UBFX [$]1," "TBZ"
        // riscv64:"SRLI" "ANDI" "BEQZ"
        if (a[4]>>1)&1 == 0 {
                return 1
        }
-       // amd64:"BTL [$]0"
-       // riscv64:"ANDI" "BEQZ" -"SRLI"
+       // amd64:"BTL [$]0,"
+       // arm64:"TBZ" -"UBFX" -"SRL"
+       // riscv64:"ANDI" "BEQZ" -"SRLI "
        if (a[5]>>0)&1 == 0 {
                return 1
        }
-       // amd64:"BTL [$]7"
+       // amd64:"BTL [$]7,"
+       // arm64:"UBFX [$]5," "TBNZ"
        // riscv64:"SRLI" "ANDI" "BNEZ"
        if (a[6]>>5)&4 == 0 {
                return 1
@@ -239,11 +278,13 @@ func bitsCheckConstRightShiftU32(a [8]uint32) (n int) {
 
 func bitsCheckVarU32(a, b uint32) (n int) {
        // amd64:"BTL"
+       // arm64:"AND [$]31," "MOVD [$]1," "LSL" "TSTW"
        // riscv64:"ANDI [$]31," "SLL " "AND "
        if a&(1<<(b&31)) != 0 {
                return 1
        }
        // amd64:"BTL" -"BT. [$]0"
+       // arm64:"AND [$]31," "LSR" "TBZ"
        // riscv64:"ANDI [$]31," "SRLW " "ANDI [$]1,"
        if (b>>(a&31))&1 != 0 {
                return 1
@@ -252,17 +293,20 @@ func bitsCheckVarU32(a, b uint32) (n int) {
 }
 
 func bitsCheckMaskU32(a uint32) (n int) {
-       // amd64:"BTL [$]31"
+       // amd64:"BTL [$]31,"
+       // arm64:"TBNZ [$]31,"
        // riscv64:"MOV [$]" "AND" "BNEZ"
        if a&0x80000000 != 0 {
                return 1
        }
-       // amd64:"BTL [$]27"
+       // amd64:"BTL [$]27,"
+       // arm64:"TBNZ [$]27,"
        // riscv64:"ANDI" "BNEZ"
        if a&0x8000000 != 0 {
                return 1
        }
-       // amd64:"BTL [$]0"
+       // amd64:"BTL [$]0,"
+       // arm64:"TBZ [$]0,"
        // riscv64:"ANDI" "BEQZ"
        if a&0x1 != 0 {
                return 1
@@ -272,19 +316,23 @@ func bitsCheckMaskU32(a uint32) (n int) {
 
 func bitsSetU32(a, b uint32) (n uint32) {
        // amd64:"BTSL"
+       // arm64:"AND [$]31," "MOVD [$]1," "LSL" "ORR"
        // riscv64:"ANDI" "SLL" "OR"
        n += b | (1 << (a & 31))
 
-       // amd64:"ORL [$]-2147483648"
-       // riscv64:"ORI [$]-2147483648"
+       // amd64:"ORL [$]-2147483648,"
+       // arm64:"ORR [$]-2147483648,"
+       // riscv64:"ORI [$]-2147483648,"
        n += a | (1 << 31)
 
-       // amd64:"ORL [$]268435456"
-       // riscv64:"ORI [$]268435456"
+       // amd64:"ORL [$]268435456,"
+       // arm64:"ORR [$]268435456,"
+       // riscv64:"ORI [$]268435456,"
        n += a | (1 << 28)
 
-       // amd64:"ORL [$]1"
-       // riscv64:"ORI [$]1"
+       // amd64:"ORL [$]1,"
+       // arm64:"ORR [$]1,"
+       // riscv64:"ORI [$]1,"
        n += a | (1 << 0)
 
        return n
@@ -292,19 +340,23 @@ func bitsSetU32(a, b uint32) (n uint32) {
 
 func bitsClearU32(a, b uint32) (n uint32) {
        // amd64:"BTRL"
+       // arm64:"AND [$]31," "MOVD [$]1," "LSL" "BIC"
        // riscv64:"ANDI" "SLL" "ANDN"
        n += b &^ (1 << (a & 31))
 
-       // amd64:"ANDL [$]2147483647"
-       // riscv64:"ANDI [$]2147483647"
+       // amd64:"ANDL [$]2147483647,"
+       // arm64:"AND [$]2147483647,"
+       // riscv64:"ANDI [$]2147483647,"
        n += a &^ (1 << 31)
 
-       // amd64:"ANDL [$]-268435457"
-       // riscv64:"ANDI [$]-268435457"
+       // amd64:"ANDL [$]-268435457,"
+       // arm64:"AND [$]-268435457,"
+       // riscv64:"ANDI [$]-268435457,"
        n += a &^ (1 << 28)
 
-       // amd64:"ANDL [$]-2"
-       // riscv64:"ANDI [$]-2"
+       // amd64:"ANDL [$]-2,"
+       // arm64:"AND [$]-2,"
+       // riscv64:"ANDI [$]-2,"
        n += a &^ (1 << 0)
 
        return n
@@ -312,19 +364,23 @@ func bitsClearU32(a, b uint32) (n uint32) {
 
 func bitsFlipU32(a, b uint32) (n uint32) {
        // amd64:"BTCL"
+       // arm64:"AND [$]31," "MOVD [$]1," "LSL" "EOR"
        // riscv64:"ANDI" "SLL" "XOR "
        n += b ^ (1 << (a & 31))
 
-       // amd64:"XORL [$]-2147483648"
-       // riscv64:"XORI [$]-2147483648"
+       // amd64:"XORL [$]-2147483648,"
+       // arm64:"EOR [$]-2147483648,"
+       // riscv64:"XORI [$]-2147483648,"
        n += a ^ (1 << 31)
 
-       // amd64:"XORL [$]268435456"
-       // riscv64:"XORI [$]268435456"
+       // amd64:"XORL [$]268435456,"
+       // arm64:"EOR [$]268435456,"
+       // riscv64:"XORI [$]268435456,"
        n += a ^ (1 << 28)
 
-       // amd64:"XORL [$]1"
-       // riscv64:"XORI [$]1"
+       // amd64:"XORL [$]1,"
+       // arm64:"EOR [$]1,"
+       // riscv64:"XORI [$]1,"
        n += a ^ (1 << 0)
 
        return n
@@ -343,6 +399,7 @@ func bitsOpOnMem(a []uint32, b, c, d uint32) {
 
 func bitsCheckMostNegative(b uint8) bool {
        // amd64:"TESTB"
+       // arm64:"TSTW" "CSET"
        // riscv64:"ANDI [$]128," "SNEZ" -"ADDI"
        return b&0x80 == 0x80
 }