cmd/compile: use correct types in phiopt

We try to preserve type correctness of generic ops.
phiopt modified a bool to be an int without a conversion.
Add a conversion. There are a few random fluctations in the
generated code as a result, but nothing noteworthy or systematic.

no binary size changes

file                        before   after    Δ       %       
math.s                      35966    35961    -5      -0.014% 
debug/dwarf.s               108141   108147   +6      +0.006% 
crypto/dsa.s                6047     6044     -3      -0.050% 
image/png.s                 42882    42885    +3      +0.007% 
go/parser.s                 80281    80278    -3      -0.004% 
cmd/internal/obj.s          115116   115113   -3      -0.003% 
go/types.s                  322130   322118   -12     -0.004% 
cmd/internal/obj/arm64.s    151679   151685   +6      +0.004% 
go/internal/gccgoimporter.s 56487    56493    +6      +0.011% 
cmd/test2json.s             1650     1647     -3      -0.182% 
cmd/link/internal/loadelf.s 35442    35443    +1      +0.003% 
cmd/go/internal/work.s      305039   305035   -4      -0.001% 
cmd/link/internal/ld.s      544835   544834   -1      -0.000% 
net/http.s                  558777   558774   -3      -0.001% 
cmd/compile/internal/ssa.s  3926551  3926994  +443    +0.011% 
cmd/compile/internal/gc.s   1552320  1552321  +1      +0.000% 
total                       18862241 18862670 +429    +0.002% 


Change-Id: I4289e773be6be534ea3f907d68f614441b8f9b46
Reviewed-on: https://go-review.googlesource.com/c/go/+/221607
Run-TryBot: Josh Bleecher Snyder <josharian@gmail.com>
Reviewed-by: Keith Randall <khr@golang.org>

src/cmd/compile/internal/ssa/gen/386.rules

@@ -92,6 +92,8 @@
 (Round32F ...) -> (Copy ...)
 (Round64F ...) -> (Copy ...)
 
+(CvtBoolToUint8 ...) -> (Copy ...)
+
 // Lowering shifts
 // Unsigned shifts need to return 0 if shift amount is >= width of shifted value.
 //   result = (arg << shift) & (shift >= argbits ? 0 : 0xffffffffffffffff)

src/cmd/compile/internal/ssa/gen/AMD64.rules

@@ -154,6 +154,8 @@
 
 (Round(32|64)F ...) -> (Copy ...)
 
+(CvtBoolToUint8 ...) -> (Copy ...)
+
 // Lowering shifts
 // Unsigned shifts need to return 0 if shift amount is >= width of shifted value.
 //   result = (arg << shift) & (shift >= argbits ? 0 : 0xffffffffffffffff)

src/cmd/compile/internal/ssa/gen/ARM.rules

@@ -207,6 +207,8 @@
 
 (Round(32|64)F ...) -> (Copy ...)
 
+(CvtBoolToUint8 ...) -> (Copy ...)
+
 // fused-multiply-add
 (FMA x y z) -> (FMULAD z x y)
 

src/cmd/compile/internal/ssa/gen/ARM64.rules

@@ -244,6 +244,8 @@
 (Cvt32Fto64F ...) -> (FCVTSD ...)
 (Cvt64Fto32F ...) -> (FCVTDS ...)
 
+(CvtBoolToUint8 ...) -> (Copy ...)
+
 (Round32F ...) -> (LoweredRound32F ...)
 (Round64F ...) -> (LoweredRound64F ...)
 

src/cmd/compile/internal/ssa/gen/MIPS.rules

@@ -170,6 +170,8 @@
 (Cvt32Fto64F ...) -> (MOVFD ...)
 (Cvt64Fto32F ...) -> (MOVDF ...)
 
+(CvtBoolToUint8 ...) -> (Copy ...)
+
 (Round(32|64)F ...) -> (Copy ...)
 
 // comparisons

src/cmd/compile/internal/ssa/gen/MIPS64.rules

@@ -171,6 +171,8 @@
 (Cvt32Fto64F ...) -> (MOVFD ...)
 (Cvt64Fto32F ...) -> (MOVDF ...)
 
+(CvtBoolToUint8 ...) -> (Copy ...)
+
 (Round(32|64)F ...) -> (Copy ...)
 
 // comparisons

