aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Edelsohn <edelsohn@gnu.org>2003-03-26 16:04:08 +0000
committerDavid Edelsohn <dje@gcc.gnu.org>2003-03-26 11:04:08 -0500
commit29ae93642d81acf4bba804d2929de1527d319b13 (patch)
tree853cfda3ad07f11b37ecd60ec348c05b4a02fdc5
parentbe565ad7dfb253836b579f666b230fd261a19913 (diff)
downloadgcc-29ae93642d81acf4bba804d2929de1527d319b13.zip
gcc-29ae93642d81acf4bba804d2929de1527d319b13.tar.gz
gcc-29ae93642d81acf4bba804d2929de1527d319b13.tar.bz2
power4.md: Allow delay between dispatch and function units for simple instructions.
* config/rs6000/power4.md: Allow delay between dispatch and function units for simple instructions. Correct store units. Allow branch to occupy as many dispatch slots as necessary. From-SVN: r64896
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/config/rs6000/power4.md43
2 files changed, 33 insertions, 16 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 06993a1..3726073 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-26 David Edelsohn <edelsohn@gnu.org>
+
+ * config/rs6000/power4.md: Allow delay between dispatch and
+ function units for simple instructions. Correct store units.
+ Allow branch to occupy as many dispatch slots as necessary.
+
2003-03-26 Jakub Jelinek <jakub@redhat.com>
* config/ia64/ia64.c (ia64_expand_op_and_fetch): Fix comment.
diff --git a/gcc/config/rs6000/power4.md b/gcc/config/rs6000/power4.md
index bf0a92b..35f1ba21 100644
--- a/gcc/config/rs6000/power4.md
+++ b/gcc/config/rs6000/power4.md
@@ -37,9 +37,12 @@
(define_reservation "q1_power4" "du1_power4|du4_power4")
(define_reservation "q2_power4" "du2_power4|du3_power4")
+(define_reservation "q4_power4" "du1_power4|du2_power4|du3_power4|du4_power4")
-(define_reservation "lsq_power4" "((du1_power4|du4_power4),lsu1_power4)\
- |((du2_power4|du3_power4),lsu2_power4)")
+(define_reservation "lsq_power4" "(q1_power4,lsu1_power4)\
+ |(q2_power4,lsu2_power4)\
+ |(du3_power4,nothing,lsu2_power4)\
+ |(du4_power4,nothing,lsu1_power4)")
(define_reservation "lsuq_power4"
"((du1_power4+du2_power4),lsu1_power4+iu2_power4)\
@@ -51,17 +54,21 @@
"(du1_power4+du2_power4+du3_power4+du4_power4),\
iu1_power4,(lsu2_power4+iu2_power4)")
-(define_reservation "iq_power4" "((du1_power4|du4_power4),iu1_power4)\
- |((du2_power4|du3_power4),iu2_power4)")
+(define_reservation "iq_power4" "(q1_power4,iu1_power4)\
+ |(q2_power4,iu2_power4)\
+ |(du3_power4,nothing,iu2_power4)\
+ |(du4_power4,nothing,iu1_power4)")
-(define_reservation "fpq_power4" "((du1_power4|du4_power4),fpu1_power4)\
- |((du2_power4|du3_power4),fpu2_power4)")
+(define_reservation "fpq_power4" "(q1_power4,fpu1_power4)\
+ |(q2_power4,fpu2_power4)\
+ |(du3_power4,nothing,fpu2_power4)\
+ |(du4_power4,nothing,fpu1_power4)")
(define_reservation "vq_power4"
- "(du1_power4|du2_power4|du3_power4|du4_power4),vec_power4")
+ "(q4_power4,vec_power4)|(q4_power4,nothing,vec_power4)")
(define_reservation "vpq_power4"
- "(du1_power4|du2_power4|du3_power4|du4_power4),\
- vecperm_power4")
+ "(q4_power4,vecperm_power4)\
+ |(q4_power4,nothing,vecperm_power4)")
; Dispatch slots are allocated in order conforming to program order.
@@ -129,8 +136,8 @@
(define_insn_reservation "power4-store" 1
(and (eq_attr "type" "store")
(eq_attr "cpu" "power4"))
- "((du1_power4|du4_power4),lsu1_power4,iu2_power4)\
- |((du2_power4|du3_power4),lsu2_power4,iu1_power4)")
+ "(q1_power4,lsu1_power4,iu1_power4)\
+ |(q2_power4,lsu2_power4,iu2_power4)")
(define_insn_reservation "power4-store-update" 1
(and (eq_attr "type" "store_u")
@@ -145,8 +152,8 @@
(define_insn_reservation "power4-fpstore" 1
(and (eq_attr "type" "fpstore")
(eq_attr "cpu" "power4"))
- "((du1_power4|du4_power4),lsu1_power4,fpu1_power4)\
- |((du2_power4|du3_power4),lsu2_power4,fpu2_power4)")
+ "(q1_power4,lsu1_power4,fpu1_power4)\
+ |(q2_power4,lsu2_power4,fpu2_power4)")
(define_insn_reservation "power4-fpstore-update" 1
(and (eq_attr "type" "fpstore_u")
@@ -165,8 +172,8 @@
(define_insn_reservation "power4-vecstore" 1
(and (eq_attr "type" "vecstore")
(eq_attr "cpu" "power4"))
- "((du1_power4|du4_power4),lsu1_power4,vec_power4)\
- |((du2_power4|du3_power4),lsu2_power4,vec_power4)")
+ "(q1_power4,lsu1_power4,vec_power4)\
+ |(q2_power4,lsu2_power4,vec_power4)")
; Integer latency is 2 cycles
@@ -228,7 +235,11 @@
(define_insn_reservation "power4-branch" 2
(and (eq_attr "type" "jmpreg,branch")
(eq_attr "cpu" "power4"))
- "du5_power4,bpu_power4")
+ "(du5_power4\
+ |du4_power4+du5_power4\
+ |du3_power4+du4_power4+du5_power4\
+ |du2_power4+du3_power4+du4_power4+du5_power4\
+ |du1_power4+du2_power4+du3_power4+du4_power4+du5_power4),bpu_power4")
; Condition Register logical ops are split if non-destructive (RT != RB)