simd/archsimd: fix "go generate" command

Correct the generate command for test helpers. There is no longer
a genfiles.go. Also correct the generated file headers to match
the current generator layout.

Change-Id: Ifb9a8c394477359020ff44290dbaabe7a2d59aca
Reviewed-on: https://go-review.googlesource.com/c/go/+/732280
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: David Chase <drchase@google.com>
Auto-Submit: David Chase <drchase@google.com>

24 files changed, 26 insertions, 27 deletions

diff --git a/src/cmd/compile/internal/amd64/simdssa.go b/src/cmd/compile/internal/amd64/simdssa.go
index 8ef6e5c7f4..c4d0fd69c6 100644
--- a/src/cmd/compile/internal/amd64/simdssa.go
+++ b/src/cmd/compile/internal/amd64/simdssa.go
@@ -1,4 +1,4 @@
-// Code generated by x/arch/internal/simdgen using 'go run . -xedPath $XED_PATH -o godefs -goroot $GOROOT go.yaml types.yaml categories.yaml'; DO NOT EDIT.
+// Code generated by 'simdgen -o godefs -goroot $GOROOT -xedPath $XED_PATH go.yaml types.yaml categories.yaml'; DO NOT EDIT.
 
 package amd64
 
diff --git a/src/cmd/compile/internal/ssa/_gen/simdAMD64.rules b/src/cmd/compile/internal/ssa/_gen/simdAMD64.rules
index dd8f9f91b3..a7a6a3f7a1 100644
--- a/src/cmd/compile/internal/ssa/_gen/simdAMD64.rules
+++ b/src/cmd/compile/internal/ssa/_gen/simdAMD64.rules
@@ -1,4 +1,4 @@
-// Code generated by x/arch/internal/simdgen using 'go run . -xedPath $XED_PATH -o godefs -goroot $GOROOT go.yaml types.yaml categories.yaml'; DO NOT EDIT.
+// Code generated by 'simdgen -o godefs -goroot $GOROOT -xedPath $XED_PATH go.yaml types.yaml categories.yaml'; DO NOT EDIT.
 
 (AESDecryptLastRoundUint8x16 ...) => (VAESDECLAST128 ...)
 (AESDecryptLastRoundUint8x32 ...) => (VAESDECLAST256 ...)
diff --git a/src/cmd/compile/internal/ssa/_gen/simdAMD64ops.go b/src/cmd/compile/internal/ssa/_gen/simdAMD64ops.go
index c81e6b7869..648e372fb4 100644
--- a/src/cmd/compile/internal/ssa/_gen/simdAMD64ops.go
+++ b/src/cmd/compile/internal/ssa/_gen/simdAMD64ops.go
@@ -1,4 +1,4 @@
-// Code generated by x/arch/internal/simdgen using 'go run . -xedPath $XED_PATH -o godefs -goroot $GOROOT go.yaml types.yaml categories.yaml'; DO NOT EDIT.
+// Code generated by 'simdgen -o godefs -goroot $GOROOT -xedPath $XED_PATH go.yaml types.yaml categories.yaml'; DO NOT EDIT.
 
 package main
 
diff --git a/src/cmd/compile/internal/ssa/_gen/simdgenericOps.go b/src/cmd/compile/internal/ssa/_gen/simdgenericOps.go
index 0ae127a60d..fd43f3d61f 100644
--- a/src/cmd/compile/internal/ssa/_gen/simdgenericOps.go
+++ b/src/cmd/compile/internal/ssa/_gen/simdgenericOps.go
@@ -1,4 +1,4 @@
-// Code generated by x/arch/internal/simdgen using 'go run . -xedPath $XED_PATH -o godefs -goroot $GOROOT go.yaml types.yaml categories.yaml'; DO NOT EDIT.
+// Code generated by 'simdgen -o godefs -goroot $GOROOT -xedPath $XED_PATH go.yaml types.yaml categories.yaml'; DO NOT EDIT.
 
 package main
 
diff --git a/src/cmd/compile/internal/ssa/tern_helpers.go b/src/cmd/compile/internal/ssa/tern_helpers.go
index 3ffc980c33..923a9f505e 100644
--- a/src/cmd/compile/internal/ssa/tern_helpers.go
+++ b/src/cmd/compile/internal/ssa/tern_helpers.go
@@ -1,4 +1,4 @@
-// Code generated by 'go run genfiles.go'; DO NOT EDIT.
+// Code generated by 'tmplgen'; DO NOT EDIT.
 
 package ssa
 
