On 19/11/2024 10:23, Torbjörn SVENSSON wrote:
> Update test cases to use -mcpu=unset/-march=unset feature introduced in
> r15-3606-g7d6c6a0d15c.
>
> gcc/testsuite/ChangeLog:
>
> * gcc.target/arm/thumb2-slow-flash-data-2.c: Use
> effective-target arm_arch_v7em and added option "-march=unset
> -mfpu=auto".
> * gcc.target/arm/thumb2-slow-flash-data-3.c: Likewise.
> * gcc.target/arm/thumb2-slow-flash-data-4.c: Likewise.
> * gcc.target/arm/thumb2-slow-flash-data-5.c: Likewise.
>
> Signed-off-by: Torbjörn SVENSSON <torbjorn.svens...@foss.st.com>
> ---
> gcc/testsuite/gcc.target/arm/thumb2-slow-flash-data-2.c | 7 +++----
> gcc/testsuite/gcc.target/arm/thumb2-slow-flash-data-3.c | 7 +++----
> gcc/testsuite/gcc.target/arm/thumb2-slow-flash-data-4.c | 7 +++----
> gcc/testsuite/gcc.target/arm/thumb2-slow-flash-data-5.c | 7 +++----
> 4 files changed, 12 insertions(+), 16 deletions(-)
>
> diff --git a/gcc/testsuite/gcc.target/arm/thumb2-slow-flash-data-2.c
> b/gcc/testsuite/gcc.target/arm/thumb2-slow-flash-data-2.c
> index 231243759cf..581e510762a 100644
> --- a/gcc/testsuite/gcc.target/arm/thumb2-slow-flash-data-2.c
> +++ b/gcc/testsuite/gcc.target/arm/thumb2-slow-flash-data-2.c
> @@ -1,11 +1,10 @@
> /* { dg-do compile } */
> -/* { dg-require-effective-target arm_cortex_m } */
> /* { dg-require-effective-target arm_thumb2_ok } */
> /* { dg-require-effective-target arm_fp_ok } */
> -/* { dg-skip-if "avoid conflicts with multilib options" { *-*-* } {
> "-mcpu=*" } { "-mcpu=cortex-m4" "-mcpu=cortex-m7" } } */
> -/* { dg-skip-if "do not override -mfloat-abi" { *-*-* } { "-mfloat-abi=*" }
> { "-mfloat-abi=hard" } } */
> +/* { dg-require-effective-target arm_arch_v7em_ok } */
> /* { dg-skip-if "-mslow-flash-data and -mword-relocations incompatible" {
> *-*-* } { "-mword-relocations" } } */
> -/* { dg-options "-march=armv7e-m+fp -mfloat-abi=hard -O2 -mthumb
> -mslow-flash-data" } */
> +/* { dg-options "-mfloat-abi=hard -mfpu=auto -O2 -mslow-flash-data" } */
> +/* { dg-add-options arm_arch_v7em } */
All of these should be able to use arm_arch_v7e_hard, as suggested on an
earlier patch on this series, then
/* { dg-require-effective-target arm_thumb2_ok } */
/* { dg-require-effective-target arm_fp_ok } */
should both be unnecessary, as we're only generating assembly output and we've
forced the architecture. Your dg-options then becomes just "-O2
-mslow-flash-data".
OK with that change.
R.
>
> float f (float);
>
> diff --git a/gcc/testsuite/gcc.target/arm/thumb2-slow-flash-data-3.c
> b/gcc/testsuite/gcc.target/arm/thumb2-slow-flash-data-3.c
> index 27e72ec2086..b5f4c0d7d6e 100644
> --- a/gcc/testsuite/gcc.target/arm/thumb2-slow-flash-data-3.c
> +++ b/gcc/testsuite/gcc.target/arm/thumb2-slow-flash-data-3.c
> @@ -1,11 +1,10 @@
> /* { dg-do compile } */
> -/* { dg-require-effective-target arm_cortex_m } */
> /* { dg-require-effective-target arm_thumb2_ok } */
> /* { dg-require-effective-target arm_fp_ok } */
> -/* { dg-skip-if "avoid conflicts with multilib options" { *-*-* } {
> "-mcpu=*" } { "-mcpu=cortex-m4" "-mcpu=cortex-m7" } } */
> -/* { dg-skip-if "do not override -mfloat-abi" { *-*-* } { "-mfloat-abi=*" }
> { "-mfloat-abi=hard" } } */
> +/* { dg-require-effective-target arm_arch_v7em_ok } */
> /* { dg-skip-if "-mslow-flash-data and -mword-relocations incompatible" {
> *-*-* } { "-mword-relocations" } } */
> -/* { dg-options "-march=armv7e-m+fp -mfloat-abi=hard -mthumb
> -mslow-flash-data" } */
> +/* { dg-options "-mfloat-abi=hard -mfpu=auto -mslow-flash-data" } */
> +/* { dg-add-options arm_arch_v7em } */
>
> /* From PR71607 */
>
> diff --git a/gcc/testsuite/gcc.target/arm/thumb2-slow-flash-data-4.c
> b/gcc/testsuite/gcc.target/arm/thumb2-slow-flash-data-4.c
> index 8dbe87a1e68..a4d3846996e 100644
> --- a/gcc/testsuite/gcc.target/arm/thumb2-slow-flash-data-4.c
> +++ b/gcc/testsuite/gcc.target/arm/thumb2-slow-flash-data-4.c
> @@ -1,11 +1,10 @@
> /* { dg-do compile } */
> -/* { dg-require-effective-target arm_cortex_m } */
> /* { dg-require-effective-target arm_thumb2_ok } */
> /* { dg-require-effective-target arm_fp_ok } */
> -/* { dg-skip-if "avoid conflicts with multilib options" { *-*-* } {
> "-mcpu=*" } { "-mcpu=cortex-m4" "-mcpu=cortex-m7" } } */
> -/* { dg-skip-if "do not override -mfloat-abi" { *-*-* } { "-mfloat-abi=*" }
> { "-mfloat-abi=hard" } } */
> +/* { dg-require-effective-target arm_arch_v7em_ok } */
> /* { dg-skip-if "-mslow-flash-data and -mword-relocations incompatible" {
> *-*-* } { "-mword-relocations" } } */
> -/* { dg-options "-march=armv7e-m+fp -mfloat-abi=hard -O2 -mthumb
> -mslow-flash-data" } */
> +/* { dg-options "-mfloat-abi=hard -mfpu=auto -O2 -mslow-flash-data" } */
> +/* { dg-add-options arm_arch_v7em } */
>
> double __attribute__ ((target ("fpu=fpv5-d16")))
> foo (void)
> diff --git a/gcc/testsuite/gcc.target/arm/thumb2-slow-flash-data-5.c
> b/gcc/testsuite/gcc.target/arm/thumb2-slow-flash-data-5.c
> index b98eb7624e4..0fcfb65c5cd 100644
> --- a/gcc/testsuite/gcc.target/arm/thumb2-slow-flash-data-5.c
> +++ b/gcc/testsuite/gcc.target/arm/thumb2-slow-flash-data-5.c
> @@ -1,11 +1,10 @@
> /* { dg-do compile } */
> -/* { dg-require-effective-target arm_cortex_m } */
> /* { dg-require-effective-target arm_thumb2_ok } */
> /* { dg-require-effective-target arm_fp_ok } */
> -/* { dg-skip-if "avoid conflicts with multilib options" { *-*-* } {
> "-mcpu=*" } { "-mcpu=cortex-m4" "-mcpu=cortex-m7" } } */
> -/* { dg-skip-if "do not override -mfloat-abi" { *-*-* } { "-mfloat-abi=*" }
> { "-mfloat-abi=hard" } } */
> +/* { dg-require-effective-target arm_arch_v7em_ok } */
> /* { dg-skip-if "-mslow-flash-data and -mword-relocations incompatible" {
> *-*-* } { "-mword-relocations" } } */
> -/* { dg-options "-march=armv7e-m+fp -mfloat-abi=hard -O2 -mthumb
> -mslow-flash-data" } */
> +/* { dg-options "-mfloat-abi=hard -mfpu=auto -O2 -mslow-flash-data" } */
> +/* { dg-add-options arm_arch_v7em } */
>
> double __attribute__ ((target ("fpu=fpv5-sp-d16")))
> foo (void)
