diff options
| author | Richard Sandiford <rsandifo@redhat.com> | 2003-10-02 12:26:39 +0000 |
|---|---|---|
| committer | Richard Sandiford <rsandifo@gcc.gnu.org> | 2003-10-02 12:26:39 +0000 |
| commit | 28a6085042290266bb682a39cbef0a9c195d5838 (patch) | |
| tree | 0ee41a45e93679c869e833e8ce5f4092ec9d9bcd | |
| parent | be4cee68205a016feaab7f3730261f2f64c62b42 (diff) | |
| download | gcc-28a6085042290266bb682a39cbef0a9c195d5838.zip gcc-28a6085042290266bb682a39cbef0a9c195d5838.tar.gz gcc-28a6085042290266bb682a39cbef0a9c195d5838.tar.bz2 | |
frv.c (frv_issue_rate): New function.
* config/frv/frv.c (frv_issue_rate): New function.
(frv_pack_insns): Use it.
(TARGET_SCHED_ISSUE_RATE): Define.
From-SVN: r72026
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/config/frv/frv.c | 48 |
2 files changed, 39 insertions, 15 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e04ac6a..396a3b9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2003-10-02 Richard Sandiford <rsandifo@redhat.com> + + * config/frv/frv.c (frv_issue_rate): New function. + (frv_pack_insns): Use it. + (TARGET_SCHED_ISSUE_RATE): Define. + 2003-10-02 Steven Bosscher <s.bosscher@student.tudelft.nl> * config/mcore/mcore.c: Convert to ISO C90 function declarations diff --git a/gcc/config/frv/frv.c b/gcc/config/frv/frv.c index fa385f1..0d83982 100644 --- a/gcc/config/frv/frv.c +++ b/gcc/config/frv/frv.c @@ -272,6 +272,7 @@ static int frv_registers_used_p PARAMS ((rtx, unsigned char [], int)); static int frv_registers_set_p PARAMS ((rtx, unsigned char [], int)); +static int frv_issue_rate PARAMS ((void)); static int frv_use_dfa_pipeline_interface PARAMS ((void)); static void frv_pack_insns PARAMS ((void)); static void frv_function_prologue PARAMS ((FILE *, HOST_WIDE_INT)); @@ -314,6 +315,8 @@ static void frv_asm_out_destructor PARAMS ((rtx, int)); #undef TARGET_ASM_CAN_OUTPUT_MI_THUNK #define TARGET_ASM_CAN_OUTPUT_MI_THUNK default_can_output_mi_thunk_no_vcall +#undef TARGET_SCHED_ISSUE_RATE +#define TARGET_SCHED_ISSUE_RATE frv_issue_rate #undef TARGET_SCHED_USE_DFA_PIPELINE_INTERFACE #define TARGET_SCHED_USE_DFA_PIPELINE_INTERFACE frv_use_dfa_pipeline_interface @@ -8195,6 +8198,32 @@ frv_init_machine_status () return ggc_alloc_cleared (sizeof (struct machine_function)); } +/* Implement TARGET_SCHED_ISSUE_RATE. */ + +static int +frv_issue_rate (void) +{ + if (!TARGET_PACK) + return 1; + + switch (frv_cpu_type) + { + default: + case FRV_CPU_FR300: + case FRV_CPU_SIMPLE: + return 1; + + case FRV_CPU_FR400: + return 2; + + case FRV_CPU_GENERIC: + case FRV_CPU_FR500: + case FRV_CPU_TOMCAT: + return 4; + } +} + + /* Implement TARGET_SCHED_USE_DFA_PIPELINE_INTERFACE. */ static int @@ -8645,23 +8674,12 @@ frv_pack_insns () unsigned char reg_state[FIRST_PSEUDO_REGISTER]; /* If we weren't going to pack the insns, don't bother with this pass. */ - if (!optimize || !flag_schedule_insns_after_reload || TARGET_NO_VLIW_BRANCH) + if (!optimize + || !flag_schedule_insns_after_reload + || TARGET_NO_VLIW_BRANCH + || frv_issue_rate () == 1) return; - switch (frv_cpu_type) - { - default: - case FRV_CPU_FR300: /* FR300/simple are single issue */ - case FRV_CPU_SIMPLE: - return; - - case FRV_CPU_GENERIC: /* FR-V and FR500 are multi-issue */ - case FRV_CPU_FR400: - case FRV_CPU_FR500: - case FRV_CPU_TOMCAT: - break; - } - /* Set up the instruction and register states. */ dfa_start (); frv_state = (state_t) xmalloc (state_size ()); |