From 0c6caaf8b4de07a4b33fe090d7620bd531724282 Mon Sep 17 00:00:00 2001 From: Renlin Li Date: Thu, 6 Nov 2014 14:41:52 +0000 Subject: [PATCH] [AArch64] Add ACLE arch-related predefined macros 2014-11-06 Renlin Li * config/aarch64/aarch64.c (aarch64_architecture_version): New. (processor): New architecture_version field. (aarch64_override_options): Initialize aarch64_architecture_version. * config/aarch64/aarch64.h (TARGET_CPU_CPP_BUILTINS): Define __ARM_ARCH, __ARM_ARCH_PROFILE, aarch64_arch_name macro. From-SVN: r217192 --- gcc/ChangeLog | 8 ++++++++ gcc/config/aarch64/aarch64.c | 17 ++++++++++++----- gcc/config/aarch64/aarch64.h | 8 ++++++++ 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index dafb268c1f6..d8cbe9610cc 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2014-11-06 Renlin Li + + * config/aarch64/aarch64.c (aarch64_architecture_version): New. + (processor): New architecture_version field. + (aarch64_override_options): Initialize aarch64_architecture_version. + * config/aarch64/aarch64.h (TARGET_CPU_CPP_BUILTINS): Define __ARM_ARCH, + __ARM_ARCH_PROFILE, aarch64_arch_name macro. + 2014-11-06 James Greenhalgh * params.def (sra-max-scalarization-size-Ospeed): New. diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c index afc393159e7..736ad903b70 100644 --- a/gcc/config/aarch64/aarch64.c +++ b/gcc/config/aarch64/aarch64.c @@ -154,6 +154,9 @@ static bool aarch64_vectorize_vec_perm_const_ok (machine_mode vmode, const unsigned char *sel); static int aarch64_address_cost (rtx, machine_mode, addr_space_t, bool); +/* Major revision number of the ARM Architecture implemented by the target. */ +unsigned aarch64_architecture_version; + /* The processor for which instructions should be scheduled. */ enum aarch64_processor aarch64_tune = cortexa53; @@ -348,6 +351,7 @@ struct processor const char *const name; enum aarch64_processor core; const char *arch; + unsigned architecture_version; const unsigned long flags; const struct tune_params *const tune; }; @@ -356,21 +360,23 @@ struct processor static const struct processor all_cores[] = { #define AARCH64_CORE(NAME, X, IDENT, ARCH, FLAGS, COSTS) \ - {NAME, IDENT, #ARCH, FLAGS | AARCH64_FL_FOR_ARCH##ARCH, &COSTS##_tunings}, + {NAME, IDENT, #ARCH, ARCH,\ + FLAGS | AARCH64_FL_FOR_ARCH##ARCH, &COSTS##_tunings}, #include "aarch64-cores.def" #undef AARCH64_CORE - {"generic", cortexa53, "8", AARCH64_FL_FPSIMD | AARCH64_FL_FOR_ARCH8, &generic_tunings}, - {NULL, aarch64_none, NULL, 0, NULL} + {"generic", cortexa53, "8", 8,\ + AARCH64_FL_FPSIMD | AARCH64_FL_FOR_ARCH8, &generic_tunings}, + {NULL, aarch64_none, NULL, 0, 0, NULL} }; /* Architectures implementing AArch64. */ static const struct processor all_architectures[] = { #define AARCH64_ARCH(NAME, CORE, ARCH, FLAGS) \ - {NAME, CORE, #ARCH, FLAGS, NULL}, + {NAME, CORE, #ARCH, ARCH, FLAGS, NULL}, #include "aarch64-arches.def" #undef AARCH64_ARCH - {NULL, aarch64_none, NULL, 0, NULL} + {NULL, aarch64_none, NULL, 0, 0, NULL} }; /* Target specification. These are populated as commandline arguments @@ -6470,6 +6476,7 @@ aarch64_override_options (void) aarch64_tune_flags = selected_tune->flags; aarch64_tune = selected_tune->core; aarch64_tune_params = selected_tune->tune; + aarch64_architecture_version = selected_cpu->architecture_version; if (aarch64_fix_a53_err835769 == 2) { diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h index e22163e62af..1a6e909986e 100644 --- a/gcc/config/aarch64/aarch64.h +++ b/gcc/config/aarch64/aarch64.h @@ -28,7 +28,13 @@ { \ builtin_define ("__aarch64__"); \ builtin_define ("__ARM_64BIT_STATE"); \ + builtin_define_with_int_value \ + ("__ARM_ARCH", aarch64_architecture_version); \ + cpp_define_formatted \ + (parse_in, "__ARM_ARCH_%dA", aarch64_architecture_version); \ builtin_define ("__ARM_ARCH_ISA_A64"); \ + builtin_define_with_int_value \ + ("__ARM_ARCH_PROFILE", 'A'); \ builtin_define ("__ARM_FEATURE_CLZ"); \ builtin_define ("__ARM_FEATURE_IDIV"); \ builtin_define ("__ARM_FEATURE_UNALIGNED"); \ @@ -172,6 +178,8 @@ #define PCC_BITFIELD_TYPE_MATTERS 1 +/* Major revision number of the ARM Architecture implemented by the target. */ +extern unsigned aarch64_architecture_version; /* Instruction tuning/selection flags. */ -- 2.30.2