[02/20] s390: Add common IBM Z CPU name to assembler test names

Message ID 20260930081834.2948939-24-jremus@linux.ibm.com
State New
Headers
Series s390: Instruction cleanups |

Commit Message

Jens Remus Sept. 30, 2026, 8:18 a.m. UTC
  Support for some IBM Z CPUs has initially been added using their
respective IBM z/Architecture Principles of Operation edition number
as CPU name, i.e. "archNN".  This is also reflected in respective
assembler test (file) names.  Their common CPU name was added later,
but only to the assembler option "-march=<cpu>" and its documentation.

gas/testsuite/
	* gas/s390/zarch-arch12.d: Add "z14" to test name.
	* gas/s390/zarch-arch13.d: Add "z15" to test name.
	* gas/s390/zarch-arch14.d: Add "z16" to test name.

Signed-off-by: Jens Remus <jremus@linux.ibm.com>
---
 gas/testsuite/gas/s390/esa-g5.d       | 2 +-
 gas/testsuite/gas/s390/esa-z9-109.d   | 2 +-
 gas/testsuite/gas/s390/esa-z900.d     | 2 +-
 gas/testsuite/gas/s390/esa-z990.d     | 2 +-
 gas/testsuite/gas/s390/zarch-arch12.d | 2 +-
 gas/testsuite/gas/s390/zarch-arch13.d | 2 +-
 gas/testsuite/gas/s390/zarch-arch14.d | 2 +-
 gas/testsuite/gas/s390/zarch-arch15.d | 2 +-
 gas/testsuite/gas/s390/zarch-z10.d    | 2 +-
 gas/testsuite/gas/s390/zarch-z13.d    | 2 +-
 gas/testsuite/gas/s390/zarch-z196.d   | 2 +-
 gas/testsuite/gas/s390/zarch-z9-109.d | 2 +-
 gas/testsuite/gas/s390/zarch-z9-ec.d  | 2 +-
 gas/testsuite/gas/s390/zarch-z900.d   | 2 +-
 gas/testsuite/gas/s390/zarch-z990.d   | 2 +-
 gas/testsuite/gas/s390/zarch-zEC12.d  | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)
  

Patch

diff --git a/gas/testsuite/gas/s390/esa-g5.d b/gas/testsuite/gas/s390/esa-g5.d
index 5dbe70fa466b..7766defd199e 100644
--- a/gas/testsuite/gas/s390/esa-g5.d
+++ b/gas/testsuite/gas/s390/esa-g5.d
@@ -1,4 +1,4 @@ 
-#name: s390 opcode (esa g5)
+#name: s390 opcode (g5 / arch3)
 #objdump: -drw
 
 .*: +file format .*
diff --git a/gas/testsuite/gas/s390/esa-z9-109.d b/gas/testsuite/gas/s390/esa-z9-109.d
index c09193956c34..99c385eaa0a9 100644
--- a/gas/testsuite/gas/s390/esa-z9-109.d
+++ b/gas/testsuite/gas/s390/esa-z9-109.d
@@ -1,4 +1,4 @@ 
-#name: s390 opcode (esa z9 109)
+#name: s390 opcode (z9-109)
 #objdump: -drw
 
 .*: +file format .*
diff --git a/gas/testsuite/gas/s390/esa-z900.d b/gas/testsuite/gas/s390/esa-z900.d
index c734b9ca32f5..122155be3368 100644
--- a/gas/testsuite/gas/s390/esa-z900.d
+++ b/gas/testsuite/gas/s390/esa-z900.d
@@ -1,4 +1,4 @@ 
-#name: s390 opcode (esa z900)
+#name: s390 opcode (z900 / arch5)
 #objdump: -drw
 
 .*: +file format .*
diff --git a/gas/testsuite/gas/s390/esa-z990.d b/gas/testsuite/gas/s390/esa-z990.d
index 4992557ede57..3d05cd7e30e0 100644
--- a/gas/testsuite/gas/s390/esa-z990.d
+++ b/gas/testsuite/gas/s390/esa-z990.d
@@ -1,4 +1,4 @@ 
-#name: s390 opcode (esa z990)
+#name: s390 opcode (z990 / arch6)
 #objdump: -drw
 
 .*: +file format .*
diff --git a/gas/testsuite/gas/s390/zarch-arch12.d b/gas/testsuite/gas/s390/zarch-arch12.d
index d463bcd12405..00e534021bbe 100644
--- a/gas/testsuite/gas/s390/zarch-arch12.d
+++ b/gas/testsuite/gas/s390/zarch-arch12.d
@@ -1,4 +1,4 @@ 
-#name: s390x opcodes (arch12)
+#name: s390x opcodes (z14 / arch12)
 #objdump: -dr
 
 .*: +file format .*
diff --git a/gas/testsuite/gas/s390/zarch-arch13.d b/gas/testsuite/gas/s390/zarch-arch13.d
index 1435a719236c..409ceb6ea34e 100644
--- a/gas/testsuite/gas/s390/zarch-arch13.d
+++ b/gas/testsuite/gas/s390/zarch-arch13.d
@@ -1,4 +1,4 @@ 
-#name: s390x opcodes (arch 13)
+#name: s390x opcodes (z15 / arch13)
 #objdump: -dr
 
 .*: +file format .*
