]> git.ipfire.org Git - thirdparty/gcc.git/blobdiff - gcc/config/rs6000/power4.md
Update copyright years.
[thirdparty/gcc.git] / gcc / config / rs6000 / power4.md
index 99d78d3a29d5edd8dbf2c33161ad95568794d36b..4021b3ab9b5a6757c115cc70d80e022f3fe1cece 100644 (file)
@@ -1,22 +1,21 @@
 ;; Scheduling description for IBM Power4 and PowerPC 970 processors.
-;;   Copyright (C) 2003 Free Software Foundation, Inc.
+;;   Copyright (C) 2003-2024 Free Software Foundation, Inc.
 ;;
-;; This file is part of GNU CC.
+;; This file is part of GCC.
 ;;
-;; GNU CC is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; GCC is free software; you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published
+;; by the Free Software Foundation; either version 3, or (at your
+;; option) any later version.
 ;;
-;; GNU CC is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
+;; GCC is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+;; or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+;; License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU CC; see the file COPYING.  If not, write to
-;; the Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GCC; see the file COPYING3.  If not see
+;; <http://www.gnu.org/licenses/>.
 
 ;; Sources: IBM Red Book and White Paper on POWER4
 
 ;; (split) or more internal ops.  The chip can issue up to 5
 ;; internal ops per cycle.
 
-(define_automaton "power4iu,power4lsu,power4fpu,power4misc,power4vec,power4disp")
+(define_automaton "power4iu,power4fpu,power4vec,power4misc")
 
 (define_cpu_unit "iu1_power4,iu2_power4" "power4iu")
-(define_cpu_unit "lsu1_power4,lsu2_power4" "power4lsu")
+(define_cpu_unit "lsu1_power4,lsu2_power4" "power4misc")
 (define_cpu_unit "fpu1_power4,fpu2_power4" "power4fpu")
 (define_cpu_unit "bpu_power4,cru_power4" "power4misc")
 (define_cpu_unit "vec_power4,vecperm_power4" "power4vec")
 (define_cpu_unit "du1_power4,du2_power4,du3_power4,du4_power4,du5_power4"
-                "power4disp")
+                "power4misc")
 
-(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" "(q1_power4,lsu1_power4)\
-                                |(q2_power4,lsu2_power4)\
-                                |(du3_power4,nothing,lsu2_power4)\
-                                |(du4_power4,nothing,lsu1_power4)")
+(define_reservation "lsq_power4"
+                   "(du1_power4,lsu1_power4)\
+                   |(du2_power4,lsu2_power4)\
+                   |(du3_power4,lsu2_power4)\
+                   |(du4_power4,lsu1_power4)")
 
 (define_reservation "lsuq_power4"
-                   "((du1_power4+du2_power4),lsu1_power4+iu2_power4)\
-                   |((du2_power4+du3_power4),lsu2_power4+iu2_power4)\
-                   |((du3_power4+du4_power4),lsu2_power4+iu1_power4)")
-;;;                |((du2_power4+du3_power4),lsu2_power4,iu2_power4)
-
-(define_reservation "lsuxq_power4"
-                   "(du1_power4+du2_power4+du3_power4+du4_power4),\
-                    iu1_power4,(lsu2_power4+iu2_power4)")
+                   "((du1_power4+du2_power4,lsu1_power4)\
+                     |(du2_power4+du3_power4,lsu2_power4)\
+                     |(du3_power4+du4_power4,lsu2_power4))\
+                     +(nothing,iu2_power4|nothing,iu1_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 "iq_power4"
+                   "(du1_power4|du2_power4|du3_power4|du4_power4),\
+                     (iu1_power4|iu2_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 "fpq_power4"
+                   "(du1_power4|du2_power4|du3_power4|du4_power4),\
+                     (fpu1_power4|fpu2_power4)")
 
 (define_reservation "vq_power4"
-                   "(q4_power4,vec_power4)|(q4_power4,nothing,vec_power4)")
+                   "(du1_power4,vec_power4)\
+                   |(du2_power4,vec_power4)\
+                   |(du3_power4,vec_power4)\
+                   |(du4_power4,vec_power4)")
+
 (define_reservation "vpq_power4"
-                   "(q4_power4,vecperm_power4)\
-                   |(q4_power4,nothing,vecperm_power4)")
+                   "(du1_power4,vecperm_power4)\
+                   |(du2_power4,vecperm_power4)\
+                   |(du3_power4,vecperm_power4)\
+                   |(du4_power4,vecperm_power4)")
 
 
 ; Dispatch slots are allocated in order conforming to program order.
 
 
 ; Load/store
