RISC-V: Update testsuite to use b

Update all instances of zba_zbb_zbs in the testsuite to use b instead

gcc/testsuite/ChangeLog:

	* g++.target/riscv/redundant-bitmap-1.C: Use gcb instead of
	zba_zbb_zbs
	* g++.target/riscv/redundant-bitmap-2.C: Ditto
	* g++.target/riscv/redundant-bitmap-3.C: Ditto
	* g++.target/riscv/redundant-bitmap-4.C: Ditto
	* gcc.target/riscv/shift-add-1.c: Ditto
	* gcc.target/riscv/shift-add-2.c: Ditto
	* gcc.target/riscv/synthesis-1.c: Ditto
	* gcc.target/riscv/synthesis-2.c: Ditto
	* gcc.target/riscv/synthesis-3.c: Ditto
	* gcc.target/riscv/synthesis-4.c: Ditto
	* gcc.target/riscv/synthesis-5.c: Ditto
	* gcc.target/riscv/synthesis-6.c: Ditto
	* gcc.target/riscv/synthesis-7.c: Ditto
	* gcc.target/riscv/synthesis-8.c: Ditto
	* gcc.target/riscv/zba_zbs_and-1.c: Ditto
	* gcc.target/riscv/zbs-zext-3.c: Ditto
	* lib/target-supports.exp: Add b to riscv_get_arch

Signed-off-by: Edwin Lu <ewlu@rivosinc.com>