diff --git a/gas/testsuite/gas/s390/zarch-arch14.d b/gas/testsuite/gas/s390/zarch-arch14.d
index cca13ba493ce..70ca1f04cbc1 100644
--- a/gas/testsuite/gas/s390/zarch-arch14.d
+++ b/gas/testsuite/gas/s390/zarch-arch14.d
@@ -1,4 +1,4 @@ 
-#name: s390x opcodes (arch14)
+#name: s390x opcodes (z16 / arch14)
 #objdump: -dr
 
 .*: +file format .*
diff --git a/gas/testsuite/gas/s390/zarch-arch15.d b/gas/testsuite/gas/s390/zarch-arch15.d
index dd049a00d779..474bcad3d700 100644
--- a/gas/testsuite/gas/s390/zarch-arch15.d
+++ b/gas/testsuite/gas/s390/zarch-arch15.d
@@ -1,4 +1,4 @@ 
-#name: s390x opcodes (arch15)
+#name: s390x opcodes (z17 / arch15)
 #objdump: -dr
 
 .*: +file format .*
diff --git a/gas/testsuite/gas/s390/zarch-z10.d b/gas/testsuite/gas/s390/zarch-z10.d
index 2e3cce02b6d7..e2da509c6d6a 100644
--- a/gas/testsuite/gas/s390/zarch-z10.d
+++ b/gas/testsuite/gas/s390/zarch-z10.d
@@ -1,4 +1,4 @@ 
-#name: s390x opcodes (z10)
+#name: s390x opcodes (z10 / arch8)
 #objdump: -drw
 
 .*: +file format .*
diff --git a/gas/testsuite/gas/s390/zarch-z13.d b/gas/testsuite/gas/s390/zarch-z13.d
index 54c42f858f94..002ed257ae83 100644
--- a/gas/testsuite/gas/s390/zarch-z13.d
+++ b/gas/testsuite/gas/s390/zarch-z13.d
@@ -1,4 +1,4 @@ 
-#name: s390x opcodes (z13)
+#name: s390x opcodes (z13 / arch11)
 #objdump: -dr
 
 .*: +file format .*
diff --git a/gas/testsuite/gas/s390/zarch-z196.d b/gas/testsuite/gas/s390/zarch-z196.d
index 365ccbf88b52..d8cfbe18436e 100644
--- a/gas/testsuite/gas/s390/zarch-z196.d
+++ b/gas/testsuite/gas/s390/zarch-z196.d
@@ -1,4 +1,4 @@ 
-#name: s390x opcodes (z196)
+#name: s390x opcodes (z196 / arch9)
 #objdump: -drw
 
 .*: +file format .*
diff --git a/gas/testsuite/gas/s390/zarch-z9-109.d b/gas/testsuite/gas/s390/zarch-z9-109.d
index aa05299e42a1..a192bd2c7e57 100644
--- a/gas/testsuite/gas/s390/zarch-z9-109.d
+++ b/gas/testsuite/gas/s390/zarch-z9-109.d
@@ -1,4 +1,4 @@ 
-#name: s390x opcodes (z9 109)
+#name: s390x opcodes (z9-109)
 #objdump: -drw
 
 .*: +file format .*
diff --git a/gas/testsuite/gas/s390/zarch-z9-ec.d b/gas/testsuite/gas/s390/zarch-z9-ec.d
index d859a0bf6c98..586057c2355b 100644
--- a/gas/testsuite/gas/s390/zarch-z9-ec.d
+++ b/gas/testsuite/gas/s390/zarch-z9-ec.d
@@ -1,4 +1,4 @@ 
-#name: s390x opcodes (z9 ec)
+#name: s390x opcodes (z9-ec / arch7)
 #objdump: -drw
 
 .*: +file format .*
diff --git a/gas/testsuite/gas/s390/zarch-z900.d b/gas/testsuite/gas/s390/zarch-z900.d
index 82dd3b0860dc..5f993865da50 100644
--- a/gas/testsuite/gas/s390/zarch-z900.d
+++ b/gas/testsuite/gas/s390/zarch-z900.d
@@ -1,4 +1,4 @@ 
-#name: s390x opcodes (z900)
+#name: s390x opcodes (z900 / arch5)
 #objdump: -drw
 
 .*: +file format .*
diff --git a/gas/testsuite/gas/s390/zarch-z990.d b/gas/testsuite/gas/s390/zarch-z990.d
index b49dddb92f31..47d68492fd61 100644
--- a/gas/testsuite/gas/s390/zarch-z990.d
+++ b/gas/testsuite/gas/s390/zarch-z990.d
@@ -1,4 +1,4 @@ 
-#name: s390x opcodes (z990)
+#name: s390x opcodes (z990 / arch6)
 #objdump: -drw
 
 .*: +file format .*
diff --git a/gas/testsuite/gas/s390/zarch-zEC12.d b/gas/testsuite/gas/s390/zarch-zEC12.d
index 04cd13853159..8eb8d256b203 100644
--- a/gas/testsuite/gas/s390/zarch-zEC12.d
+++ b/gas/testsuite/gas/s390/zarch-zEC12.d
@@ -1,4 +1,4 @@ 
-#name: s390x opcodes (zEC12)
+#name: s390x opcodes (zEC12 / arch10)
 #objdump: -dr
 
 .*: +file format .*