mips.h (processor_type): Removed PROCESSOR_24K, add PROCESSOR_24KC and PROCESSOR_24KF.

* config/mips/mips.h (processor_type): Removed PROCESSOR_24K, add
PROCESSOR_24KC and PROCESSOR_24KF.
* config/mips/mips.c (mips_cpu_info_table): Add processor names
and aliases for 4kec/4kem/4kep/24kec/24kef/24kex/34kc/34kf/34kx.
(mips_rtx_cost_data): Add costs for the 24kc.
* config/mips/mips.md ("cpu"): Remove 24k, add 24kc and 24kf.
* config/mips/24k.md: Remove references to 24k and replace with
uses of 24kc/24kf in the appropriate reservations.
* doc/invoke.texi (MIPS Options): Updated.

From-SVN: r118459

6 files changed, 71 insertions, 38 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5212852..5297f5f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,15 @@
+2006-11-03  David Ung  <davidung@mips.com>
+	
+	* config/mips/mips.h (processor_type): Removed PROCESSOR_24K, add
+	PROCESSOR_24KC and PROCESSOR_24KF.
+	* config/mips/mips.c (mips_cpu_info_table): Add processor names
+	and aliases for 4kec/4kem/4kep/24kec/24kef/24kex/34kc/34kf/34kx.
+	(mips_rtx_cost_data): Add costs for the 24kc.
+	* config/mips/mips.md ("cpu"): Remove 24k, add 24kc and 24kf.
+	* config/mips/24k.md: Remove references to 24k and replace with
+	uses of 24kc/24kf in the appropriate reservations.
+	* doc/invoke.texi (MIPS Options): Updated. 
+	
 2006-11-03  J"orn Rennecke  <joern.rennecke@st.com>
 
 	* config/sh/crt1.asm: Fix #ifdef indent.
