From df8de9b3d6466b9e58b882e9b942a52ce4efd698 Mon Sep 17 00:00:00 2001 From: Yi-Hsiu Hsu Date: Fri, 18 Jan 2013 14:26:15 +0000 Subject: [PATCH] Add support for Marvell's PJ4 CPU 2013-01-18 Yi-Hsiu Hsu Ramana Radhakrishnan * config/arm/marvell-pj4.md: New file. * config/arm/arm.c (arm_issue_rate): Add marvell_pj4. * config/arm/arm.md (generic_sched): Add marvell_pj4. (generic_vfp): Likewise. * config/arm/arm-cores.def: Add marvell-pj4. * config/arm/arm-tune.md: Regenerate. * config/arm/arm-tables.opt: Regenerate. * config/arm/bpabi.h (BE8_LINK_SPEC): Add marvell_pj4. * doc/invoke.texi: Document marvell-pj4. Co-Authored-By: Ramana Radhakrishnan From-SVN: r195295 --- gcc/ChangeLog | 13 +++++++++++++ gcc/config/arm/arm-cores.def | 1 + gcc/config/arm/arm-tables.opt | 3 +++ gcc/config/arm/arm-tune.md | 2 +- gcc/config/arm/arm.c | 1 + gcc/config/arm/arm.md | 5 +++-- gcc/config/arm/bpabi.h | 2 ++ gcc/doc/invoke.texi | 1 + 8 files changed, 25 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2e724c857b6..8d1b689862b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,16 @@ +2013-01-18 Yi-Hsiu Hsu + Ramana Radhakrishnan + + * config/arm/marvell-pj4.md: New file. + * config/arm/arm.c (arm_issue_rate): Add marvell_pj4. + * config/arm/arm.md (generic_sched): Add marvell_pj4. + (generic_vfp): Likewise. + * config/arm/arm-cores.def: Add marvell-pj4. + * config/arm/arm-tune.md: Regenerate. + * config/arm/arm-tables.opt: Regenerate. + * config/arm/bpabi.h (BE8_LINK_SPEC): Add marvell_pj4. + * doc/invoke.texi: Document marvell-pj4. + 2013-01-18 Tejas Belagod * config/aarch64/arm_neon.h: Map scalar types to standard types. diff --git a/gcc/config/arm/arm-cores.def b/gcc/config/arm/arm-cores.def index 0cd87147e3b..a4cb7c68740 100644 --- a/gcc/config/arm/arm-cores.def +++ b/gcc/config/arm/arm-cores.def @@ -137,3 +137,4 @@ ARM_CORE("cortex-m3", cortexm3, 7M, FL_LDSCHED, cortex) ARM_CORE("cortex-m1", cortexm1, 6M, FL_LDSCHED, v6m) ARM_CORE("cortex-m0", cortexm0, 6M, FL_LDSCHED, v6m) ARM_CORE("cortex-m0plus", cortexm0plus, 6M, FL_LDSCHED, v6m) +ARM_CORE("marvell-pj4", marvell_pj4, 7A, FL_LDSCHED, 9e) diff --git a/gcc/config/arm/arm-tables.opt b/gcc/config/arm/arm-tables.opt index 6d0af59b177..06a529db70f 100644 --- a/gcc/config/arm/arm-tables.opt +++ b/gcc/config/arm/arm-tables.opt @@ -273,6 +273,9 @@ Enum(processor_type) String(cortex-m0) Value(cortexm0) EnumValue Enum(processor_type) String(cortex-m0plus) Value(cortexm0plus) +EnumValue +Enum(processor_type) String(marvell-pj4) Value(marvell_pj4) + Enum Name(arm_arch) Type(int) Known ARM architectures (for use with the -march= option): diff --git a/gcc/config/arm/arm-tune.md b/gcc/config/arm/arm-tune.md index 040587af6e4..26c2e1fe6f6 100644 --- a/gcc/config/arm/arm-tune.md +++ b/gcc/config/arm/arm-tune.md @@ -1,5 +1,5 @@ ;; -*- buffer-read-only: t -*- ;; Generated automatically by gentune.sh from arm-cores.def (define_attr "tune" - "arm2,arm250,arm3,arm6,arm60,arm600,arm610,arm620,arm7,arm7d,arm7di,arm70,arm700,arm700i,arm710,arm720,arm710c,arm7100,arm7500,arm7500fe,arm7m,arm7dm,arm7dmi,arm8,arm810,strongarm,strongarm110,strongarm1100,strongarm1110,fa526,fa626,arm7tdmi,arm7tdmis,arm710t,arm720t,arm740t,arm9,arm9tdmi,arm920,arm920t,arm922t,arm940t,ep9312,arm10tdmi,arm1020t,arm9e,arm946es,arm966es,arm968es,arm10e,arm1020e,arm1022e,xscale,iwmmxt,iwmmxt2,fa606te,fa626te,fmp626,fa726te,arm926ejs,arm1026ejs,arm1136js,arm1136jfs,arm1176jzs,arm1176jzfs,mpcorenovfp,mpcore,arm1156t2s,arm1156t2fs,genericv7a,cortexa5,cortexa7,cortexa8,cortexa9,cortexa15,cortexr4,cortexr4f,cortexr5,cortexm4,cortexm3,cortexm1,cortexm0,cortexm0plus" + "arm2,arm250,arm3,arm6,arm60,arm600,arm610,arm620,arm7,arm7d,arm7di,arm70,arm700,arm700i,arm710,arm720,arm710c,arm7100,arm7500,arm7500fe,arm7m,arm7dm,arm7dmi,arm8,arm810,strongarm,strongarm110,strongarm1100,strongarm1110,fa526,fa626,arm7tdmi,arm7tdmis,arm710t,arm720t,arm740t,arm9,arm9tdmi,arm920,arm920t,arm922t,arm940t,ep9312,arm10tdmi,arm1020t,arm9e,arm946es,arm966es,arm968es,arm10e,arm1020e,arm1022e,xscale,iwmmxt,iwmmxt2,fa606te,fa626te,fmp626,fa726te,arm926ejs,arm1026ejs,arm1136js,arm1136jfs,arm1176jzs,arm1176jzfs,mpcorenovfp,mpcore,arm1156t2s,arm1156t2fs,genericv7a,cortexa5,cortexa7,cortexa8,cortexa9,cortexa15,cortexr4,cortexr4f,cortexr5,cortexm4,cortexm3,cortexm1,cortexm0,cortexm0plus,marvell_pj4" (const (symbol_ref "((enum attr_tune) arm_tune)"))) diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index 3bf7397b832..9d3981d5e48 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -25644,6 +25644,7 @@ arm_issue_rate (void) case cortexa8: case cortexa9: case fa726te: + case marvell_pj4: return 2; default: diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md index c7b30eb164f..22f2218dd0c 100644 --- a/gcc/config/arm/arm.md +++ b/gcc/config/arm/arm.md @@ -500,7 +500,7 @@ (define_attr "generic_sched" "yes,no" (const (if_then_else - (ior (eq_attr "tune" "fa526,fa626,fa606te,fa626te,fmp626,fa726te,arm926ejs,arm1020e,arm1026ejs,arm1136js,arm1136jfs,cortexa5,cortexa7,cortexa8,cortexa9,cortexa15,cortexm4") + (ior (eq_attr "tune" "fa526,fa626,fa606te,fa626te,fmp626,fa726te,arm926ejs,arm1020e,arm1026ejs,arm1136js,arm1136jfs,cortexa5,cortexa7,cortexa8,cortexa9,cortexa15,cortexm4,marvell_pj4") (eq_attr "tune_cortexr4" "yes")) (const_string "no") (const_string "yes")))) @@ -508,7 +508,7 @@ (define_attr "generic_vfp" "yes,no" (const (if_then_else (and (eq_attr "fpu" "vfp") - (eq_attr "tune" "!arm1020e,arm1022e,cortexa5,cortexa7,cortexa8,cortexa9,cortexm4") + (eq_attr "tune" "!arm1020e,arm1022e,cortexa5,cortexa7,cortexa8,cortexa9,cortexm4,marvell_pj4") (eq_attr "tune_cortexr4" "no")) (const_string "yes") (const_string "no")))) @@ -534,6 +534,7 @@ (include "cortex-m4.md") (include "cortex-m4-fpu.md") (include "vfp11.md") +(include "marvell-pj4.md") ;;--------------------------------------------------------------------------- diff --git a/gcc/config/arm/bpabi.h b/gcc/config/arm/bpabi.h index eaf2cbb6ac8..bee429f82db 100644 --- a/gcc/config/arm/bpabi.h +++ b/gcc/config/arm/bpabi.h @@ -59,6 +59,7 @@ " %{!mlittle-endian:%{march=armv7-a|mcpu=cortex-a5 \ |mcpu=cortex-a7 \ |mcpu=cortex-a8|mcpu=cortex-a9|mcpu=cortex-a15 \ + |mcpu=marvell-pj4 \ |mcpu=generic-armv7-a \ |march=armv7-m|mcpu=cortex-m3 \ |march=armv7e-m|mcpu=cortex-m4 \ @@ -70,6 +71,7 @@ " %{mbig-endian:%{march=armv7-a|mcpu=cortex-a5 \ |mcpu=cortex-a7 \ |mcpu=cortex-a8|mcpu=cortex-a9|mcpu=cortex-a15 \ + |mcpu=marvell-pj4 \ |mcpu=generic-armv7-a \ |march=armv7-m|mcpu=cortex-m3 \ |march=armv7e-m|mcpu=cortex-m4 \ diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi index 9ef6c938796..887d31eec20 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi @@ -11242,6 +11242,7 @@ assembly code. Permissible names are: @samp{arm2}, @samp{arm250}, @samp{cortex-m1}, @samp{cortex-m0}, @samp{cortex-m0plus}, +@samp{marvell-pj4}, @samp{xscale}, @samp{iwmmxt}, @samp{iwmmxt2}, @samp{ep9312}, @samp{fa526}, @samp{fa626}, @samp{fa606te}, @samp{fa626te}, @samp{fmp626}, @samp{fa726te}. -- 2.30.2