[committed] arm: Rename some tests to avoid duplicate tests names

Message ID 20250915105855.2545992-1-rearnsha@arm.com
State New
Headers
Series [committed] arm: Rename some tests to avoid duplicate tests names |

Commit Message

Richard Earnshaw Sept. 15, 2025, 10:58 a.m. UTC
  A number of arm-specific tests print the same name.  This can cause problems
if one of those tests fails, since then comparing tests with GCC's
compare_tests script can result in ambiguities in the changes summary.

Avoid this by giving tests unique names.

Still to do is where a test is run more than once (eg by having multiple
'#as: ' lines).  This will require a tweak to the framework.
---
 gas/testsuite/gas/arm/arch6zk.d                             | 2 +-
 gas/testsuite/gas/arm/archv6t2-1-pe.d                       | 2 +-
 gas/testsuite/gas/arm/armv8-2-fp16-scalar-bad-ext.d         | 2 +-
 gas/testsuite/gas/arm/armv8-2-fp16-scalar-ext.d             | 2 +-
 gas/testsuite/gas/arm/armv8-2-fp16-scalar-thumb-ext.d       | 2 +-
 gas/testsuite/gas/arm/armv8-2-fp16-simd-ext.d               | 2 +-
 gas/testsuite/gas/arm/armv8-2-fp16-simd-thumb-ext.d         | 2 +-
 gas/testsuite/gas/arm/armv8-2-fp16-simd-warning-ext.d       | 2 +-
 gas/testsuite/gas/arm/armv8-2-fp16-simd-warning-thumb-ext.d | 2 +-
 gas/testsuite/gas/arm/armv8-a-it-bad.d                      | 2 +-
 gas/testsuite/gas/arm/armv8-r-it-bad.d                      | 2 +-
 gas/testsuite/gas/arm/armv8_2+rdma-ext.d                    | 2 +-
 gas/testsuite/gas/arm/attr-march-armv6s-m.d                 | 2 +-
 gas/testsuite/gas/arm/attr-march-armv9_1-a.d                | 2 +-
 gas/testsuite/gas/arm/attr-march-armv9_2-a.d                | 2 +-
 gas/testsuite/gas/arm/attr-march-armv9_3-a.d                | 2 +-
 gas/testsuite/gas/arm/cde-mve-or-neon.d                     | 2 +-
 gas/testsuite/gas/arm/cpu-arm_any.d                         | 2 +-
 gas/testsuite/gas/arm/mve-vabav.d                           | 2 +-
 gas/testsuite/gas/arm/mve-vmlsldav.d                        | 2 +-
 gas/testsuite/gas/arm/mve-vorn.d                            | 2 +-
 gas/testsuite/gas/arm/mve-vqdmulh.d                         | 2 +-
 gas/testsuite/gas/arm/mve-vrshl.d                           | 2 +-
 gas/testsuite/gas/arm/mve-vshrn.d                           | 2 +-
 gas/testsuite/gas/arm/sb-thumb1-pe.d                        | 2 +-
 gas/testsuite/gas/arm/sb-thumb2-pe.d                        | 2 +-
 gas/testsuite/gas/arm/thumb2_it_auto.d                      | 2 +-
 gas/testsuite/gas/arm/thumb2_it_bad_auto.d                  | 2 +-
 gas/testsuite/gas/arm/thumb2_vpool_be.d                     | 2 +-
 29 files changed, 29 insertions(+), 29 deletions(-)
  

Comments

Hans-Peter Nilsson Sept. 15, 2025, 11:08 p.m. UTC | #1
On Mon, 15 Sep 2025, Richard Earnshaw wrote:
> A number of arm-specific tests print the same name.  This can cause problems
> if one of those tests fails, since then comparing tests with GCC's
> compare_tests script can result in ambiguities in the changes summary.
> 
> Avoid this by giving tests unique names.

Another way to solve that, is to not use the "#name:" clause at 
all, so that the name defaults to the .d filename.  They're 
pretty unique, and as a bonus it's easier to find the test 
whenever it's failing.

I know, it's a matter of taste, so: "just saying". ;)

brgds, H-P
  
