[PATCH][MIPS] Add support for P6600

[Robert Suchanek <Robert dot Suchanek at imgtec dot com>]

Hi,

The below patch adds support for MIPS P6600 CPU.

This patch will go in after the approval of the Binutils patch.

Tested with mips-img-linux-gnu.

Regards,
Robert

2016-05-20  Matthew Fortune  <matthew.fortune@imgtec.com>
            Prachi Godbole  <prachi.godbole@imgtec.com>

	* config/mips/mips-cpus.def: Add definition for p6600.
	* config/mips/mips-tables.opt: Regenerate.
	* config/mips/mips.c (mips_ucbranch_type): New enum.
	(mips_rtx_cost_data): Add costs for p6600.
	(mips_issue_rate): Add support for p6600.
	(mips_multipass_dfa_lookahead): Likewise.
	(mips_classify_branch_p6600): New function.
	(mips_avoid_hazard): Optimize unconditional compact branch
	hazard.
	(mips_reorg_process_insns): Likewise.
	* config/mips/mips.h (TUNE_P6600): New define.
	(MIPS_ISA_LEVEL_SPEC): Infer mips64r6 from p6600.
	(ENABLE_LD_ST_PAIRS): Enable load/store pairs for p6600.
	* config/mips/mips.md: Include p6600.md.
	(processor): Add p6600.
	(JOIN_MODE): Add support for load/store pairs for 64-bit target.
	* config/mips/p6600.md: New file.
	* doc/invoke.texi: Add p6600 to supported architectures.
---
 gcc/config/mips/mips-cpus.def   |   1 +
 gcc/config/mips/mips-tables.opt |   3 +
 gcc/config/mips/mips.c          |  84 +++++++++-
 gcc/config/mips/mips.h          |   6 +-
 gcc/config/mips/mips.md         |   3 +
 gcc/config/mips/p6600.md        | 349 ++++++++++++++++++++++++++++++++++++++++
 gcc/doc/invoke.texi             |   2 +-
 7 files changed, 442 insertions(+), 6 deletions(-)
 create mode 100644 gcc/config/mips/p6600.md

diff --git a/gcc/config/mips/mips-cpus.def b/gcc/config/mips/mips-cpus.def
index 5df9807..5694e87 100644
--- a/gcc/config/mips/mips-cpus.def
+++ b/gcc/config/mips/mips-cpus.def
@@ -171,3 +171,4 @@ MIPS_CPU ("xlp", PROCESSOR_XLP, 65, PTF_AVOID_BRANCHLIKELY)
 
 /* MIPS64 Release 6 processors.  */
 MIPS_CPU ("i6400", PROCESSOR_I6400, 69, 0)
+MIPS_CPU ("p6600", PROCESSOR_P6600, 69, 0)
diff --git a/gcc/config/mips/mips-tables.opt b/gcc/config/mips/mips-tables.opt
index 34c12bd..270fcc0 100644
--- a/gcc/config/mips/mips-tables.opt
+++ b/gcc/config/mips/mips-tables.opt
@@ -696,3 +696,6 @@ Enum(mips_arch_opt_value) String(xlp) Value(101) Canonical
 EnumValue
 Enum(mips_arch_opt_value) String(i6400) Value(102) Canonical
 
+EnumValue
+Enum(mips_arch_opt_value) String(p6600) Value(103) Canonical
+
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index 06acd30..cbe1007 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -194,6 +194,15 @@ enum mips_address_type {
   ADDRESS_SYMBOLIC
 };
 
+/* Classifies an unconditional branch of interest for the P6600.  */
+
+enum mips_ucbranch_type {
+  /* May not even be a branch.  */
+  UC_UNDEFINED,
+  UC_BALC,
+  UC_OTHER
+};
+
 /* Macros to create an enumeration identifier for a function prototype.  */
 #define MIPS_FTYPE_NAME1(A, B) MIPS_##A##_FTYPE_##B
 #define MIPS_FTYPE_NAME2(A, B, C) MIPS_##A##_FTYPE_##B##_##C
@@ -1122,6 +1131,19 @@ static const struct mips_rtx_cost_data
     COSTS_N_INSNS (36),           /* int_div_di */
 		    2,            /* branch_cost */
 		    4             /* memory_latency */
