diff options
author | Khem Raj <raj.khem@gmail.com> | 2012-06-28 12:19:53 -0700 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-07-09 18:40:21 +0200 |
commit | 6b278fbb02d818b54b5a9fa2716fc49e896b72a8 (patch) | |
tree | 833783fb738ff7abf3d0e3029c9a468e73b06e28 /toolchain-layer/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106848.patch | |
parent | 680af24d1ff95533db610176e6b01fcc9dcf6699 (diff) | |
download | meta-openembedded-6b278fbb02d818b54b5a9fa2716fc49e896b72a8.tar.gz |
gcc-4.6: Migrate recipes from OE-Core
Remove linaro patches. If one needs to use linaro
modified gcc they should use meta-linaro
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'toolchain-layer/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106848.patch')
-rw-r--r-- | toolchain-layer/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106848.patch | 276 |
1 files changed, 0 insertions, 276 deletions
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106848.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106848.patch deleted file mode 100644 index 43a2a4da96..0000000000 --- a/toolchain-layer/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106848.patch +++ /dev/null | |||
@@ -1,276 +0,0 @@ | |||
1 | 2011-12-05 Ramana Radhakrishnan <ramana.radhakrishnan@linaro.org> | ||
2 | |||
3 | Backport from mainline -A15 tuning. | ||
4 | 2011-11-30 Matthew Gretton-Dann <matthew.gretton-dann@arm.com> | ||
5 | |||
6 | * config/arm/arm.c (arm_issue_rate): Cortex-A15 can triple issue. | ||
7 | * config/arm/arm.md (mul64): New attribute. | ||
8 | (generic_sched): Cortex-A15 is not scheduled generically. | ||
9 | (cortex-a15.md): Include. | ||
10 | * config/arm/cortex-a15.md: New machine description. | ||
11 | * config/arm/t-arm (MD_INCLUDES): Add cortex-a15.md. | ||
12 | |||
13 | 2011-11-30 Matthew Gretton-Dann <matthew.gretton-dann@arm.com> | ||
14 | * config/arm/t-arm (MD_INCLUDES): Ensure all md files are listed. | ||
15 | |||
16 | === modified file 'gcc/config/arm/arm.c' | ||
17 | --- old/gcc/config/arm/arm.c 2011-12-05 10:55:48 +0000 | ||
18 | +++ new/gcc/config/arm/arm.c 2011-12-05 12:33:25 +0000 | ||
19 | @@ -24056,6 +24056,9 @@ | ||
20 | { | ||
21 | switch (arm_tune) | ||
22 | { | ||
23 | + case cortexa15: | ||
24 | + return 3; | ||
25 | + | ||
26 | case cortexr4: | ||
27 | case cortexr4f: | ||
28 | case cortexr5: | ||
29 | |||
30 | === modified file 'gcc/config/arm/arm.md' | ||
31 | --- old/gcc/config/arm/arm.md 2011-10-26 11:38:30 +0000 | ||
32 | +++ new/gcc/config/arm/arm.md 2011-12-02 00:38:59 +0000 | ||
33 | @@ -345,6 +345,13 @@ | ||
34 | (const_string "mult") | ||
35 | (const_string "alu"))) | ||
36 | |||
37 | +; Is this an (integer side) multiply with a 64-bit result? | ||
38 | +(define_attr "mul64" "no,yes" | ||
39 | + (if_then_else | ||
40 | + (eq_attr "insn" "smlalxy,umull,umulls,umlal,umlals,smull,smulls,smlal,smlals") | ||
41 | + (const_string "yes") | ||
42 | + (const_string "no"))) | ||
43 | + | ||
44 | ; Load scheduling, set from the arm_ld_sched variable | ||
45 | ; initialized by arm_option_override() | ||
46 | (define_attr "ldsched" "no,yes" (const (symbol_ref "arm_ld_sched"))) | ||
47 | @@ -511,7 +518,7 @@ | ||
48 | |||
49 | (define_attr "generic_sched" "yes,no" | ||
50 | (const (if_then_else | ||
51 | - (ior (eq_attr "tune" "fa526,fa626,fa606te,fa626te,fmp626,fa726te,arm926ejs,arm1020e,arm1026ejs,arm1136js,arm1136jfs,cortexa5,cortexa8,cortexa9,cortexm4") | ||
52 | + (ior (eq_attr "tune" "fa526,fa626,fa606te,fa626te,fmp626,fa726te,arm926ejs,arm1020e,arm1026ejs,arm1136js,arm1136jfs,cortexa5,cortexa8,cortexa9,cortexa15,cortexm4") | ||
53 | (eq_attr "tune_cortexr4" "yes")) | ||
54 | (const_string "no") | ||
55 | (const_string "yes")))) | ||
56 | @@ -537,6 +544,7 @@ | ||
57 | (include "cortex-a5.md") | ||
58 | (include "cortex-a8.md") | ||
59 | (include "cortex-a9.md") | ||
60 | +(include "cortex-a15.md") | ||
61 | (include "cortex-r4.md") | ||
62 | (include "cortex-r4f.md") | ||
63 | (include "cortex-m4.md") | ||
64 | |||
65 | === added file 'gcc/config/arm/cortex-a15.md' | ||
66 | --- old/gcc/config/arm/cortex-a15.md 1970-01-01 00:00:00 +0000 | ||
67 | +++ new/gcc/config/arm/cortex-a15.md 2011-12-02 00:38:59 +0000 | ||
68 | @@ -0,0 +1,186 @@ | ||
69 | +;; ARM Cortex-A15 pipeline description | ||
70 | +;; Copyright (C) 2011 Free Software Foundation, Inc. | ||
71 | +;; | ||
72 | +;; Written by Matthew Gretton-Dann <matthew.gretton-dann@arm.com> | ||
73 | + | ||
74 | +;; This file is part of GCC. | ||
75 | +;; | ||
76 | +;; GCC is free software; you can redistribute it and/or modify it | ||
77 | +;; under the terms of the GNU General Public License as published by | ||
78 | +;; the Free Software Foundation; either version 3, or (at your option) | ||
79 | +;; any later version. | ||
80 | +;; | ||
81 | +;; GCC is distributed in the hope that it will be useful, but | ||
82 | +;; WITHOUT ANY WARRANTY; without even the implied warranty of | ||
83 | +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
84 | +;; General Public License for more details. | ||
85 | +;; | ||
86 | +;; You should have received a copy of the GNU General Public License | ||
87 | +;; along with GCC; see the file COPYING3. If not see | ||
88 | +;; <http://www.gnu.org/licenses/>. | ||
89 | + | ||
90 | +(define_automaton "cortex_a15") | ||
91 | + | ||
92 | +;; The Cortex-A15 core is modelled as a triple issue pipeline that has | ||
93 | +;; the following dispatch units. | ||
94 | +;; 1. Two pipelines for simple integer operations: SX1, SX2 | ||
95 | +;; 2. Two pipelines for Neon and FP data-processing operations: CX1, CX2 | ||
96 | +;; 3. One pipeline for branch operations: BX | ||
97 | +;; 4. One pipeline for integer multiply and divide operations: MX | ||
98 | +;; 5. Two pipelines for load and store operations: LS1, LS2 | ||
99 | +;; | ||
100 | +;; We can issue into three pipelines per-cycle. | ||
101 | +;; | ||
102 | +;; We assume that where we have unit pairs xx1 is always filled before xx2. | ||
103 | + | ||
104 | +;; The three issue units | ||
105 | +(define_cpu_unit "ca15_i0, ca15_i1, ca15_i2" "cortex_a15") | ||
106 | + | ||
107 | +(define_reservation "ca15_issue1" "(ca15_i0|ca15_i1|ca15_i2)") | ||
108 | +(define_reservation "ca15_issue2" "((ca15_i0+ca15_i1)|(ca15_i1+ca15_i2))") | ||
109 | +(define_reservation "ca15_issue3" "(ca15_i0+ca15_i1+ca15_i2)") | ||
110 | +(final_presence_set "ca15_i1" "ca15_i0") | ||
111 | +(final_presence_set "ca15_i2" "ca15_i1") | ||
112 | + | ||
113 | +;; The main dispatch units | ||
114 | +(define_cpu_unit "ca15_sx1, ca15_sx2" "cortex_a15") | ||
115 | +(define_cpu_unit "ca15_cx1, ca15_cx2" "cortex_a15") | ||
116 | +(define_cpu_unit "ca15_ls1, ca15_ls2" "cortex_a15") | ||
117 | +(define_cpu_unit "ca15_bx, ca15_mx" "cortex_a15") | ||
118 | + | ||
119 | +(define_reservation "ca15_ls" "(ca15_ls1|ca15_ls2)") | ||
120 | + | ||
121 | +;; The extended load-store pipeline | ||
122 | +(define_cpu_unit "ca15_ldr, ca15_str" "cortex_a15") | ||
123 | + | ||
124 | +;; The extended ALU pipeline | ||
125 | +(define_cpu_unit "ca15_sx1_alu, ca15_sx1_shf, ca15_sx1_sat" "cortex_a15") | ||
126 | +(define_cpu_unit "ca15_sx2_alu, ca15_sx2_shf, ca15_sx2_sat" "cortex_a15") | ||
127 | + | ||
128 | +;; Simple Execution Unit: | ||
129 | +;; | ||
130 | +;; Simple ALU without shift | ||
131 | +(define_insn_reservation "cortex_a15_alu" 2 | ||
132 | + (and (eq_attr "tune" "cortexa15") | ||
133 | + (and (eq_attr "type" "alu") | ||
134 | + (eq_attr "neon_type" "none"))) | ||
135 | + "ca15_issue1,(ca15_sx1,ca15_sx1_alu)|(ca15_sx2,ca15_sx2_alu)") | ||
136 | + | ||
137 | +;; ALU ops with immediate shift | ||
138 | +(define_insn_reservation "cortex_a15_alu_shift" 3 | ||
139 | + (and (eq_attr "tune" "cortexa15") | ||
140 | + (and (eq_attr "type" "alu_shift") | ||
141 | + (eq_attr "neon_type" "none"))) | ||
142 | + "ca15_issue1,(ca15_sx1,ca15_sx1+ca15_sx1_shf,ca15_sx1_alu)\ | ||
143 | + |(ca15_sx2,ca15_sx2+ca15_sx2_shf,ca15_sx2_alu)") | ||
144 | + | ||
145 | +;; ALU ops with register controlled shift | ||
146 | +(define_insn_reservation "cortex_a15_alu_shift_reg" 3 | ||
147 | + (and (eq_attr "tune" "cortexa15") | ||
148 | + (and (eq_attr "type" "alu_shift_reg") | ||
149 | + (eq_attr "neon_type" "none"))) | ||
150 | + "(ca15_issue2,ca15_sx1+ca15_sx2,ca15_sx1_shf,ca15_sx2_alu)\ | ||
151 | + |(ca15_issue1,(ca15_issue1+ca15_sx2,ca15_sx1+ca15_sx2_shf)\ | ||
152 | + |(ca15_issue1+ca15_sx1,ca15_sx1+ca15_sx1_shf),ca15_sx1_alu)") | ||
153 | + | ||
154 | +;; Multiply Execution Unit: | ||
155 | +;; | ||
156 | +;; 32-bit multiplies | ||
157 | +(define_insn_reservation "cortex_a15_mult32" 3 | ||
158 | + (and (eq_attr "tune" "cortexa15") | ||
159 | + (and (eq_attr "type" "mult") | ||
160 | + (and (eq_attr "neon_type" "none") | ||
161 | + (eq_attr "mul64" "no")))) | ||
162 | + "ca15_issue1,ca15_mx") | ||
163 | + | ||
164 | +;; 64-bit multiplies | ||
165 | +(define_insn_reservation "cortex_a15_mult64" 4 | ||
166 | + (and (eq_attr "tune" "cortexa15") | ||
167 | + (and (eq_attr "type" "mult") | ||
168 | + (and (eq_attr "neon_type" "none") | ||
169 | + (eq_attr "mul64" "yes")))) | ||
170 | + "ca15_issue1,ca15_mx*2") | ||
171 | + | ||
172 | +;; Integer divide | ||
173 | +(define_insn_reservation "cortex_a15_udiv" 9 | ||
174 | + (and (eq_attr "tune" "cortexa15") | ||
175 | + (eq_attr "insn" "udiv")) | ||
176 | + "ca15_issue1,ca15_mx") | ||
177 | + | ||
178 | +(define_insn_reservation "cortex_a15_sdiv" 10 | ||
179 | + (and (eq_attr "tune" "cortexa15") | ||
180 | + (eq_attr "insn" "sdiv")) | ||
181 | + "ca15_issue1,ca15_mx") | ||
182 | + | ||
183 | +;; Block all issue pipes for a cycle | ||
184 | +(define_insn_reservation "cortex_a15_block" 1 | ||
185 | + (and (eq_attr "tune" "cortexa15") | ||
186 | + (and (eq_attr "type" "block") | ||
187 | + (eq_attr "neon_type" "none"))) | ||
188 | + "ca15_issue3") | ||
189 | + | ||
190 | +;; Branch execution Unit | ||
191 | +;; | ||
192 | +;; Branches take one issue slot. | ||
193 | +;; No latency as there is no result | ||
194 | +(define_insn_reservation "cortex_a15_branch" 0 | ||
195 | + (and (eq_attr "tune" "cortexa15") | ||
196 | + (and (eq_attr "type" "branch") | ||
197 | + (eq_attr "neon_type" "none"))) | ||
198 | + "ca15_issue1,ca15_bx") | ||
199 | + | ||
200 | + | ||
201 | +;; We lie with calls. They take up all issue slots, and form a block in the | ||
202 | +;; pipeline. The result however is available the next cycle. | ||
203 | +;; | ||
204 | +;; Addition of new units requires this to be updated. | ||
205 | +(define_insn_reservation "cortex_a15_call" 1 | ||
206 | + (and (eq_attr "tune" "cortexa15") | ||
207 | + (and (eq_attr "type" "call") | ||
208 | + (eq_attr "neon_type" "none"))) | ||
209 | + "ca15_issue3,\ | ||
210 | + ca15_sx1+ca15_sx2+ca15_bx+ca15_mx+ca15_cx1+ca15_cx2+ca15_ls1+ca15_ls2,\ | ||
211 | + ca15_sx1_alu+ca15_sx1_shf+ca15_sx1_sat+ca15_sx2_alu+ca15_sx2_shf\ | ||
212 | + +ca15_sx2_sat+ca15_ldr+ca15_str") | ||
213 | + | ||
214 | +;; Load-store execution Unit | ||
215 | +;; | ||
216 | +;; Loads of up to two words. | ||
217 | +(define_insn_reservation "cortex_a15_load1" 4 | ||
218 | + (and (eq_attr "tune" "cortexa15") | ||
219 | + (and (eq_attr "type" "load_byte,load1,load2") | ||
220 | + (eq_attr "neon_type" "none"))) | ||
221 | + "ca15_issue1,ca15_ls,ca15_ldr,nothing") | ||
222 | + | ||
223 | +;; Loads of three or four words. | ||
224 | +(define_insn_reservation "cortex_a15_load3" 5 | ||
225 | + (and (eq_attr "tune" "cortexa15") | ||
226 | + (and (eq_attr "type" "load3,load4") | ||
227 | + (eq_attr "neon_type" "none"))) | ||
228 | + "ca15_issue2,ca15_ls1+ca15_ls2,ca15_ldr,ca15_ldr,nothing") | ||
229 | + | ||
230 | +;; Stores of up to two words. | ||
231 | +(define_insn_reservation "cortex_a15_store1" 0 | ||
232 | + (and (eq_attr "tune" "cortexa15") | ||
233 | + (and (eq_attr "type" "store1,store2") | ||
234 | + (eq_attr "neon_type" "none"))) | ||
235 | + "ca15_issue1,ca15_ls,ca15_str") | ||
236 | + | ||
237 | +;; Stores of three or four words. | ||
238 | +(define_insn_reservation "cortex_a15_store3" 0 | ||
239 | + (and (eq_attr "tune" "cortexa15") | ||
240 | + (and (eq_attr "type" "store3,store4") | ||
241 | + (eq_attr "neon_type" "none"))) | ||
242 | + "ca15_issue2,ca15_ls1+ca15_ls2,ca15_str,ca15_str") | ||
243 | + | ||
244 | +;; Simple execution unit bypasses | ||
245 | +(define_bypass 1 "cortex_a15_alu" | ||
246 | + "cortex_a15_alu,cortex_a15_alu_shift,cortex_a15_alu_shift_reg") | ||
247 | +(define_bypass 2 "cortex_a15_alu_shift" | ||
248 | + "cortex_a15_alu,cortex_a15_alu_shift,cortex_a15_alu_shift_reg") | ||
249 | +(define_bypass 2 "cortex_a15_alu_shift_reg" | ||
250 | + "cortex_a15_alu,cortex_a15_alu_shift,cortex_a15_alu_shift_reg") | ||
251 | +(define_bypass 1 "cortex_a15_alu" "cortex_a15_load1,cortex_a15_load3") | ||
252 | +(define_bypass 2 "cortex_a15_alu_shift" "cortex_a15_load1,cortex_a15_load3") | ||
253 | +(define_bypass 2 "cortex_a15_alu_shift_reg" | ||
254 | + "cortex_a15_load1,cortex_a15_load3") | ||
255 | |||
256 | === modified file 'gcc/config/arm/t-arm' | ||
257 | --- old/gcc/config/arm/t-arm 2011-01-03 20:52:22 +0000 | ||
258 | +++ new/gcc/config/arm/t-arm 2011-12-02 00:38:59 +0000 | ||
259 | @@ -31,6 +31,16 @@ | ||
260 | $(srcdir)/config/arm/fmp626.md \ | ||
261 | $(srcdir)/config/arm/fa726te.md \ | ||
262 | $(srcdir)/config/arm/arm926ejs.md \ | ||
263 | + $(srcdir)/config/arm/cortex-a15.md \ | ||
264 | + $(srcdir)/config/arm/cortex-a5.md \ | ||
265 | + $(srcdir)/config/arm/cortex-a8.md \ | ||
266 | + $(srcdir)/config/arm/cortex-a8-neon.md \ | ||
267 | + $(srcdir)/config/arm/cortex-a9.md \ | ||
268 | + $(srcdir)/config/arm/cortex-a9-neon.md \ | ||
269 | + $(srcdir)/config/arm/cortex-m4-fpu.md \ | ||
270 | + $(srcdir)/config/arm/cortex-m4.md \ | ||
271 | + $(srcdir)/config/arm/cortex-r4f.md \ | ||
272 | + $(srcdir)/config/arm/cortex-r4.md \ | ||
273 | $(srcdir)/config/arm/cirrus.md \ | ||
274 | $(srcdir)/config/arm/fpa.md \ | ||
275 | $(srcdir)/config/arm/vec-common.md \ | ||
276 | |||