Testsuite: Fix tests properly for compact-branches

Compact-branches use the balc opcode, this patch adjusts the testsuite
to handle that correctly.

gcc/testsuite
	* gcc.target/mips/near-far-1.c: Fix tests properly for
	compact-branches (jals and balc).
	* gcc.target/mips/near-far-2.c: Likewise.
	* gcc.target/mips/near-far-3.c: Likewise.
	* gcc.target/mips/near-far-4.c: Likewise.

diff --git a/gcc/testsuite/gcc.target/mips/near-far-1.c b/gcc/testsuite/gcc.target/mips/near-far-1.c
index 356f7adc725231a9172117a8cc15a8f75832c51e..9d3f29d264e1836c3a82491b152f6488ed101959 100644 (file)
--- a/gcc/testsuite/gcc.target/mips/near-far-1.c
+++ b/gcc/testsuite/gcc.target/mips/near-far-1.c
@@ -16,8 +16,8 @@ int test ()
           + normal_func ());
 }
 
-/* { dg-final { scan-assembler-not "\tjal\tlong_call_func\n" } } */
-/* { dg-final { scan-assembler-not "\tjal\tfar_func\n" } } */
-/* { dg-final { scan-assembler     "\t(jal(|s)|balc)\tshort_call_func\n" } } */
-/* { dg-final { scan-assembler     "\t(jal(|s)|balc)\tnear_func\n" } } */
-/* { dg-final { scan-assembler-not "\tjal\tnormal_func\n" } } */
+/* { dg-final { scan-assembler-not "\t(jals?|balc)\tlong_call_func\n" } } */
+/* { dg-final { scan-assembler-not "\t(jals?|balc)\tfar_func\n" } } */
+/* { dg-final { scan-assembler     "\t(jals?|balc)\tshort_call_func\n" } } */
+/* { dg-final { scan-assembler     "\t(jals?|balc)\tnear_func\n" } } */
+/* { dg-final { scan-assembler-not "\t(jals?|balc)\tnormal_func\n" } } */

diff --git a/gcc/testsuite/gcc.target/mips/near-far-2.c b/gcc/testsuite/gcc.target/mips/near-far-2.c
index 2e8dbb17f7e23948e41bc2f4c57ffba67fbf8841..ed9757c4812f023a56805500886f0853d6046328 100644 (file)
--- a/gcc/testsuite/gcc.target/mips/near-far-2.c
+++ b/gcc/testsuite/gcc.target/mips/near-far-2.c
@@ -16,8 +16,8 @@ int test ()
           + normal_func ());
 }
 
-/* { dg-final { scan-assembler-not "\tjal(|s)\tlong_call_func\n" } } */
-/* { dg-final { scan-assembler-not "\tjal(|s)\tfar_func\n" } } */
-/* { dg-final { scan-assembler     "\t(jal(|s)|balc)\tshort_call_func\n" } } */
-/* { dg-final { scan-assembler     "\t(jal(|s)|balc)\tnear_func\n" } } */
-/* { dg-final { scan-assembler     "\t(jal(|s)|balc)\tnormal_func\n" } } */
+/* { dg-final { scan-assembler-not "\t(jals?|balc)\tlong_call_func\n" } } */
+/* { dg-final { scan-assembler-not "\t(jals?|balc)\tfar_func\n" } } */
+/* { dg-final { scan-assembler     "\t(jals?|balc)\tshort_call_func\n" } } */
+/* { dg-final { scan-assembler     "\t(jals?|balc)\tnear_func\n" } } */
+/* { dg-final { scan-assembler     "\t(jals?|balc)\tnormal_func\n" } } */

diff --git a/gcc/testsuite/gcc.target/mips/near-far-3.c b/gcc/testsuite/gcc.target/mips/near-far-3.c
index 19e1b3a7334cce49de94fb039cd3099d9ac2951f..d4ad3e753b9ae408906de5bc45d41ec3beb620e9 100644 (file)
--- a/gcc/testsuite/gcc.target/mips/near-far-3.c
+++ b/gcc/testsuite/gcc.target/mips/near-far-3.c
@@ -13,8 +13,8 @@ NOMIPS16 int test3 () { return near_func (); }
 NOMIPS16 int test4 () { return normal_func (); }
 NOMIPS16 int test5 () { return short_call_func (); }
 
-/* { dg-final { scan-assembler-not "\tj\tlong_call_func\n" } } */
-/* { dg-final { scan-assembler-not "\tj\tfar_func\n" } } */
-/* { dg-final { scan-assembler     "\t(j(|al|als)|b(|al)c)\tnear_func\n" } } */
-/* { dg-final { scan-assembler-not "\tj\tnormal_func\n" } } */
-/* { dg-final { scan-assembler     "\t(j(|al|als)|b(|al)c)\tshort_call_func\n" } } */
+/* { dg-final { scan-assembler-not "\t((j(|al|als))|b(|al)c)\tlong_call_func\n" } } */
+/* { dg-final { scan-assembler-not "\t((j(|al|als))|b(|al)c)\tfar_func\n" } } */
+/* { dg-final { scan-assembler     "\t((j(|al|als))|b(|al)c)\tnear_func\n" } } */
+/* { dg-final { scan-assembler-not "\t((j(|al|als))|b(|al)c)\tnormal_func\n" } } */
+/* { dg-final { scan-assembler     "\t((j(|al|als))|b(|al)c)\tshort_call_func\n" } } */

diff --git a/gcc/testsuite/gcc.target/mips/near-far-4.c b/gcc/testsuite/gcc.target/mips/near-far-4.c
index ac7d727381429fe5c6e11ad55e5d42f67148c63d..37baad9b4f6577c84e4e981f6048d036ceb3359f 100644 (file)
--- a/gcc/testsuite/gcc.target/mips/near-far-4.c
+++ b/gcc/testsuite/gcc.target/mips/near-far-4.c
@@ -13,8 +13,8 @@ NOMIPS16 int test3 () { return near_func (); }
 NOMIPS16 int test4 () { return normal_func (); }
 NOMIPS16 int test5 () { return short_call_func (); }
 
-/* { dg-final { scan-assembler-not "\tj\tlong_call_func\n" } } */
-/* { dg-final { scan-assembler-not "\tj\tfar_func\n" } } */
-/* { dg-final { scan-assembler     "\t(j(|al|als)|b(|al)c)\tnear_func\n" } } */
-/* { dg-final { scan-assembler     "\t(j(|al|als)|b(|al)c)\tnormal_func\n" } } */
-/* { dg-final { scan-assembler     "\t(j(|al|als)|b(|al)c)\tshort_call_func\n" } } */
+/* { dg-final { scan-assembler-not "\t((j(|al|als))|b(|al)c)\tlong_call_func\n" } } */
+/* { dg-final { scan-assembler-not "\t((j(|al|als))|b(|al)c)\tfar_func\n" } } */
+/* { dg-final { scan-assembler     "\t((j(|al|als))|b(|al)c)\tnear_func\n" } } */
+/* { dg-final { scan-assembler     "\t((j(|al|als))|b(|al)c)\tnormal_func\n" } } */
+/* { dg-final { scan-assembler     "\t((j(|al|als))|b(|al)c)\tshort_call_func\n" } } */