Richard Earnshaw (foss) Sept. 16, 2025, 1:42 p.m. UTC | #2
On 16/09/2025 00:08, Hans-Peter Nilsson wrote:
> On Mon, 15 Sep 2025, Richard Earnshaw wrote:
>> A number of arm-specific tests print the same name.  This can cause problems
>> if one of those tests fails, since then comparing tests with GCC's
>> compare_tests script can result in ambiguities in the changes summary.
>>
>> Avoid this by giving tests unique names.
> 
> Another way to solve that, is to not use the "#name:" clause at 
> all, so that the name defaults to the .d filename.  They're 
> pretty unique, and as a bonus it's easier to find the test 
> whenever it's failing.
> 
> I know, it's a matter of taste, so: "just saying". ;)
> 
> brgds, H-P

That might be better for new tests, but I was trying to avoid any unnecessary churn in the results.  It's relatively easy to look at, say:

Changes to non-unique test names:
-      2 PASS: arm-qemu/-mthumb: gas: ARM V6 instructions

New tests that PASS (60 tests):

arm-qemu/-mthumb: gas: ARM V6zk instructions

Old tests that passed, that have disappeared (60 tests): (Eeek!)

arm-qemu/-mthumb: gas: ARM V6 instructions


and see that this is a simple test rename.  It's much harder if the new test name is 

New tests that PASS (60 tests):

arm-qemu/-mthumb: arm/arch6zk.d

especially if there are many tests changing at once.

R.
  

Patch

diff --git a/gas/testsuite/gas/arm/arch6zk.d b/gas/testsuite/gas/arm/arch6zk.d
index f9ae025295f..282f13749ad 100644
--- a/gas/testsuite/gas/arm/arch6zk.d
+++ b/gas/testsuite/gas/arm/arch6zk.d
@@ -1,4 +1,4 @@ 
-#name: ARM V6 instructions
+#name: ARM V6zk instructions
 #as: -march=armv6zk
 #objdump: -dr --prefix-addresses --show-raw-insn
 
diff --git a/gas/testsuite/gas/arm/archv6t2-1-pe.d b/gas/testsuite/gas/arm/archv6t2-1-pe.d
index 5f98e61c8de..5d37f1a49ee 100644
--- a/gas/testsuite/gas/arm/archv6t2-1-pe.d
+++ b/gas/testsuite/gas/arm/archv6t2-1-pe.d
@@ -1,4 +1,4 @@ 
-# name: ARMv6T2 THUMB mode
+# name: ARMv6T2 THUMB mode (pe)
 # as: -march=armv6t2 -mthumb
 # source: archv6t2-1.s
 # objdump: -dr --prefix-addresses --show-raw-insn -M force-thumb
diff --git a/gas/testsuite/gas/arm/armv8-2-fp16-scalar-bad-ext.d b/gas/testsuite/gas/arm/armv8-2-fp16-scalar-bad-ext.d
index d9049445144..d59cc0a2e64 100644
--- a/gas/testsuite/gas/arm/armv8-2-fp16-scalar-bad-ext.d
+++ b/gas/testsuite/gas/arm/armv8-2-fp16-scalar-bad-ext.d
@@ -1,4 +1,4 @@ 
-#name: Invalid armv8.2-a scalar fp16
+#name: Invalid armv8.2-a scalar fp16 (ext)
 #source: armv8-2-fp16-scalar-bad.s
 #as: -march=armv8.2-a+fp16 -mwarn-restrict-it
 #error_output: armv8-2-fp16-scalar-bad.l
diff --git a/gas/testsuite/gas/arm/armv8-2-fp16-scalar-ext.d b/gas/testsuite/gas/arm/armv8-2-fp16-scalar-ext.d
index 7934fdb0544..df506eb61e4 100644
--- a/gas/testsuite/gas/arm/armv8-2-fp16-scalar-ext.d
+++ b/gas/testsuite/gas/arm/armv8-2-fp16-scalar-ext.d
@@ -1,4 +1,4 @@ 
-#name: ARM v8.2 FP16 support on scalar
+#name: ARM v8.2 FP16 support on scalar (ext)
 #source: armv8-2-fp16-scalar.s
 #objdump: -d
 #as: -march=armv8.2-a+fp16