src/cmd/compile/internal/ssa/gen/PPC64.rules

@@ -59,6 +59,8 @@
 (Cvt32Fto64F ...) -> (Copy ...) // Note v will have the wrong type for patterns dependent on Float32/Float64
 (Cvt64Fto32F ...) -> (FRSP ...)
 
+(CvtBoolToUint8 ...) -> (Copy ...)
+
 (Round(32|64)F ...) -> (LoweredRound(32|64)F ...)
 
 (Sqrt ...) -> (FSQRT ...)

src/cmd/compile/internal/ssa/gen/RISCV64.rules

@@ -131,6 +131,8 @@
 (Cvt32Fto64F ...) -> (FCVTDS ...)
 (Cvt64Fto32F ...) -> (FCVTSD ...)
 
+(CvtBoolToUint8 ...) -> (Copy ...)
+
 (Round32F ...) -> (Copy ...)
 (Round64F ...) -> (Copy ...)
 

src/cmd/compile/internal/ssa/gen/S390X.rules

@@ -230,6 +230,8 @@
 (Cvt32Fto64F ...) -> (LDEBR ...)
 (Cvt64Fto32F ...) -> (LEDBR ...)
 
+(CvtBoolToUint8 ...) -> (Copy ...)
+
 (Round(32|64)F ...) -> (LoweredRound(32|64)F ...)
 
 // Lowering shifts

src/cmd/compile/internal/ssa/gen/Wasm.rules

@@ -91,6 +91,8 @@
 (Cvt32Fto64F ...) -> (F64PromoteF32 ...)
 (Cvt64Fto32F ...) -> (F32DemoteF64 ...)
 
+(CvtBoolToUint8 ...) -> (Copy ...)
+
 (Round32F ...) -> (Copy ...)
 (Round64F ...) -> (Copy ...)
 

src/cmd/compile/internal/ssa/gen/genericOps.go

