[committed][RISC-V] Fix testsuite fallout from check-function-bodies change

Minor fallout from HJ's recent change to the check-function-bodies code in the testsuite.

The label isn't at all important here, so forcing it match is just a waste of time.  So this patch just skips over the label.  It fixes a handful of failures in testsuite:

> unix//-march=rv32gcv: gcc: gcc.target/riscv/amo/zalrsc-rvwmo-amo-add-int.c check-function-bodies atomic_add_fetch_int_acq_rel
> unix//-march=rv32gcv: gcc: gcc.target/riscv/amo/zalrsc-rvwmo-amo-add-int.c check-function-bodies atomic_add_fetch_int_acquire
> unix//-march=rv32gcv: gcc: gcc.target/riscv/amo/zalrsc-rvwmo-amo-add-int.c check-function-bodies atomic_add_fetch_int_relaxed
> unix//-march=rv32gcv: gcc: gcc.target/riscv/amo/zalrsc-rvwmo-amo-add-int.c check-function-bodies atomic_add_fetch_int_release
> unix//-march=rv32gcv: gcc: gcc.target/riscv/amo/zalrsc-rvwmo-amo-add-int.c check-function-bodies atomic_add_fetch_int_seq_cst
> unix//-march=rv32gcv: gcc: gcc.target/riscv/amo/zalrsc-ztso-amo-add-int.c check-function-bodies atomic_add_fetch_int_acq_rel
> unix//-march=rv32gcv: gcc: gcc.target/riscv/amo/zalrsc-ztso-amo-add-int.c check-function-bodies atomic_add_fetch_int_acquire
> unix//-march=rv32gcv: gcc: gcc.target/riscv/amo/zalrsc-ztso-amo-add-int.c check-function-bodies atomic_add_fetch_int_relaxed
> unix//-march=rv32gcv: gcc: gcc.target/riscv/amo/zalrsc-ztso-amo-add-int.c check-function-bodies atomic_add_fetch_int_release
> unix//-march=rv32gcv: gcc: gcc.target/riscv/amo/zalrsc-ztso-amo-add-int.c check-function-bodies atomic_add_fetch_int_seq_cst

gcc/testsuite
	* gcc.target/riscv/amo/zalrsc-rvwmo-amo-add-int.c: Adjust expected
	output.
	* gcc.target/riscv/amo/zalrsc-ztso-amo-add-int.c: Likewise.

diff --git a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-amo-add-int.c b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-amo-add-int.c
index 4cf617d603571218ea914ebec166782fe0983a94..0dfe816ba29134719cfd5597eee0ee225220b9cf 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-amo-add-int.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-amo-add-int.c
@@ -9,7 +9,7 @@
 
 /*
 ** atomic_add_fetch_int_relaxed:
-**     1:
+**...
 **     lr.w\t[atx][0-9]+, 0\(a0\)
 **     add\t[atx][0-9]+, [atx][0-9]+, a1
 **     sc.w\t[atx][0-9]+, [atx][0-9]+, 0\(a0\)
@@ -23,7 +23,7 @@ void atomic_add_fetch_int_relaxed (int* bar, int baz)
 
 /*
 ** atomic_add_fetch_int_acquire:
-**     1:
+**...
 **     lr.w.aq\t[atx][0-9]+, 0\(a0\)
 **     add\t[atx][0-9]+, [atx][0-9]+, a1
 **     sc.w\t[atx][0-9]+, [atx][0-9]+, 0\(a0\)
@@ -37,7 +37,7 @@ void atomic_add_fetch_int_acquire (int* bar, int baz)
 
 /*
 ** atomic_add_fetch_int_release:
-**     1:
+**...
 **     lr.w\t[atx][0-9]+, 0\(a0\)
 **     add\t[atx][0-9]+, [atx][0-9]+, a1
 **     sc.w.rl\t[atx][0-9]+, [atx][0-9]+, 0\(a0\)
@@ -51,7 +51,7 @@ void atomic_add_fetch_int_release (int* bar, int baz)
 
 /*
 ** atomic_add_fetch_int_acq_rel:
-**     1:
+**...
 **     lr.w.aq\t[atx][0-9]+, 0\(a0\)
 **     add\t[atx][0-9]+, [atx][0-9]+, a1
 **     sc.w.rl\t[atx][0-9]+, [atx][0-9]+, 0\(a0\)
@@ -65,7 +65,7 @@ void atomic_add_fetch_int_acq_rel (int* bar, int baz)
 
 /*
 ** atomic_add_fetch_int_seq_cst:
-**     1:
+**...
 **     lr.w.aqrl\t[atx][0-9]+, 0\(a0\)
 **     add\t[atx][0-9]+, [atx][0-9]+, a1
 **     sc.w.rl\t[atx][0-9]+, [atx][0-9]+, 0\(a0\)

diff --git a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-amo-add-int.c b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-amo-add-int.c
index 3fb16c0119186501baa300e49574051464d383b0..658b0404b9725cac728249e6ecdeb4a834a43bc8 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-amo-add-int.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-amo-add-int.c
@@ -9,7 +9,7 @@
 
 /*
 ** atomic_add_fetch_int_relaxed:
-**     1:
+**...
 **     lr.w\t[atx][0-9]+, 0\(a0\)
 **     add\t[atx][0-9]+, [atx][0-9]+, a1
 **     sc.w\t[atx][0-9]+, [atx][0-9]+, 0\(a0\)
@@ -23,7 +23,7 @@ void atomic_add_fetch_int_relaxed (int* bar, int baz)
 
 /*
 ** atomic_add_fetch_int_acquire:
-**     1:
+**...
 **     lr.w\t[atx][0-9]+, 0\(a0\)
 **     add\t[atx][0-9]+, [atx][0-9]+, a1
 **     sc.w\t[atx][0-9]+, [atx][0-9]+, 0\(a0\)
@@ -37,7 +37,7 @@ void atomic_add_fetch_int_acquire (int* bar, int baz)
 
 /*
 ** atomic_add_fetch_int_release:
-**     1:
+**...
 **     lr.w\t[atx][0-9]+, 0\(a0\)
 **     add\t[atx][0-9]+, [atx][0-9]+, a1
 **     sc.w\t[atx][0-9]+, [atx][0-9]+, 0\(a0\)
@@ -51,7 +51,7 @@ void atomic_add_fetch_int_release (int* bar, int baz)
 
 /*
 ** atomic_add_fetch_int_acq_rel:
-**     1:
+**...
 **     lr.w\t[atx][0-9]+, 0\(a0\)
 **     add\t[atx][0-9]+, [atx][0-9]+, a1
 **     sc.w\t[atx][0-9]+, [atx][0-9]+, 0\(a0\)
@@ -65,7 +65,7 @@ void atomic_add_fetch_int_acq_rel (int* bar, int baz)
 
 /*
 ** atomic_add_fetch_int_seq_cst:
-**     1:
+**...
 **     lr.w.aqrl\t[atx][0-9]+, 0\(a0\)
 **     add\t[atx][0-9]+, [atx][0-9]+, a1
 **     sc.w.rl\t[atx][0-9]+, [atx][0-9]+, 0\(a0\)