diff mbox series

AArch64 SVE2: Fix aarch64-sve2-acle-asm tests.

Message ID patch-13998-tamar@arm.com
State New
Headers show
Series AArch64 SVE2: Fix aarch64-sve2-acle-asm tests. | expand

Commit Message

Tamar Christina Jan. 8, 2021, 9:31 a.m. UTC 
Hi All,

This fixes a logical inconsistency with the SVE2 ACLE tests where the SVE2 tests
are checking for SVE support in the assembler instead of SVE2.

This makes all these tests fail when the user has an SVE enabled assembler but
not an SVE2 one.

Ok for master?

Thanks,
Tamar

gcc/testsuite/ChangeLog:

	* lib/target-supports.exp
	(check_effective_target_aarch64_asm_sve_ok): New.
	* g++.target/aarch64/sve2/acle/aarch64-sve2-acle-asm.exp: Use it.

--- inline copy of patch -- 
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 aa8dc9ee11ec4e0a7144e79a36f52c6d9d83ec68..c3a3a01a7ed913720e31729300dc0a5c99232ec4 100644


--

Comments

Richard Sandiford Jan. 8, 2021, 9:56 a.m. UTC | #1 
Tamar Christina <tamar.christina@arm.com> writes:
> Hi All,
>
> This fixes a logical inconsistency with the SVE2 ACLE tests where the SVE2 tests
> are checking for SVE support in the assembler instead of SVE2.
>
> This makes all these tests fail when the user has an SVE enabled assembler but
> not an SVE2 one.
>
> Ok for master?
>
> Thanks,
> Tamar
>
> gcc/testsuite/ChangeLog:
>
> 	* lib/target-supports.exp
> 	(check_effective_target_aarch64_asm_sve_ok): New.
> 	* g++.target/aarch64/sve2/acle/aarch64-sve2-acle-asm.exp: Use it.

While you're there, could you do the same for the gcc.target version
(gcc.target/aarch64/sve2/acle/aarch64-sve2-acle-asm.exp)?

OK with that change, thanks.

Richard

>
> --- inline copy of patch -- 
> 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 aa8dc9ee11ec4e0a7144e79a36f52c6d9d83ec68..c3a3a01a7ed913720e31729300dc0a5c99232ec4 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
> @@ -66,7 +66,7 @@ set-torture-options {
>  # Main loop.
>  set files [glob -nocomplain $srcdir/$gcc_subdir/asm/*.c]
>  set save-dg-do-what-default ${dg-do-what-default}
> -if { [check_effective_target_aarch64_asm_sve_ok]
> +if { [check_effective_target_aarch64_asm_sve2_ok]
>       && [check_effective_target_aarch64_variant_pcs] } {
>      set dg-do-what-default assemble
>  } else {
> diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
> index 5cf0f4218a6420a5289a4be25ecca0915107b139..47d4c45e9eb9008148a5f8f26b3c7dd7292369fc 100644
> --- a/gcc/testsuite/lib/target-supports.exp
> +++ b/gcc/testsuite/lib/target-supports.exp
> @@ -9735,7 +9735,7 @@ proc check_effective_target_aarch64_tiny { } {
>  # various architecture extensions via the .arch_extension pseudo-op.
>  
>  foreach { aarch64_ext } { "fp" "simd" "crypto" "crc" "lse" "dotprod" "sve"
> -			  "i8mm" "f32mm" "f64mm" "bf16" "sb" } {
> +			  "i8mm" "f32mm" "f64mm" "bf16" "sb" "sve2" } {
>      eval [string map [list FUNC $aarch64_ext] {
>  	proc check_effective_target_aarch64_asm_FUNC_ok { } {
>  	  if { [istarget aarch64*-*-*] } {
diff mbox series

Patch

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 aa8dc9ee11ec4e0a7144e79a36f52c6d9d83ec68..c3a3a01a7ed913720e31729300dc0a5c99232ec4 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
@@ -66,7 +66,7 @@  set-torture-options {
 # Main loop.
 set files [glob -nocomplain $srcdir/$gcc_subdir/asm/*.c]
 set save-dg-do-what-default ${dg-do-what-default}
-if { [check_effective_target_aarch64_asm_sve_ok]
+if { [check_effective_target_aarch64_asm_sve2_ok]
      && [check_effective_target_aarch64_variant_pcs] } {
     set dg-do-what-default assemble
 } else {
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index 5cf0f4218a6420a5289a4be25ecca0915107b139..47d4c45e9eb9008148a5f8f26b3c7dd7292369fc 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -9735,7 +9735,7 @@  proc check_effective_target_aarch64_tiny { } {
 # various architecture extensions via the .arch_extension pseudo-op.
 
 foreach { aarch64_ext } { "fp" "simd" "crypto" "crc" "lse" "dotprod" "sve"
-			  "i8mm" "f32mm" "f64mm" "bf16" "sb" } {
+			  "i8mm" "f32mm" "f64mm" "bf16" "sb" "sve2" } {
     eval [string map [list FUNC $aarch64_ext] {
 	proc check_effective_target_aarch64_asm_FUNC_ok { } {
 	  if { [istarget aarch64*-*-*] } {