From 4d224603d38d3e88f2a3c215b65c12c5f0da1d8d Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Thu, 15 Apr 2021 16:18:26 +0100 Subject: Make SVE ACLE tests work with --with-cpu This patch follows on from a previous one and adds -mtune=generic to the SVE ACLE assembler tests. These tests are pure assembly tests (execution tests are elsewhere) and they already require dg-additional-options to be used to add new options. We therefore don't need aarch64-with-arch-dg-options. gcc/testsuite/ * g++.target/aarch64/sve/acle/aarch64-sve-acle-asm.exp: Add -mtune=generic to the SVE flags. * g++.target/aarch64/sve2/acle/aarch64-sve2-acle-asm.exp: Likewise. * gcc.target/aarch64/sve/acle/aarch64-sve-acle-asm.exp: Likewise. * gcc.target/aarch64/sve2/acle/aarch64-sve2-acle-asm.exp: Likewise. --- gcc/testsuite/g++.target/aarch64/sve/acle/aarch64-sve-acle-asm.exp | 2 +- gcc/testsuite/g++.target/aarch64/sve2/acle/aarch64-sve2-acle-asm.exp | 4 ++++ gcc/testsuite/gcc.target/aarch64/sve/acle/aarch64-sve-acle-asm.exp | 2 +- gcc/testsuite/gcc.target/aarch64/sve2/acle/aarch64-sve2-acle-asm.exp | 4 ++++ 4 files changed, 10 insertions(+), 2 deletions(-) (limited to 'gcc') diff --git a/gcc/testsuite/g++.target/aarch64/sve/acle/aarch64-sve-acle-asm.exp b/gcc/testsuite/g++.target/aarch64/sve/acle/aarch64-sve-acle-asm.exp index 84ae95e..070a049 100644 --- a/gcc/testsuite/g++.target/aarch64/sve/acle/aarch64-sve-acle-asm.exp +++ b/gcc/testsuite/g++.target/aarch64/sve/acle/aarch64-sve-acle-asm.exp @@ -39,7 +39,7 @@ if { [check_effective_target_aarch64_sve] } { # Turn off any codegen tweaks by default that may affect expected assembly. # Tests relying on those should turn them on explicitly. -set sve_flags "$sve_flags -moverride=tune=none" +set sve_flags "$sve_flags -mtune=generic -moverride=tune=none" global gcc_runtest_parallelize_limit_minor if { [info exists gcc_runtest_parallelize_limit_minor] } { diff --git a/gcc/testsuite/g++.target/aarch64/sve2/acle/aarch64-sve2-acle-asm.exp b/gcc/testsuite/g++.target/aarch64/sve2/acle/aarch64-sve2-acle-asm.exp index c3a3a01..4989818 100644 --- a/gcc/testsuite/g++.target/aarch64/sve2/acle/aarch64-sve2-acle-asm.exp +++ b/gcc/testsuite/g++.target/aarch64/sve2/acle/aarch64-sve2-acle-asm.exp @@ -37,6 +37,10 @@ if { [check_effective_target_aarch64_sve2] } { set sve2_flags "-march=armv8.5-a+sve2" } +# Turn off any codegen tweaks by default that may affect expected assembly. +# Tests relying on those should turn them on explicitly. +set sve2_flags "$sve2_flags -mtune=generic -moverride=tune=none" + set gcc_subdir [string replace $subdir 0 2 gcc] lappend extra_flags "-fno-ipa-icf" "-I$srcdir/$gcc_subdir/../../sve/acle/asm" diff --git a/gcc/testsuite/gcc.target/aarch64/sve/acle/aarch64-sve-acle-asm.exp b/gcc/testsuite/gcc.target/aarch64/sve/acle/aarch64-sve-acle-asm.exp index fcd07aa..3522991 100644 --- a/gcc/testsuite/gcc.target/aarch64/sve/acle/aarch64-sve-acle-asm.exp +++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/aarch64-sve-acle-asm.exp @@ -39,7 +39,7 @@ if { [check_effective_target_aarch64_sve] } { # Turn off any codegen tweaks by default that may affect expected assembly. # Tests relying on those should turn them on explicitly. -set sve_flags "$sve_flags -moverride=tune=none" +set sve_flags "$sve_flags -mtune=generic -moverride=tune=none" global gcc_runtest_parallelize_limit_minor if { [info exists gcc_runtest_parallelize_limit_minor] } { diff --git a/gcc/testsuite/gcc.target/aarch64/sve2/acle/aarch64-sve2-acle-asm.exp b/gcc/testsuite/gcc.target/aarch64/sve2/acle/aarch64-sve2-acle-asm.exp index 632d350..67f817d 100644 --- a/gcc/testsuite/gcc.target/aarch64/sve2/acle/aarch64-sve2-acle-asm.exp +++ b/gcc/testsuite/gcc.target/aarch64/sve2/acle/aarch64-sve2-acle-asm.exp @@ -37,6 +37,10 @@ if { [check_effective_target_aarch64_sve2] } { set sve2_flags "-march=armv8.5-a+sve2" } +# Turn off any codegen tweaks by default that may affect expected assembly. +# Tests relying on those should turn them on explicitly. +set sve_flags "$sve_flags -mtune=generic -moverride=tune=none" + lappend extra_flags "-fno-ipa-icf" global gcc_runtest_parallelize_limit_minor -- cgit v1.1