diff options
| author | bernds <bernds@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-02-15 00:38:04 +0000 |
|---|---|---|
| committer | bernds <bernds@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-02-15 00:38:04 +0000 |
| commit | a905d9138570fb444c8fc5fce9ff552a64dff119 (patch) | |
| tree | 940ae982b2fb3910c8642693062862c748d41ba8 /gcc/config/c6x | |
| parent | 3bd76a9934b9469a02c6fa46e089f720e1b600ce (diff) | |
| download | gcc-a905d9138570fb444c8fc5fce9ff552a64dff119.tar.gz | |
* config/c6x/c6x.md (reserve_cycles): New attribute.
* config/c6x/c6x.c (c6x_sched_reorder_1): Ensure insns we predicate
don't reserve functional units after the branch occurs.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@184252 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/config/c6x')
| -rw-r--r-- | gcc/config/c6x/c6x.c | 6 | ||||
| -rw-r--r-- | gcc/config/c6x/c6x.md | 13 |
2 files changed, 16 insertions, 3 deletions
diff --git a/gcc/config/c6x/c6x.c b/gcc/config/c6x/c6x.c index c128890d929..4cb4ffb4c4c 100644 --- a/gcc/config/c6x/c6x.c +++ b/gcc/config/c6x/c6x.c @@ -1,5 +1,5 @@ /* Target Code for TI C6X - Copyright (C) 2010, 2011 Free Software Foundation, Inc. + Copyright (C) 2010, 2011, 2012 Free Software Foundation, Inc. Contributed by Andrew Jenner <andrew@codesourcery.com> Contributed by Bernd Schmidt <bernds@codesourcery.com> @@ -4196,13 +4196,14 @@ c6x_sched_reorder_1 (rtx *ready, int *pn_ready, int clock_var) bool is_asm = (icode < 0 && (GET_CODE (PATTERN (insn)) == ASM_INPUT || asm_noperands (PATTERN (insn)) >= 0)); - int this_cycles; + int this_cycles, rsrv_cycles; enum attr_type type; gcc_assert (!is_asm); if (icode < 0) continue; this_cycles = get_attr_cycles (insn); + rsrv_cycles = get_attr_reserve_cycles (insn); type = get_attr_type (insn); /* Treat branches specially; there is also a hazard if two jumps end at the same cycle. */ @@ -4211,6 +4212,7 @@ c6x_sched_reorder_1 (rtx *ready, int *pn_ready, int clock_var) if (clock_var + this_cycles <= first_cycle) continue; if ((first_jump > 0 && clock_var + this_cycles > second_cycle) + || clock_var + rsrv_cycles > first_cycle || !predicate_insn (insn, first_cond, false)) { memmove (ready + 1, ready, (insnp - ready) * sizeof (rtx)); diff --git a/gcc/config/c6x/c6x.md b/gcc/config/c6x/c6x.md index ec3d04e90ac..8e6ef4a59e2 100644 --- a/gcc/config/c6x/c6x.md +++ b/gcc/config/c6x/c6x.md @@ -1,5 +1,5 @@ ;; Machine description for TI C6X. -;; Copyright (C) 2010, 2011 Free Software Foundation, Inc. +;; Copyright (C) 2010, 2011, 2012 Free Software Foundation, Inc. ;; Contributed by Andrew Jenner <andrew@codesourcery.com> ;; Contributed by Bernd Schmidt <bernds@codesourcery.com> ;; Contributed by CodeSourcery. @@ -201,6 +201,17 @@ (eq_attr "type" "mpysp2dp") (const_int 5)] (const_int 1))) +;; The number of cycles during which the instruction reserves functional +;; units. +(define_attr "reserve_cycles" "" + (cond [(eq_attr "type" "cmpdp") (const_int 2) + (eq_attr "type" "adddp") (const_int 2) + (eq_attr "type" "mpydp") (const_int 4) + (eq_attr "type" "mpyi") (const_int 4) + (eq_attr "type" "mpyid") (const_int 4) + (eq_attr "type" "mpyspdp") (const_int 2)] + (const_int 1))) + (define_attr "predicable" "no,yes" (const_string "yes")) |