From d0f8cb17bbd35e5eb25fc3b2119756b3e103e798 Mon Sep 17 00:00:00 2001 From: Tamar Christina Date: Wed, 21 Feb 2024 11:42:53 +0000 Subject: AArch64: remove ls64 from being mandatory on armv8.7-a.. The Arm Architectural Reference Manual (Version J.a, section A2.9 on FEAT_LS64) shows that ls64 is an optional extensions and should not be enabled by default for Armv8.7-a. This drops it from the mandatory bits for the architecture and brings GCC inline with LLVM and the achitecture. Note that we will not be changing binutils to preserve compatibility with older released compilers. gcc/ChangeLog: * config/aarch64/aarch64-arches.def (AARCH64_ARCH): Remove LS64 from Armv8.7-a. gcc/testsuite/ChangeLog: * g++.target/aarch64/acle/ls64.C: Add +ls64. * g++.target/aarch64/acle/ls64_lto.C: Likewise. * gcc.target/aarch64/acle/ls64_lto.c: Likewise. * gcc.target/aarch64/acle/pr110100.c: Likewise. * gcc.target/aarch64/acle/pr110132.c: Likewise. * gcc.target/aarch64/options_set_28.c: Drop check for nols64. * gcc.target/aarch64/pragma_cpp_predefs_2.c: Correct header checks. --- gcc/config/aarch64/aarch64-arches.def | 2 +- gcc/testsuite/g++.target/aarch64/acle/ls64.C | 2 +- gcc/testsuite/g++.target/aarch64/acle/ls64_lto.C | 2 +- gcc/testsuite/gcc.target/aarch64/acle/ls64_lto.c | 2 +- gcc/testsuite/gcc.target/aarch64/acle/pr110100.c | 2 +- gcc/testsuite/gcc.target/aarch64/acle/pr110132.c | 2 +- gcc/testsuite/gcc.target/aarch64/options_set_28.c | 4 ++-- gcc/testsuite/gcc.target/aarch64/pragma_cpp_predefs_2.c | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) (limited to 'gcc') diff --git a/gcc/config/aarch64/aarch64-arches.def b/gcc/config/aarch64/aarch64-arches.def index b7115ff..9bec30e 100644 --- a/gcc/config/aarch64/aarch64-arches.def +++ b/gcc/config/aarch64/aarch64-arches.def @@ -37,7 +37,7 @@ AARCH64_ARCH("armv8.3-a", generic_armv8_a, V8_3A, 8, (V8_2A, PAUTH, R AARCH64_ARCH("armv8.4-a", generic_armv8_a, V8_4A, 8, (V8_3A, F16FML, DOTPROD, FLAGM)) AARCH64_ARCH("armv8.5-a", generic_armv8_a, V8_5A, 8, (V8_4A, SB, SSBS, PREDRES)) AARCH64_ARCH("armv8.6-a", generic_armv8_a, V8_6A, 8, (V8_5A, I8MM, BF16)) -AARCH64_ARCH("armv8.7-a", generic_armv8_a, V8_7A, 8, (V8_6A, LS64)) +AARCH64_ARCH("armv8.7-a", generic_armv8_a, V8_7A, 8, (V8_6A)) AARCH64_ARCH("armv8.8-a", generic_armv8_a, V8_8A, 8, (V8_7A, MOPS)) AARCH64_ARCH("armv8.9-a", generic_armv8_a, V8_9A, 8, (V8_8A)) AARCH64_ARCH("armv8-r", generic_armv8_a, V8R , 8, (V8_4A)) diff --git a/gcc/testsuite/g++.target/aarch64/acle/ls64.C b/gcc/testsuite/g++.target/aarch64/acle/ls64.C index d900278..dcfe6f1 100644 --- a/gcc/testsuite/g++.target/aarch64/acle/ls64.C +++ b/gcc/testsuite/g++.target/aarch64/acle/ls64.C @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-additional-options "-march=armv8.7-a" } */ +/* { dg-additional-options "-march=armv8.7-a+ls64" } */ #include int main() { diff --git a/gcc/testsuite/g++.target/aarch64/acle/ls64_lto.C b/gcc/testsuite/g++.target/aarch64/acle/ls64_lto.C index 274a477..0198fe2 100644 --- a/gcc/testsuite/g++.target/aarch64/acle/ls64_lto.C +++ b/gcc/testsuite/g++.target/aarch64/acle/ls64_lto.C @@ -1,5 +1,5 @@ /* { dg-do link { target aarch64_asm_ls64_ok } } */ -/* { dg-additional-options "-march=armv8.7-a -flto" } */ +/* { dg-additional-options "-march=armv8.7-a+ls64 -flto" } */ #include int main() { diff --git a/gcc/testsuite/gcc.target/aarch64/acle/ls64_lto.c b/gcc/testsuite/gcc.target/aarch64/acle/ls64_lto.c index 8b4f242..0e5ae0b 100644 --- a/gcc/testsuite/gcc.target/aarch64/acle/ls64_lto.c +++ b/gcc/testsuite/gcc.target/aarch64/acle/ls64_lto.c @@ -1,5 +1,5 @@ /* { dg-do link { target aarch64_asm_ls64_ok } } */ -/* { dg-additional-options "-march=armv8.7-a -flto" } */ +/* { dg-additional-options "-march=armv8.7-a+ls64 -flto" } */ #include int main(void) { diff --git a/gcc/testsuite/gcc.target/aarch64/acle/pr110100.c b/gcc/testsuite/gcc.target/aarch64/acle/pr110100.c index f56d5e6..62a82b9 100644 --- a/gcc/testsuite/gcc.target/aarch64/acle/pr110100.c +++ b/gcc/testsuite/gcc.target/aarch64/acle/pr110100.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-march=armv8.7-a -O2" } */ +/* { dg-options "-march=armv8.7-a+ls64 -O2" } */ #include void do_st64b(data512_t data) { __arm_st64b((void*)0x10000000, data); diff --git a/gcc/testsuite/gcc.target/aarch64/acle/pr110132.c b/gcc/testsuite/gcc.target/aarch64/acle/pr110132.c index fb88d63..423d91b 100644 --- a/gcc/testsuite/gcc.target/aarch64/acle/pr110132.c +++ b/gcc/testsuite/gcc.target/aarch64/acle/pr110132.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-additional-options "-march=armv8.7-a" } */ +/* { dg-additional-options "-march=armv8.7-a+ls64" } */ /* Check that ls64 builtins can be invoked using a preprocesed testcase without triggering bogus builtin warnings, see PR110132. diff --git a/gcc/testsuite/gcc.target/aarch64/options_set_28.c b/gcc/testsuite/gcc.target/aarch64/options_set_28.c index 9e63768..d5b15f8 100644 --- a/gcc/testsuite/gcc.target/aarch64/options_set_28.c +++ b/gcc/testsuite/gcc.target/aarch64/options_set_28.c @@ -1,9 +1,9 @@ /* { dg-do compile } */ -/* { dg-additional-options "-march=armv9.3-a+nopredres+nols64+nomops" } */ +/* { dg-additional-options "-march=armv9.3-a+nopredres+nomops" } */ int main () { return 0; } -/* { dg-final { scan-assembler-times {\.arch armv9\.3\-a\+crc\+nopredres\+nols64\+nomops\n} 1 } } */ +/* { dg-final { scan-assembler-times {\.arch armv9\.3\-a\+crc\+nopredres\+nomops\n} 1 } } */ diff --git a/gcc/testsuite/gcc.target/aarch64/pragma_cpp_predefs_2.c b/gcc/testsuite/gcc.target/aarch64/pragma_cpp_predefs_2.c index 2d76bfc..d8fc86d 100644 --- a/gcc/testsuite/gcc.target/aarch64/pragma_cpp_predefs_2.c +++ b/gcc/testsuite/gcc.target/aarch64/pragma_cpp_predefs_2.c @@ -242,8 +242,8 @@ #pragma GCC push_options #pragma GCC target ("arch=armv8.7-a") -#ifndef __ARM_FEATURE_LS64 -#error "__ARM_FEATURE_LS64 is not defined but should be!" +#ifdef __ARM_FEATURE_LS64 +#error "__ARM_FEATURE_LS64 is defined but should not be!" #endif #pragma GCC pop_options -- cgit v1.1