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/bfloat16_scalar_1_2.c: Added option
> "-march=unset".
> * gcc.target/arm/bfloat16_scalar_2_1.c: Likewise.
> * gcc.target/arm/bfloat16_scalar_2_2.c: Likewise.
> * gcc.target/arm/bfloat16_scalar_3_1.c: Likewise.
> * gcc.target/arm/bfloat16_scalar_3_2.c: Likewise.
>
> Signed-off-by: Torbjörn SVENSSON <torbjorn.svens...@foss.st.com>
> ---
> gcc/testsuite/gcc.target/arm/bfloat16_scalar_1_2.c | 2 +-
> gcc/testsuite/gcc.target/arm/bfloat16_scalar_2_1.c | 2 +-
> gcc/testsuite/gcc.target/arm/bfloat16_scalar_2_2.c | 2 +-
> gcc/testsuite/gcc.target/arm/bfloat16_scalar_3_1.c | 2 +-
> gcc/testsuite/gcc.target/arm/bfloat16_scalar_3_2.c | 2 +-
> 5 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/gcc/testsuite/gcc.target/arm/bfloat16_scalar_1_2.c
> b/gcc/testsuite/gcc.target/arm/bfloat16_scalar_1_2.c
> index 8293cafcc14..0d4c3ffec53 100644
> --- a/gcc/testsuite/gcc.target/arm/bfloat16_scalar_1_2.c
> +++ b/gcc/testsuite/gcc.target/arm/bfloat16_scalar_1_2.c
> @@ -1,7 +1,7 @@
> /* { dg-do assemble { target { arm*-*-* } } } */
> /* { dg-require-effective-target arm_v8_neon_ok } */
> /* { dg-require-effective-target arm_v8_2a_bf16_neon_ok } */
> -/* { dg-additional-options "-march=armv8.2-a+bf16 -mfloat-abi=softfp
> -mfpu=auto" } */
> +/* { dg-additional-options "-mcpu=unset -march=armv8.2-a+bf16
> -mfloat-abi=softfp -mfpu=auto" } */
> /* { dg-additional-options "-O3 --save-temps -std=gnu90" } */
> /* { dg-final { check-function-bodies "**" "" } } */
For all of these tests I'd just add v8_2a_bf16 to the table of architectures,
then use that. We then don't need to mess about with multiple dg-r-e-t rules.
R.
>
> diff --git a/gcc/testsuite/gcc.target/arm/bfloat16_scalar_2_1.c
> b/gcc/testsuite/gcc.target/arm/bfloat16_scalar_2_1.c
> index e84f837e162..43c6ce0c1d3 100644
> --- a/gcc/testsuite/gcc.target/arm/bfloat16_scalar_2_1.c
> +++ b/gcc/testsuite/gcc.target/arm/bfloat16_scalar_2_1.c
> @@ -1,7 +1,7 @@
> /* { dg-do assemble { target { arm*-*-* } } } */
> /* { dg-require-effective-target arm_v8_neon_ok } */
> /* { dg-require-effective-target arm_v8_2a_bf16_neon_ok } */
> -/* { dg-additional-options "-march=armv8.2-a -mfloat-abi=hard
> -mfpu=neon-fp-armv8" } */
> +/* { dg-additional-options "-mcpu=unset -march=armv8.2-a -mfloat-abi=hard
> -mfpu=neon-fp-armv8" } */
> /* { dg-additional-options "-O3 --save-temps -std=gnu90" } */
> /* { dg-final { check-function-bodies "**" "" } } */
>
> diff --git a/gcc/testsuite/gcc.target/arm/bfloat16_scalar_2_2.c
> b/gcc/testsuite/gcc.target/arm/bfloat16_scalar_2_2.c
> index 93ec059819a..64b584ea34c 100644
> --- a/gcc/testsuite/gcc.target/arm/bfloat16_scalar_2_2.c
> +++ b/gcc/testsuite/gcc.target/arm/bfloat16_scalar_2_2.c
> @@ -1,7 +1,7 @@
> /* { dg-do assemble { target { arm*-*-* } } } */
> /* { dg-require-effective-target arm_v8_neon_ok } */
> /* { dg-require-effective-target arm_v8_2a_bf16_neon_ok } */
> -/* { dg-additional-options "-march=armv8.2-a -mfloat-abi=softfp
> -mfpu=neon-fp-armv8" } */
> +/* { dg-additional-options "-mcpu=unset -march=armv8.2-a -mfloat-abi=softfp
> -mfpu=neon-fp-armv8" } */
> /* { dg-additional-options "-O3 --save-temps -std=gnu90" } */
> /* { dg-final { check-function-bodies "**" "" } } */
>
> diff --git a/gcc/testsuite/gcc.target/arm/bfloat16_scalar_3_1.c
> b/gcc/testsuite/gcc.target/arm/bfloat16_scalar_3_1.c
> index a1a70690322..eb9baba9cd8 100644
> --- a/gcc/testsuite/gcc.target/arm/bfloat16_scalar_3_1.c
> +++ b/gcc/testsuite/gcc.target/arm/bfloat16_scalar_3_1.c
> @@ -1,7 +1,7 @@
> /* { dg-do assemble { target { arm*-*-* } } } */
> /* { dg-require-effective-target arm_v8_neon_ok } */
> /* { dg-require-effective-target arm_v8_2a_bf16_neon_ok } */
> -/* { dg-additional-options "-march=armv8.2-a -mfloat-abi=hard
> -mfpu=neon-fp-armv8" } */
> +/* { dg-additional-options "-mcpu=unset -march=armv8.2-a -mfloat-abi=hard
> -mfpu=neon-fp-armv8" } */
> /* { dg-additional-options "-O3 --save-temps -std=gnu90" } */
> /* { dg-final { check-function-bodies "**" "" } } */
>
> diff --git a/gcc/testsuite/gcc.target/arm/bfloat16_scalar_3_2.c
> b/gcc/testsuite/gcc.target/arm/bfloat16_scalar_3_2.c
> index f49072613f0..74a74ec54fe 100644
> --- a/gcc/testsuite/gcc.target/arm/bfloat16_scalar_3_2.c
> +++ b/gcc/testsuite/gcc.target/arm/bfloat16_scalar_3_2.c
> @@ -1,7 +1,7 @@
> /* { dg-do assemble { target { arm*-*-* } } } */
> /* { dg-require-effective-target arm_v8_neon_ok } */
> /* { dg-require-effective-target arm_v8_2a_bf16_neon_ok } */
> -/* { dg-additional-options "-march=armv8.2-a -mfloat-abi=softfp
> -mfpu=neon-fp-armv8" } */
> +/* { dg-additional-options "-mcpu=unset -march=armv8.2-a -mfloat-abi=softfp
> -mfpu=neon-fp-armv8" } */
> /* { dg-additional-options "-O3 --save-temps -std=gnu90" } */
> /* { dg-final { check-function-bodies "**" "" } } */
>
