[testsuite] rearrange requirements for dfp bitint run tests

Message ID or4j27jicq.fsf@lxoliva.fsfla.org
State New
Headers
Series [testsuite] rearrange requirements for dfp bitint run tests |

Commit Message

Alexandre Oliva Jan. 10, 2025, 6:25 a.m. UTC
  dfp.exp sets the default to compile when dfprt is not available, but
some dfp bitint tests override the default without that requirement,
and try to run even when dfprt is not available.

Instead of overriding the default, rewrite the requirements so that
they apply even when compiling, since the absence of bitint or of
int128 would presumably cause compile failures.

Regstrapped on x86_64-linux-gnu.  Also tested with aarch64-elf and
arm-eabi on gcc-14, with dfp support (implicitly) disabled in libgcc.
Ok to install?


for  gcc/testsuite/ChangeLog

	* gcc.dg/dfp/bitint-1.c: Rewrite requirements to retain dfprt.
	* gcc.dg/dfp/bitint-2.c: Likewise.
	* gcc.dg/dfp/bitint-3.c: Likewise.
	* gcc.dg/dfp/bitint-4.c: Likewise.
	* gcc.dg/dfp/bitint-5.c: Likewise.
	* gcc.dg/dfp/bitint-6.c: Likewise.
	* gcc.dg/dfp/bitint-7.c: Likewise.
	* gcc.dg/dfp/bitint-8.c: Likewise.
	* gcc.dg/dfp/int128-1.c: Likewise.
	* gcc.dg/dfp/int128-2.c: Likewise.
	* gcc.dg/dfp/int128-3.c: Likewise.
	* gcc.dg/dfp/int128-4.c: Likewise.
---
 gcc/testsuite/gcc.dg/dfp/bitint-1.c |    2 +-
 gcc/testsuite/gcc.dg/dfp/bitint-2.c |    2 +-
 gcc/testsuite/gcc.dg/dfp/bitint-3.c |    2 +-
 gcc/testsuite/gcc.dg/dfp/bitint-4.c |    2 +-
 gcc/testsuite/gcc.dg/dfp/bitint-5.c |    2 +-
 gcc/testsuite/gcc.dg/dfp/bitint-6.c |    2 +-
 gcc/testsuite/gcc.dg/dfp/bitint-7.c |    2 +-
 gcc/testsuite/gcc.dg/dfp/bitint-8.c |    2 +-
 gcc/testsuite/gcc.dg/dfp/int128-1.c |    3 ++-
 gcc/testsuite/gcc.dg/dfp/int128-2.c |    3 ++-
 gcc/testsuite/gcc.dg/dfp/int128-3.c |    3 ++-
 gcc/testsuite/gcc.dg/dfp/int128-4.c |    3 ++-
 12 files changed, 16 insertions(+), 12 deletions(-)
  

Comments

Alexandre Oliva Jan. 16, 2025, 7:35 p.m. UTC | #1
On Jan 10, 2025, Alexandre Oliva <oliva@adacore.com> wrote:

> dfp.exp sets the default to compile when dfprt is not available, but
> some dfp bitint tests override the default without that requirement,
> and try to run even when dfprt is not available.

> Instead of overriding the default, rewrite the requirements so that
> they apply even when compiling, since the absence of bitint or of
> int128 would presumably cause compile failures.

> Regstrapped on x86_64-linux-gnu.  Also tested with aarch64-elf and
> arm-eabi on gcc-14, with dfp support (implicitly) disabled in libgcc.
> Ok to install?

Ping?
https://gcc.gnu.org/pipermail/gcc-patches/2025-January/673160.html

> for  gcc/testsuite/ChangeLog

> 	* gcc.dg/dfp/bitint-1.c: Rewrite requirements to retain dfprt.
> 	* gcc.dg/dfp/bitint-2.c: Likewise.
> 	* gcc.dg/dfp/bitint-3.c: Likewise.
> 	* gcc.dg/dfp/bitint-4.c: Likewise.
> 	* gcc.dg/dfp/bitint-5.c: Likewise.
> 	* gcc.dg/dfp/bitint-6.c: Likewise.
> 	* gcc.dg/dfp/bitint-7.c: Likewise.
> 	* gcc.dg/dfp/bitint-8.c: Likewise.
> 	* gcc.dg/dfp/int128-1.c: Likewise.
> 	* gcc.dg/dfp/int128-2.c: Likewise.
> 	* gcc.dg/dfp/int128-3.c: Likewise.
> 	* gcc.dg/dfp/int128-4.c: Likewise.
  
Mike Stump Jan. 16, 2025, 8:22 p.m. UTC | #2
On Jan 9, 2025, at 10:25 PM, Alexandre Oliva <oliva@adacore.com> wrote:
> 
> dfp.exp sets the default to compile when dfprt is not available, but
> some dfp bitint tests override the default without that requirement,
> and try to run even when dfprt is not available.
> 
> Instead of overriding the default, rewrite the requirements so that
> they apply even when compiling, since the absence of bitint or of
> int128 would presumably cause compile failures.
> 
> Regstrapped on x86_64-linux-gnu.  Also tested with aarch64-elf and
> arm-eabi on gcc-14, with dfp support (implicitly) disabled in libgcc.
> Ok to install?

