[AArch64][1/14] Add ident field to struct processor

        * config/aarch64/aarch64.c (struct processor): Add ident field.
        Rename core sched_core.
        (all_cores): Handle above changes.
        (all_architectures): Likewise.
        (aarch64_parse_arch): Likewise.
        (aarch64_override_options): Likewise.

From-SVN: r226552

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 10f4ff1975bf07a81aabdec8d5b286bfbcc41892..cf83542ece144ac07132639d72397d0d7e95d180 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2015-08-04  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+       * config/aarch64/aarch64.c (struct processor): Add ident field.
+       Rename core sched_core.
+       (all_cores): Handle above changes.
+       (all_architectures): Likewise.
+       (aarch64_parse_arch): Likewise.
+       (aarch64_override_options): Likewise.
+
 2015-08-04  Richard Biener  <rguenther@suse.de>
 
        * gimple-fold.c (gimple_fold_stmt_to_constant_1): Remove

diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index 2b1ae36f7f079d6b64ecd8a139a9dffce2edf727..1867e4c317d45c5c4d470ccb8e30a1e5a77be842 100644 (file)
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -498,7 +498,8 @@ aarch64_tuning_override_functions[] =
 struct processor
 {
   const char *const name;
-  enum aarch64_processor core;
+  enum aarch64_processor ident;
+  enum aarch64_processor sched_core;
   const char *arch;
   unsigned architecture_version;
   const unsigned long flags;
@@ -509,21 +510,22 @@ struct processor
 static const struct processor all_cores[] =
 {
 #define AARCH64_CORE(NAME, IDENT, SCHED, ARCH, FLAGS, COSTS, IMP, PART) \
-  {NAME, SCHED, #ARCH, ARCH, FLAGS, &COSTS##_tunings},
+  {NAME, IDENT, SCHED, #ARCH, ARCH, FLAGS, &COSTS##_tunings},
 #include "aarch64-cores.def"
 #undef AARCH64_CORE
-  {"generic", cortexa53, "8", 8, AARCH64_FL_FOR_ARCH8, &generic_tunings},
-  {NULL, aarch64_none, NULL, 0, 0, NULL}
+  {"generic", generic, cortexa53, "8", 8,
+   AARCH64_FL_FOR_ARCH8, &generic_tunings},
+  {NULL, aarch64_none, 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, ARCH, FLAGS, NULL},
+  {NAME, CORE, CORE, #ARCH, ARCH, FLAGS, NULL},
 #include "aarch64-arches.def"
 #undef AARCH64_ARCH
-  {NULL, aarch64_none, NULL, 0, 0, NULL}
+  {NULL, aarch64_none, aarch64_none, NULL, 0, 0, NULL}
 };
 
 /* Target specification.  These are populated as commandline arguments
@@ -7206,7 +7208,7 @@ aarch64_parse_arch (void)
          aarch64_isa_flags = selected_arch->flags;
 
          if (!selected_cpu)
-           selected_cpu = &all_cores[selected_arch->core];
+           selected_cpu = &all_cores[selected_arch->ident];
 
          if (ext != NULL)
            {
@@ -7531,7 +7533,7 @@ aarch64_override_options (void)
     selected_tune = selected_cpu;
 
   aarch64_tune_flags = selected_tune->flags;
-  aarch64_tune = selected_tune->core;
+  aarch64_tune = selected_tune->sched_core;
   /* Make a copy of the tuning parameters attached to the core, which
      we may later overwrite.  */
   aarch64_tune_params = *(selected_tune->tune);