diff --git a/src/cmd/compile/internal/ssagen/simdintrinsics.go b/src/cmd/compile/internal/ssagen/simdintrinsics.go
index 59598f0052..8b9fe3afdc 100644
--- a/src/cmd/compile/internal/ssagen/simdintrinsics.go
+++ b/src/cmd/compile/internal/ssagen/simdintrinsics.go
@@ -1,4 +1,4 @@
-// Code generated by x/arch/internal/simdgen using 'go run . -xedPath $XED_PATH -o godefs -goroot $GOROOT go.yaml types.yaml categories.yaml'; DO NOT EDIT.
+// Code generated by 'simdgen -o godefs -goroot $GOROOT -xedPath $XED_PATH go.yaml types.yaml categories.yaml'; DO NOT EDIT.
 
 package ssagen
 
diff --git a/src/simd/archsimd/_gen/simdgen/gen_simdssa.go b/src/simd/archsimd/_gen/simdgen/gen_simdssa.go
index c9d8693aa1..876ffabe3d 100644
--- a/src/simd/archsimd/_gen/simdgen/gen_simdssa.go
+++ b/src/simd/archsimd/_gen/simdgen/gen_simdssa.go
@@ -13,9 +13,7 @@ import (
 )
 
 var (
-	ssaTemplates = template.Must(template.New("simdSSA").Parse(`
-{{define "header"}}// Code generated by x/arch/internal/simdgen using 'go run . -xedPath $XED_PATH -o godefs -goroot $GOROOT go.yaml types.yaml categories.yaml'; DO NOT EDIT.
-
+	ssaTemplates = template.Must(template.New("simdSSA").Parse(`{{define "header"}}` + generatedHeader + `
 package amd64
 
 import (
diff --git a/src/simd/archsimd/_gen/simdgen/godefs.go b/src/simd/archsimd/_gen/simdgen/godefs.go
index 71cae158f7..e956c1cd1d 100644
--- a/src/simd/archsimd/_gen/simdgen/godefs.go
+++ b/src/simd/archsimd/_gen/simdgen/godefs.go
@@ -375,7 +375,7 @@ func compareNatural(s1, s2 string) int {
 	return strings.Compare(s1, s2)
 }
 
-const generatedHeader = `// Code generated by x/arch/internal/simdgen using 'go run . -xedPath $XED_PATH -o godefs -goroot $GOROOT go.yaml types.yaml categories.yaml'; DO NOT EDIT.
+const generatedHeader = `// Code generated by 'simdgen -o godefs -goroot $GOROOT -xedPath $XED_PATH go.yaml types.yaml categories.yaml'; DO NOT EDIT.
 `
 
 func writeGoDefs(path string, cl unify.Closure) error {
diff --git a/src/simd/archsimd/_gen/tmplgen/main.go b/src/simd/archsimd/_gen/tmplgen/main.go
index 46bd3cf8fc..52ac10af1d 100644
--- a/src/simd/archsimd/_gen/tmplgen/main.go
+++ b/src/simd/archsimd/_gen/tmplgen/main.go
@@ -1018,7 +1018,7 @@ func nonTemplateRewrites(filename string, prologue func(s string, out io.Writer)
 
 	out := new(bytes.Buffer)
 
-	prologue("go run genfiles.go", out)
+	prologue("tmplgen", out)
 	for _, rewrite := range rewrites {
 		rewrite(out)
 	}
@@ -1054,7 +1054,7 @@ func one(filename string, prologue func(s string, out io.Writer), sats ...shapeA
 
 	out := new(bytes.Buffer)
 
-	prologue("go run genfiles.go", out)
+	prologue("tmplgen", out)
 	for _, sat := range sats {
 		sat.forTemplates(out)
 	}
diff --git a/src/simd/archsimd/compare_gen_amd64.go b/src/simd/archsimd/compare_gen_amd64.go
index a8636f0b33..13b1e03dc9 100644
--- a/src/simd/archsimd/compare_gen_amd64.go
+++ b/src/simd/archsimd/compare_gen_amd64.go
@@ -1,4 +1,4 @@
-// Code generated by 'go run genfiles.go'; DO NOT EDIT.
+// Code generated by 'tmplgen'; DO NOT EDIT.
 
 //go:build goexperiment.simd
 
diff --git a/src/simd/archsimd/cpu.go b/src/simd/archsimd/cpu.go
index bb0ebbc16a..d0c0ff5426 100644
--- a/src/simd/archsimd/cpu.go
+++ b/src/simd/archsimd/cpu.go
@@ -1,4 +1,4 @@
-// Code generated by x/arch/internal/simdgen using 'go run . -xedPath $XED_PATH -o godefs -goroot $GOROOT go.yaml types.yaml categories.yaml'; DO NOT EDIT.
+// Code generated by 'simdgen -o godefs -goroot $GOROOT -xedPath $XED_PATH go.yaml types.yaml categories.yaml'; DO NOT EDIT.
 
 //go:build goexperiment.simd
 
diff --git a/src/simd/archsimd/internal/simd_test/binary_helpers_test.go b/src/simd/archsimd/internal/simd_test/binary_helpers_test.go
index a834398a53..c725f657f3 100644
--- a/src/simd/archsimd/internal/simd_test/binary_helpers_test.go
+++ b/src/simd/archsimd/internal/simd_test/binary_helpers_test.go
@@ -1,4 +1,4 @@
-// Code generated by 'go run genfiles.go'; DO NOT EDIT.
+// Code generated by 'tmplgen'; DO NOT EDIT.
 
 //go:build goexperiment.simd && amd64
 
diff --git a/src/simd/archsimd/internal/simd_test/compare_helpers_test.go b/src/simd/archsimd/internal/simd_test/compare_helpers_test.go
index a191605b0b..c520aa7f17 100644
--- a/src/simd/archsimd/internal/simd_test/compare_helpers_test.go
+++ b/src/simd/archsimd/internal/simd_test/compare_helpers_test.go
@@ -1,4 +1,4 @@
-// Code generated by 'go run genfiles.go'; DO NOT EDIT.
+// Code generated by 'tmplgen'; DO NOT EDIT.
 
 //go:build goexperiment.simd && amd64
 
diff --git a/src/simd/archsimd/internal/simd_test/comparemasked_helpers_test.go b/src/simd/archsimd/internal/simd_test/comparemasked_helpers_test.go
index 24790e5d26..c7197568ed 100644
--- a/src/simd/archsimd/internal/simd_test/comparemasked_helpers_test.go
+++ b/src/simd/archsimd/internal/simd_test/comparemasked_helpers_test.go
@@ -1,4 +1,4 @@
-// Code generated by 'go run genfiles.go'; DO NOT EDIT.
+// Code generated by 'tmplgen'; DO NOT EDIT.
 
 //go:build goexperiment.simd && amd64
 
diff --git a/src/simd/archsimd/internal/simd_test/generate.go b/src/simd/archsimd/internal/simd_test/generate.go
index e744a5299f..4bc24fea2d 100644
--- a/src/simd/archsimd/internal/simd_test/generate.go
+++ b/src/simd/archsimd/internal/simd_test/generate.go
@@ -7,5 +7,6 @@
 package simd
 
 // Invoke code generators.
+// The test helpers are generated by tmplgen from the archsimd package.
 
-//go:generate go run -C ../.. genfiles.go
+//go:generate go -C ../.. generate
diff --git a/src/simd/archsimd/internal/simd_test/ternary_helpers_test.go b/src/simd/archsimd/internal/simd_test/ternary_helpers_test.go
index f31e7a32a0..2e25010890 100644
--- a/src/simd/archsimd/internal/simd_test/ternary_helpers_test.go
+++ b/src/simd/archsimd/internal/simd_test/ternary_helpers_test.go
@@ -1,4 +1,4 @@
-// Code generated by 'go run genfiles.go'; DO NOT EDIT.
+// Code generated by 'tmplgen'; DO NOT EDIT.
 
 //go:build goexperiment.simd && amd64
 
diff --git a/src/simd/archsimd/internal/simd_test/unary_helpers_test.go b/src/simd/archsimd/internal/simd_test/unary_helpers_test.go
index 64e538bda6..1601e32486 100644
--- a/src/simd/archsimd/internal/simd_test/unary_helpers_test.go
+++ b/src/simd/archsimd/internal/simd_test/unary_helpers_test.go
@@ -1,4 +1,4 @@
-// Code generated by 'go run genfiles.go'; DO NOT EDIT.
+// Code generated by 'tmplgen'; DO NOT EDIT.
 
 //go:build goexperiment.simd && amd64
 
diff --git a/src/simd/archsimd/maskmerge_gen_amd64.go b/src/simd/archsimd/maskmerge_gen_amd64.go
index 5e9ea394b3..2469a477c7 100644
--- a/src/simd/archsimd/maskmerge_gen_amd64.go
+++ b/src/simd/archsimd/maskmerge_gen_amd64.go
@@ -1,4 +1,4 @@
-// Code generated by 'go run genfiles.go'; DO NOT EDIT.
+// Code generated by 'tmplgen'; DO NOT EDIT.
 
 //go:build goexperiment.simd
 
diff --git a/src/simd/archsimd/ops_amd64.go b/src/simd/archsimd/ops_amd64.go
index e421f31891..20ae3b1cc2 100644
--- a/src/simd/archsimd/ops_amd64.go
+++ b/src/simd/archsimd/ops_amd64.go
@@ -1,4 +1,4 @@
-// Code generated by x/arch/internal/simdgen using 'go run . -xedPath $XED_PATH -o godefs -goroot $GOROOT go.yaml types.yaml categories.yaml'; DO NOT EDIT.
+// Code generated by 'simdgen -o godefs -goroot $GOROOT -xedPath $XED_PATH go.yaml types.yaml categories.yaml'; DO NOT EDIT.
 
 //go:build goexperiment.simd
 
diff --git a/src/simd/archsimd/ops_internal_amd64.go b/src/simd/archsimd/ops_internal_amd64.go
index 566b88d510..b8127b302e 100644
--- a/src/simd/archsimd/ops_internal_amd64.go
+++ b/src/simd/archsimd/ops_internal_amd64.go
@@ -1,4 +1,4 @@
-// Code generated by x/arch/internal/simdgen using 'go run . -xedPath $XED_PATH -o godefs -goroot $GOROOT go.yaml types.yaml categories.yaml'; DO NOT EDIT.
+// Code generated by 'simdgen -o godefs -goroot $GOROOT -xedPath $XED_PATH go.yaml types.yaml categories.yaml'; DO NOT EDIT.
 
 //go:build goexperiment.simd
 
diff --git a/src/simd/archsimd/other_gen_amd64.go b/src/simd/archsimd/other_gen_amd64.go
index 8d04409197..5c85b1842a 100644
--- a/src/simd/archsimd/other_gen_amd64.go
+++ b/src/simd/archsimd/other_gen_amd64.go
@@ -1,4 +1,4 @@
-// Code generated by 'go run genfiles.go'; DO NOT EDIT.
+// Code generated by 'tmplgen'; DO NOT EDIT.
 
 //go:build goexperiment.simd
 
diff --git a/src/simd/archsimd/slice_gen_amd64.go b/src/simd/archsimd/slice_gen_amd64.go
index c03e28206d..9cf72502db 100644
--- a/src/simd/archsimd/slice_gen_amd64.go
+++ b/src/simd/archsimd/slice_gen_amd64.go
@@ -1,4 +1,4 @@
-// Code generated by 'go run genfiles.go'; DO NOT EDIT.
+// Code generated by 'tmplgen'; DO NOT EDIT.
 
 //go:build goexperiment.simd
 
diff --git a/src/simd/archsimd/types_amd64.go b/src/simd/archsimd/types_amd64.go
index 556383b380..e309bb42ef 100644
--- a/src/simd/archsimd/types_amd64.go
+++ b/src/simd/archsimd/types_amd64.go
@@ -1,4 +1,4 @@
-// Code generated by x/arch/internal/simdgen using 'go run . -xedPath $XED_PATH -o godefs -goroot $GOROOT go.yaml types.yaml categories.yaml'; DO NOT EDIT.
+// Code generated by 'simdgen -o godefs -goroot $GOROOT -xedPath $XED_PATH go.yaml types.yaml categories.yaml'; DO NOT EDIT.
 
 //go:build goexperiment.simd
 
diff --git a/src/simd/archsimd/unsafe_helpers.go b/src/simd/archsimd/unsafe_helpers.go
index 0123ad77c5..7b98053e70 100644
--- a/src/simd/archsimd/unsafe_helpers.go
+++ b/src/simd/archsimd/unsafe_helpers.go
@@ -1,4 +1,4 @@
-// Code generated by 'go run genfiles.go'; DO NOT EDIT.
+// Code generated by 'tmplgen'; DO NOT EDIT.
 
 //go:build goexperiment.simd