https://gcc.gnu.org/g:24a34a7efae7444414f890aa2cd596c1d081c2fc
commit r16-3243-g24a34a7efae7444414f890aa2cd596c1d081c2fc Author: Andrew Bennett <andrew.benn...@imgtec.com> Date: Sun Aug 17 08:41:13 2025 -0600 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: --- gcc/testsuite/gcc.target/mips/near-far-1.c | 10 +++++----- gcc/testsuite/gcc.target/mips/near-far-2.c | 10 +++++----- gcc/testsuite/gcc.target/mips/near-far-3.c | 10 +++++----- gcc/testsuite/gcc.target/mips/near-far-4.c | 10 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/gcc/testsuite/gcc.target/mips/near-far-1.c b/gcc/testsuite/gcc.target/mips/near-far-1.c index 356f7adc7252..9d3f29d264e1 100644 --- 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 2e8dbb17f7e2..ed9757c4812f 100644 --- 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 19e1b3a7334c..d4ad3e753b9a 100644 --- 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 ac7d72738142..37baad9b4f65 100644 --- 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" } } */