From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1984) id 822373858D33; Wed, 1 Feb 2023 18:32:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 822373858D33 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1675276371; bh=Jsbsgd/TWwBr5AmqVqtKHD5sWvaI2FyGwMwUun/rTsQ=; h=From:To:Subject:Date:From; b=IRNzUyEsyTbmRab3RnAsOdD2mqsgP+5LwnEEFjGZD5vrne3ilHyW68ccMekhjpFyG +9e2IIKXrQ7dROTFCMBxXlULhaw/44WaQq4Vgf/g9BViuNOlDx5M3tAnfo8+Vd1bW5 O2i+RiWw6ZmhoVh4eiTrCft6D29h2JSi0+Bzb3Q8= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Tamar Christina To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-5635] AArch64: Fix native detection in the presence of mandatory features which don't have midr values X-Act-Checkin: gcc X-Git-Author: Tamar Christina X-Git-Refname: refs/heads/master X-Git-Oldrev: 9fadd8dec79876d3c393daccc62959f6f4853cc5 X-Git-Newrev: a2c848c92c3f13c2dd9bd92d22beb44c1ff848b4 Message-Id: <20230201183251.822373858D33@sourceware.org> Date: Wed, 1 Feb 2023 18:32:51 +0000 (GMT) List-Id: https://gcc.gnu.org/g:a2c848c92c3f13c2dd9bd92d22beb44c1ff848b4 commit r13-5635-ga2c848c92c3f13c2dd9bd92d22beb44c1ff848b4 Author: Tamar Christina Date: Wed Feb 1 18:31:41 2023 +0000 AArch64: Fix native detection in the presence of mandatory features which don't have midr values aarch64-option-extensions.def explicitly defines the semantics for an empty midr field as being: In that case this field should contain a space (" ") separated list of the strings in 'Features' that are required. Their order is not important. An empty string means do not detect this feature during auto detection. That is to say, an empty string means that we don't know the midr value for this feature and so it just shouldn't be taken into account for native features detection. However this meaning seems to have gotten lost at some point. This results in e.g. -mcpu=native on a Neoverse N2 disabling features it does have. Essentially we disabled any mandatory feature for which there is no midr entry. The rationale for having -mcpu=native being able to disable features at all, is because the kernel is able to disable a mandatory feature for correctness issues. Unfortunately we can't distinguish between "old kernel" and "kernel disabled". This patch adds a new field that indicates whether the midr field has any value at all. If there's no value we skip the extension when determining the "off" flags. gcc/ChangeLog: * common/config/aarch64/aarch64-common.cc (struct aarch64_option_extension): Add native_detect and document struct a bit more. (all_extensions): Set new field native_detect. * config/aarch64/aarch64.cc (struct aarch64_option_extension): Delete unused struct. gcc/testsuite/ChangeLog: * gcc.target/aarch64/cpunative/info_19: New test. * gcc.target/aarch64/cpunative/info_20: New test. * gcc.target/aarch64/cpunative/info_21: New test. * gcc.target/aarch64/cpunative/info_22: New test. * gcc.target/aarch64/cpunative/native_cpu_19.c: New test. * gcc.target/aarch64/cpunative/native_cpu_20.c: New test. * gcc.target/aarch64/cpunative/native_cpu_21.c: New test. * gcc.target/aarch64/cpunative/native_cpu_22.c: New test. Diff: --- gcc/common/config/aarch64/aarch64-common.cc | 22 +++++++++++++++++----- gcc/config/aarch64/aarch64.cc | 8 -------- gcc/testsuite/gcc.target/aarch64/cpunative/info_19 | 9 +++++++++ gcc/testsuite/gcc.target/aarch64/cpunative/info_20 | 9 +++++++++ gcc/testsuite/gcc.target/aarch64/cpunative/info_21 | 9 +++++++++ gcc/testsuite/gcc.target/aarch64/cpunative/info_22 | 9 +++++++++ .../gcc.target/aarch64/cpunative/native_cpu_19.c | 14 ++++++++++++++ .../gcc.target/aarch64/cpunative/native_cpu_20.c | 15 +++++++++++++++ .../gcc.target/aarch64/cpunative/native_cpu_21.c | 13 +++++++++++++ .../gcc.target/aarch64/cpunative/native_cpu_22.c | 13 +++++++++++++ 10 files changed, 108 insertions(+), 13 deletions(-) diff --git a/gcc/common/config/aarch64/aarch64-common.cc b/gcc/common/config/aarch64/aarch64-common.cc index 5fb9e9de747..20bc4e1291b 100644 --- a/gcc/common/config/aarch64/aarch64-common.cc +++ b/gcc/common/config/aarch64/aarch64-common.cc @@ -140,20 +140,28 @@ aarch64_handle_option (struct gcc_options *opts, /* An ISA extension in the co-processor and main instruction set space. */ struct aarch64_option_extension { + /* The extension name to pass on to the assembler. */ const char *name; + /* The smallest set of feature bits to toggle to enable this option. */ aarch64_feature_flags flag_canonical; + /* If this feature is turned on, these bits also need to be turned on. */ aarch64_feature_flags flags_on; + /* If this feature is turned off, these bits also need to be turned off. */ aarch64_feature_flags flags_off; + /* Indicates whether this feature is taken into account during native cpu + detection. */ + bool native_detect_p; }; /* ISA extensions in AArch64. */ static constexpr aarch64_option_extension all_extensions[] = { -#define AARCH64_OPT_EXTENSION(NAME, IDENT, C, D, E, F) \ +#define AARCH64_OPT_EXTENSION(NAME, IDENT, C, D, E, FEATURE_STRING) \ {NAME, AARCH64_FL_##IDENT, feature_deps::IDENT ().explicit_on, \ - feature_deps::get_flags_off (feature_deps::root_off_##IDENT)}, + feature_deps::get_flags_off (feature_deps::root_off_##IDENT), \ + FEATURE_STRING[0]}, #include "config/aarch64/aarch64-option-extensions.def" - {NULL, 0, 0, 0} + {NULL, 0, 0, 0, false} }; struct processor_name_to_arch @@ -326,9 +334,13 @@ aarch64_get_extension_string_for_isa_flags outstr += opt.name; } - /* Remove the features in current_flags & ~isa_flags. */ + /* Remove the features in current_flags & ~isa_flags. If the feature does + not have an HWCAPs then it shouldn't be taken into account for feature + detection because one way or another we can't tell if it's available + or not. */ for (auto &opt : all_extensions) - if (opt.flag_canonical & current_flags & ~isa_flags) + if (opt.native_detect_p + && (opt.flag_canonical & current_flags & ~isa_flags)) { current_flags &= ~opt.flags_off; outstr += "+no"; diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc index acc0cfe5f94..e6f47cbbb0d 100644 --- a/gcc/config/aarch64/aarch64.cc +++ b/gcc/config/aarch64/aarch64.cc @@ -2808,14 +2808,6 @@ static const struct attribute_spec aarch64_attribute_table[] = { NULL, 0, 0, false, false, false, false, NULL, NULL } }; -/* An ISA extension in the co-processor and main instruction set space. */ -struct aarch64_option_extension -{ - const char *const name; - const unsigned long flags_on; - const unsigned long flags_off; -}; - typedef enum aarch64_cond_code { AARCH64_EQ = 0, AARCH64_NE, AARCH64_CS, AARCH64_CC, AARCH64_MI, AARCH64_PL, diff --git a/gcc/testsuite/gcc.target/aarch64/cpunative/info_19 b/gcc/testsuite/gcc.target/aarch64/cpunative/info_19 new file mode 100644 index 00000000000..616d3b26d03 --- /dev/null +++ b/gcc/testsuite/gcc.target/aarch64/cpunative/info_19 @@ -0,0 +1,9 @@ +processor : 0 +BogoMIPS : 100.00 +Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics fphp asimdhp cpuid asimdrdm jscvt fcma lrcpc dcpop sha3 sm3 sm4 asimddp sha512 sve asimdfhm dit uscat ilrcpc flagm ssbs sb dcpodp sve2 sveaes svepmull svebitperm svesha3 svesm4 flagm2 frint svei8mm svebf16 i8mm bf16 dgh bti +CPU implementer : 0x41 +CPU architecture: 8 +CPU variant : 0x0 +CPU part : 0xd49 +CPU revision : 2 + diff --git a/gcc/testsuite/gcc.target/aarch64/cpunative/info_20 b/gcc/testsuite/gcc.target/aarch64/cpunative/info_20 new file mode 100644 index 00000000000..45d45d15f16 --- /dev/null +++ b/gcc/testsuite/gcc.target/aarch64/cpunative/info_20 @@ -0,0 +1,9 @@ +processor : 0 +BogoMIPS : 100.00 +Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics fphp asimdhp cpuid asimdrdm jscvt fcma lrcpc dcpop sha3 sm3 sm4 asimddp sha512 sve asimdfhm dit uscat ilrcpc flagm ssbs sb dcpodp sve2 sveaes svepmull svebitperm svesha3 svesm4 flagm2 frint svei8mm svebf16 i8mm bf16 dgh bti paca pacg +CPU implementer : 0x41 +CPU architecture: 8 +CPU variant : 0x0 +CPU part : 0xd49 +CPU revision : 2 + diff --git a/gcc/testsuite/gcc.target/aarch64/cpunative/info_21 b/gcc/testsuite/gcc.target/aarch64/cpunative/info_21 new file mode 100644 index 00000000000..3c418a4bee4 --- /dev/null +++ b/gcc/testsuite/gcc.target/aarch64/cpunative/info_21 @@ -0,0 +1,9 @@ +processor : 0 +BogoMIPS : 100.00 +Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics fphp asimdhp cpuid asimdrdm jscvt fcma lrcpc dcpop sha3 sm3 sm4 asimddp sha512 sve asimdfhm dit uscat ilrcpc flagm ssbs sb dcpodp sve2 sveaes svepmull svebitperm svesha3 svesm4 flagm2 frint svei8mm svebf16 i8mm bf16 dgh bti +CPU implementer : 0x41 +CPU architecture: 8 +CPU variant : 0x0 +CPU part : 0xd08 +CPU revision : 2 + diff --git a/gcc/testsuite/gcc.target/aarch64/cpunative/info_22 b/gcc/testsuite/gcc.target/aarch64/cpunative/info_22 new file mode 100644 index 00000000000..3147eec1f44 --- /dev/null +++ b/gcc/testsuite/gcc.target/aarch64/cpunative/info_22 @@ -0,0 +1,9 @@ +processor : 0 +BogoMIPS : 100.00 +Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics fphp asimdhp cpuid asimdrdm jscvt fcma lrcpc dcpop sha3 sm3 sm4 asimddp sha512 sve asimdfhm dit uscat ilrcpc flagm ssbs sb dcpodp sve2 sveaes svepmull svebitperm svesha3 svesm4 flagm2 frint svei8mm svebf16 i8mm bf16 dgh bti paca pacg +CPU implementer : 0x41 +CPU architecture: 8 +CPU variant : 0x0 +CPU part : 0xd08 +CPU revision : 2 + diff --git a/gcc/testsuite/gcc.target/aarch64/cpunative/native_cpu_19.c b/gcc/testsuite/gcc.target/aarch64/cpunative/native_cpu_19.c new file mode 100644 index 00000000000..980d3f79dfb --- /dev/null +++ b/gcc/testsuite/gcc.target/aarch64/cpunative/native_cpu_19.c @@ -0,0 +1,14 @@ +/* { dg-do compile { target { { aarch64*-*-linux*} && native } } } */ +/* { dg-set-compiler-env-var GCC_CPUINFO "$srcdir/gcc.target/aarch64/cpunative/info_19" } */ +/* { dg-additional-options "-mcpu=native" } */ + +int main() +{ + return 0; +} + +/* { dg-final { scan-assembler {\.arch armv9-a\+crc\+profile\+memtag\+sve2-sm4\+sve2-aes\+sve2-sha3\+sve2-bitperm\+i8mm\+bf16\+nopauth\n} } } */ + +/* Test one that if the kernel doesn't report the availability of a mandatory + feature that it has turned it off for whatever reason. As such compilers + should follow along. */ diff --git a/gcc/testsuite/gcc.target/aarch64/cpunative/native_cpu_20.c b/gcc/testsuite/gcc.target/aarch64/cpunative/native_cpu_20.c new file mode 100644 index 00000000000..117df2b0b6c --- /dev/null +++ b/gcc/testsuite/gcc.target/aarch64/cpunative/native_cpu_20.c @@ -0,0 +1,15 @@ +/* { dg-do compile { target { { aarch64*-*-linux*} && native } } } */ +/* { dg-set-compiler-env-var GCC_CPUINFO "$srcdir/gcc.target/aarch64/cpunative/info_20" } */ +/* { dg-additional-options "-mcpu=native" } */ + +int main() +{ + return 0; +} + +/* { dg-final { scan-assembler {\.arch armv9-a\+crc\+profile\+memtag\+sve2-sm4\+sve2-aes\+sve2-sha3\+sve2-bitperm\+i8mm\+bf16\n} } } */ + +/* Check whether features that don't have a midr name during detection are + correctly ignored. These features shouldn't affect the native detection. + This particular test checks that predres is not turned off during + detection. */ diff --git a/gcc/testsuite/gcc.target/aarch64/cpunative/native_cpu_21.c b/gcc/testsuite/gcc.target/aarch64/cpunative/native_cpu_21.c new file mode 100644 index 00000000000..efbd02cbdc0 --- /dev/null +++ b/gcc/testsuite/gcc.target/aarch64/cpunative/native_cpu_21.c @@ -0,0 +1,13 @@ +/* { dg-do compile { target { { aarch64*-*-linux*} && native } } } */ +/* { dg-set-compiler-env-var GCC_CPUINFO "$srcdir/gcc.target/aarch64/cpunative/info_21" } */ +/* { dg-additional-options "-mcpu=native" } */ + +int main() +{ + return 0; +} + +/* { dg-final { scan-assembler {\.arch armv8-a\+crc\+lse\+rcpc\+rdma\+dotprod\+fp16fml\+sb\+ssbs\+sve2-sm4\+sve2-aes\+sve2-sha3\+sve2-bitperm\+i8mm\+bf16\+flagm\n} } } */ + +/* Check that an Armv8-A core doesn't fall apart on extensions without midr + values. */ diff --git a/gcc/testsuite/gcc.target/aarch64/cpunative/native_cpu_22.c b/gcc/testsuite/gcc.target/aarch64/cpunative/native_cpu_22.c new file mode 100644 index 00000000000..d431d493826 --- /dev/null +++ b/gcc/testsuite/gcc.target/aarch64/cpunative/native_cpu_22.c @@ -0,0 +1,13 @@ +/* { dg-do compile { target { { aarch64*-*-linux*} && native } } } */ +/* { dg-set-compiler-env-var GCC_CPUINFO "$srcdir/gcc.target/aarch64/cpunative/info_22" } */ +/* { dg-additional-options "-mcpu=native" } */ + +int main() +{ + return 0; +} + +/* { dg-final { scan-assembler {\.arch armv8-a\+crc\+lse\+rcpc\+rdma\+dotprod\+fp16fml\+sb\+ssbs\+sve2-sm4\+sve2-aes\+sve2-sha3\+sve2-bitperm\+i8mm\+bf16\+flagm\+pauth\n} } } */ + +/* Check that an Armv8-A core doesn't fall apart on extensions without midr + values and that it enables optional features. */