Ok.

> for  gcc/testsuite/ChangeLog
> 
> 	* gcc.dg/dfp/bitint-1.c: Rewrite requirements to retain dfprt.
> 	* gcc.dg/dfp/bitint-2.c: Likewise.
> 	* gcc.dg/dfp/bitint-3.c: Likewise.
> 	* gcc.dg/dfp/bitint-4.c: Likewise.
> 	* gcc.dg/dfp/bitint-5.c: Likewise.
> 	* gcc.dg/dfp/bitint-6.c: Likewise.
> 	* gcc.dg/dfp/bitint-7.c: Likewise.
> 	* gcc.dg/dfp/bitint-8.c: Likewise.
> 	* gcc.dg/dfp/int128-1.c: Likewise.
> 	* gcc.dg/dfp/int128-2.c: Likewise.
> 	* gcc.dg/dfp/int128-3.c: Likewise.
> 	* gcc.dg/dfp/int128-4.c: Likewise.
  

Patch

diff --git a/gcc/testsuite/gcc.dg/dfp/bitint-1.c b/gcc/testsuite/gcc.dg/dfp/bitint-1.c
index ab826e16ba390..1493bf3c52f02 100644
--- a/gcc/testsuite/gcc.dg/dfp/bitint-1.c
+++ b/gcc/testsuite/gcc.dg/dfp/bitint-1.c
@@ -1,5 +1,5 @@ 
 /* PR c/102989 */
-/* { dg-do run { target bitint } } */
+/* { dg-require-effective-target bitint } */
 /* { dg-options "-O2 -std=c23 -pedantic-errors" } */
 
 #if __BITINT_MAXWIDTH__ >= 192
diff --git a/gcc/testsuite/gcc.dg/dfp/bitint-2.c b/gcc/testsuite/gcc.dg/dfp/bitint-2.c
index 68cce0e66521c..1ed5be8929f2d 100644
--- a/gcc/testsuite/gcc.dg/dfp/bitint-2.c
+++ b/gcc/testsuite/gcc.dg/dfp/bitint-2.c
@@ -1,5 +1,5 @@ 
 /* PR c/102989 */
-/* { dg-do run { target bitint } } */
+/* { dg-require-effective-target bitint } */
 /* { dg-options "-O2 -std=c23 -pedantic-errors" } */
 
 #if __BITINT_MAXWIDTH__ >= 192
diff --git a/gcc/testsuite/gcc.dg/dfp/bitint-3.c b/gcc/testsuite/gcc.dg/dfp/bitint-3.c
index 911bf8afb3083..11997ddbea698 100644
--- a/gcc/testsuite/gcc.dg/dfp/bitint-3.c
+++ b/gcc/testsuite/gcc.dg/dfp/bitint-3.c
@@ -1,5 +1,5 @@ 
 /* PR c/102989 */
-/* { dg-do run { target bitint } } */
+/* { dg-require-effective-target bitint } */
 /* { dg-options "-O2 -std=c23 -pedantic-errors" } */
 
 #if __BITINT_MAXWIDTH__ >= 192
diff --git a/gcc/testsuite/gcc.dg/dfp/bitint-4.c b/gcc/testsuite/gcc.dg/dfp/bitint-4.c
index 0b6011055786e..0e600160752be 100644
--- a/gcc/testsuite/gcc.dg/dfp/bitint-4.c
+++ b/gcc/testsuite/gcc.dg/dfp/bitint-4.c
@@ -1,5 +1,5 @@ 
 /* PR c/102989 */
-/* { dg-do run { target bitint } } */
+/* { dg-require-effective-target bitint } */
 /* { dg-options "-O2 -std=c23 -pedantic-errors" } */
 
 #if __BITINT_MAXWIDTH__ >= 192
diff --git a/gcc/testsuite/gcc.dg/dfp/bitint-5.c b/gcc/testsuite/gcc.dg/dfp/bitint-5.c
index 37d373cdf320a..b7f7484d225b7 100644
--- a/gcc/testsuite/gcc.dg/dfp/bitint-5.c
+++ b/gcc/testsuite/gcc.dg/dfp/bitint-5.c
@@ -1,5 +1,5 @@ 
 /* PR c/102989 */
-/* { dg-do run { target bitint } } */
+/* { dg-require-effective-target bitint } */
 /* { dg-options "-O2 -std=c23 -pedantic-errors" } */
 
 #if __BITINT_MAXWIDTH__ >= 192