diff --git a/gcc/config/mips/24k.md b/gcc/config/mips/24k.md
index 0dbb9f0..1012677 100644
--- a/gcc/config/mips/24k.md
+++ b/gcc/config/mips/24k.md
@@ -42,7 +42,7 @@
 
 ;; 1. Loads: lb, lbu, lh, lhu, ll, lw, lwl, lwr, lwpc, lwxs
 (define_insn_reservation "r24k_int_load" 2
-  (and (eq_attr "cpu" "24k,24kx")
+  (and (eq_attr "cpu" "24kc,24kf,24kx")
        (eq_attr "type" "load"))
   "r24k_iss+r24k_ixu_arith")
 
@@ -54,7 +54,7 @@
 ;; (movn/movz is not matched, we'll need to split condmov to
 ;;  differentiate between integer/float moves)
 (define_insn_reservation "r24k_int_arith" 1
-  (and (eq_attr "cpu" "24k,24kx")
+  (and (eq_attr "cpu" "24kc,24kf,24kx")
        (eq_attr "type" "arith,const,nop,shift,slt"))
   "r24k_iss+r24k_ixu_arith")
 
@@ -62,13 +62,13 @@
 ;; 3. Links: bgezal, bgezall, bltzal, bltzall, jal, jalr, jalx
 ;; 3a. jr/jalr consumer
 (define_insn_reservation "r24k_int_jump" 1
-  (and (eq_attr "cpu" "24k,24kx")
+  (and (eq_attr "cpu" "24kc,24kf,24kx")
        (eq_attr "type" "call,jump"))
   "r24k_iss+r24k_ixu_arith")
 
 ;; 3b. branch consumer
 (define_insn_reservation "r24k_int_branch" 1
-  (and (eq_attr "cpu" "24k,24kx")
+  (and (eq_attr "cpu" "24kc,24kf,24kx")
        (eq_attr "type" "branch"))
   "r24k_iss+r24k_ixu_arith")
 
@@ -76,38 +76,38 @@
 ;; 4. MDU: fully pipelined multiplier
 ;; mult - delivers result to hi/lo in 1 cycle (pipelined)
 (define_insn_reservation "r24k_int_mult" 1
-  (and (eq_attr "cpu" "24k,24kx")
+  (and (eq_attr "cpu" "24kc,24kf,24kx")
        (eq_attr "type" "imul"))
   "r24k_iss+(r24k_mul3a|r24k_mul3b|r24k_mul3c)")
 
 ;; madd, msub - delivers result to hi/lo in 1 cycle (pipelined)
 (define_insn_reservation "r24k_int_madd" 1
-  (and (eq_attr "cpu" "24k,24kx")
+  (and (eq_attr "cpu" "24kc,24kf,24kx")
        (eq_attr "type" "imadd"))
   "r24k_iss+(r24k_mul3a|r24k_mul3b|r24k_mul3c)")
 
 ;; mul - delivers result to gpr in 5 cycles
 (define_insn_reservation "r24k_int_mul3" 5
-  (and (eq_attr "cpu" "24k,24kx")
+  (and (eq_attr "cpu" "24kc,24kf,24kx")
        (eq_attr "type" "imul3"))
   "r24k_iss+(r24k_mul3a|r24k_mul3b|r24k_mul3c)*5")
 
 ;; mfhi, mflo, mflhxu - deliver result to gpr in 5 cycles
 (define_insn_reservation "r24k_int_mfhilo" 5
-  (and (eq_attr "cpu" "24k,24kx")
+  (and (eq_attr "cpu" "24kc,24kf,24kx")
        (eq_attr "type" "mfhilo"))
   "r24k_iss+(r24k_mul3a|r24k_mul3b|r24k_mul3c)")
 
 ;; mthi, mtlo, mtlhx - deliver result to hi/lo, thence madd, handled as bypass
 (define_insn_reservation "r24k_int_mthilo" 1
-  (and (eq_attr "cpu" "24k,24kx")
+  (and (eq_attr "cpu" "24kc,24kf,24kx")
        (eq_attr "type" "mthilo"))
   "r24k_iss+(r24k_mul3a|r24k_mul3b|r24k_mul3c)")
 
 ;; div - default to 36 cycles for 32bit operands.  Faster for 24bit, 16bit and
 ;; 8bit, but is tricky to identify.
 (define_insn_reservation "r24k_int_div" 36
-  (and (eq_attr "cpu" "24k,24kx")
+  (and (eq_attr "cpu" "24kc,24kf,24kx")
        (eq_attr "type" "idiv"))
   "r24k_iss+(r24k_mul3a+r24k_mul3b+r24k_mul3c)*36")
 
@@ -122,7 +122,7 @@
 
 ;; 6. Store
 (define_insn_reservation "r24k_int_store" 1
-  (and (eq_attr "cpu" "24k,24kx")
+  (and (eq_attr "cpu" "24kc,24kf,24kx")
        (and (eq_attr "type" "store")
 	    (eq_attr "mode" "!unknown")))
   "r24k_iss+r24k_ixu_arith")
@@ -132,7 +132,7 @@
 ;;     against store_data_bypass_p, which would then fail because cprestore
 ;;     does not have a normal SET pattern.
 (define_insn_reservation "r24k_unknown_store" 1
-  (and (eq_attr "cpu" "24k,24kx")
+  (and (eq_attr "cpu" "24kc,24kf,24kx")
        (and (eq_attr "type" "store")
 	    (eq_attr "mode" "unknown")))
   "r24k_iss+r24k_ixu_arith")
@@ -140,7 +140,7 @@
 
 ;; 7. Multiple instructions
 (define_insn_reservation "r24k_int_multi" 1
-  (and (eq_attr "cpu" "24k,24kx")
+  (and (eq_attr "cpu" "24kc,24kf,24kx")
        (eq_attr "type" "multi"))
   "r24k_iss+r24k_ixu_arith+r24k_fpu_arith+(r24k_mul3a+r24k_mul3b+r24k_mul3c)")
 
@@ -149,14 +149,14 @@
 ;;    rtls. They do not really affect scheduling latency, (blockage affects
 ;;    scheduling via log links, but not used here).
 (define_insn_reservation "r24k_int_unknown" 0
-  (and (eq_attr "cpu" "24k,24kx")
+  (and (eq_attr "cpu" "24kc,24kf,24kx")
        (eq_attr "type" "unknown"))
   "r24k_iss")
 
 
 ;; 9. Prefetch
 (define_insn_reservation "r24k_int_prefetch" 1
-  (and (eq_attr "cpu" "24k,24kx")
+  (and (eq_attr "cpu" "24kc,24kf,24kx")
        (eq_attr "type" "prefetch,prefetchx"))
   "r24k_iss+r24k_ixu_arith")
 
@@ -230,37 +230,37 @@
 
 ;; fadd, fabs, fneg
 (define_insn_reservation "r24k_fadd" 8
-  (and (eq_attr "cpu" "24k")
+  (and (eq_attr "cpu" "24kf")
        (eq_attr "type" "fadd,fabs,fneg"))
   "r24k_fpu_iss")
 
 ;; fmove, fcmove
 (define_insn_reservation "r24k_fmove" 8
-  (and (eq_attr "cpu" "24k")
+  (and (eq_attr "cpu" "24kf")
        (eq_attr "type" "fmove,condmove"))
   "r24k_fpu_iss")
 
 ;; fload
 (define_insn_reservation "r24k_fload" 6
-  (and (eq_attr "cpu" "24k")
+  (and (eq_attr "cpu" "24kf")
        (eq_attr "type" "fpload,fpidxload"))
   "r24k_fpu_iss")
 
 ;; fstore
 (define_insn_reservation "r24k_fstore" 2
-  (and (eq_attr "cpu" "24k")
+  (and (eq_attr "cpu" "24kf")
        (eq_attr "type" "fpstore"))
   "r24k_fpu_iss")
 
 ;; fmul, fmadd
 (define_insn_reservation "r24k_fmul_sf" 8
-  (and (eq_attr "cpu" "24k")
+  (and (eq_attr "cpu" "24kf")
        (and (eq_attr "type" "fmul,fmadd")
 	    (eq_attr "mode" "SF")))
   "r24k_fpu_iss")
 
 (define_insn_reservation "r24k_fmul_df" 10
-  (and (eq_attr "cpu" "24k")
+  (and (eq_attr "cpu" "24kf")
        (and (eq_attr "type" "fmul,fmadd")
 	    (eq_attr "mode" "DF")))
   "r24k_fpu_iss,(r24k_fpu_arith*2)")
@@ -268,27 +268,27 @@
 
 ;; fdiv, fsqrt, frsqrt
 (define_insn_reservation "r24k_fdiv_sf" 34
-  (and (eq_attr "cpu" "24k")
+  (and (eq_attr "cpu" "24kf")
        (and (eq_attr "type" "fdiv,fsqrt,frsqrt")
 	    (eq_attr "mode" "SF")))
   "r24k_fpu_iss,(r24k_fpu_arith*26)")
 
 (define_insn_reservation "r24k_fdiv_df" 64
-  (and (eq_attr "cpu" "24k")
+  (and (eq_attr "cpu" "24kf")
        (and (eq_attr "type" "fdiv,fsqrt")
 	    (eq_attr "mode" "DF")))
   "r24k_fpu_iss,(r24k_fpu_arith*56)")
 
 ;; frsqrt
 (define_insn_reservation "r24k_frsqrt_df" 70
-  (and (eq_attr "cpu" "24k")
+  (and (eq_attr "cpu" "24kf")
        (and (eq_attr "type" "frsqrt")
 	    (eq_attr "mode" "DF")))
   "r24k_fpu_iss,(r24k_fpu_arith*60)")
 
 ;; fcmp
 (define_insn_reservation "r24k_fcmp" 4
-  (and (eq_attr "cpu" "24k")
+  (and (eq_attr "cpu" "24kf")
        (eq_attr "type" "fcmp"))
   "r24k_fpu_iss")
 
@@ -297,28 +297,28 @@
 
 ;; fcvt (cvt.d.s, cvt.[sd].[wl])
 (define_insn_reservation "r24k_fcvt_i2f_s2d" 8
-  (and (eq_attr "cpu" "24k")
+  (and (eq_attr "cpu" "24kf")
        (and (eq_attr "type" "fcvt")
 	    (eq_attr "cnv_mode" "I2S,I2D,S2D")))
   "r24k_fpu_iss")
 
 ;; fcvt (cvt.s.d)
 (define_insn_reservation "r24k_fcvt_s2d" 12
-  (and (eq_attr "cpu" "24k")
+  (and (eq_attr "cpu" "24kf")
        (and (eq_attr "type" "fcvt")
 	    (eq_attr "cnv_mode" "D2S")))
   "r24k_fpu_iss")
 
 ;; fcvt (cvt.[wl].[sd], etc)
 (define_insn_reservation "r24k_fcvt_f2i" 10
-  (and (eq_attr "cpu" "24k")
+  (and (eq_attr "cpu" "24kf")
        (and (eq_attr "type" "fcvt")
 	    (eq_attr "cnv_mode" "S2I,D2I")))
   "r24k_fpu_iss")
 
 ;; fxfer (mfc1, mfhc1, mtc1, mthc1)
 (define_insn_reservation "r24k_fxfer" 4
-  (and (eq_attr "cpu" "24k")
+  (and (eq_attr "cpu" "24kf")
        (eq_attr "type" "xfer"))
   "r24k_fpu_iss")
 
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index 5fe1b50..6706b83 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -749,10 +749,18 @@ const struct mips_cpu_info mips_cpu_info_table[] = {
 
   /* MIPS32 Release 2 */
   { "m4k", PROCESSOR_M4K, 33 },
-  { "24k", PROCESSOR_24K, 33 },
-  { "24kc", PROCESSOR_24K, 33 },  /* 24K  no FPU */
-  { "24kf", PROCESSOR_24K, 33 },  /* 24K 1:2 FPU */
-  { "24kx", PROCESSOR_24KX, 33 }, /* 24K 1:1 FPU */
+  { "4kec", PROCESSOR_4KC, 33 },
+  { "4kem", PROCESSOR_4KC, 33 },
+  { "4kep", PROCESSOR_4KP, 33 },
+  { "24kc", PROCESSOR_24KC, 33 },  /* 24K  no FPU */
+  { "24kf", PROCESSOR_24KF, 33 },  /* 24K 1:2 FPU */
+  { "24kx", PROCESSOR_24KX, 33 },  /* 24K 1:1 FPU */
+  { "24kec", PROCESSOR_24KC, 33 }, /* 24K with DSP */
+  { "24kef", PROCESSOR_24KF, 33 },
+  { "24kex", PROCESSOR_24KX, 33 },
+  { "34kc", PROCESSOR_24KC, 33 },  /* 34K with MT/DSP */
+  { "34kf", PROCESSOR_24KF, 33 },
+  { "34kx", PROCESSOR_24KX, 33 },
 
   /* MIPS64 */
   { "5kc", PROCESSOR_5KC, 64 },
@@ -847,7 +855,16 @@ static struct mips_rtx_cost_data const mips_rtx_cost_data[PROCESSOR_MAX] =
     { /* 20KC */
       DEFAULT_COSTS
     },
-    { /* 24k */
+    { /* 24KC */
+      SOFT_FP_COSTS,
+      COSTS_N_INSNS (5),            /* int_mult_si */
+      COSTS_N_INSNS (5),            /* int_mult_di */
+      COSTS_N_INSNS (41),           /* int_div_si */
+      COSTS_N_INSNS (41),           /* int_div_di */
+                       1,           /* branch_cost */
+                       4            /* memory_latency */
+    },
+    { /* 24KF */
       COSTS_N_INSNS (8),            /* fp_add */
       COSTS_N_INSNS (8),            /* fp_mult_sf */
       COSTS_N_INSNS (10),           /* fp_mult_df */
@@ -860,7 +877,7 @@ static struct mips_rtx_cost_data const mips_rtx_cost_data[PROCESSOR_MAX] =
                        1,           /* branch_cost */
                        4            /* memory_latency */
     },
-    { /* 24kx */
+    { /* 24KX */
       COSTS_N_INSNS (4),            /* fp_add */
       COSTS_N_INSNS (4),            /* fp_mult_sf */
       COSTS_N_INSNS (5),            /* fp_mult_df */
diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
index 9e2542f..981a8d1 100644
--- a/gcc/config/mips/mips.h
+++ b/gcc/config/mips/mips.h
@@ -38,7 +38,8 @@ enum processor_type {
   PROCESSOR_5KC,
   PROCESSOR_5KF,
   PROCESSOR_20KC,
-  PROCESSOR_24K,
+  PROCESSOR_24KC,
+  PROCESSOR_24KF,
   PROCESSOR_24KX,
   PROCESSOR_M4K,
   PROCESSOR_R3900,
diff --git a/gcc/config/mips/mips.md b/gcc/config/mips/mips.md
index 8a2e44a..dfa82f1 100644
--- a/gcc/config/mips/mips.md
+++ b/gcc/config/mips/mips.md
@@ -341,7 +341,7 @@
 ;; Attribute describing the processor.  This attribute must match exactly
 ;; with the processor_type enumeration in mips.h.
 (define_attr "cpu"
-  "r3000,4kc,4kp,5kc,5kf,20kc,24k,24kx,m4k,r3900,r6000,r4000,r4100,r4111,r4120,r4130,r4300,r4600,r4650,r5000,r5400,r5500,r7000,r8000,r9000,sb1,sb1a,sr71000"
+  "r3000,4kc,4kp,5kc,5kf,20kc,24kc,24kf,24kx,m4k,r3900,r6000,r4000,r4100,r4111,r4120,r4130,r4300,r4600,r4650,r5000,r5400,r5500,r7000,r8000,r9000,sb1,sb1a,sr71000"
   (const (symbol_ref "mips_tune")))
 
 ;; The type of hardware hazard associated with this instruction.
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 816b547..5bbbfc5 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -10480,9 +10480,12 @@ The ISA names are:
 @samp{mips32}, @samp{mips32r2}, and @samp{mips64}.
 The processor names are:
 @samp{4kc}, @samp{4km}, @samp{4kp},
+@samp{4kec}, @samp{4kem}, @samp{4kep},
 @samp{5kc}, @samp{5kf},
 @samp{20kc},
-@samp{24k}, @samp{24kc}, @samp{24kf}, @samp{24kx},
+@samp{24kc}, @samp{24kf}, @samp{24kx},
+@samp{24kec}, @samp{24kef}, @samp{24kex},
+@samp{34kc}, @samp{34kf}, @samp{34kx},
 @samp{m4k},
 @samp{orion},
 @samp{r2000}, @samp{r3000}, @samp{r3900}, @samp{r4000}, @samp{r4400},