@@ -418,6 +418,7 @@ var genericOps = []opData{
 	{name: "Cvt64Fto64", argLength: 1},
 	{name: "Cvt32Fto64F", argLength: 1},
 	{name: "Cvt64Fto32F", argLength: 1},
+	{name: "CvtBoolToUint8", argLength: 1},
 
 	// Force rounding to precision of type.
 	{name: "Round32F", argLength: 1},

src/cmd/compile/internal/ssa/opGen.go

@@ -2584,6 +2584,7 @@ const (
 	OpCvt64Fto64
 	OpCvt32Fto64F
 	OpCvt64Fto32F
+	OpCvtBoolToUint8
 	OpRound32F
 	OpRound64F
 	OpIsNonNil
@@ -32561,6 +32562,11 @@ var opcodeTable = [...]opInfo{
 		argLen:  1,
 		generic: true,
 	},
+	{
+		name:    "CvtBoolToUint8",
+		argLen:  1,
+		generic: true,
+	},
 	{
 		name:    "Round32F",
 		argLen:  1,

src/cmd/compile/internal/ssa/phiopt.go

@@ -148,6 +148,13 @@ func phioptint(v *Value, b0 *Block, reverse int) {
 		negate = !negate
 	}
 
+	a := b0.Controls[0]
+	if negate {
+		a = v.Block.NewValue1(v.Pos, OpNot, a.Type, a)
+	}
+	v.AddArg(a)
+
+	cvt := v.Block.NewValue1(v.Pos, OpCvtBoolToUint8, a.Type, a)
 	switch v.Type.Size() {
 	case 1:
 		v.reset(OpCopy)
@@ -160,12 +167,7 @@ func phioptint(v *Value, b0 *Block, reverse int) {
 	default:
 		v.Fatalf("bad int size %d", v.Type.Size())
 	}
-
-	a := b0.Controls[0]
-	if negate {
-		a = v.Block.NewValue1(v.Pos, OpNot, a.Type, a)
-	}
-	v.AddArg(a)
+	v.AddArg(cvt)
 
 	f := b0.Func
 	if f.pass.debug > 0 {

src/cmd/compile/internal/ssa/rewrite386.go

@@ -408,6 +408,9 @@ func rewriteValue386(v *Value) bool {
 	case OpCvt64Fto32F:
 		v.Op = Op386CVTSD2SS
 		return true
+	case OpCvtBoolToUint8:
+		v.Op = OpCopy
+		return true
 	case OpDiv16:
 		v.Op = Op386DIVW
 		return true

src/cmd/compile/internal/ssa/rewriteAMD64.go

@@ -780,6 +780,9 @@ func rewriteValueAMD64(v *Value) bool {
 	case OpCvt64to64F:
 		v.Op = OpAMD64CVTSQ2SD
 		return true
+	case OpCvtBoolToUint8:
+		v.Op = OpCopy
+		return true
 	case OpDiv128u:
 		v.Op = OpAMD64DIVQU2
 		return true

src/cmd/compile/internal/ssa/rewriteARM.go

@@ -545,6 +545,9 @@ func rewriteValueARM(v *Value) bool {
 	case OpCvt64Fto32U:
 		v.Op = OpARMMOVDWU
 		return true
+	case OpCvtBoolToUint8:
+		v.Op = OpCopy
+		return true
 	case OpDiv16:
 		return rewriteValueARM_OpDiv16(v)
 	case OpDiv16u:

src/cmd/compile/internal/ssa/rewriteARM64.go

@@ -604,6 +604,9 @@ func rewriteValueARM64(v *Value) bool {
 	case OpCvt64to64F:
 		v.Op = OpARM64SCVTFD
 		return true
+	case OpCvtBoolToUint8:
+		v.Op = OpCopy
+		return true
 	case OpDiv16:
 		return rewriteValueARM64_OpDiv16(v)
 	case OpDiv16u:

src/cmd/compile/internal/ssa/rewriteMIPS.go

@@ -129,6 +129,9 @@ func rewriteValueMIPS(v *Value) bool {
 	case OpCvt64Fto32F:
 		v.Op = OpMIPSMOVDF
 		return true
+	case OpCvtBoolToUint8:
+		v.Op = OpCopy
+		return true
 	case OpDiv16:
 		return rewriteValueMIPS_OpDiv16(v)
 	case OpDiv16u:

src/cmd/compile/internal/ssa/rewriteMIPS64.go

@@ -154,6 +154,9 @@ func rewriteValueMIPS64(v *Value) bool {
 	case OpCvt64to64F:
 		v.Op = OpMIPS64MOVVD
 		return true
+	case OpCvtBoolToUint8:
+		v.Op = OpCopy
+		return true
 	case OpDiv16:
 		return rewriteValueMIPS64_OpDiv16(v)
 	case OpDiv16u:

src/cmd/compile/internal/ssa/rewritePPC64.go

@@ -179,6 +179,9 @@ func rewriteValuePPC64(v *Value) bool {
 		return rewriteValuePPC64_OpCvt64to32F(v)
 	case OpCvt64to64F:
 		return rewriteValuePPC64_OpCvt64to64F(v)
+	case OpCvtBoolToUint8:
+		v.Op = OpCopy
+		return true
 	case OpDiv16:
 		return rewriteValuePPC64_OpDiv16(v)
 	case OpDiv16u:

src/cmd/compile/internal/ssa/rewriteRISCV64.go

@@ -114,6 +114,9 @@ func rewriteValueRISCV64(v *Value) bool {
 	case OpCvt64to64F:
 		v.Op = OpRISCV64FCVTDL
 		return true
+	case OpCvtBoolToUint8:
+		v.Op = OpCopy
+		return true
 	case OpDiv16:
 		return rewriteValueRISCV64_OpDiv16(v)
 	case OpDiv16u:

src/cmd/compile/internal/ssa/rewriteS390X.go

@@ -183,6 +183,9 @@ func rewriteValueS390X(v *Value) bool {
 	case OpCvt64to64F:
 		v.Op = OpS390XCDGBRA
 		return true
+	case OpCvtBoolToUint8:
+		v.Op = OpCopy
+		return true
 	case OpDiv16:
 		return rewriteValueS390X_OpDiv16(v)
 	case OpDiv16u:

src/cmd/compile/internal/ssa/rewriteWasm.go

@@ -169,6 +169,9 @@ func rewriteValueWasm(v *Value) bool {
 	case OpCvt64to64F:
 		v.Op = OpWasmF64ConvertI64S
 		return true
+	case OpCvtBoolToUint8:
+		v.Op = OpCopy
+		return true
 	case OpDiv16:
 		return rewriteValueWasm_OpDiv16(v)
 	case OpDiv16u: