test/codegen: simplify asmcheck pattern matching

Separate patterns in asmcheck by spaces instead of commas.
Many patterns end in comma (like "MOV [$]123,") so separating
patterns by comma is not great; they're already quoted, so spaces are fine.

Also replace all tabs in the assembly lines with spaces before matching.
Finally, replace \$ or \\$ with [$] as the matching idiom.
The effect of all these is to make the patterns look like:

  	   // amd64:"BSFQ" "ORQ [$]256"

instead of the old:

  	   // amd64:"BSFQ","ORQ\t\\$256"

Update all tests as well.

Change-Id: Ia39febe5d7f67ba115846422789e11b185d5c807
Reviewed-on: https://go-review.googlesource.com/c/go/+/716060
LUCI-TryBot-Result: Go LUCI <[email protected]>
Reviewed-by: Alan Donovan <[email protected]>
Reviewed-by: Jorropo <[email protected]>

Author: rsc

src/cmd/internal/testdir/testdir_test.go

@@ -1488,7 +1488,7 @@ var (
 	//	"\s*,\s*` matches " , "
 	//	second reMatchCheck matches "`SUB`"
 	//	")*)" closes started groups; "*" means that there might be other elements in the comma-separated list
-	rxAsmPlatform = regexp.MustCompile(`(\w+)(/[\w.]+)?(/\w*)?\s*:\s*(` + reMatchCheck + `(?:\s*,\s*` + reMatchCheck + `)*)`)
+	rxAsmPlatform = regexp.MustCompile(`(\w+)(/[\w.]+)?(/\w*)?\s*:\s*(` + reMatchCheck + `(?:\s+` + reMatchCheck + `)*)`)
 
 	// Regexp to extract a single opcoded check
 	rxAsmCheck = regexp.MustCompile(reMatchCheck)
@@ -1701,6 +1701,9 @@ func (t test) asmCheck(outStr string, fn string, env buildEnv, fullops map[strin
 		}
 		srcFileLine, asm := matches[1], matches[2]
 
+		// Replace tabs with single spaces to make matches easier to write.
+		asm = strings.ReplaceAll(asm, "\t", " ")
+
 		// Associate the original file/line information to the current
 		// function in the output; it will be useful to dump it in case
 		// of error.
@@ -1752,11 +1755,11 @@ func (t test) asmCheck(outStr string, fn string, env buildEnv, fullops map[strin
 		}
 
 		if o.negative {
-			fmt.Fprintf(&errbuf, "%s:%d: %s: wrong opcode found: %q\n", t.goFileName(), o.line, env, o.opcode.String())
+			fmt.Fprintf(&errbuf, "%s:%d: %s: wrong opcode found: %#q\n", t.goFileName(), o.line, env, o.opcode.String())
 		} else if o.expected > 0 {
-			fmt.Fprintf(&errbuf, "%s:%d: %s: wrong number of opcodes: %q\n", t.goFileName(), o.line, env, o.opcode.String())
+			fmt.Fprintf(&errbuf, "%s:%d: %s: wrong number of opcodes: %#q\n", t.goFileName(), o.line, env, o.opcode.String())
 		} else {
-			fmt.Fprintf(&errbuf, "%s:%d: %s: opcode not found: %q\n", t.goFileName(), o.line, env, o.opcode.String())
+			fmt.Fprintf(&errbuf, "%s:%d: %s: opcode not found: %#q\n", t.goFileName(), o.line, env, o.opcode.String())
 		}
 	}
 	return errors.New(errbuf.String())

test/codegen/addrcalc.go

@@ -9,6 +9,6 @@ package codegen
 // Make sure we use ADDQ instead of LEAQ when we can.
 
 func f(p *[4][2]int, x int) *int {
-	// amd64:"ADDQ",-"LEAQ"
+	// amd64:"ADDQ" -"LEAQ"
 	return &p[x][0]
 }

test/codegen/alloc.go

@@ -10,28 +10,28 @@
 package codegen
 
 func zeroAllocNew1() *struct{} {
-	// 386:-`CALL\truntime\.newobject`, `LEAL\truntime.zerobase`
-	// amd64:-`CALL\truntime\.newobject`, `LEAQ\truntime.zerobase`
-	// arm:-`CALL\truntime\.newobject`, `MOVW\t[$]runtime.zerobase`
-	// arm64:-`CALL\truntime\.newobject`, `MOVD\t[$]runtime.zerobase`
-	// riscv64:-`CALL\truntime\.newobject`, `MOV\t[$]runtime.zerobase`
+	// 386:-`CALL runtime\.newobject`, `LEAL runtime.zerobase`
+	// amd64:-`CALL runtime\.newobject`, `LEAQ runtime.zerobase`
+	// arm:-`CALL runtime\.newobject`, `MOVW [$]runtime.zerobase`
+	// arm64:-`CALL runtime\.newobject`, `MOVD [$]runtime.zerobase`
+	// riscv64:-`CALL runtime\.newobject`, `MOV [$]runtime.zerobase`
 	return new(struct{})
 }
 
 func zeroAllocNew2() *[0]int {
-	// 386:-`CALL\truntime\.newobject`, `LEAL\truntime.zerobase`
-	// amd64:-`CALL\truntime\.newobject`, `LEAQ\truntime.zerobase`
-	// arm:-`CALL\truntime\.newobject`, `MOVW\t[$]runtime.zerobase`
-	// arm64:-`CALL\truntime\.newobject`, `MOVD\t[$]runtime.zerobase`
-	// riscv64:-`CALL\truntime\.newobject`, `MOV\t[$]runtime.zerobase`
+	// 386:-`CALL runtime\.newobject`, `LEAL runtime.zerobase`
+	// amd64:-`CALL runtime\.newobject`, `LEAQ runtime.zerobase`
+	// arm:-`CALL runtime\.newobject`, `MOVW [$]runtime.zerobase`
+	// arm64:-`CALL runtime\.newobject`, `MOVD [$]runtime.zerobase`
+	// riscv64:-`CALL runtime\.newobject`, `MOV [$]runtime.zerobase`
 	return new([0]int)
 }
 
 func zeroAllocSliceLit() []int {
-	// 386:-`CALL\truntime\.newobject`, `LEAL\truntime.zerobase`
-	// amd64:-`CALL\truntime\.newobject`, `LEAQ\truntime.zerobase`
-	// arm:-`CALL\truntime\.newobject`, `MOVW\t[$]runtime.zerobase`
-	// arm64:-`CALL\truntime\.newobject`, `MOVD\t[$]runtime.zerobase`
-	// riscv64:-`CALL\truntime\.newobject`, `MOV\t[$]runtime.zerobase`
+	// 386:-`CALL runtime\.newobject`, `LEAL runtime.zerobase`
+	// amd64:-`CALL runtime\.newobject`, `LEAQ runtime.zerobase`
+	// arm:-`CALL runtime\.newobject`, `MOVW [$]runtime.zerobase`
+	// arm64:-`CALL runtime\.newobject`, `MOVD [$]runtime.zerobase`
+	// riscv64:-`CALL runtime\.newobject`, `MOV [$]runtime.zerobase`
 	return []int{}
 }