diff --git a/gcc/testsuite/gcc.dg/dfp/bitint-6.c b/gcc/testsuite/gcc.dg/dfp/bitint-6.c
index eb137a60e4b7d..e9c538015f4a0 100644
--- a/gcc/testsuite/gcc.dg/dfp/bitint-6.c
+++ b/gcc/testsuite/gcc.dg/dfp/bitint-6.c
@@ -1,5 +1,5 @@ 
 /* PR c/102989 */
-/* { dg-do run { target bitint } } */
+/* { dg-require-effective-target bitint } */
 /* { dg-options "-O2 -std=c23 -pedantic-errors" } */
 
 #if __BITINT_MAXWIDTH__ >= 192
diff --git a/gcc/testsuite/gcc.dg/dfp/bitint-7.c b/gcc/testsuite/gcc.dg/dfp/bitint-7.c
index 49e8103723cb2..530a26c47e51d 100644
--- a/gcc/testsuite/gcc.dg/dfp/bitint-7.c
+++ b/gcc/testsuite/gcc.dg/dfp/bitint-7.c
@@ -1,6 +1,6 @@ 
 /* PR c/102989 */
 /* Test non-canonical BID significands.  */
-/* { dg-do run { target bitint } } */
+/* { dg-require-effective-target bitint } */
 /* { dg-require-effective-target dfp_bid } */
 /* { dg-options "-std=gnu23 -O2" } */
 
diff --git a/gcc/testsuite/gcc.dg/dfp/bitint-8.c b/gcc/testsuite/gcc.dg/dfp/bitint-8.c
index 18263e2bd7533..2990877a2fbd0 100644
--- a/gcc/testsuite/gcc.dg/dfp/bitint-8.c
+++ b/gcc/testsuite/gcc.dg/dfp/bitint-8.c
@@ -1,5 +1,5 @@ 
 /* PR c/102989 */
-/* { dg-do run { target bitint } } */
+/* { dg-require-effective-target bitint } */
 /* { dg-require-effective-target fenv_exceptions } */
 /* { dg-options "-std=c23" } */
 
diff --git a/gcc/testsuite/gcc.dg/dfp/int128-1.c b/gcc/testsuite/gcc.dg/dfp/int128-1.c
index 2d3017b8c64a1..7a882f4883519 100644
--- a/gcc/testsuite/gcc.dg/dfp/int128-1.c
+++ b/gcc/testsuite/gcc.dg/dfp/int128-1.c
@@ -1,5 +1,6 @@ 
 /* PR libgcc/65833 */
-/* { dg-do run { target { int128 && bitint } } } */
+/* { dg-require-effective-target int128 } */
+/* { dg-require-effective-target bitint } */
 /* { dg-options "-O2 -std=gnu2x" } */
 
 #define INT128_MAX ((__int128) ((((unsigned __int128) 1) << 127) - 1))
diff --git a/gcc/testsuite/gcc.dg/dfp/int128-2.c b/gcc/testsuite/gcc.dg/dfp/int128-2.c
index 3dd41bc834898..be318a2c7d866 100644
--- a/gcc/testsuite/gcc.dg/dfp/int128-2.c
+++ b/gcc/testsuite/gcc.dg/dfp/int128-2.c
@@ -1,5 +1,6 @@ 
 /* PR libgcc/65833 */
-/* { dg-do run { target { int128 && bitint } } } */
+/* { dg-require-effective-target int128 } */
+/* { dg-require-effective-target bitint } */
 /* { dg-options "-O2 -std=gnu2x" } */
 
 __attribute__((noipa)) _Decimal64
diff --git a/gcc/testsuite/gcc.dg/dfp/int128-3.c b/gcc/testsuite/gcc.dg/dfp/int128-3.c
index c1b10c9dfe212..c98e6462061bc 100644
--- a/gcc/testsuite/gcc.dg/dfp/int128-3.c
+++ b/gcc/testsuite/gcc.dg/dfp/int128-3.c
@@ -1,6 +1,7 @@ 
 /* PR libgcc/65833 */
 /* Test non-canonical BID significands.  */
-/* { dg-do run { target { int128 && bitint } } } */
+/* { dg-require-effective-target int128 } */
+/* { dg-require-effective-target bitint } */
 /* { dg-options "-O2 -std=gnu2x" } */
 /* { dg-require-effective-target dfp_bid } */
 
diff --git a/gcc/testsuite/gcc.dg/dfp/int128-4.c b/gcc/testsuite/gcc.dg/dfp/int128-4.c
index b91800989f947..b83e7e4221cec 100644
--- a/gcc/testsuite/gcc.dg/dfp/int128-4.c
+++ b/gcc/testsuite/gcc.dg/dfp/int128-4.c
@@ -1,5 +1,6 @@ 
 /* PR libgcc/65833 */
-/* { dg-do run { target { int128 && bitint } } } */
+/* { dg-require-effective-target int128 } */
+/* { dg-require-effective-target bitint } */
 /* { dg-require-effective-target fenv_exceptions } */
 /* { dg-options "-std=c2x" } */