diff --git a/gas/testsuite/gas/arm/armv8-2-fp16-scalar-thumb-ext.d b/gas/testsuite/gas/arm/armv8-2-fp16-scalar-thumb-ext.d
index cfe40d37f3e..665dc4cbfbd 100644
--- a/gas/testsuite/gas/arm/armv8-2-fp16-scalar-thumb-ext.d
+++ b/gas/testsuite/gas/arm/armv8-2-fp16-scalar-thumb-ext.d
@@ -1,4 +1,4 @@ 
-#name: ARM v8.2 FP16 support on scalar (Thumb)
+#name: ARM v8.2 FP16 support on scalar (ext, Thumb)
 #source: armv8-2-fp16-scalar.s
 #objdump: -d
 #as: -march=armv8.2-a+fp16 -mthumb
diff --git a/gas/testsuite/gas/arm/armv8-2-fp16-simd-ext.d b/gas/testsuite/gas/arm/armv8-2-fp16-simd-ext.d
index d551234beaa..4bdc4f02fb4 100644
--- a/gas/testsuite/gas/arm/armv8-2-fp16-simd-ext.d
+++ b/gas/testsuite/gas/arm/armv8-2-fp16-simd-ext.d
@@ -1,4 +1,4 @@ 
-#name: ARM v8.2 FP16 support on SIMD
+#name: ARM v8.2 FP16 support on SIMD (ext)
 #source: armv8-2-fp16-simd.s
 #objdump: -d
 #as: -march=armv8.2-a+fp16
diff --git a/gas/testsuite/gas/arm/armv8-2-fp16-simd-thumb-ext.d b/gas/testsuite/gas/arm/armv8-2-fp16-simd-thumb-ext.d
index 5385fe3b67a..dd566afa31e 100644
--- a/gas/testsuite/gas/arm/armv8-2-fp16-simd-thumb-ext.d
+++ b/gas/testsuite/gas/arm/armv8-2-fp16-simd-thumb-ext.d
@@ -1,4 +1,4 @@ 
-#name: ARM v8.2 FP16 support on SIMD (Thumb)
+#name: ARM v8.2 FP16 support on SIMD (ext, Thumb)
 #source: armv8-2-fp16-simd.s
 #objdump: -d
 #as: -march=armv8.2-a+fp16 -mthumb
diff --git a/gas/testsuite/gas/arm/armv8-2-fp16-simd-warning-ext.d b/gas/testsuite/gas/arm/armv8-2-fp16-simd-warning-ext.d
index abaeb43619b..08ac679253a 100644
--- a/gas/testsuite/gas/arm/armv8-2-fp16-simd-warning-ext.d
+++ b/gas/testsuite/gas/arm/armv8-2-fp16-simd-warning-ext.d
@@ -1,4 +1,4 @@ 
-#name: Reject ARM v8.2 FP16 SIMD instruction for early arch
+#name: Reject ARM v8.2 FP16 SIMD instruction for early arch (ext)
 #source: armv8-2-fp16-simd.s
 #as: -march=armv8.2-a+simd
 #error_output: armv8-2-fp16-simd-warning.l
diff --git a/gas/testsuite/gas/arm/armv8-2-fp16-simd-warning-thumb-ext.d b/gas/testsuite/gas/arm/armv8-2-fp16-simd-warning-thumb-ext.d
index 8f92525704d..23e3e56b14f 100644
--- a/gas/testsuite/gas/arm/armv8-2-fp16-simd-warning-thumb-ext.d
+++ b/gas/testsuite/gas/arm/armv8-2-fp16-simd-warning-thumb-ext.d
@@ -1,4 +1,4 @@ 
-#name: Reject ARM v8.2 FP16 SIMD instruction for early arch (Thumb)
+#name: Reject ARM v8.2 FP16 SIMD instruction for early arch (ext, Thumb)
 #source: armv8-2-fp16-simd.s
 #as: -march=armv8.2-a+simd -mthumb
 #error_output: armv8-2-fp16-simd-warning.l
diff --git a/gas/testsuite/gas/arm/armv8-a-it-bad.d b/gas/testsuite/gas/arm/armv8-a-it-bad.d
index 02788e0dcd2..af7cdce1a0d 100644
--- a/gas/testsuite/gas/arm/armv8-a-it-bad.d
+++ b/gas/testsuite/gas/arm/armv8-a-it-bad.d
@@ -1,4 +1,4 @@ 
-#name: Deprecated IT blocks (ARM v8)
+#name: Deprecated IT blocks (ARM v8-a)
 #source: armv8-ar-it-bad.s
 #error_output: armv8-ar-it-bad.l
 #as: -march=armv8-a -mimplicit-it=always -mwarn-restrict-it