+  },
+  { /* P6600 */
+    COSTS_N_INSNS (4),            /* fp_add */
+    COSTS_N_INSNS (5),            /* fp_mult_sf */
+    COSTS_N_INSNS (5),            /* fp_mult_df */
+    COSTS_N_INSNS (17),           /* fp_div_sf */
+    COSTS_N_INSNS (17),           /* fp_div_df */
+    COSTS_N_INSNS (5),            /* int_mult_si */
+    COSTS_N_INSNS (5),            /* int_mult_di */
+    COSTS_N_INSNS (8),            /* int_div_si */
+    COSTS_N_INSNS (8),            /* int_div_di */
+		    2,            /* branch_cost */
+		    4             /* memory_latency */
   }
 };
 

@@ -14507,6 +14529,7 @@ mips_issue_rate (void)
     case PROCESSOR_LOONGSON_2F:
     case PROCESSOR_LOONGSON_3A:
     case PROCESSOR_P5600:
+    case PROCESSOR_P6600:
       return 4;
 
     case PROCESSOR_XLP:
@@ -14642,7 +14665,7 @@ mips_multipass_dfa_lookahead (void)
   if (TUNE_OCTEON)
     return 2;
 
-  if (TUNE_P5600 || TUNE_I6400)
+  if (TUNE_P5600 || TUNE_I6400 || TUNE_P6600)
     return 4;
 
   return 0;
@@ -18496,6 +18519,28 @@ mips_orphaned_high_part_p (mips_offset_table *htab, rtx_insn *insn)
   return false;
 }
 
+/* Subroutine of mips_avoid_hazard.  We classify unconditional branches
+   of interest for the P6600 for performance reasons.  We are interested
+   in differentiating BALC from JIC, JIALC and BC.  */
+
+static enum mips_ucbranch_type
+mips_classify_branch_p6600 (rtx_insn *insn)
+{
+  if (!(insn
+	&& USEFUL_INSN_P (insn)
+	&& GET_CODE (PATTERN (insn)) != SEQUENCE))
+    return UC_UNDEFINED;
+
+  if (get_attr_jal (insn) == JAL_INDIRECT /* JIC and JIALC.  */
+      || get_attr_type (insn) == TYPE_JUMP) /* BC as it is a loose jump.  */
+    return UC_OTHER;
+
+  if (CALL_P (insn) && get_attr_jal (insn) == JAL_DIRECT)
+    return UC_BALC;
+
+  return UC_UNDEFINED;
+}
+
 /* Subroutine of mips_reorg_process_insns.  If there is a hazard between
    INSN and a previous instruction, avoid it by inserting nops after
    instruction AFTER.
@@ -18548,14 +18593,36 @@ mips_avoid_hazard (rtx_insn *after, rtx_insn *insn, int *hilo_delay,
 	   && GET_CODE (pattern) != ASM_INPUT
 	   && asm_noperands (pattern) < 0)
     nops = 1;
+  /* The P6600's branch predictor does not handle certain static
+     sequences of back-to-back jumps well.  Inserting a no-op only
+     costs space as the dispatch unit will disregard the nop.
+     Here we handle the cases of back to back unconditional branches
+     that are inefficient.  */
+  else if (TUNE_P6600 && TARGET_CB_MAYBE && !optimize_size
+	   && ((mips_classify_branch_p6600 (after) == UC_BALC
+		&& mips_classify_branch_p6600 (insn) == UC_OTHER)
+	       || (mips_classify_branch_p6600 (insn) == UC_BALC
+		   && (mips_classify_branch_p6600 (after) == UC_OTHER))))
+    nops = 1;
   else
     nops = 0;
 
   /* Insert the nops between this instruction and the previous one.
      Each new nop takes us further from the last hilo hazard.  */
   *hilo_delay += nops;
+
+  /* If we're tuning for the P6600, we come across an annoying GCC
+     assumption that debug information always follows a call.  Move
+     past any debug information in that case.  */
+  rtx_insn *real_after = after;
+  if (real_after && nops && CALL_P (real_after))
+    while (TUNE_P6600 && real_after
+	   && (NOTE_P (NEXT_INSN (real_after))
+	       || BARRIER_P (NEXT_INSN (real_after))))
+      real_after = NEXT_INSN (real_after);
+
   while (nops-- > 0)
