On 19/11/2024 10:24, 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/cortex-m55-nodsp-flag-hard.c: Added option
> "-march=unset".
> * gcc.target/arm/cortex-m55-nodsp-flag-softfp.c: Likewise.
> * gcc.target/arm/cortex-m55-nodsp-nofp-flag-softfp.c: Likesie.
> * gcc.target/arm/cortex-m55-nofp-flag-hard.c: Likewise.
> * gcc.target/arm/cortex-m55-nofp-flag-softfp.c: Likewise.
> * gcc.target/arm/cortex-m55-nofp-nomve-flag-softfp.c: Likewise.
> * gcc.target/arm/cortex-m55-nomve-flag-hard.c: Likewise.
> * gcc.target/arm/cortex-m55-nomve-flag-softfp.c: Likewise.
> * gcc.target/arm/cortex-m55-nomve.fp-flag-hard.c: Likewise.
> * gcc.target/arm/cortex-m55-nomve.fp-flag-softfp.c: Likewise.
>
> Signed-off-by: Torbjörn SVENSSON <[email protected]>
OK (I don't think it's worth adding entries to the CPU table for these).
R.
> ---
> gcc/testsuite/gcc.target/arm/cortex-m55-nodsp-flag-hard.c | 2 +-
> gcc/testsuite/gcc.target/arm/cortex-m55-nodsp-flag-softfp.c | 2 +-
> .../gcc.target/arm/cortex-m55-nodsp-nofp-flag-softfp.c | 2 +-
> gcc/testsuite/gcc.target/arm/cortex-m55-nofp-flag-hard.c | 2 +-
> gcc/testsuite/gcc.target/arm/cortex-m55-nofp-flag-softfp.c | 2 +-
> .../gcc.target/arm/cortex-m55-nofp-nomve-flag-softfp.c | 2 +-
> gcc/testsuite/gcc.target/arm/cortex-m55-nomve-flag-hard.c | 2 +-
> gcc/testsuite/gcc.target/arm/cortex-m55-nomve-flag-softfp.c | 2 +-
> gcc/testsuite/gcc.target/arm/cortex-m55-nomve.fp-flag-hard.c | 2 +-
> gcc/testsuite/gcc.target/arm/cortex-m55-nomve.fp-flag-softfp.c | 2 +-
> 10 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/gcc/testsuite/gcc.target/arm/cortex-m55-nodsp-flag-hard.c
> b/gcc/testsuite/gcc.target/arm/cortex-m55-nodsp-flag-hard.c
> index 92c15112ae7..9810e28f58d 100644
> --- a/gcc/testsuite/gcc.target/arm/cortex-m55-nodsp-flag-hard.c
> +++ b/gcc/testsuite/gcc.target/arm/cortex-m55-nodsp-flag-hard.c
> @@ -1,6 +1,6 @@
> /* { dg-do assemble } */
> /* { dg-require-effective-target arm_v8_1m_mve_fp_ok } */
> -/* { dg-additional-options "-mcpu=cortex-m55+nodsp -mthumb -mfloat-abi=hard
> -mfpu=auto --save-temps" } */
> +/* { dg-additional-options "-march=unset -mcpu=cortex-m55+nodsp -mthumb
> -mfloat-abi=hard -mfpu=auto --save-temps" } */
> /* { dg-final { scan-assembler "\.arch_extension fp" } } */
> /* { dg-final { scan-assembler "\.arch_extension fp.dp" } } */
> /* { dg-final { scan-assembler-not "\.arch_extension dsp" } } */
> diff --git a/gcc/testsuite/gcc.target/arm/cortex-m55-nodsp-flag-softfp.c
> b/gcc/testsuite/gcc.target/arm/cortex-m55-nodsp-flag-softfp.c
> index 89d778f8ecb..cc92d8ccc60 100644
> --- a/gcc/testsuite/gcc.target/arm/cortex-m55-nodsp-flag-softfp.c
> +++ b/gcc/testsuite/gcc.target/arm/cortex-m55-nodsp-flag-softfp.c
> @@ -1,6 +1,6 @@
> /* { dg-do assemble } */
> /* { dg-require-effective-target arm_v8_1m_mve_fp_ok } */
> -/* { dg-additional-options "-mcpu=cortex-m55+nodsp -mthumb
> -mfloat-abi=softfp -mfpu=auto --save-temps" } */
> +/* { dg-additional-options "-march=unset -mcpu=cortex-m55+nodsp -mthumb
> -mfloat-abi=softfp -mfpu=auto --save-temps" } */
> /* { dg-final { scan-assembler "\.arch_extension fp" } } */
> /* { dg-final { scan-assembler "\.arch_extension fp.dp" } } */
> /* { dg-final { scan-assembler-not "\.arch_extension dsp" } } */
> diff --git a/gcc/testsuite/gcc.target/arm/cortex-m55-nodsp-nofp-flag-softfp.c
> b/gcc/testsuite/gcc.target/arm/cortex-m55-nodsp-nofp-flag-softfp.c
> index 405090ca9e9..11d4634a30f 100644
> --- a/gcc/testsuite/gcc.target/arm/cortex-m55-nodsp-nofp-flag-softfp.c
> +++ b/gcc/testsuite/gcc.target/arm/cortex-m55-nodsp-nofp-flag-softfp.c
> @@ -1,6 +1,6 @@
> /* { dg-do assemble } */
> /* { dg-require-effective-target arm_v8_1m_mve_fp_ok } */
> -/* { dg-additional-options "-mcpu=cortex-m55+nodsp+nofp -mthumb
> -mfloat-abi=softfp -mfpu=auto --save-temps" } */
> +/* { dg-additional-options "-march=unset -mcpu=cortex-m55+nodsp+nofp -mthumb
> -mfloat-abi=softfp -mfpu=auto --save-temps" } */
> /* { dg-final { scan-assembler-not "\.arch_extension fp" } } */
> /* { dg-final { scan-assembler-not "\.arch_extension fp.dp" } } */
> /* { dg-final { scan-assembler-not "\.arch_extension dsp" } } */
> diff --git a/gcc/testsuite/gcc.target/arm/cortex-m55-nofp-flag-hard.c
> b/gcc/testsuite/gcc.target/arm/cortex-m55-nofp-flag-hard.c
> index e0fb307ac30..bed231fc711 100644
> --- a/gcc/testsuite/gcc.target/arm/cortex-m55-nofp-flag-hard.c
> +++ b/gcc/testsuite/gcc.target/arm/cortex-m55-nofp-flag-hard.c
> @@ -1,6 +1,6 @@
> /* { dg-do assemble } */
> /* { dg-require-effective-target arm_v8_1m_mve_fp_ok } */
> -/* { dg-additional-options "-mcpu=cortex-m55+nofp -mthumb -mfloat-abi=hard
> -mfpu=auto --save-temps" } */
> +/* { dg-additional-options "-march=unset -mcpu=cortex-m55+nofp -mthumb
> -mfloat-abi=hard -mfpu=auto --save-temps" } */
> /* { dg-final { scan-assembler "\.fpu softvfp" } } */
> /* { dg-final { scan-assembler "\.arch_extension mve" } } */
> /* { dg-final { scan-assembler "\.arch_extension dsp" } } */
> diff --git a/gcc/testsuite/gcc.target/arm/cortex-m55-nofp-flag-softfp.c
> b/gcc/testsuite/gcc.target/arm/cortex-m55-nofp-flag-softfp.c
> index 50645e8cd0f..aad449c06c1 100644
> --- a/gcc/testsuite/gcc.target/arm/cortex-m55-nofp-flag-softfp.c
> +++ b/gcc/testsuite/gcc.target/arm/cortex-m55-nofp-flag-softfp.c
> @@ -1,6 +1,6 @@
> /* { dg-do assemble } */
> /* { dg-require-effective-target arm_v8_1m_mve_fp_ok } */
> -/* { dg-additional-options "-mcpu=cortex-m55+nofp -mthumb -mfloat-abi=softfp
> -mfpu=auto --save-temps" } */
> +/* { dg-additional-options "-march=unset -mcpu=cortex-m55+nofp -mthumb
> -mfloat-abi=softfp -mfpu=auto --save-temps" } */
> /* { dg-final { scan-assembler "\.fpu softvfp" } } */
> /* { dg-final { scan-assembler "\.arch_extension mve" } } */
> /* { dg-final { scan-assembler "\.arch_extension dsp" } } */
> diff --git a/gcc/testsuite/gcc.target/arm/cortex-m55-nofp-nomve-flag-softfp.c
> b/gcc/testsuite/gcc.target/arm/cortex-m55-nofp-nomve-flag-softfp.c
> index 948f622633c..0453cc187be 100644
> --- a/gcc/testsuite/gcc.target/arm/cortex-m55-nofp-nomve-flag-softfp.c
> +++ b/gcc/testsuite/gcc.target/arm/cortex-m55-nofp-nomve-flag-softfp.c
> @@ -1,6 +1,6 @@
> /* { dg-do assemble } */
> /* { dg-require-effective-target arm_v8_1m_mve_fp_ok } */
> -/* { dg-additional-options "-mcpu=cortex-m55+nomve+nofp -mthumb
> -mfloat-abi=softfp -mfpu=auto --save-temps" } */
> +/* { dg-additional-options "-march=unset -mcpu=cortex-m55+nomve+nofp -mthumb
> -mfloat-abi=softfp -mfpu=auto --save-temps" } */
> /* { dg-final { scan-assembler "\.fpu softvfp" } } */
> /* { dg-final { scan-assembler-not "\.arch_extension mve" } } */
> /* { dg-final { scan-assembler-not "\.arch_extension mve.fp" } } */
> diff --git a/gcc/testsuite/gcc.target/arm/cortex-m55-nomve-flag-hard.c
> b/gcc/testsuite/gcc.target/arm/cortex-m55-nomve-flag-hard.c
> index 2366e99ad24..755245cd92b 100644
> --- a/gcc/testsuite/gcc.target/arm/cortex-m55-nomve-flag-hard.c
> +++ b/gcc/testsuite/gcc.target/arm/cortex-m55-nomve-flag-hard.c
> @@ -1,6 +1,6 @@
> /* { dg-do assemble } */
> /* { dg-require-effective-target arm_v8_1m_mve_fp_ok } */
> -/* { dg-additional-options "-mcpu=cortex-m55+nomve -mthumb -mfloat-abi=hard
> -mfpu=auto --save-temps" } */
> +/* { dg-additional-options "-march=unset -mcpu=cortex-m55+nomve -mthumb
> -mfloat-abi=hard -mfpu=auto --save-temps" } */
> /* { dg-final { scan-assembler-not "\.arch_extension mve" } } */
> /* { dg-final { scan-assembler "\.arch_extension dsp" } } */
> /* { dg-final { scan-assembler "\.arch_extension fp" } } */
> diff --git a/gcc/testsuite/gcc.target/arm/cortex-m55-nomve-flag-softfp.c
> b/gcc/testsuite/gcc.target/arm/cortex-m55-nomve-flag-softfp.c
> index eb2d63d3291..bec5d697038 100644
> --- a/gcc/testsuite/gcc.target/arm/cortex-m55-nomve-flag-softfp.c
> +++ b/gcc/testsuite/gcc.target/arm/cortex-m55-nomve-flag-softfp.c
> @@ -1,6 +1,6 @@
> /* { dg-do assemble } */
> /* { dg-require-effective-target arm_v8_1m_mve_fp_ok } */
> -/* { dg-additional-options "-mcpu=cortex-m55+nomve -mthumb
> -mfloat-abi=softfp -mfpu=auto --save-temps" } */
> +/* { dg-additional-options "-march=unset -mcpu=cortex-m55+nomve -mthumb
> -mfloat-abi=softfp -mfpu=auto --save-temps" } */
> /* { dg-final { scan-assembler-not "\.arch_extension mve" } } */
> /* { dg-final { scan-assembler "\.arch_extension dsp" } } */
> /* { dg-final { scan-assembler "\.arch_extension fp" } } */
> diff --git a/gcc/testsuite/gcc.target/arm/cortex-m55-nomve.fp-flag-hard.c
> b/gcc/testsuite/gcc.target/arm/cortex-m55-nomve.fp-flag-hard.c
> index e7e57d986ca..75ca5c2769c 100644
> --- a/gcc/testsuite/gcc.target/arm/cortex-m55-nomve.fp-flag-hard.c
> +++ b/gcc/testsuite/gcc.target/arm/cortex-m55-nomve.fp-flag-hard.c
> @@ -1,6 +1,6 @@
> /* { dg-do assemble } */
> /* { dg-require-effective-target arm_v8_1m_mve_fp_ok } */
> -/* { dg-additional-options "-mcpu=cortex-m55+nomve.fp -mthumb
> -mfloat-abi=hard -mfpu=auto --save-temps" } */
> +/* { dg-additional-options "-march=unset -mcpu=cortex-m55+nomve.fp -mthumb
> -mfloat-abi=hard -mfpu=auto --save-temps" } */
> /* { dg-final { scan-assembler-not "\.arch_extension mve.fp" } } */
> /* { dg-final { scan-assembler "\.arch_extension mve" } } */
> /* { dg-final { scan-assembler "\.arch_extension dsp" } } */
> diff --git a/gcc/testsuite/gcc.target/arm/cortex-m55-nomve.fp-flag-softfp.c
> b/gcc/testsuite/gcc.target/arm/cortex-m55-nomve.fp-flag-softfp.c
> index 42889aad4a3..0fddbfd54c9 100644
> --- a/gcc/testsuite/gcc.target/arm/cortex-m55-nomve.fp-flag-softfp.c
> +++ b/gcc/testsuite/gcc.target/arm/cortex-m55-nomve.fp-flag-softfp.c
> @@ -1,6 +1,6 @@
> /* { dg-do assemble } */
> /* { dg-require-effective-target arm_v8_1m_mve_fp_ok } */
> -/* { dg-additional-options "-mcpu=cortex-m55+nomve.fp -mthumb
> -mfloat-abi=softfp -mfpu=auto --save-temps" } */
> +/* { dg-additional-options "-march=unset -mcpu=cortex-m55+nomve.fp -mthumb
> -mfloat-abi=softfp -mfpu=auto --save-temps" } */
> /* { dg-final { scan-assembler-not "\.arch_extension mve.fp" } } */
> /* { dg-final { scan-assembler "\.arch_extension mve" } } */
> /* { dg-final { scan-assembler "\.arch_extension dsp" } } */