diff --git a/gas/testsuite/gas/arm/armv8-r-it-bad.d b/gas/testsuite/gas/arm/armv8-r-it-bad.d
index c6f0c5bcae8..a4b16f8c2a9 100644
--- a/gas/testsuite/gas/arm/armv8-r-it-bad.d
+++ b/gas/testsuite/gas/arm/armv8-r-it-bad.d
@@ -1,4 +1,4 @@ 
-#name: Deprecated IT blocks (ARM v8)
+#name: Deprecated IT blocks (ARM v8-r)
 #source: armv8-ar-it-bad.s
 #error_output: armv8-ar-it-bad.l
 #as: -march=armv8-r -mimplicit-it=always -mwarn-restrict-it
diff --git a/gas/testsuite/gas/arm/armv8_2+rdma-ext.d b/gas/testsuite/gas/arm/armv8_2+rdma-ext.d
index 159a5302444..5da79710809 100644
--- a/gas/testsuite/gas/arm/armv8_2+rdma-ext.d
+++ b/gas/testsuite/gas/arm/armv8_2+rdma-ext.d
@@ -1,4 +1,4 @@ 
-#name: Valid ARMv8.2-A with ARMv8.1-A NEON instructions.
+#name: Valid ARMv8.2-A with ARMv8.1-A NEON instructions (ext).
 #as: -march=armv8.2-a+simd
 #objdump: -dr
 #skip: *-*-pe *-*-wince
diff --git a/gas/testsuite/gas/arm/attr-march-armv6s-m.d b/gas/testsuite/gas/arm/attr-march-armv6s-m.d
index 204a184fb1a..b030e3ba9cf 100644
--- a/gas/testsuite/gas/arm/attr-march-armv6s-m.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6s-m.d
@@ -1,4 +1,4 @@ 
-# name: attributes for -march=armv6-m
+# name: attributes for -march=armv6s-m
 # source: blank.s
 # as: -march=armv6-m
 # readelf: -A
diff --git a/gas/testsuite/gas/arm/attr-march-armv9_1-a.d b/gas/testsuite/gas/arm/attr-march-armv9_1-a.d
index cea559d205d..cc3c36b17bb 100644
--- a/gas/testsuite/gas/arm/attr-march-armv9_1-a.d
+++ b/gas/testsuite/gas/arm/attr-march-armv9_1-a.d
@@ -1,4 +1,4 @@ 
-# name: check for armv9-a command line option settings
+# name: check for armv9.1-a command line option settings
 # source: blank.s
 # as: -march=armv9.1-a
 # readelf: -A
diff --git a/gas/testsuite/gas/arm/attr-march-armv9_2-a.d b/gas/testsuite/gas/arm/attr-march-armv9_2-a.d
index 2048c4db51b..f06fcbe62ce 100644
--- a/gas/testsuite/gas/arm/attr-march-armv9_2-a.d
+++ b/gas/testsuite/gas/arm/attr-march-armv9_2-a.d
@@ -1,4 +1,4 @@ 
-# name: check for armv9-a command line option settings
+# name: check for armv9.2-a command line option settings
 # source: blank.s
 # as: -march=armv9.2-a
 # readelf: -A
diff --git a/gas/testsuite/gas/arm/attr-march-armv9_3-a.d b/gas/testsuite/gas/arm/attr-march-armv9_3-a.d
index 1360a237784..486d2ad44e2 100644
--- a/gas/testsuite/gas/arm/attr-march-armv9_3-a.d
+++ b/gas/testsuite/gas/arm/attr-march-armv9_3-a.d
@@ -1,4 +1,4 @@ 
-# name: check for armv9-a command line option settings
+# name: check for armv9.3-a command line option settings
 # source: blank.s
 # as: -march=armv9.3-a
 # readelf: -A