-    emit_insn_after (gen_hazard_nop (), after);
+    emit_insn_after (gen_hazard_nop (), real_after);
 
   /* Set up the state for the next instruction.  */
   *hilo_delay += ninsns;
@@ -18565,6 +18632,14 @@ mips_avoid_hazard (rtx_insn *after, rtx_insn *insn, int *hilo_delay,
     switch (get_attr_hazard (insn))
       {
       case HAZARD_NONE:
+	/* For the P6600, flag some unconditional branches as having
+	   a pseudo-forbidden slot.  This will cause additional nop insertion
+	   or SEQUENCE breaking as required.  */
+	if (TUNE_P6600
+	    && !optimize_size
+	    && TARGET_CB_MAYBE
+	    && mips_classify_branch_p6600 (insn) == UC_OTHER)
+	  *fs_delay = true;
 	break;
 
       case HAZARD_FORBIDDEN_SLOT:
@@ -18806,7 +18881,10 @@ mips_reorg_process_insns (void)
 		     sequence and replace it with the delay slot instruction
 		     then the jump to clear the forbidden slot hazard.  */
 
-		  if (fs_delay)
+		  if (fs_delay || (TUNE_P6600
+				   && TARGET_CB_MAYBE
+				   && mips_classify_branch_p6600 (insn)
+				      == UC_BALC))
 		    {
 		      /* Search onwards from the current position looking for
 			 a SEQUENCE.  We are looking for pipeline hazards here
diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
index e8897d1..5020208 100644
--- a/gcc/config/mips/mips.h
+++ b/gcc/config/mips/mips.h
@@ -307,6 +307,7 @@ struct mips_cpu_info {
 				     || mips_tune == PROCESSOR_SB1A)
 #define TUNE_P5600                  (mips_tune == PROCESSOR_P5600)
 #define TUNE_I6400                  (mips_tune == PROCESSOR_I6400)
+#define TUNE_P6600                  (mips_tune == PROCESSOR_P6600)
 
 /* Whether vector modes and intrinsics for ST Microelectronics
    Loongson-2E/2F processors should be enabled.  In o32 pairs of
@@ -768,7 +769,7 @@ struct mips_cpu_info {
      %{march=mips64r2|march=loongson3a|march=octeon|march=xlp: -mips64r2} \
      %{march=mips64r3: -mips64r3} \
      %{march=mips64r5: -mips64r5} \
-     %{march=mips64r6|march=i6400: -mips64r6}}"
+     %{march=mips64r6|march=i6400|march=p6600: -mips64r6}}"
 
 /* A spec that injects the default multilib ISA if no architecture is
    specified.  */
@@ -3411,5 +3412,6 @@ struct GTY(())  machine_function {
    performance can be degraded for those targets.  Hence, do not bond for
    micromips or fix_24k.  */
 #define ENABLE_LD_ST_PAIRS \
-  (TARGET_LOAD_STORE_PAIRS && (TUNE_P5600 || TUNE_I6400) \
+  (TARGET_LOAD_STORE_PAIRS \
+   && (TUNE_P5600 || TUNE_I6400 || TUNE_P6600) \
    && !TARGET_MICROMIPS && !TARGET_FIX_24K)
diff --git a/gcc/config/mips/mips.md b/gcc/config/mips/mips.md
index d8d564f..527f2e1 100644
--- a/gcc/config/mips/mips.md
+++ b/gcc/config/mips/mips.md
@@ -69,6 +69,7 @@ (define_enum "processor" [
   p5600
   m5100
   i6400
+  p6600
 ])
 
 (define_c_enum "unspec" [
@@ -789,6 +790,7 @@ (define_mode_iterator MOVEP1 [SI SF])
 (define_mode_iterator MOVEP2 [SI SF])
 (define_mode_iterator JOIN_MODE [HI
 				 SI
+				 (DI "TARGET_64BIT")
 				 (SF "TARGET_HARD_FLOAT")
 				 (DF "TARGET_HARD_FLOAT
 				      && TARGET_DOUBLE_FLOAT")])
@@ -1142,6 +1144,7 @@ (define_insn_reservation "ghost" 0
 
 (include "i6400.md")
 (include "p5600.md")
+(include "p6600.md")
 (include "m5100.md")
 (include "4k.md")
 (include "5k.md")
diff --git a/gcc/config/mips/p6600.md b/gcc/config/mips/p6600.md
new file mode 100644
index 0000000..b66d5e4
--- /dev/null
+++ b/gcc/config/mips/p6600.md
@@ -0,0 +1,349 @@
+;; DFA-based pipeline description for P6600.
+;;
+;; Copyright (C) 2007-2015 Free Software Foundation, Inc.
+;;
+;; This file is part of GCC.
+;;
+;; 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.
+
+;; 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 GCC; see the file COPYING3.  If not see
+;; <http://www.gnu.org/licenses/>.
+
+(define_automaton "p6600_agen_alq_pipe, p6600_fpu_pipe")
+
+;; The address generation queue (AGQ) has AL2, CTISTD and LDSTA pipes
+(define_cpu_unit "p6600_agq, p6600_al2, p6600_ctistd, p6600_ldsta,
+		  p6600_gpdiv" "p6600_agen_alq_pipe")
+
+;; The arithmetic-logic-unit queue (ALQ) has ALU pipe
+(define_cpu_unit "p6600_alq, p6600_alu" "p6600_agen_alq_pipe")
+
+;; The floating-point-unit queue (FPQ) has short and long pipes
+(define_cpu_unit "p6600_fpu_short, p6600_fpu_long" "p6600_fpu_pipe")
+
+;; Short FPU pipeline.
+(define_cpu_unit "p6600_fpu_intadd, p6600_fpu_cmp, p6600_fpu_float,
+		  p6600_fpu_logic_a, p6600_fpu_logic_b, p6600_fpu_div,
+		  p6600_fpu_store" "p6600_fpu_pipe")
+
+;; Long FPU pipeline.
+(define_cpu_unit "p6600_fpu_logic, p6600_fpu_float_a, p6600_fpu_float_b,
+		  p6600_fpu_float_c, p6600_fpu_float_d" "p6600_fpu_pipe")
+(define_cpu_unit "p6600_fpu_mult, p6600_fpu_fdiv, p6600_fpu_load,
+		  p6600_fpu_apu" "p6600_fpu_pipe")
+
+(define_reservation "p6600_agq_al2" "p6600_agq, p6600_al2")
+(define_reservation "p6600_agq_ctistd" "p6600_agq, p6600_ctistd")
+(define_reservation "p6600_agq_ldsta" "p6600_agq, p6600_ldsta")
+(define_reservation "p6600_alq_alu" "p6600_alq, p6600_alu")
+
+;;
+;; FPU-MSA pipe
+;;
+
+;; Arithmetic
+;; add, hadd, sub, hsub, average, min, max, compare
+(define_insn_reservation "p6600_msa_short_int_add" 2
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "simd_int_arith"))
+  "p6600_fpu_short, p6600_fpu_intadd")
+
+;; Bitwise Instructions
+;; and, or, xor, bit-clear, leading-bits-count, shift, shuffle
+(define_insn_reservation "p6600_msa_short_logic" 2
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "simd_shift,simd_bit,simd_splat,simd_fill,simd_shf,
+			simd_permute,simd_logic"))
+  "p6600_fpu_short, p6600_fpu_logic_a")
+
+;; move.v
+(define_insn_reservation "p6600_msa_short_logic_move_v" 2
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "simd_move"))
+  "p6600_fpu_short, p6600_fpu_logic_a")
+
+;; Float compare
+(define_insn_reservation "p6600_msa_short_cmp" 2
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "simd_fcmp"))
+  "p6600_fpu_short, p6600_fpu_cmp")
+
+;; Float exp2, min, max
+(define_insn_reservation "p6600_msa_short_float2" 2
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "simd_fexp2,simd_fminmax"))
+  "p6600_fpu_short, p6600_fpu_float")
+
+;; Vector sat
+(define_insn_reservation "p6600_msa_short_logic3" 3
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "simd_sat,simd_pcnt"))
+  "p6600_fpu_short, p6600_fpu_logic_a, p6600_fpu_logic_b")
+
+;; Vector copy, bz, bnz
+(define_insn_reservation "p6600_msa_short_store4" 4
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "simd_copy,simd_branch,simd_cmsa"))
+  "p6600_fpu_short, p6600_fpu_store")
+
+;; Vector load
+(define_insn_reservation "p6600_msa_long_load" 10
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "simd_load"))
+  "p6600_fpu_long, p6600_fpu_load")
+
+;; Vector store
+(define_insn_reservation "p6600_msa_short_store" 2
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "simd_store"))
+  "p6600_fpu_short, p6600_fpu_store")
+
+;; binsl, binsr, insert, vshf, sld
+(define_insn_reservation "p6600_msa_long_logic" 2
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "simd_bitins,simd_bitmov,simd_insert,simd_sld"))
+  "p6600_fpu_long, p6600_fpu_logic")
+
+;; Float fclass, flog2
+(define_insn_reservation "p6600_msa_long_float2" 2
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "simd_fclass,simd_flog2"))
+  "p6600_fpu_long, p6600_fpu_float_a")
+
+;; fadd, fsub
+(define_insn_reservation "p6600_msa_long_float4" 4
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "simd_fadd,simd_fcvt"))
+  "p6600_fpu_long, p6600_fpu_float_a, p6600_fpu_float_b")
+
+;; fmul
+(define_insn_reservation "p6600_msa_long_float5" 5
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "simd_fmul"))
+  "p6600_fpu_long, p6600_fpu_float_a, p6600_fpu_float_b, p6600_fpu_float_c")
+
+;; fmadd, fmsub
+(define_insn_reservation "p6600_msa_long_float8" 8
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "simd_fmadd"))
+  "p6600_fpu_long, p6600_fpu_float_a,
+   p6600_fpu_float_b, p6600_fpu_float_c, p6600_fpu_float_d")
+
+;; Vector mul, dotp, madd, msub
+(define_insn_reservation "p6600_msa_long_mult" 5
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "simd_mul"))
+  "p6600_fpu_long, p6600_fpu_mult")
+
+;; fdiv, fmod (semi-pipelined)
+(define_insn_reservation "p6600_msa_long_fdiv" 10
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "simd_fdiv"))
+  "p6600_fpu_long, nothing, nothing, p6600_fpu_fdiv*8")
+
+;; div, mod (non-pipelined)
+(define_insn_reservation "p6600_msa_long_div" 10
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "simd_div"))
+  "p6600_fpu_long, p6600_fpu_div*9, p6600_fpu_div + p6600_fpu_logic_a")
+
+;;
+;; FPU pipe
+;;
+
+;; fadd, fsub
+(define_insn_reservation "p6600_fpu_fadd" 4
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "fadd,fabs,fneg"))
+  "p6600_fpu_long, p6600_fpu_apu")
+
+;; fabs, fneg, fcmp
+(define_insn_reservation "p6600_fpu_fabs" 2
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "fabs,fneg,fcmp,fmove"))
+  "p6600_fpu_short, p6600_fpu_apu")
+
+;; fload
+(define_insn_reservation "p6600_fpu_fload" 8
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "fpload,fpidxload"))
+  "p6600_fpu_long, p6600_fpu_apu")
+
+;; fstore
+(define_insn_reservation "p6600_fpu_fstore" 1
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "fpstore,fpidxstore"))
+  "p6600_fpu_short, p6600_fpu_apu")
+
+;; fmadd
+(define_insn_reservation "p6600_fpu_fmadd" 9
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "fmadd"))
+  "p6600_fpu_long, p6600_fpu_apu")
+
+;; fmul
+(define_insn_reservation "p6600_fpu_fmul" 5
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "fmul"))
+  "p6600_fpu_long, p6600_fpu_apu")
+
+;; fdiv, fsqrt
+(define_insn_reservation "p6600_fpu_div" 17
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "fdiv,frdiv,fsqrt,frsqrt"))
+  "p6600_fpu_long, p6600_fpu_apu*17")
+
+;; fcvt
+(define_insn_reservation "p6600_fpu_fcvt" 4
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "fcvt"))
+  "p6600_fpu_long, p6600_fpu_apu")
+
+;; mtc
+(define_insn_reservation "p6600_fpu_fmtc" 7
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "mtc"))
+  "p6600_fpu_short, p6600_fpu_store")
+
+;; mfc
+(define_insn_reservation "p6600_fpu_fmfc" 4
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "mfc"))
+  "p6600_fpu_short, p6600_fpu_store")
+
+;; madd/msub feeding into the add source
+;; madd.fmt dst, x, y, z -> madd.fmt a, dst, b, c 5 cycles
+(define_bypass 5 "p6600_fpu_fmadd" "p6600_fpu_fmadd" "mips_fmadd_bypass")
+
+;;
+;; Integer pipe
+;;
+
+;; and
+(define_insn_reservation "p6600_int_and" 1
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "move_type" "logical"))
+  "p6600_alq_alu")
+
+;; lui
+(define_insn_reservation "p6600_int_lui" 1
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "move_type" "const"))
+  "p6600_alq_alu")
+
+;; Load lb, lbu, lh, lhu, lq, lw, lw_i2f, lwxs
+(define_insn_reservation "p6600_int_load" 4
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "move_type" "load"))
+  "p6600_agq_ldsta")
+
+;; store
+(define_insn_reservation "p6600_int_store" 3
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "move_type" "store"))
+  "p6600_agq_ldsta")
+
+;; andi, sll, srl, seb, seh
+(define_insn_reservation "p6600_int_arith_1" 1
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "move_type" "andi,sll0,signext"))
+  "p6600_alq_alu | p6600_agq_al2")
+
+;; addi, addiu, ori, xori, add, addu
+(define_insn_reservation "p6600_int_arith_2" 1
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "alu_type" "add,or,xor"))
+  "p6600_alq_alu | p6600_agq_al2")
+
+;; nor, sub
+(define_insn_reservation "p6600_int_arith_3" 1
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "alu_type" "nor,sub"))
+  "p6600_alq_alu")
+
+;; srl, sra, rotr, slt, sllv, srlv
+(define_insn_reservation "p6600_int_arith_4" 1
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "shift,slt,move"))
+  "p6600_alq_alu | p6600_agq_al2")
+
+;; nop
+(define_insn_reservation "p6600_int_nop" 0
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "nop"))
+  "p6600_agq_al2")
+
+;; clo, clz
+(define_insn_reservation "p6600_int_countbits" 1
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "clz"))
+  "p6600_agq_al2")
+
+;; Conditional moves
+(define_insn_reservation "p6600_int_condmove" 1
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "condmove"))
+  "p6600_agq_al2")
+
+;; madd, msub
+(define_insn_reservation "p6600_dsp_mac" 5
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "imadd"))
+  "p6600_agq_al2")
+
+;; mfhi/lo
+(define_insn_reservation "p6600_dsp_mfhilo" 1
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "mfhi,mflo"))
+  "p6600_agq_al2")
+
+;; mthi/lo
+(define_insn_reservation "p6600_dsp_mthilo" 5
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "mthi,mtlo"))
+  "p6600_agq_al2")
+
+;; mult, multu, mul
+(define_insn_reservation "p6600_dsp_mult" 5
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "imul3,imul"))
+  "p6600_agq_al2")
+
+;; branch and jump
+(define_insn_reservation "p6600_int_branch" 1
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "branch,jump"))
+  "p6600_agq_ctistd")
+
+;; prefetch
+(define_insn_reservation "p6600_int_prefetch" 3
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "prefetch,prefetchx"))
+  "p6600_agq_ldsta")
+
+;; divide
+(define_insn_reservation "p6600_int_div" 8
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "idiv"))
+  "p6600_agq_al2+p6600_gpdiv*8")
+
+;; arith
+(define_insn_reservation "p6600_int_arith_5" 2
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "type" "arith"))
+  "p6600_agq_al2")
+
+;; call
+(define_insn_reservation "p6600_int_call" 2
+  (and (eq_attr "cpu" "p6600")
+       (eq_attr "jal" "indirect,direct"))
+  "p6600_agq_ctistd")
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index c72ec5b..73f1cb6 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -17764,7 +17764,7 @@ The processor names are:
 @samp{m5100}, @samp{m5101},
 @samp{octeon}, @samp{octeon+}, @samp{octeon2}, @samp{octeon3},
 @samp{orion},
-@samp{p5600},
+@samp{p5600}, @samp{p6600},
 @samp{r2000}, @samp{r3000}, @samp{r3900}, @samp{r4000}, @samp{r4400},
 @samp{r4600}, @samp{r4650}, @samp{r4700}, @samp{r6000}, @samp{r8000},
 @samp{rm7000}, @samp{rm9000},
-- 
2.8.2.396.g5fe494c