[07/61] Testsuite: Fix tests properly for compact-branches

Message ID 20250131171232.1018281-9-aleksandar.rakic@htecgroup.com
State Committed
Commit 24a34a7efae7444414f890aa2cd596c1d081c2fc
Headers
Series Improve Mips target |

Commit Message

Aleksandar Rakic Jan. 31, 2025, 5:13 p.m. UTC
  From: abennett <abennett@138bc75d-0d04-0410-961f-82ee72b054a4>

Cherry-picked 4420f953c31daf1991011d306a56ab74c39b44ee
and 83c13cb19cb1e87a25326024943b95930a17e86b
from https://github.com/MIPS/gcc

Signed-off-by: Andrew Bennett <andrew.bennett@imgtec.com>
Signed-off-by: Matthew Fortune <matthew.fortune@imgtec.com>
Signed-off-by: Faraz Shahbazker <fshahbazker@wavecomp.com>
Signed-off-by: Aleksandar Rakic <aleksandar.rakic@htecgroup.com>
---
 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(-)
  

Comments

Jeffrey Law April 19, 2025, 2:54 p.m. UTC | #1
On 1/31/25 10:13 AM, Aleksandar Rakic wrote:
> From: abennett <abennett@138bc75d-0d04-0410-961f-82ee72b054a4>
> 
> Cherry-picked 4420f953c31daf1991011d306a56ab74c39b44ee
> and 83c13cb19cb1e87a25326024943b95930a17e86b
> from https://github.com/MIPS/gcc
> 
> Signed-off-by: Andrew Bennett <andrew.bennett@imgtec.com>
> Signed-off-by: Matthew Fortune <matthew.fortune@imgtec.com>
> Signed-off-by: Faraz Shahbazker <fshahbazker@wavecomp.com>
> Signed-off-by: Aleksandar Rakic <aleksandar.rakic@htecgroup.com>
> ---
>   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 +++++-----
This likely needs to be updated for the trunk.

Before:


                 === gcc Summary ===

# of expected passes            95
# of unexpected failures        25


After:
                 === gcc Summary ===

# of expected passes            70
# of unexpected failures        50

Clearly not going in the right direction.  Configured as 
mips64el-linux-gnuabi64.  Running just the near-far-?.c tests.

jeff
  
Aleksandar Rakic April 23, 2025, 11:08 a.m. UTC | #2
HTEC Public

Hi,

> This likely needs to be updated for the trunk.

> Before:


>                  === gcc Summary ===

> # of expected passes            95
> # of unexpected failures        25


> After:
>                  === gcc Summary ===

> # of expected passes            70
> # of unexpected failures        50

> Clearly not going in the right direction.  Configured as
> mips64el-linux-gnuabi64.  Running just the near-far-?.c tests.

> Jeff

I would like to inform you that the version 2 of this patch with the
appropriate ChangeLog entry is available at the following link:

https://gcc.gnu.org/pipermail/gcc-patches/2025-March/677827.html

Please find attached scripts that I used for building the GCC
cross-compiler and for running the GCC testsuite for the
mips64-r6-linux-gnu target.
The script run_mips_gcc_testsuite is meant to be run inside the
$BUILD_DIR/gcc-build directory with the following arguments:

--sys-root=$SYSROOT --test-driver=mips.exp --test-regex="near-far-?.c"

I ran the near-far-?.c tests and all of them passed:

Before:
                === gcc Summary ===

# of expected passes            168

After:
                === gcc Summary ===

# of expected passes            168

Kind regards,
Aleksandar
  
Aleksandar Rakic May 28, 2025, 12:51 p.m. UTC | #3
HTEC Public

Hi,

Could you please let us know if you have any comments
on the latest reply on this patch?

Kind regards,
Aleksandar Rakic
  

Patch

diff --git a/gcc/testsuite/gcc.target/mips/near-far-1.c b/gcc/testsuite/gcc.target/mips/near-far-1.c
index 356f7adc725..9d3f29d264e 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 2e8dbb17f7e..ed9757c4812 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 19e1b3a7334..d4ad3e753b9 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 ac7d7273814..37baad9b4f6 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" } } */