diff --git a/gas/testsuite/gas/arm/cde-mve-or-neon.d b/gas/testsuite/gas/arm/cde-mve-or-neon.d
index 7d0a1b8d3d5..4c6fabfffe2 100644
--- a/gas/testsuite/gas/arm/cde-mve-or-neon.d
+++ b/gas/testsuite/gas/arm/cde-mve-or-neon.d
@@ -1,4 +1,4 @@ 
-#name: Custom Datapath Extension (CDE)
+#name: Custom Datapath Extension (CDE) - MVE/Neon
 #source: cde-mve-or-neon.s
 #as: -mno-warn-deprecated -march=armv8-m.main+cdecp0+cdecp7+fp -I$srcdir/$subdir
 #as: -mno-warn-deprecated -march=armv8-m.main+cdecp0+cdecp1+cdecp2+cdecp3+cdecp4+cdecp5+cdecp6+cdecp7+fp -I$srcdir/$subdir
diff --git a/gas/testsuite/gas/arm/cpu-arm_any.d b/gas/testsuite/gas/arm/cpu-arm_any.d
index 8dd3d2e17d5..97f46d6f199 100644
--- a/gas/testsuite/gas/arm/cpu-arm_any.d
+++ b/gas/testsuite/gas/arm/cpu-arm_any.d
@@ -1,4 +1,4 @@ 
-# name: Assemble and dump for arm2 CPU
+# name: Assemble and dump for arm any CPU
 # source: nop-asm.s
 # as: -mcpu=all
 # objdump: -d -marm_any
diff --git a/gas/testsuite/gas/arm/mve-vabav.d b/gas/testsuite/gas/arm/mve-vabav.d
index 086240b899e..e9a15500e94 100644
--- a/gas/testsuite/gas/arm/mve-vabav.d
+++ b/gas/testsuite/gas/arm/mve-vabav.d
@@ -1,4 +1,4 @@ 
-# name: MVE vabs and vneg instructions
+# name: MVE vabav instructions
 # as: -march=armv8.1-m.main+mve.fp
 # objdump: -dr --prefix-addresses --show-raw-insn -marmv8.1-m.main
 
diff --git a/gas/testsuite/gas/arm/mve-vmlsldav.d b/gas/testsuite/gas/arm/mve-vmlsldav.d
index 7a17a1cd402..9cb265b82d7 100644
--- a/gas/testsuite/gas/arm/mve-vmlsldav.d
+++ b/gas/testsuite/gas/arm/mve-vmlsldav.d
@@ -1,4 +1,4 @@ 
-# name: MVE vmlsdav instructions
+# name: MVE vmlsldav instructions
 # as: -march=armv8.1-m.main+mve.fp
 # objdump: -dr --prefix-addresses --show-raw-insn -marmv8.1-m.main
 
diff --git a/gas/testsuite/gas/arm/mve-vorn.d b/gas/testsuite/gas/arm/mve-vorn.d
index 083de03812f..00caf13d167 100644
--- a/gas/testsuite/gas/arm/mve-vorn.d
+++ b/gas/testsuite/gas/arm/mve-vorn.d
@@ -1,4 +1,4 @@ 
-# name: MVE vorr instructions
+# name: MVE vorn instructions
 # as: -march=armv8.1-m.main+mve
 # objdump: -dr --prefix-addresses --show-raw-insn -marmv8.1-m.main
 
diff --git a/gas/testsuite/gas/arm/mve-vqdmulh.d b/gas/testsuite/gas/arm/mve-vqdmulh.d
index dbe2c33beea..60625889a01 100644
--- a/gas/testsuite/gas/arm/mve-vqdmulh.d
+++ b/gas/testsuite/gas/arm/mve-vqdmulh.d
@@ -1,4 +1,4 @@ 
-# name: MVE vqdmlash and vqrdmlash instructions
+# name: MVE vqdmulh instructions
 # as: -march=armv8.1-m.main+mve.fp
 # objdump: -dr --prefix-addresses --show-raw-insn -marmv8.1-m.main
 
diff --git a/gas/testsuite/gas/arm/mve-vrshl.d b/gas/testsuite/gas/arm/mve-vrshl.d
index 472e2ce2906..e75152c51e3 100644
--- a/gas/testsuite/gas/arm/mve-vrshl.d
+++ b/gas/testsuite/gas/arm/mve-vrshl.d
@@ -1,4 +1,4 @@ 
-# name: MVE vrmlaldavh(a)(x), vrmlalvh(a), vrmlsldavh(a)(x) instructions
+# name: MVE vrshl instructions
 # as: -march=armv8.1-m.main+mve.fp
 # objdump: -dr --prefix-addresses --show-raw-insn -marmv8.1-m.main
 
