Generalize codegen tests to not hardcode G_MIR opcodes

nhaehnle · nhaehnle · commit d3e72e4913c2 · 2025-10-08T14:49:52.000-07:00
diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/legalizer-info-validation.mir b/llvm/test/CodeGen/AArch64/GlobalISel/legalizer-info-validation.mir
@@ -70,12 +70,12 @@
 # DEBUG-NEXT: .. the first uncovered type index: 1, OK
 # DEBUG-NEXT: .. the first uncovered imm index: 0, OK
 #
-# DEBUG-NEXT: G_ABDS (opcode 65): 1 type index, 0 imm indices
+# DEBUG-NEXT: G_ABDS (opcode [[G_ABDS:[0-9]+]]): 1 type index, 0 imm indices
 # DEBUG-NEXT: .. type index coverage check SKIPPED: user-defined predicate detected
 # DEBUG-NEXT: .. imm index coverage check SKIPPED: user-defined predicate detected
 #
-# DEBUG-NEXT: G_ABDU (opcode 66): 1 type index, 0 imm indices
-# DEBUG-NEXT: .. opcode {{[0-9]+}} is aliased to {{[0-9]+}}
+# DEBUG-NEXT: G_ABDU (opcode [[G_ABDU:[0-9]+]]): 1 type index, 0 imm indices
+# DEBUG-NEXT: .. opcode [[G_ABDU]] is aliased to [[G_ABDS]]
 # DEBUG-NEXT: .. type index coverage check SKIPPED: user-defined predicate detected
 # DEBUG-NEXT: .. imm index coverage check SKIPPED: user-defined predicate detected
 #
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer-info-validation.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer-info-validation.mir
@@ -72,12 +72,12 @@
 # DEBUG-NEXT: .. type index coverage check SKIPPED: user-defined predicate detected
 # DEBUG-NEXT: .. imm index coverage check SKIPPED: user-defined predicate detected
 #
-# DEBUG-NEXT: G_ABDS (opcode 65): 1 type index, 0 imm indices
+# DEBUG-NEXT: G_ABDS (opcode [[G_ABDS:[0-9]+]]): 1 type index, 0 imm indices
 # DEBUG-NEXT:.. type index coverage check SKIPPED: user-defined predicate detected
 # DEBUG-NEXT:.. imm index coverage check SKIPPED: user-defined predicate detected
 #
-# DEBUG-NEXT:G_ABDU (opcode 66): 1 type index, 0 imm indices
-# DEBUG-NEXT:.. opcode 66 is aliased to 65
+# DEBUG-NEXT:G_ABDU (opcode [[G_ABDU:[0-9]+]]): 1 type index, 0 imm indices
+# DEBUG-NEXT:.. opcode [[G_ABDU]] is aliased to [[G_ABDS]]
 # DEBUG-NEXT:.. type index coverage check SKIPPED: user-defined predicate detected
 # DEBUG-NEXT:.. imm index coverage check SKIPPED: user-defined predicate detected
 #

Original file line number	Diff line number	Diff line change
`@@ -70,12 +70,12 @@`
`70`	`70`	`# DEBUG-NEXT: .. the first uncovered type index: 1, OK`
`71`	`71`	`# DEBUG-NEXT: .. the first uncovered imm index: 0, OK`
`72`	`72`	`#`
`73`		`-# DEBUG-NEXT: G_ABDS (opcode 65): 1 type index, 0 imm indices`
	`73`	`+# DEBUG-NEXT: G_ABDS (opcode [[G_ABDS:[0-9]+]]): 1 type index, 0 imm indices`
`74`	`74`	`# DEBUG-NEXT: .. type index coverage check SKIPPED: user-defined predicate detected`
`75`	`75`	`# DEBUG-NEXT: .. imm index coverage check SKIPPED: user-defined predicate detected`
`76`	`76`	`#`
`77`		`-# DEBUG-NEXT: G_ABDU (opcode 66): 1 type index, 0 imm indices`
`78`		`-# DEBUG-NEXT: .. opcode {{[0-9]+}} is aliased to {{[0-9]+}}`
	`77`	`+# DEBUG-NEXT: G_ABDU (opcode [[G_ABDU:[0-9]+]]): 1 type index, 0 imm indices`
	`78`	`+# DEBUG-NEXT: .. opcode [[G_ABDU]] is aliased to [[G_ABDS]]`
`79`	`79`	`# DEBUG-NEXT: .. type index coverage check SKIPPED: user-defined predicate detected`
`80`	`80`	`# DEBUG-NEXT: .. imm index coverage check SKIPPED: user-defined predicate detected`
`81`	`81`	`#`
Original file line number	Diff line number	Diff line change
`@@ -72,12 +72,12 @@`
`72`	`72`	`# DEBUG-NEXT: .. type index coverage check SKIPPED: user-defined predicate detected`
`73`	`73`	`# DEBUG-NEXT: .. imm index coverage check SKIPPED: user-defined predicate detected`
`74`	`74`	`#`
`75`		`-# DEBUG-NEXT: G_ABDS (opcode 65): 1 type index, 0 imm indices`
	`75`	`+# DEBUG-NEXT: G_ABDS (opcode [[G_ABDS:[0-9]+]]): 1 type index, 0 imm indices`
`76`	`76`	`# DEBUG-NEXT:.. type index coverage check SKIPPED: user-defined predicate detected`
`77`	`77`	`# DEBUG-NEXT:.. imm index coverage check SKIPPED: user-defined predicate detected`
`78`	`78`	`#`
`79`		`-# DEBUG-NEXT:G_ABDU (opcode 66): 1 type index, 0 imm indices`
`80`		`-# DEBUG-NEXT:.. opcode 66 is aliased to 65`
	`79`	`+# DEBUG-NEXT:G_ABDU (opcode [[G_ABDU:[0-9]+]]): 1 type index, 0 imm indices`
	`80`	`+# DEBUG-NEXT:.. opcode [[G_ABDU]] is aliased to [[G_ABDS]]`
`81`	`81`	`# DEBUG-NEXT:.. type index coverage check SKIPPED: user-defined predicate detected`
`82`	`82`	`# DEBUG-NEXT:.. imm index coverage check SKIPPED: user-defined predicate detected`
`83`	`83`	`#`