From 7b1ac803d3fa6873c336109b1f68be1b62f31300 Mon Sep 17 00:00:00 2001 From: Bernd Schmidt Date: Thu, 26 May 2011 10:16:03 +0000 Subject: [PATCH] haifa-sched.c (schedule-block): Reorder the inner scheduling loop to reduce duplication... * haifa-sched.c (schedule-block): Reorder the inner scheduling loop to reduce duplication, and to achieve a slightly more logical order of operations. From-SVN: r174271 --- gcc/ChangeLog | 6 ++ gcc/haifa-sched.c | 148 +++++++++++++++++++--------------------------- 2 files changed, 68 insertions(+), 86 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 14503137b5a..d6bfc8011ed 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2011-05-26 Bernd Schmidt + + * haifa-sched.c (schedule-block): Reorder the inner scheduling loop + to reduce duplication, and to achieve a slightly more logical order + of operations. + 2011-05-26 Jakub Jelinek PR tree-optimization/49161 diff --git a/gcc/haifa-sched.c b/gcc/haifa-sched.c index f5580b867ab..6b949b41179 100644 --- a/gcc/haifa-sched.c +++ b/gcc/haifa-sched.c @@ -3066,63 +3066,77 @@ schedule_block (basic_block *target_bb) } while (advance > 0); - prune_ready_list (temp_state, true); + if (ready.n_ready > 0) + prune_ready_list (temp_state, true); if (ready.n_ready == 0) - continue; + continue; - if (sort_p) + first_cycle_insn_p = true; + cycle_issued_insns = 0; + can_issue_more = issue_rate; + for (;;) { - /* Sort the ready list based on priority. */ - ready_sort (&ready); + rtx insn; + int cost; + bool asm_p = false; - if (sched_verbose >= 2) + if (sort_p && ready.n_ready > 0) { - fprintf (sched_dump, ";;\t\tReady list after ready_sort: "); - debug_ready_list (&ready); + /* Sort the ready list based on priority. This must be + done every iteration through the loop, as schedule_insn + may have readied additional insns that will not be + sorted correctly. */ + ready_sort (&ready); + + if (sched_verbose >= 2) + { + fprintf (sched_dump, ";;\t\tReady list after ready_sort: "); + debug_ready_list (&ready); + } } - } - /* We don't want md sched reorder to even see debug isns, so put - them out right away. */ - if (ready.n_ready && DEBUG_INSN_P (ready_element (&ready, 0))) - { - while (ready.n_ready && DEBUG_INSN_P (ready_element (&ready, 0))) + /* We don't want md sched reorder to even see debug isns, so put + them out right away. */ + if (ready.n_ready && DEBUG_INSN_P (ready_element (&ready, 0)) + && (*current_sched_info->schedule_more_p) ()) { - rtx insn = ready_remove_first (&ready); - gcc_assert (DEBUG_INSN_P (insn)); - (*current_sched_info->begin_schedule_ready) (insn); - VEC_safe_push (rtx, heap, scheduled_insns, insn); - last_scheduled_insn = insn; - advance = schedule_insn (insn); - gcc_assert (advance == 0); - if (ready.n_ready > 0) - ready_sort (&ready); + while (ready.n_ready && DEBUG_INSN_P (ready_element (&ready, 0))) + { + rtx insn = ready_remove_first (&ready); + gcc_assert (DEBUG_INSN_P (insn)); + (*current_sched_info->begin_schedule_ready) (insn); + VEC_safe_push (rtx, heap, scheduled_insns, insn); + last_scheduled_insn = insn; + advance = schedule_insn (insn); + gcc_assert (advance == 0); + if (ready.n_ready > 0) + ready_sort (&ready); + } } - if (!ready.n_ready) - continue; - } - - /* Allow the target to reorder the list, typically for - better instruction bundling. */ - if (sort_p && targetm.sched.reorder - && (ready.n_ready == 0 - || !SCHED_GROUP_P (ready_element (&ready, 0)))) - can_issue_more = - targetm.sched.reorder (sched_dump, sched_verbose, - ready_lastpos (&ready), - &ready.n_ready, clock_var); - else - can_issue_more = issue_rate; + if (first_cycle_insn_p && !ready.n_ready) + break; - first_cycle_insn_p = true; - cycle_issued_insns = 0; - for (;;) - { - rtx insn; - int cost; - bool asm_p = false; + /* Allow the target to reorder the list, typically for + better instruction bundling. */ + if (sort_p + && (ready.n_ready == 0 + || !SCHED_GROUP_P (ready_element (&ready, 0)))) + { + if (first_cycle_insn_p && targetm.sched.reorder) + can_issue_more + = targetm.sched.reorder (sched_dump, sched_verbose, + ready_lastpos (&ready), + &ready.n_ready, clock_var); + else if (!first_cycle_insn_p && targetm.sched.reorder2) + can_issue_more + = targetm.sched.reorder2 (sched_dump, sched_verbose, + ready.n_ready + ? ready_lastpos (&ready) : NULL, + &ready.n_ready, clock_var); + } + restart_choose_ready: if (sched_verbose >= 2) { fprintf (sched_dump, ";;\tReady list (t = %3d): ", @@ -3164,8 +3178,7 @@ schedule_block (basic_block *target_bb) /* Finish cycle. */ break; if (res > 0) - /* Restart choose_ready (). */ - continue; + goto restart_choose_ready; gcc_assert (insn != NULL_RTX); } @@ -3207,7 +3220,7 @@ schedule_block (basic_block *target_bb) insn from the split block. */ { TODO_SPEC (insn) = (TODO_SPEC (insn) & ~SPECULATIVE) | HARD_DEP; - continue; + goto restart_choose_ready; } /* DECISION is made. */ @@ -3256,45 +3269,8 @@ schedule_block (basic_block *target_bb) break; first_cycle_insn_p = false; - - if (ready.n_ready > 0) - prune_ready_list (temp_state, false); - - /* Sort the ready list based on priority. This must be - redone here, as schedule_insn may have readied additional - insns that will not be sorted correctly. */ if (ready.n_ready > 0) - ready_sort (&ready); - - /* Quickly go through debug insns such that md sched - reorder2 doesn't have to deal with debug insns. */ - if (ready.n_ready && DEBUG_INSN_P (ready_element (&ready, 0)) - && (*current_sched_info->schedule_more_p) ()) - { - while (ready.n_ready && DEBUG_INSN_P (ready_element (&ready, 0))) - { - insn = ready_remove_first (&ready); - gcc_assert (DEBUG_INSN_P (insn)); - (*current_sched_info->begin_schedule_ready) (insn); - VEC_safe_push (rtx, heap, scheduled_insns, insn); - advance = schedule_insn (insn); - last_scheduled_insn = insn; - gcc_assert (advance == 0); - if (ready.n_ready > 0) - ready_sort (&ready); - } - } - - if (targetm.sched.reorder2 - && (ready.n_ready == 0 - || !SCHED_GROUP_P (ready_element (&ready, 0)))) - { - can_issue_more = - targetm.sched.reorder2 (sched_dump, sched_verbose, - ready.n_ready - ? ready_lastpos (&ready) : NULL, - &ready.n_ready, clock_var); - } + prune_ready_list (temp_state, false); } } -- 2.30.2