diff --git a/gcc/testsuite/g++.target/riscv/redundant-bitmap-1.C b/gcc/testsuite/g++.target/riscv/redundant-bitmap-1.C
index 37066f10eeae5c6d80928d8ee8bac3892402222d..62bb2ab7b67dc40e633dcd15d5fbb3712c544797 100644 (file)
--- a/gcc/testsuite/g++.target/riscv/redundant-bitmap-1.C
+++ b/gcc/testsuite/g++.target/riscv/redundant-bitmap-1.C
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -march=rv64gc_zba_zbb_zbs -mabi=lp64" } */
+/* { dg-options "-O2 -march=rv64gcb -mabi=lp64" } */
 
 void setBit(char &a, int b) {
     char c = 0x1UL << b;

diff --git a/gcc/testsuite/g++.target/riscv/redundant-bitmap-2.C b/gcc/testsuite/g++.target/riscv/redundant-bitmap-2.C
index 86acaba298fc6cf7f4fdc864de0a5082773d5079..52204daecd11a2c5887262ef7f55889574846f1a 100644 (file)
--- a/gcc/testsuite/g++.target/riscv/redundant-bitmap-2.C
+++ b/gcc/testsuite/g++.target/riscv/redundant-bitmap-2.C
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -march=rv64gc_zba_zbb_zbs -mabi=lp64" } */
+/* { dg-options "-O2 -march=rv64gcb -mabi=lp64" } */
 
 void setBit(char &a, int b) {
     char c = 0x1UL << b;

diff --git a/gcc/testsuite/g++.target/riscv/redundant-bitmap-3.C b/gcc/testsuite/g++.target/riscv/redundant-bitmap-3.C
index 16bd7c1785e7c480d20a1d1e9a06b40a04d01a97..6745220f2f4173237ee012b392ec950d3b4e696e 100644 (file)
--- a/gcc/testsuite/g++.target/riscv/redundant-bitmap-3.C
+++ b/gcc/testsuite/g++.target/riscv/redundant-bitmap-3.C
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -march=rv64gc_zba_zbb_zbs -mabi=lp64" } */
+/* { dg-options "-O2 -march=rv64gcb -mabi=lp64" } */
 
 void setBit(char &a, int b) {
     char c = 0x1UL << b;

diff --git a/gcc/testsuite/g++.target/riscv/redundant-bitmap-4.C b/gcc/testsuite/g++.target/riscv/redundant-bitmap-4.C
index f664ee01a016a13dcf5a145543c330f7656e74bb..5e351fe457e90f871d9f4375ef16753a902f1f13 100644 (file)
--- a/gcc/testsuite/g++.target/riscv/redundant-bitmap-4.C
+++ b/gcc/testsuite/g++.target/riscv/redundant-bitmap-4.C
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -march=rv64gc_zba_zbb_zbs -mabi=lp64" } */
+/* { dg-options "-O2 -march=rv64gcb -mabi=lp64" } */
 
 void setBit(char &a, int b) {
     char c = 0x1UL << b;

diff --git a/gcc/testsuite/gcc.target/riscv/shift-add-1.c b/gcc/testsuite/gcc.target/riscv/shift-add-1.c
index d98875c32716a25f684d2240977fb3e62dea5165..db84a51a2227e5065cd6dddce74cc9c0084d9e8d 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/shift-add-1.c
+++ b/gcc/testsuite/gcc.target/riscv/shift-add-1.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_zba_zbb_zbs -mabi=lp64" } */
+/* { dg-options "-march=rv64gcb -mabi=lp64" } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
 
 int composeFromSurrogate(const unsigned short high) {

diff --git a/gcc/testsuite/gcc.target/riscv/shift-add-2.c b/gcc/testsuite/gcc.target/riscv/shift-add-2.c
index 87439858e59e97b8ebae73f167b8d39854a3a8fe..ed95ced5b85543e7e479faf8ce3da5f76c85c0cb 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/shift-add-2.c
+++ b/gcc/testsuite/gcc.target/riscv/shift-add-2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_zba_zbb_zbs -mabi=lp64" } */
+/* { dg-options "-march=rv64gcb -mabi=lp64" } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
 
 int sub2(int a, long long b) {

diff --git a/gcc/testsuite/gcc.target/riscv/synthesis-1.c b/gcc/testsuite/gcc.target/riscv/synthesis-1.c
index 9176d5f4989ff23ebbd280c8a08763963975278c..c50abb083308bd623f7abea8c8ba84d85b1eb013 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/synthesis-1.c
+++ b/gcc/testsuite/gcc.target/riscv/synthesis-1.c
@@ -5,7 +5,7 @@
    and eliminates the usual sources of extraneous dead code that would throw
    off the counts.  */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-O2" "-O3" "-Os" "-Oz" "-flto" } } */
-/* { dg-options "-march=rv64gc_zba_zbb_zbs" } */
+/* { dg-options "-march=rv64gcb" } */
 
 /* Rather than test for a specific synthesis of all these constants or
    having thousands of tests each testing one variant, we just test the

diff --git a/gcc/testsuite/gcc.target/riscv/synthesis-2.c b/gcc/testsuite/gcc.target/riscv/synthesis-2.c
index b88374da3c4c06488bda8e5c5abac0ee8df52d35..82383408f7765df9a5f6d8db1015514e3b65fb92 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/synthesis-2.c
+++ b/gcc/testsuite/gcc.target/riscv/synthesis-2.c
@@ -5,7 +5,7 @@
    and eliminates the usual sources of extraneous dead code that would throw
    off the counts.  */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-O2" "-O3" "-Os" "-Oz" "-flto" } } */
-/* { dg-options "-march=rv64gc_zba_zbb_zbs" } */
+/* { dg-options "-march=rv64gcb" } */
 
 /* All these cases have the same form.  lui+slli.uw+addi
 /* { dg-final { scan-assembler-times "\\tadd" 367 } } */

diff --git a/gcc/testsuite/gcc.target/riscv/synthesis-3.c b/gcc/testsuite/gcc.target/riscv/synthesis-3.c
index 5d92ac8e309934c1a2cb82187dcfd848cf1f5b7f..88ef0e81203f47cf0211727355d7a5e3a7170e77 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/synthesis-3.c
+++ b/gcc/testsuite/gcc.target/riscv/synthesis-3.c
@@ -5,7 +5,7 @@
    and eliminates the usual sources of extraneous dead code that would throw
    off the counts.  */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-O2" "-O3" "-Os" "-Oz" "-flto" } } */
-/* { dg-options "-march=rv64gc_zba_zbb_zbs" } */
+/* { dg-options "-march=rv64gcb" } */
 
 /* Rather than test for a specific synthesis of all these constants or
    having thousands of tests each testing one variant, we just test the

diff --git a/gcc/testsuite/gcc.target/riscv/synthesis-4.c b/gcc/testsuite/gcc.target/riscv/synthesis-4.c
index 328a55b9e6e517f391f52625c7e2d9f44e4cf561..54d25e2681f27aaf51d14ebda2c0cbbed1b32749 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/synthesis-4.c
+++ b/gcc/testsuite/gcc.target/riscv/synthesis-4.c
@@ -5,7 +5,7 @@
    and eliminates the usual sources of extraneous dead code that would throw
    off the counts.  */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-O2" "-O3" "-Os" "-Oz" "-flto" } } */
-/* { dg-options "-march=rv64gc_zba_zbb_zbs" } */
+/* { dg-options "-march=rv64gcb" } */
 
 /* Rather than test for a specific synthesis of all these constants or
    having thousands of tests each testing one variant, we just test the

diff --git a/gcc/testsuite/gcc.target/riscv/synthesis-5.c b/gcc/testsuite/gcc.target/riscv/synthesis-5.c
index 4d81565b563b158b229b4a457fddcf070fdbe4db..4ed07e4def546d0390d96732e480eccc1b8122bb 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/synthesis-5.c
+++ b/gcc/testsuite/gcc.target/riscv/synthesis-5.c
@@ -6,7 +6,7 @@
    and eliminates the usual sources of extraneous dead code that would throw
    off the counts.  */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-O2" "-O3" "-Os" "-Oz" "-flto" } } */
-/* { dg-options "-march=rv64gc_zba_zbb_zbs" } */
+/* { dg-options "-march=rv64gcb" } */
 
 /* Rather than test for a specific synthesis of all these constants or
    having thousands of tests each testing one variant, we just test the

diff --git a/gcc/testsuite/gcc.target/riscv/synthesis-6.c b/gcc/testsuite/gcc.target/riscv/synthesis-6.c
index 65cf748f4b506c98603ffb15e498143ef659f940..2304855fbd1f1ddb9ef86719c2ab7c8728474d0a 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/synthesis-6.c
+++ b/gcc/testsuite/gcc.target/riscv/synthesis-6.c
@@ -5,7 +5,7 @@
    and eliminates the usual sources of extraneous dead code that would throw
    off the counts.  */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-O2" "-O3" "-Os" "-Oz" "-flto" } } */
-/* { dg-options "-march=rv64gc_zba_zbb_zbs" } */
+/* { dg-options "-march=rv64gcb" } */
 
 /* Rather than test for a specific synthesis of all these constants or
    having thousands of tests each testing one variant, we just test the

diff --git a/gcc/testsuite/gcc.target/riscv/synthesis-7.c b/gcc/testsuite/gcc.target/riscv/synthesis-7.c
index 1611c9647584b913413ea0e848d3957d635bb790..5a69d2e5f21b473baf34739313d432fd6a7ba580 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/synthesis-7.c
+++ b/gcc/testsuite/gcc.target/riscv/synthesis-7.c
@@ -5,7 +5,7 @@
    and eliminates the usual sources of extraneous dead code that would throw
    off the counts.  */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-O2" "-O3" "-Os" "-Oz" "-flto" } } */
-/* { dg-options "-march=rv64gc_zba_zbb_zbs" } */
+/* { dg-options "-march=rv64gcb" } */
 
 /* Rather than test for a specific synthesis of all these constants or
    having thousands of tests each testing one variant, we just test the

diff --git a/gcc/testsuite/gcc.target/riscv/synthesis-8.c b/gcc/testsuite/gcc.target/riscv/synthesis-8.c
index 2bcdb4e774d635a14838d374e3d7bde98e0c6e92..72fd7113321e0bb0bcf170f6fdb7b730d13fbd1e 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/synthesis-8.c
+++ b/gcc/testsuite/gcc.target/riscv/synthesis-8.c
@@ -5,7 +5,7 @@
    and eliminates the usual sources of extraneous dead code that would throw
    off the counts.  */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-O2" "-O3" "-Os" "-Oz" "-flto" } } */
-/* { dg-options "-march=rv64gc_zba_zbb_zbs" } */
+/* { dg-options "-march=rv64gcb" } */
 
 /* Rather than test for a specific synthesis of all these constants or
    having thousands of tests each testing one variant, we just test the

diff --git a/gcc/testsuite/gcc.target/riscv/zba_zbs_and-1.c b/gcc/testsuite/gcc.target/riscv/zba_zbs_and-1.c
index 23fd769449ea68b3e35efd85a96cb790086cde2b..ddff91a4e7c1f6acf3c1df0e357fc5b702e63f14 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/zba_zbs_and-1.c
+++ b/gcc/testsuite/gcc.target/riscv/zba_zbs_and-1.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_zba_zbb_zbs -mabi=lp64" } */
+/* { dg-options "-march=rv64gcb -mabi=lp64" } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
 
 

diff --git a/gcc/testsuite/gcc.target/riscv/zbs-zext-3.c b/gcc/testsuite/gcc.target/riscv/zbs-zext-3.c
index 0239014e06bf5dcbd0a19976d5282814e72b25a7..8dc3f289778869c10cc36dd93a930768698ce723 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/zbs-zext-3.c
+++ b/gcc/testsuite/gcc.target/riscv/zbs-zext-3.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_zba_zbb_zbs -mabi=lp64d" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zba_zbb_zbs -mabi=ilp32" { target { rv32 } } } */
+/* { dg-options "-march=rv64gcb -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gcb -mabi=ilp32" { target { rv32 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
 
 /* We need to adjust the constant so this works for rv32 and rv64.  */

diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index d3edc7d839ec2d9460501c157c1129176542d870..f001c28072f6943c00eb9cf548a3e1da67e15336 100644 (file)
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -2140,7 +2140,7 @@ proc check_effective_target_riscv_v_misalign_ok { } {
 proc riscv_get_arch { } {
     set gcc_march ""
     # ??? do we neeed to add more extensions to the list below?
-    foreach ext { i m a f d q c v zicsr zifencei zfh zba zbb zbc zbs zvbb zvfh ztso zaamo zalrsc zabha } {
+    foreach ext { i m a f d q c b v zicsr zifencei zfh zba zbb zbc zbs zvbb zvfh ztso zaamo zalrsc zabha } {
        if { [check_no_compiler_messages  riscv_ext_$ext assembly [string map [list DEF __riscv_$ext] {
                #ifndef DEF
                #error "Not DEF"