internal/simdgen: adjust type defs for masks and fix errors

Change-Id: I88b970c754450080c5780b7223808072f72dd61f
Reviewed-on: https://go-review.googlesource.com/c/arch/+/679275
LUCI-TryBot-Result: Go LUCI <[email protected]>
Reviewed-by: David Chase <[email protected]>

Author: JunyangShao

internal/simdgen/categories.yaml

@@ -14,18 +14,18 @@
   commutative: "true"
   extension: "AVX.*"
 - go: Sub
-  commutative: "true"
+  commutative: "false"
   extension: "AVX.*"
 - go: SaturatedSub
-  commutative: "true"
+  commutative: "false"
   extension: "AVX.*"
 - go: MaskedSub
   masked: "true"
-  commutative: "true"
+  commutative: "false"
   extension: "AVX.*"
 - go: MaskedSaturatedSub
   masked: "true"
-  commutative: "true"
+  commutative: "false"
   extension: "AVX.*"
 - go: PairwiseAdd
   commutative: "false"

internal/simdgen/gen_simdTypes.go

@@ -47,6 +47,8 @@ type {{$tsrc.Name}} struct {
 {{$tsrc.Fields}}
 }
 
+{{- if ne $tsrc.Type "mask"}}
+
 // Len returns the number of elements in a {{$tsrc.Name}}
 func (x {{$tsrc.Name}}) Len() int { return {{$tsrc.Lanes}} }
 
@@ -60,6 +62,7 @@ func Load{{$tsrc.Name}}(y *[{{$tsrc.Lanes}}]{{$tsrc.Base}}) {{$tsrc.Name}}
 //go:noescape
 func (x {{$tsrc.Name}}) Store(y *[{{$tsrc.Lanes}}]{{$tsrc.Base}})
 
+{{- end}}
 {{- end}}
 {{- end}}
 `

internal/simdgen/gen_simdssa.go

@@ -148,13 +148,13 @@ func writeSIMDSSA(directory string, ops []Operation) error {
 		All         string
 		ZeroingMask string
 	}{
-		strings.Join(Imms, ", "),
-		strings.Join(Regs[0], ", "),
-		strings.Join(Regs[1], ", "),
-		strings.Join(Regs[2], ", "),
-		strings.Join(Regs[3], ", "),
-		strings.Join(All, ", "),
-		strings.Join(ZeroingMask, ", "),
+		strings.Join(Imms, ",\n\t\t"),
+		strings.Join(Regs[0], ",\n\t\t"),
+		strings.Join(Regs[1], ",\n\t\t"),
+		strings.Join(Regs[2], ",\n\t\t"),
+		strings.Join(Regs[3], ",\n\t\t"),
+		strings.Join(All, ",\n\t\t"),
+		strings.Join(ZeroingMask, ",\n\t\t"),
 	}
 
 	file, t, err := openFileAndPrepareTemplate(directory, "src/cmd/compile/internal/amd64/simdssa.go", simdssaTmpl)

internal/simdgen/ops/AddSub/categories.yaml

@@ -14,18 +14,18 @@
   commutative: "true"
   extension: "AVX.*"
 - go: Sub
-  commutative: "true"
+  commutative: "false"
   extension: "AVX.*"
 - go: SaturatedSub
-  commutative: "true"
+  commutative: "false"
   extension: "AVX.*"
 - go: MaskedSub
   masked: "true"
-  commutative: "true"
+  commutative: "false"
   extension: "AVX.*"
 - go: MaskedSaturatedSub
   masked: "true"
-  commutative: "true"
+  commutative: "false"
   extension: "AVX.*"
 - go: PairwiseAdd
   commutative: "false"