diff --git a/gas/testsuite/gas/arm/mve-vshrn.d b/gas/testsuite/gas/arm/mve-vshrn.d
index 2aeb5a7e42b..b532bb12976 100644
--- a/gas/testsuite/gas/arm/mve-vshrn.d
+++ b/gas/testsuite/gas/arm/mve-vshrn.d
@@ -1,4 +1,4 @@ 
-# name: MVE vshr and vrshr instructions
+# name: MVE vshrn and vrshrn instructions
 # as: -march=armv8.1-m.main+mve.fp
 # objdump: -dr --prefix-addresses --show-raw-insn -marmv8.1-m.main
 
diff --git a/gas/testsuite/gas/arm/sb-thumb1-pe.d b/gas/testsuite/gas/arm/sb-thumb1-pe.d
index 850c93fd0de..9bc61257f1c 100644
--- a/gas/testsuite/gas/arm/sb-thumb1-pe.d
+++ b/gas/testsuite/gas/arm/sb-thumb1-pe.d
@@ -1,5 +1,5 @@ 
 #objdump: -dr --prefix-addresses --show-raw-insn -M force-thumb
-#name: SB instruction (Thumb)
+#name: SB instruction (pe, Thumb)
 #source: sb.s
 #as: -march=armv8.5-a -mthumb
 
diff --git a/gas/testsuite/gas/arm/sb-thumb2-pe.d b/gas/testsuite/gas/arm/sb-thumb2-pe.d
index 681d985dfbf..addd88f5e49 100644
--- a/gas/testsuite/gas/arm/sb-thumb2-pe.d
+++ b/gas/testsuite/gas/arm/sb-thumb2-pe.d
@@ -1,5 +1,5 @@ 
 #objdump: -dr --prefix-addresses --show-raw-insn -M force-thumb
-#name: SB instruction (Thumb) with +sb
+#name: SB instruction (Thumb) with +sb (pe)
 #source: sb.s
 #as: -march=armv8-a+sb -mthumb
 
diff --git a/gas/testsuite/gas/arm/thumb2_it_auto.d b/gas/testsuite/gas/arm/thumb2_it_auto.d
index fa480f89fa9..5b519aa353c 100644
--- a/gas/testsuite/gas/arm/thumb2_it_auto.d
+++ b/gas/testsuite/gas/arm/thumb2_it_auto.d
@@ -1,4 +1,4 @@ 
-# name: Mixed 16 and 32-bit Thumb conditional instructions
+# name: Mixed 16 and 32-bit Thumb conditional instructions (auto)
 # as: -march=armv6kt2 -mimplicit-it=always
 # source: thumb2_it.s
 # objdump: -dr --prefix-addresses --show-raw-insn
diff --git a/gas/testsuite/gas/arm/thumb2_it_bad_auto.d b/gas/testsuite/gas/arm/thumb2_it_bad_auto.d
index 0b43a624fda..1cdfc099953 100644
--- a/gas/testsuite/gas/arm/thumb2_it_bad_auto.d
+++ b/gas/testsuite/gas/arm/thumb2_it_bad_auto.d
@@ -1,4 +1,4 @@ 
-#name: Invalid IT instructions
+#name: Invalid IT instructions (auto)
 #as: -mimplicit-it=always
 #source: thumb2_it_bad.s
 #error_output: thumb2_it_bad.l
diff --git a/gas/testsuite/gas/arm/thumb2_vpool_be.d b/gas/testsuite/gas/arm/thumb2_vpool_be.d
index df6ce2f3931..370a6a070bf 100644
--- a/gas/testsuite/gas/arm/thumb2_vpool_be.d
+++ b/gas/testsuite/gas/arm/thumb2_vpool_be.d
@@ -2,7 +2,7 @@ 
 # objdump: -dr --prefix-addresses --show-raw-insn
 # This test is only valid on ELF based ports.
 #notarget: *-*-pe *-*-wince
-#name: Thumb2 vldr with immediate constant
+#name: Thumb2 vldr with immediate constant (BE)
 #source: thumb2_vpool.s
 
 .*: +file format .*arm.*