On 07/10/2024 09:03, Torbjörn SVENSSON wrote:
> Ok for trunk?
>
> --
>
> Update test cases to use -mcpu=unset/-march=unset feature introduced in
> r15-3606-g7d6c6a0d15c.
The acronym ET isn't one I recognize - I'm guessing you intend it to be
Effective Target, rather than Extra Terrestrial, or Elf Target or some other
expansion? I think perhaps it would be better to avoid this in the commit log.
Your summary line is also a little imprecise as I suspect we will have more
patches of a similar nature for some other patches soon. Something like:
testsuite: arm: use effective-target for vsel* and mod* tests
would be closer
>
> gcc/testsuite/ChangeLog
>
> * gcc.target/arm/pr65647.c: Use ET arm_arch_v6m.
> * gcc.target/arm/mod_2.c: Use ET arm_cpu_cortex_a57.
> * gcc.target/arm/mod_256.c: Likewise.
> * gcc.target/arm/vseleqdf.c: Likewise.
> * gcc.target/arm/vseleqsf.c: Likewise.
> * gcc.target/arm/vselgedf.c: Likewise.
> * gcc.target/arm/vselgesf.c: Likewise.
> * gcc.target/arm/vselgtdf.c: Likewise.
> * gcc.target/arm/vselgtsf.c: Likewise.
> * gcc.target/arm/vselledf.c: Likewise.
> * gcc.target/arm/vsellesf.c: Likewise.
> * gcc.target/arm/vselltdf.c: Likewise.
> * gcc.target/arm/vselltsf.c: Likewise.
> * gcc.target/arm/vselnedf.c: Likewise.
> * gcc.target/arm/vselnesf.c: Likewise.
> * gcc.target/arm/vselvcdf.c: Likewise.
> * gcc.target/arm/vselvcsf.c: Likewise.
> * gcc.target/arm/vselvsdf.c: Likewise.
> * gcc.target/arm/vselvssf.c: Likewise.
> * lib/target-supports.exp: Define EF arm_cpu_cortex_a57. Update ET
^^
Typo for ET?
The body of the patch is OK with an updated commit message.
Thanks.
R.
> arm_v8_1_lob_ok to use -mcpu=unset.
>
> Signed-off-by: Torbjörn SVENSSON <torbjorn.svens...@foss.st.com>
> ---
> gcc/testsuite/gcc.target/arm/mod_2.c | 4 +++-
> gcc/testsuite/gcc.target/arm/mod_256.c | 4 +++-
> gcc/testsuite/gcc.target/arm/pr65647.c | 3 ++-
> gcc/testsuite/gcc.target/arm/vseleqdf.c | 5 +++--
> gcc/testsuite/gcc.target/arm/vseleqsf.c | 5 +++--
> gcc/testsuite/gcc.target/arm/vselgedf.c | 5 +++--
> gcc/testsuite/gcc.target/arm/vselgesf.c | 5 +++--
> gcc/testsuite/gcc.target/arm/vselgtdf.c | 5 +++--
> gcc/testsuite/gcc.target/arm/vselgtsf.c | 5 +++--
> gcc/testsuite/gcc.target/arm/vselledf.c | 5 +++--
> gcc/testsuite/gcc.target/arm/vsellesf.c | 5 +++--
> gcc/testsuite/gcc.target/arm/vselltdf.c | 5 +++--
> gcc/testsuite/gcc.target/arm/vselltsf.c | 5 +++--
> gcc/testsuite/gcc.target/arm/vselnedf.c | 5 +++--
> gcc/testsuite/gcc.target/arm/vselnesf.c | 5 +++--
> gcc/testsuite/gcc.target/arm/vselvcdf.c | 5 +++--
> gcc/testsuite/gcc.target/arm/vselvcsf.c | 5 +++--
> gcc/testsuite/gcc.target/arm/vselvsdf.c | 5 +++--
> gcc/testsuite/gcc.target/arm/vselvssf.c | 5 +++--
> gcc/testsuite/lib/target-supports.exp | 3 ++-
> 20 files changed, 58 insertions(+), 36 deletions(-)
>
> diff --git a/gcc/testsuite/gcc.target/arm/mod_2.c
> b/gcc/testsuite/gcc.target/arm/mod_2.c
> index 1143725d59a..3a203b67d73 100644
> --- a/gcc/testsuite/gcc.target/arm/mod_2.c
> +++ b/gcc/testsuite/gcc.target/arm/mod_2.c
> @@ -1,7 +1,9 @@
> /* { dg-do compile } */
> /* { dg-skip-if "-mpure-code supports M-profile only" { *-*-* } {
> "-mpure-code" } } */
> /* { dg-require-effective-target arm32 } */
> -/* { dg-options "-O2 -mcpu=cortex-a57 -save-temps" } */
> +/* { dg-require-effective-target arm_cpu_cortex_a57 } */
> +/* { dg-options "-O2 -save-temps" } */
> +/* { dg-add-options arm_cpu_cortex_a57 } */
>
> #include "../aarch64/mod_2.x"
>
> diff --git a/gcc/testsuite/gcc.target/arm/mod_256.c
> b/gcc/testsuite/gcc.target/arm/mod_256.c
> index d8dca0fe7d5..3521d7a05f3 100644
> --- a/gcc/testsuite/gcc.target/arm/mod_256.c
> +++ b/gcc/testsuite/gcc.target/arm/mod_256.c
> @@ -1,7 +1,9 @@
> /* { dg-do compile } */
> /* { dg-skip-if "-mpure-code supports M-profile only" { *-*-* } {
> "-mpure-code" } } */
> /* { dg-require-effective-target arm32 } */
> -/* { dg-options "-O2 -mcpu=cortex-a57 -save-temps" } */
> +/* { dg-require-effective-target arm_cpu_cortex_a57 } */
> +/* { dg-options "-O2 -save-temps" } */
> +/* { dg-add-options arm_cpu_cortex_a57 } */
>
> #include "../aarch64/mod_256.x"
>
> diff --git a/gcc/testsuite/gcc.target/arm/pr65647.c
> b/gcc/testsuite/gcc.target/arm/pr65647.c
> index 26b4e399f6b..dc3a3ca1184 100644
> --- a/gcc/testsuite/gcc.target/arm/pr65647.c
> +++ b/gcc/testsuite/gcc.target/arm/pr65647.c
> @@ -1,7 +1,8 @@
> /* { dg-do compile } */
> /* { dg-require-effective-target arm_arch_v6m_ok } */
> /* { dg-skip-if "do not override -mfloat-abi" { *-*-* } { "-mfloat-abi=*" }
> {"-mfloat-abi=soft" } } */
> -/* { dg-options "-march=armv6-m -mthumb -O3 -w -mfloat-abi=soft" } */
> +/* { dg-options "-mthumb -O3 -w -mfloat-abi=soft" } */
> +/* { dg-add-options arm_arch_v6m } */
>
> a, b, c, e, g = &e, h, i = 7, l = 1, m, n, o, q = &m, r, s = &r, u, w = 9, x,
> y = 6, z, t6 = 7, t8, t9 = 1, t11 = 5, t12 = &t8, t13 = 3, t15,
> diff --git a/gcc/testsuite/gcc.target/arm/vseleqdf.c
> b/gcc/testsuite/gcc.target/arm/vseleqdf.c
> index 8a433356492..5be3ed2b1f9 100644
> --- a/gcc/testsuite/gcc.target/arm/vseleqdf.c
> +++ b/gcc/testsuite/gcc.target/arm/vseleqdf.c
> @@ -1,7 +1,8 @@
> /* { dg-do compile } */
> -/* { dg-require-effective-target arm_arch_v8a_ok } */
> +/* { dg-require-effective-target arm_cpu_cortex_a57_ok } */
> /* { dg-require-effective-target arm_v8_vfp_ok } */
> -/* { dg-options "-O2 -mcpu=cortex-a57" } */
> +/* { dg-options "-O2" } */
> +/* { dg-add-options arm_cpu_cortex_a57 } */
> /* { dg-add-options arm_v8_vfp } */
>
> double
> diff --git a/gcc/testsuite/gcc.target/arm/vseleqsf.c
> b/gcc/testsuite/gcc.target/arm/vseleqsf.c
> index fc4631887d8..f870b5e92e9 100644
> --- a/gcc/testsuite/gcc.target/arm/vseleqsf.c
> +++ b/gcc/testsuite/gcc.target/arm/vseleqsf.c
> @@ -1,7 +1,8 @@
> /* { dg-do compile } */
> -/* { dg-require-effective-target arm_arch_v8a_ok } */
> +/* { dg-require-effective-target arm_cpu_cortex_a57_ok } */
> /* { dg-require-effective-target arm_v8_vfp_ok } */
> -/* { dg-options "-O2 -mcpu=cortex-a57" } */
> +/* { dg-options "-O2" } */
> +/* { dg-add-options arm_cpu_cortex_a57 } */
> /* { dg-add-options arm_v8_vfp } */
>
> float
> diff --git a/gcc/testsuite/gcc.target/arm/vselgedf.c
> b/gcc/testsuite/gcc.target/arm/vselgedf.c
> index 9a74eddbea9..a769f2e4577 100644
> --- a/gcc/testsuite/gcc.target/arm/vselgedf.c
> +++ b/gcc/testsuite/gcc.target/arm/vselgedf.c
> @@ -1,7 +1,8 @@
> /* { dg-do compile } */
> -/* { dg-require-effective-target arm_arch_v8a_ok } */
> +/* { dg-require-effective-target arm_cpu_cortex_a57_ok } */
> /* { dg-require-effective-target arm_v8_vfp_ok } */
> -/* { dg-options "-O2 -mcpu=cortex-a57" } */
> +/* { dg-options "-O2" } */
> +/* { dg-add-options arm_cpu_cortex_a57 } */
> /* { dg-add-options arm_v8_vfp } */
>
> double
> diff --git a/gcc/testsuite/gcc.target/arm/vselgesf.c
> b/gcc/testsuite/gcc.target/arm/vselgesf.c
> index 5f1095416ee..ecf9157928e 100644
> --- a/gcc/testsuite/gcc.target/arm/vselgesf.c
> +++ b/gcc/testsuite/gcc.target/arm/vselgesf.c
> @@ -1,7 +1,8 @@
> /* { dg-do compile } */
> -/* { dg-require-effective-target arm_arch_v8a_ok } */
> +/* { dg-require-effective-target arm_cpu_cortex_a57_ok } */
> /* { dg-require-effective-target arm_v8_vfp_ok } */
> -/* { dg-options "-O2 -mcpu=cortex-a57" } */
> +/* { dg-options "-O2" } */
> +/* { dg-add-options arm_cpu_cortex_a57 } */
> /* { dg-add-options arm_v8_vfp } */
>
> float
> diff --git a/gcc/testsuite/gcc.target/arm/vselgtdf.c
> b/gcc/testsuite/gcc.target/arm/vselgtdf.c
> index 7ceaa34a529..5267a87569f 100644
> --- a/gcc/testsuite/gcc.target/arm/vselgtdf.c
> +++ b/gcc/testsuite/gcc.target/arm/vselgtdf.c
> @@ -1,7 +1,8 @@
> /* { dg-do compile } */
> -/* { dg-require-effective-target arm_arch_v8a_ok } */
> +/* { dg-require-effective-target arm_cpu_cortex_a57_ok } */
> /* { dg-require-effective-target arm_v8_vfp_ok } */
> -/* { dg-options "-O2 -mcpu=cortex-a57" } */
> +/* { dg-options "-O2" } */
> +/* { dg-add-options arm_cpu_cortex_a57 } */
> /* { dg-add-options arm_v8_vfp } */
>
> double
> diff --git a/gcc/testsuite/gcc.target/arm/vselgtsf.c
> b/gcc/testsuite/gcc.target/arm/vselgtsf.c
> index 9062ba29666..f60629eafa8 100644
> --- a/gcc/testsuite/gcc.target/arm/vselgtsf.c
> +++ b/gcc/testsuite/gcc.target/arm/vselgtsf.c
> @@ -1,7 +1,8 @@
> /* { dg-do compile } */
> -/* { dg-require-effective-target arm_arch_v8a_ok } */
> +/* { dg-require-effective-target arm_cpu_cortex_a57_ok } */
> /* { dg-require-effective-target arm_v8_vfp_ok } */
> -/* { dg-options "-O2 -mcpu=cortex-a57" } */
> +/* { dg-options "-O2" } */
> +/* { dg-add-options arm_cpu_cortex_a57 } */
> /* { dg-add-options arm_v8_vfp } */
>
> float
> diff --git a/gcc/testsuite/gcc.target/arm/vselledf.c
> b/gcc/testsuite/gcc.target/arm/vselledf.c
> index 4aa66ce7d9a..4cf09818931 100644
> --- a/gcc/testsuite/gcc.target/arm/vselledf.c
> +++ b/gcc/testsuite/gcc.target/arm/vselledf.c
> @@ -1,7 +1,8 @@
> /* { dg-do compile } */
> -/* { dg-require-effective-target arm_arch_v8a_ok } */
> +/* { dg-require-effective-target arm_cpu_cortex_a57_ok } */
> /* { dg-require-effective-target arm_v8_vfp_ok } */
> -/* { dg-options "-O2 -mcpu=cortex-a57" } */
> +/* { dg-options "-O2" } */
> +/* { dg-add-options arm_cpu_cortex_a57 } */
> /* { dg-add-options arm_v8_vfp } */
>
> double
> diff --git a/gcc/testsuite/gcc.target/arm/vsellesf.c
> b/gcc/testsuite/gcc.target/arm/vsellesf.c
> index 9dcb791ed8e..68d29d0b5aa 100644
> --- a/gcc/testsuite/gcc.target/arm/vsellesf.c
> +++ b/gcc/testsuite/gcc.target/arm/vsellesf.c
> @@ -1,7 +1,8 @@
> /* { dg-do compile } */
> -/* { dg-require-effective-target arm_arch_v8a_ok } */
> +/* { dg-require-effective-target arm_cpu_cortex_a57_ok } */
> /* { dg-require-effective-target arm_v8_vfp_ok } */
> -/* { dg-options "-O2 -mcpu=cortex-a57" } */
> +/* { dg-options "-O2" } */
> +/* { dg-add-options arm_cpu_cortex_a57 } */
> /* { dg-add-options arm_v8_vfp } */
>
> float
> diff --git a/gcc/testsuite/gcc.target/arm/vselltdf.c
> b/gcc/testsuite/gcc.target/arm/vselltdf.c
> index 238860d7ae2..80b3787ffa4 100644
> --- a/gcc/testsuite/gcc.target/arm/vselltdf.c
> +++ b/gcc/testsuite/gcc.target/arm/vselltdf.c
> @@ -1,7 +1,8 @@
> /* { dg-do compile } */
> -/* { dg-require-effective-target arm_arch_v8a_ok } */
> +/* { dg-require-effective-target arm_cpu_cortex_a57_ok } */
> /* { dg-require-effective-target arm_v8_vfp_ok } */
> -/* { dg-options "-O2 -mcpu=cortex-a57" } */
> +/* { dg-options "-O2" } */
> +/* { dg-add-options arm_cpu_cortex_a57 } */
> /* { dg-add-options arm_v8_vfp } */
>
> double
> diff --git a/gcc/testsuite/gcc.target/arm/vselltsf.c
> b/gcc/testsuite/gcc.target/arm/vselltsf.c
> index 6f179bae625..c06378ad097 100644
> --- a/gcc/testsuite/gcc.target/arm/vselltsf.c
> +++ b/gcc/testsuite/gcc.target/arm/vselltsf.c
> @@ -1,7 +1,8 @@
> /* { dg-do compile } */
> -/* { dg-require-effective-target arm_arch_v8a_ok } */
> +/* { dg-require-effective-target arm_cpu_cortex_a57_ok } */
> /* { dg-require-effective-target arm_v8_vfp_ok } */
> -/* { dg-options "-O2 -mcpu=cortex-a57" } */
> +/* { dg-options "-O2" } */
> +/* { dg-add-options arm_cpu_cortex_a57 } */
> /* { dg-add-options arm_v8_vfp } */
>
> float
> diff --git a/gcc/testsuite/gcc.target/arm/vselnedf.c
> b/gcc/testsuite/gcc.target/arm/vselnedf.c
> index 3f5881e9809..f17ceba8d0c 100644
> --- a/gcc/testsuite/gcc.target/arm/vselnedf.c
> +++ b/gcc/testsuite/gcc.target/arm/vselnedf.c
> @@ -1,7 +1,8 @@
> /* { dg-do compile } */
> -/* { dg-require-effective-target arm_arch_v8a_ok } */
> +/* { dg-require-effective-target arm_cpu_cortex_a57_ok } */
> /* { dg-require-effective-target arm_v8_vfp_ok } */
> -/* { dg-options "-O2 -mcpu=cortex-a57" } */
> +/* { dg-options "-O2" } */
> +/* { dg-add-options arm_cpu_cortex_a57 } */
> /* { dg-add-options arm_v8_vfp } */
>
> double
> diff --git a/gcc/testsuite/gcc.target/arm/vselnesf.c
> b/gcc/testsuite/gcc.target/arm/vselnesf.c
> index e72b902c2ca..a06a4d92f3b 100644
> --- a/gcc/testsuite/gcc.target/arm/vselnesf.c
> +++ b/gcc/testsuite/gcc.target/arm/vselnesf.c
> @@ -1,7 +1,8 @@
> /* { dg-do compile } */
> -/* { dg-require-effective-target arm_arch_v8a_ok } */
> +/* { dg-require-effective-target arm_cpu_cortex_a57_ok } */
> /* { dg-require-effective-target arm_v8_vfp_ok } */
> -/* { dg-options "-O2 -mcpu=cortex-a57" } */
> +/* { dg-options "-O2" } */
> +/* { dg-add-options arm_cpu_cortex_a57 } */
> /* { dg-add-options arm_v8_vfp } */
>
> float
> diff --git a/gcc/testsuite/gcc.target/arm/vselvcdf.c
> b/gcc/testsuite/gcc.target/arm/vselvcdf.c
> index 408d0957c85..6d46bf31ba4 100644
> --- a/gcc/testsuite/gcc.target/arm/vselvcdf.c
> +++ b/gcc/testsuite/gcc.target/arm/vselvcdf.c
> @@ -1,7 +1,8 @@
> /* { dg-do compile } */
> -/* { dg-require-effective-target arm_arch_v8a_ok } */
> +/* { dg-require-effective-target arm_cpu_cortex_a57_ok } */
> /* { dg-require-effective-target arm_v8_vfp_ok } */
> -/* { dg-options "-O2 -mcpu=cortex-a57" } */
> +/* { dg-options "-O2" } */
> +/* { dg-add-options arm_cpu_cortex_a57 } */
> /* { dg-add-options arm_v8_vfp } */
>
> double
> diff --git a/gcc/testsuite/gcc.target/arm/vselvcsf.c
> b/gcc/testsuite/gcc.target/arm/vselvcsf.c
> index ccded1f714f..0f25a1c0ebd 100644
> --- a/gcc/testsuite/gcc.target/arm/vselvcsf.c
> +++ b/gcc/testsuite/gcc.target/arm/vselvcsf.c
> @@ -1,7 +1,8 @@
> /* { dg-do compile } */
> -/* { dg-require-effective-target arm_arch_v8a_ok } */
> +/* { dg-require-effective-target arm_cpu_cortex_a57_ok } */
> /* { dg-require-effective-target arm_v8_vfp_ok } */
> -/* { dg-options "-O2 -mcpu=cortex-a57" } */
> +/* { dg-options "-O2" } */
> +/* { dg-add-options arm_cpu_cortex_a57 } */
> /* { dg-add-options arm_v8_vfp } */
>
> float
> diff --git a/gcc/testsuite/gcc.target/arm/vselvsdf.c
> b/gcc/testsuite/gcc.target/arm/vselvsdf.c
> index f67bde18c66..be225b124a1 100644
> --- a/gcc/testsuite/gcc.target/arm/vselvsdf.c
> +++ b/gcc/testsuite/gcc.target/arm/vselvsdf.c
> @@ -1,7 +1,8 @@
> /* { dg-do compile } */
> -/* { dg-require-effective-target arm_arch_v8a_ok } */
> +/* { dg-require-effective-target arm_cpu_cortex_a57_ok } */
> /* { dg-require-effective-target arm_v8_vfp_ok } */
> -/* { dg-options "-O2 -mcpu=cortex-a57" } */
> +/* { dg-options "-O2" } */
> +/* { dg-add-options arm_cpu_cortex_a57 } */
> /* { dg-add-options arm_v8_vfp } */
>
> double
> diff --git a/gcc/testsuite/gcc.target/arm/vselvssf.c
> b/gcc/testsuite/gcc.target/arm/vselvssf.c
> index 1e1d2c57f20..65b8c320271 100644
> --- a/gcc/testsuite/gcc.target/arm/vselvssf.c
> +++ b/gcc/testsuite/gcc.target/arm/vselvssf.c
> @@ -1,7 +1,8 @@
> /* { dg-do compile } */
> -/* { dg-require-effective-target arm_arch_v8a_ok } */
> +/* { dg-require-effective-target arm_cpu_cortex_a57_ok } */
> /* { dg-require-effective-target arm_v8_vfp_ok } */
> -/* { dg-options "-O2 -mcpu=cortex-a57" } */
> +/* { dg-options "-O2" } */
> +/* { dg-add-options arm_cpu_cortex_a57 } */
> /* { dg-add-options arm_v8_vfp } */
>
> float
> diff --git a/gcc/testsuite/lib/target-supports.exp
> b/gcc/testsuite/lib/target-supports.exp
> index 8f2afe866c7..7e89b8e7381 100644
> --- a/gcc/testsuite/lib/target-supports.exp
> +++ b/gcc/testsuite/lib/target-supports.exp
> @@ -5794,6 +5794,7 @@ foreach { armfunc armflag armdefs } {
> # flags). See above for setting -march=.
> foreach { armfunc armflag armdefs } {
> xscale_arm "-mcpu=xscale -mfloat-abi=soft -marm" "__XSCALE__ &&
> !__thumb__"
> + cortex_a57 "-mcpu=cortex-a57" __ARM_ARCH_8A__
> } {
> eval [string map [list FUNC $armfunc FLAG $armflag DEFS $armdefs ] {
> proc check_effective_target_arm_cpu_FUNC_ok { } {
> @@ -13141,7 +13142,7 @@ proc check_effective_target_arm_v8_1_lob_ok { } {
> asm goto ("le lr, %l0" : : : "lr" : loop);
> return i != 10;
> }
> - } "-march=armv8.1-m.main -mthumb" ]
> + } "-mcpu=unset -march=armv8.1-m.main -mthumb" ]
> }
> }
>
