[AArch64] [-mtune cleanup 3/5] [Temporary] When asked to tune for

 Cortex-A57, tune for Cortex-A15

gcc/
	* config/aarch64/aarch64-cores.def (cortex-a57): Tune for cortexa15.
	* config/aarch64/aarch64-tune.md: Regenerate.
	* config/aarch64/aarch64.md: Include cortex-a15 pipeline model.
	(generic_sched): "no" if we are	tuning for cortexa15.
	* config/arm/cortex-a15.md: Include cortex-a15-neon.md by
	relative path.

From-SVN: r204783

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b49dcf2bfb19901283256306bade71fea19f3696..9a6ee76580b34025d5d746be5f9f8d537018b9e3 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2013-11-14  James Greenhalgh  <james.greenhalgh@arm.com>
+
+       * config/aarch64/aarch64-cores.def (cortex-a57): Tune for cortexa15.
+       * config/aarch64/aarch64-tune.md: Regenerate.
+       * config/aarch64/aarch64.md: Include cortex-a15 pipeline model.
+       (generic_sched): "no" if we are tuning for cortexa15.
+       * config/arm/cortex-a15.md: Include cortex-a15-neon.md by
+       relative path.
+
 2013-11-14  James Greenhalgh  <james.greenhalgh@arm.com>
 
        * config/aarch64/aarch64-arches.def (armv8-a): Tune for cortex-a53.

diff --git a/gcc/config/aarch64/aarch64-cores.def b/gcc/config/aarch64/aarch64-cores.def
index c840aa016e86278d8f6a97ed4346823e566c1157..18453583fc29d7bf4b6665b10c6a9feebf789afd 100644 (file)
--- a/gcc/config/aarch64/aarch64-cores.def
+++ b/gcc/config/aarch64/aarch64-cores.def
@@ -35,6 +35,6 @@
    therefore serves as a template for adding more CPUs in the future.  */
 
 AARCH64_CORE("cortex-a53",       cortexa53,         8,  AARCH64_FL_FPSIMD,    generic)
-AARCH64_CORE("cortex-a57",       cortexa57,         8,  AARCH64_FL_FPSIMD,    generic)
+AARCH64_CORE("cortex-a57",       cortexa15,         8,  AARCH64_FL_FPSIMD,    generic)
 AARCH64_CORE("example-1",            large,         8,  AARCH64_FL_FPSIMD,    generic)
 AARCH64_CORE("example-2",            small,         8,  AARCH64_FL_FPSIMD,    generic)

diff --git a/gcc/config/aarch64/aarch64-tune.md b/gcc/config/aarch64/aarch64-tune.md
index 02699e35c3fca8e00b45347c68e3b17286df721b..1bde99bec57c5defc35d24eb4c141aab70f616d2 100644 (file)
--- a/gcc/config/aarch64/aarch64-tune.md
+++ b/gcc/config/aarch64/aarch64-tune.md
@@ -1,5 +1,5 @@
 ;; -*- buffer-read-only: t -*-
 ;; Generated automatically by gentune.sh from aarch64-cores.def
 (define_attr "tune"
-       "cortexa53,cortexa57,large,small"
+       "cortexa53,cortexa15,large,small"
        (const (symbol_ref "((enum attr_tune) aarch64_tune)")))

diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md
index d66b41dcb42e458735c907f8e2de9f6ef206ac03..6f828e26c594994701d150396972b2a3dcd9196f 100644 (file)
--- a/gcc/config/aarch64/aarch64.md
+++ b/gcc/config/aarch64/aarch64.md
@@ -312,7 +312,7 @@
 
 (define_attr "generic_sched" "yes,no"
   (const (if_then_else
-          (eq_attr "tune" "large,small,cortexa53")
+          (eq_attr "tune" "large,small,cortexa53,cortexa15")
           (const_string "no")
           (const_string "yes"))))
 
@@ -320,6 +320,7 @@
 (include "large.md")
 (include "small.md")
 (include "../arm/cortex-a53.md")
+(include "../arm/cortex-a15.md")
 
 ;; -------------------------------------------------------------------
 ;; Jumps and other miscellaneous insns

diff --git a/gcc/config/arm/cortex-a15.md b/gcc/config/arm/cortex-a15.md
index ccad62076089b5e095f472fdbf298ba7226ae4ec..5a31a097918f7a01b38671416ece350049f00e28 100644 (file)
--- a/gcc/config/arm/cortex-a15.md
+++ b/gcc/config/arm/cortex-a15.md
@@ -158,7 +158,7 @@
   "ca15_issue2,ca15_ls1+ca15_ls2,ca15_str,ca15_str")
 
 ;; We include Neon.md here to ensure that the branch can block the Neon units.
-(include "cortex-a15-neon.md")
+(include "../arm/cortex-a15-neon.md")
 
 ;; We lie with calls.  They take up all issue slots, and form a block in the
 ;; pipeline.  The result however is available the next cycle.