-(define_insn_reservation "power4-load" 3
+(define_insn_reservation "power4-load" 4 ; 3
   (and (eq_attr "type" "load")
+       (eq_attr "sign_extend" "no")
+       (eq_attr "update" "no")
        (eq_attr "cpu" "power4"))
   "lsq_power4")
 
 (define_insn_reservation "power4-load-ext" 5
-  (and (eq_attr "type" "load_ext")
+  (and (eq_attr "type" "load")
+       (eq_attr "sign_extend" "yes")
+       (eq_attr "update" "no")
        (eq_attr "cpu" "power4"))
-  "((du1_power4+du2_power4),lsu1_power4,nothing,nothing,iu2_power4)\
-  |((du2_power4+du3_power4),lsu2_power4,nothing,nothing,iu2_power4)\
-  |((du3_power4+du4_power4),lsu2_power4,nothing,nothing,iu1_power4)")
+  "(du1_power4+du2_power4,lsu1_power4\
+    |du2_power4+du3_power4,lsu2_power4\
+    |du3_power4+du4_power4,lsu2_power4),\
+   nothing,nothing,\
+   (iu2_power4|iu1_power4)")
 
 (define_insn_reservation "power4-load-ext-update" 5
-  (and (eq_attr "type" "load_ext_u")
+  (and (eq_attr "type" "load")
+       (eq_attr "sign_extend" "yes")
+       (eq_attr "update" "yes")
+       (eq_attr "indexed" "no")
        (eq_attr "cpu" "power4"))
-  "(du1_power4+du2_power4+du3_power4+du4_power4),\
-   (lsu1_power4+iu2_power4),nothing,nothing,iu2_power4")
+  "du1_power4+du2_power4+du3_power4+du4_power4,\
+   lsu1_power4+iu2_power4,nothing,nothing,iu2_power4")
 
 (define_insn_reservation "power4-load-ext-update-indexed" 5
-  (and (eq_attr "type" "load_ext_ux")
+  (and (eq_attr "type" "load")
+       (eq_attr "sign_extend" "yes")
+       (eq_attr "update" "yes")
+       (eq_attr "indexed" "yes")
        (eq_attr "cpu" "power4"))
-  "(du1_power4+du2_power4+du3_power4+du4_power4),\
-   iu1_power4,(lsu2_power4+iu1_power4),nothing,nothing,iu2_power4")
+  "du1_power4+du2_power4+du3_power4+du4_power4,\
+   iu1_power4,lsu2_power4+iu1_power4,nothing,nothing,iu2_power4")
 
 (define_insn_reservation "power4-load-update-indexed" 3
-  (and (eq_attr "type" "load_ux")
+  (and (eq_attr "type" "load")
+       (eq_attr "sign_extend" "no")
+       (eq_attr "update" "yes")
+       (eq_attr "indexed" "yes")
        (eq_attr "cpu" "power4"))
-  "lsuxq_power4")
+  "du1_power4+du2_power4+du3_power4+du4_power4,\
+   iu1_power4,lsu2_power4+iu2_power4")
 
-(define_insn_reservation "power4-load-update" 3
-  (and (eq_attr "type" "load_u")
+(define_insn_reservation "power4-load-update" 4 ; 3
+  (and (eq_attr "type" "load")
+       (eq_attr "sign_extend" "no")
+       (eq_attr "update" "yes")
+       (eq_attr "indexed" "no")
        (eq_attr "cpu" "power4"))
   "lsuq_power4")
 
-(define_insn_reservation "power4-fpload" 5
+(define_insn_reservation "power4-fpload" 6 ; 5
   (and (eq_attr "type" "fpload")
+       (eq_attr "update" "no")
        (eq_attr "cpu" "power4"))
   "lsq_power4")
 
-(define_insn_reservation "power4-fpload-update" 5
-  (and (eq_attr "type" "fpload_u")
+(define_insn_reservation "power4-fpload-update" 6 ; 5
+  (and (eq_attr "type" "fpload")
+       (eq_attr "update" "yes")
        (eq_attr "cpu" "power4"))
   "lsuq_power4")
 
-(define_insn_reservation "power4-fpload-update-indexed" 5
-  (and (eq_attr "type" "fpload_ux")
-       (eq_attr "cpu" "power4"))
-  "lsuxq_power4")
-
-(define_insn_reservation "power4-vecload" 5
+(define_insn_reservation "power4-vecload" 6 ; 5
   (and (eq_attr "type" "vecload")
        (eq_attr "cpu" "power4"))
   "lsq_power4")
 
-(define_insn_reservation "power4-store" 1
+(define_insn_reservation "power4-store" 12
   (and (eq_attr "type" "store")
+       (eq_attr "update" "no")
        (eq_attr "cpu" "power4"))
-  "(q1_power4,lsu1_power4,iu1_power4)\
-  |(q2_power4,lsu2_power4,iu2_power4)")
+  "((du1_power4,lsu1_power4)\
+    |(du2_power4,lsu2_power4)\
+    |(du3_power4,lsu2_power4)\
+    |(du4_power4,lsu1_power4)),\
+   (iu1_power4|iu2_power4)")
 
-(define_insn_reservation "power4-store-update" 1
-  (and (eq_attr "type" "store_u")
+(define_insn_reservation "power4-store-update" 12
+  (and (eq_attr "type" "store")
+       (eq_attr "update" "yes")
+       (eq_attr "indexed" "no")
        (eq_attr "cpu" "power4"))
-  "lsuq_power4")
+  "((du1_power4+du2_power4,lsu1_power4)\
+    |(du2_power4+du3_power4,lsu2_power4)\
+    |(du3_power4+du4_power4,lsu2_power4))+\
+   ((nothing,iu1_power4,iu2_power4)\
+    |(nothing,iu2_power4,iu2_power4)\
+    |(nothing,iu2_power4,iu1_power4))")
 
-(define_insn_reservation "power4-store-update-indexed" 1
-  (and (eq_attr "type" "store_ux")
+(define_insn_reservation "power4-store-update-indexed" 12
+  (and (eq_attr "type" "store")
+       (eq_attr "update" "yes")
+       (eq_attr "indexed" "yes")
        (eq_attr "cpu" "power4"))
-  "lsuxq_power4")
+   "du1_power4+du2_power4+du3_power4+du4_power4,\
+    iu1_power4,lsu2_power4+iu2_power4,iu2_power4")
 
-(define_insn_reservation "power4-fpstore" 1
+(define_insn_reservation "power4-fpstore" 12
   (and (eq_attr "type" "fpstore")
+       (eq_attr "update" "no")
        (eq_attr "cpu" "power4"))
-  "(q1_power4,lsu1_power4,fpu1_power4)\
-  |(q2_power4,lsu2_power4,fpu2_power4)")
+  "((du1_power4,lsu1_power4)\
+    |(du2_power4,lsu2_power4)\
+    |(du3_power4,lsu2_power4)\
+    |(du4_power4,lsu1_power4)),\
+   (fpu1_power4|fpu2_power4)")
 
-(define_insn_reservation "power4-fpstore-update" 1
-  (and (eq_attr "type" "fpstore_u")
+(define_insn_reservation "power4-fpstore-update" 12
+  (and (eq_attr "type" "fpstore")
+       (eq_attr "update" "yes")
        (eq_attr "cpu" "power4"))
-  "((du1_power4+du2_power4),(fpu1_power4+iu2_power4),lsu1_power4)\
-  |((du2_power4+du3_power4),(fpu2_power4+iu2_power4),lsu2_power4)\
-  |((du3_power4+du4_power4),(fpu2_power4+iu1_power4),lsu2_power4)")
-;;;((du2_power4+du3_power4),fpu2_power4,(iu2_power4+lsu2_power4))
+  "((du1_power4+du2_power4,lsu1_power4)\
+    |(du2_power4+du3_power4,lsu2_power4)\
+    |(du3_power4+du4_power4,lsu2_power4))\
+   +(nothing,(iu1_power4|iu2_power4),(fpu1_power4|fpu2_power4))")
 
-(define_insn_reservation "power4-fpstore-update-indexed" 1
-  (and (eq_attr "type" "fpstore_ux")
+(define_insn_reservation "power4-vecstore" 12
+  (and (eq_attr "type" "vecstore")
        (eq_attr "cpu" "power4"))
-  "(du1_power4+du2_power4+du3_power4+du4_power4),
-   iu1_power4,fpu2_power4,(iu2_power4+lsu2_power4)")
+  "(du1_power4,lsu1_power4,vec_power4)\
+  |(du2_power4,lsu2_power4,vec_power4)\
+  |(du3_power4,lsu2_power4,vec_power4)\
+  |(du4_power4,lsu1_power4,vec_power4)")
 
-(define_insn_reservation "power4-vecstore" 1
-  (and (eq_attr "type" "vecstore")
+(define_insn_reservation "power4-llsc" 11
+  (and (eq_attr "type" "load_l,store_c,sync")
        (eq_attr "cpu" "power4"))
-  "(q1_power4,lsu1_power4,vec_power4)\
-  |(q2_power4,lsu2_power4,vec_power4)")
+  "du1_power4+du2_power4+du3_power4+du4_power4,lsu1_power4")
 
 
 ; Integer latency is 2 cycles
 (define_insn_reservation "power4-integer" 2
-  (and (eq_attr "type" "integer")
+  (and (ior (eq_attr "type" "integer,trap,cntlz,isel")
+           (and (eq_attr "type" "add,logical,shift,exts")
+                (eq_attr "dot" "no"))
+           (and (eq_attr "type" "insert")
+                (eq_attr "size" "64")))
        (eq_attr "cpu" "power4"))
   "iq_power4")
 
+(define_insn_reservation "power4-two" 2
+  (and (eq_attr "type" "two")
+       (eq_attr "cpu" "power4"))
+  "((du1_power4+du2_power4)\
+    |(du2_power4+du3_power4)\
+    |(du3_power4+du4_power4)\
+    |(du4_power4+du1_power4)),\
+    ((iu1_power4,nothing,iu2_power4)\
+     |(iu2_power4,nothing,iu2_power4)\
+     |(iu2_power4,nothing,iu1_power4)\
+     |(iu1_power4,nothing,iu1_power4))")
+
+(define_insn_reservation "power4-three" 2
+  (and (eq_attr "type" "three")
+       (eq_attr "cpu" "power4"))
+  "(du1_power4+du2_power4+du3_power4|du2_power4+du3_power4+du4_power4\
+    |du3_power4+du4_power4+du1_power4|du4_power4+du1_power4+du2_power4),\
+   ((iu1_power4,nothing,iu2_power4,nothing,iu2_power4)\
+    |(iu2_power4,nothing,iu2_power4,nothing,iu1_power4)\
+    |(iu2_power4,nothing,iu1_power4,nothing,iu1_power4)\
+    |(iu1_power4,nothing,iu1_power4,nothing,iu2_power4))")
+
+(define_insn_reservation "power4-insert" 4
+  (and (eq_attr "type" "insert")
+       (eq_attr "size" "32")
+       (eq_attr "cpu" "power4"))
+  "(du1_power4+du2_power4|du2_power4+du3_power4|du3_power4+du4_power4),\
+   ((iu1_power4,nothing,iu2_power4)\
+    |(iu2_power4,nothing,iu2_power4)\
+    |(iu2_power4,nothing,iu1_power4))")
+
 (define_insn_reservation "power4-cmp" 3
-  (and (eq_attr "type" "cmp,fast_compare")
+  (and (ior (eq_attr "type" "cmp")
+           (and (eq_attr "type" "add,logical")
+                (eq_attr "dot" "yes")))
        (eq_attr "cpu" "power4"))
   "iq_power4")
 
-(define_insn_reservation "power4-compare" 4
-  (and (eq_attr "type" "compare,delayed_compare")
+(define_insn_reservation "power4-compare" 2
+  (and (eq_attr "type" "shift,exts")
+       (eq_attr "dot" "yes")
+       (eq_attr "cpu" "power4"))
+  "(du1_power4+du2_power4|du2_power4+du3_power4|du3_power4+du4_power4),\
+   ((iu1_power4,iu2_power4)\
+    |(iu2_power4,iu2_power4)\
+    |(iu2_power4,iu1_power4))")
+
+(define_bypass 4 "power4-compare" "power4-branch,power4-crlogical,power4-delayedcr,power4-mfcr,power4-mfcrf")
+
+(define_insn_reservation "power4-lmul-cmp" 7
+  (and (eq_attr "type" "mul")
+       (eq_attr "dot" "yes")
+       (eq_attr "size" "64")
+       (eq_attr "cpu" "power4"))
+  "(du1_power4+du2_power4|du2_power4+du3_power4|du3_power4+du4_power4),\
+   ((iu1_power4*6,iu2_power4)\
+    |(iu2_power4*6,iu2_power4)\
+    |(iu2_power4*6,iu1_power4))")
+
+(define_bypass 10 "power4-lmul-cmp" "power4-branch,power4-crlogical,power4-delayedcr,power4-mfcr,power4-mfcrf")
+
+(define_insn_reservation "power4-imul-cmp" 5
+  (and (eq_attr "type" "mul")
+       (eq_attr "dot" "yes")
+       (eq_attr "size" "32")
        (eq_attr "cpu" "power4"))
-  "((du1_power4+du2_power4),iu1_power4,iu2_power4)\
-  |((du2_power4+du3_power4),iu2_power4,iu2_power4)\
-  |((du3_power4+du4_power4),iu2_power4,iu1_power4)")
+  "(du1_power4+du2_power4|du2_power4+du3_power4|du3_power4+du4_power4),\
+   ((iu1_power4*4,iu2_power4)\
+    |(iu2_power4*4,iu2_power4)\
+    |(iu2_power4*4,iu1_power4))")
 
-(define_bypass 2 "power4-compare" "power4-integer")
+(define_bypass 8 "power4-imul-cmp" "power4-branch,power4-crlogical,power4-delayedcr,power4-mfcr,power4-mfcrf")
 
-(define_insn_reservation "power4-imul" 7
-  (and (eq_attr "type" "imul,lmul,mult_compare")
+(define_insn_reservation "power4-lmul" 7
+  (and (eq_attr "type" "mul")
+       (eq_attr "dot" "no")
+       (eq_attr "size" "64")
        (eq_attr "cpu" "power4"))
-  "(q1_power4,iu1_power4*6)|(q2_power4,iu2_power4*6)")
+  "(du1_power4|du2_power4|du3_power4|du4_power4),\
+   (iu1_power4*6|iu2_power4*6)")
 
-(define_insn_reservation "power4-imul2" 5
-  (and (eq_attr "type" "imul2")
+(define_insn_reservation "power4-imul" 5
+  (and (eq_attr "type" "mul")
+       (eq_attr "dot" "no")
+       (eq_attr "size" "32")
        (eq_attr "cpu" "power4"))
-  "(q1_power4,iu1_power4*4)|(q2_power4,iu2_power4*4)")
+  "(du1_power4|du2_power4|du3_power4|du4_power4),\
+   (iu1_power4*4|iu2_power4*4)")
 
 (define_insn_reservation "power4-imul3" 4
-  (and (eq_attr "type" "imul3")
+  (and (eq_attr "type" "mul")
+       (eq_attr "size" "8,16")
        (eq_attr "cpu" "power4"))
-  "(q1_power4,iu1_power4*3)|(q2_power4,iu2_power4*3)")
+  "(du1_power4|du2_power4|du3_power4|du4_power4),\
+   (iu1_power4*3|iu2_power4*3)")
+
 
 ; SPR move only executes in first IU.
 ; Integer division only executes in second IU.
 (define_insn_reservation "power4-idiv" 36
-  (and (eq_attr "type" "idiv")
+  (and (eq_attr "type" "div")
+       (eq_attr "size" "32")
        (eq_attr "cpu" "power4"))
-  "(du1_power4+du2_power4),iu2_power4*35")
+  "du1_power4+du2_power4,iu2_power4*35")
 
 (define_insn_reservation "power4-ldiv" 68
-  (and (eq_attr "type" "ldiv")
+  (and (eq_attr "type" "div")
+       (eq_attr "size" "64")
        (eq_attr "cpu" "power4"))
-  "(du1_power4+du2_power4),iu2_power4*67")
+  "du1_power4+du2_power4,iu2_power4*67")
 
 
 (define_insn_reservation "power4-mtjmpr" 3
-  (and (eq_attr "type" "mtjmpr")
+  (and (eq_attr "type" "mtjmpr,mfjmpr")
        (eq_attr "cpu" "power4"))
   "du1_power4,bpu_power4")
 
 ; Condition Register logical ops are split if non-destructive (RT != RB)
 (define_insn_reservation "power4-crlogical" 2
   (and (eq_attr "type" "cr_logical")
+       (eq_attr "cr_logical_3op" "no")
        (eq_attr "cpu" "power4"))
   "du1_power4,cru_power4")
 
 (define_insn_reservation "power4-delayedcr" 4
-  (and (eq_attr "type" "delayed_cr")
+  (and (eq_attr "type" "cr_logical")
+       (eq_attr "cr_logical_3op" "yes")
        (eq_attr "cpu" "power4"))
-  "(du1_power4+du2_power4),cru_power4,cru_power4")
+  "du1_power4+du2_power4,cru_power4,cru_power4")
 
 ; 4 mfcrf (each 3 cyc, 1/cyc) + 3 fxu
 (define_insn_reservation "power4-mfcr" 6
   (and (eq_attr "type" "mfcr")
        (eq_attr "cpu" "power4"))
-  "(du1_power4+du2_power4+du3_power4+du4_power4),\
-   (du1_power4+du2_power4+du3_power4+du4_power4+cru_power4),\
-    cru_power4,cru_power4,cru_power4")
+  "du1_power4+du2_power4+du3_power4+du4_power4,\
+   du1_power4+du2_power4+du3_power4+du4_power4+cru_power4,\
+   cru_power4,cru_power4,cru_power4")
+
+; mfcrf (1 field)
+(define_insn_reservation "power4-mfcrf" 3
+  (and (eq_attr "type" "mfcrf")
+       (eq_attr "cpu" "power4"))
+  "du1_power4,cru_power4")
 
 ; mtcrf (1 field)
 (define_insn_reservation "power4-mtcr" 4
 
 ; Basic FP latency is 6 cycles
 (define_insn_reservation "power4-fp" 6
-  (and (eq_attr "type" "fp,dmul")
+  (and (eq_attr "type" "fp,fpsimple,dmul")
        (eq_attr "cpu" "power4"))
   "fpq_power4")
 
 (define_insn_reservation "power4-sdiv" 33
   (and (eq_attr "type" "sdiv,ddiv")
        (eq_attr "cpu" "power4"))
-  "(q1_power4,fpu1_power4*28)|(q2_power4,fpu2_power4*28)")
+  "(du1_power4|du2_power4|du3_power4|du4_power4),\
+   (fpu1_power4*28|fpu2_power4*28)")
 
 (define_insn_reservation "power4-sqrt" 40
   (and (eq_attr "type" "ssqrt,dsqrt")
        (eq_attr "cpu" "power4"))
-  "(q1_power4,fpu1_power4*35)|(q2_power4,fpu2_power4*35)")
+  "(du1_power4|du2_power4|du3_power4|du4_power4),\
+   (fpu1_power4*35|fpu2_power4*35)")
+
+(define_insn_reservation "power4-isync" 2
+  (and (eq_attr "type" "isync")
+       (eq_attr "cpu" "power4"))
+  "du1_power4+du2_power4+du3_power4+du4_power4,lsu1_power4")
 
 
 ; VMX
 (define_insn_reservation "power4-vecsimple" 2
-  (and (eq_attr "type" "vecsimple")
+  (and (eq_attr "type" "vecsimple,veclogical,vecmove")
        (eq_attr "cpu" "power4"))
   "vq_power4")
 
-(define_insn_reservation "power4-veccomplex" 2
+(define_insn_reservation "power4-veccomplex" 5
   (and (eq_attr "type" "veccomplex")
        (eq_attr "cpu" "power4"))
   "vq_power4")
 
 ; vecfp compare
 (define_insn_reservation "power4-veccmp" 8
-  (and (eq_attr "type" "veccmp")
+  (and (eq_attr "type" "veccmp,veccmpfx")
        (eq_attr "cpu" "power4"))
   "vq_power4")
 
 
 (define_bypass 4 "power4-vecload" "power4-vecperm")
 
-(define_bypass 3 "power4-vecsimple,power4-veccomplex" "power4-vecperm")
+(define_bypass 3 "power4-vecsimple" "power4-vecperm")
+(define_bypass 6 "power4-veccomplex" "power4-vecperm")
 (define_bypass 3 "power4-vecperm"
                 "power4-vecsimple,power4-veccomplex,power4-vecfloat")
 (define_bypass 9 "power4-vecfloat" "power4-vecperm")
 
 (define_bypass 5 "power4-vecsimple,power4-veccomplex"
-                "power4-branch,power4-crlogical,power4-delayedcr,power4-mfcr")
+                "power4-branch,power4-crlogical,power4-delayedcr,power4-mfcr,power4-mfcrf")
 
 (define_bypass 4 "power4-vecsimple,power4-vecperm" "power4-vecstore")
 (define_bypass 7 "power4-veccomplex" "power4-vecstore")