arm: Rename some tests to avoid duplicate tests names

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.

diff --git a/gas/testsuite/gas/arm/arch6zk.d b/gas/testsuite/gas/arm/arch6zk.d
index f9ae025295f562a1987dc5abf71134d7a137f036..282f13749aded3fdc2ea005c98fe09e1e6a0974a 100644 (file)
--- 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 5f98e61c8dee9abc9e1322daad2d82dd17477c02..5d37f1a49eed92940d05e5212d1565775ddd8c91 100644 (file)
--- 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 d9049445144ba2367da84cff68b2c31bb9ad5e3b..d59cc0a2e642dac8e4222b672cbb4204697d577e 100644 (file)
--- 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 7934fdb0544b0958dd67beae46161191d1e0ec47..df506eb61e46d2ad23c99f14ef9046a60c559b08 100644 (file)
--- 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 cfe40d37f3e144c65eb927bcd2135bcd3d7aecf1..665dc4cbfbded12c5bb72088da98cddb3c76f1d0 100644 (file)
--- 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 d551234beaa2467ab33cb5e99a811f11e37629a1..4bdc4f02fb4eeda7a114a6d0e75ecee6bddb077a 100644 (file)
--- 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 5385fe3b67ac3f26919357fd403cf432ddad9c28..dd566afa31e0131790b26f80cf0eed3ac4eb2e8f 100644 (file)
--- 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 abaeb43619b7e4eeb7a1c937dbfc856a85e603d6..08ac679253ad5ff3252fb4c5d7dac2ad537957f5 100644 (file)
--- 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 8f92525704d2bc5a3fbea2a03a274e54b25fccb7..23e3e56b14f4c2be9dcf48c466f4f5ac97dd561e 100644 (file)
--- 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 02788e0dcd2fe310dab06f0e1f2a8f66aaca7acb..af7cdce1a0d564e5814ecf70b32d96e8baf62026 100644 (file)
--- 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 c6f0c5bcae84edc7cb22773a38a10c95c093a9b6..a4b16f8c2a9327ad59a60d20f92558974bec14b5 100644 (file)
--- 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 159a5302444a7be477a5649bd4d7f61b9f74923b..5da79710809975ec87310047dc7e3d9bd6de95f8 100644 (file)
--- 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 204a184fb1a51a69c675f99ec3f1697c7b8f01dc..b030e3ba9cfe98478d650008755aaea869ea5b5f 100644 (file)
--- 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 cea559d205dd02af34c605d1ba791a0d624af9d7..cc3c36b17bb23673694f0120abe04a88b82a5e7e 100644 (file)
--- 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 2048c4db51b5150c53906487b220cf13115e9d32..f06fcbe62ce47340996e7f3e392dd1fac9c33903 100644 (file)
--- 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 1360a2377844a931e684afcbbe1a92e36652c4e1..486d2ad44e2296ec2e3104ace9d6b8fbbde1ef8a 100644 (file)
--- 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 7d0a1b8d3d51f60cbb82b2854c6d2d17eeb5be28..4c6fabfffe2e7e91073ce60bf1dcf5e600584430 100644 (file)
--- 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 8dd3d2e17d57e9bbad132553e41c2587c831eb23..97f46d6f199506188e328ef594f2854d92ac6cfe 100644 (file)
--- 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 086240b899e0f8d867a9a63e3cd2f74837b19f0c..e9a15500e9490c1f808620005effc4db37cf53c9 100644 (file)
--- 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 7a17a1cd402fe074480585557ee8153adc2f7f7d..9cb265b82d7cdf0f2827e89bfb8c945319c1703a 100644 (file)
--- 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 083de03812fb4d33842e330a815c3fc55398cf5c..00caf13d167143bb7b1f58c36d89537ab5c77bf9 100644 (file)
--- 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 dbe2c33beea30953cf9e8b2e21495f3fd7554ba3..60625889a01b3cb7aa35ea7a340f7a9dd81e8595 100644 (file)
--- 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 472e2ce2906c56a18bd7a06b0dc242d57f89d61f..e75152c51e37a01ab1d77496b9759293cf6670b2 100644 (file)
--- 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 2aeb5a7e42bf3b4c10e4c846322ae0d9fbe7af5f..b532bb1297644ac8067a684be012f98ce7cdf793 100644 (file)
--- 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 850c93fd0de895ce0c7d338dc8c22317c5e09e7a..9bc61257f1cdf1b6de89d616448aaa3b4fad7d0c 100644 (file)
--- 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 681d985dfbf97b03e01eccda92f8040548e7e4ab..addd88f5e492f86d46e3eec41553abb6c532eb14 100644 (file)
--- 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 fa480f89fa9a33d699c6441be5db068e9f222c5e..5b519aa353c33b9ac01ee7618830b3f3f3d66e0f 100644 (file)
--- 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 0b43a624fda1099e3eeb3692f1328052d214be2f..1cdfc099953e8fc7fc87319dcb978c3a1ea66fef 100644 (file)
--- 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 df6ce2f3931eb2c5624b195190a128d97711e5fc..370a6a070bfe8ae15c109d18a0688235b5ad85f0 100644 (file)
--- 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.*