On Sun, 2017-09-10 at 19:45 +0200, Jim Wilson wrote:
> ---------- Forwarded message ----------
> From: Jim Wilson <jim.wil...@linaro.org>
> Date: Tue, Sep 5, 2017 at 8:04 PM
> Subject: Re: [PATCH] scheduler bug fix for AArch64 insn fusing
> SCHED_GROUP usage
> To: "gcc-patches@gcc.gnu.org" <gcc-patches@gcc.gnu.org>
> Cc: Jim Wilson <jim.wil...@linaro.org>
>
>
> ping^2
>
> On Fri, Jul 21, 2017 at 3:09 PM, Jim Wilson <jim.wil...@linaro.org>
> wrote:
> >
> > Ping.
> >
> > https://gcc.gnu.org/ml/gcc-patches/2017-07/msg00779.html
> >
Silly me. I noticed that I am still listed as a sched maintainer,
which means I can self approve this.
I reverified it with x86_64 and aarch64 bootstraps and make checks. I
also did a C only testsuite run for avr, which appears to be the best
maintained cc0 target. There were no regressions for any of the 3
targets.
The patch was applied.
Jim
2017-10-10 Jim Wilson <wil...@tuliptree.org>
PR rtl-optimization/81434
* haifa-sched.c (prune_ready_list): Init min_cost_group to 0. Update
comment for main loop. In sched_group_found if, also add checks for
pass and min_cost_group.
Index: haifa-sched.c
===================================================================
--- haifa-sched.c (revision 253627)
+++ haifa-sched.c (revision 253628)
@@ -6303,7 +6303,7 @@ prune_ready_list (state_t temp_state, bool first_c
{
int i, pass;
bool sched_group_found = false;
- int min_cost_group = 1;
+ int min_cost_group = 0;
if (sched_fusion)
return;
@@ -6319,8 +6319,8 @@ prune_ready_list (state_t temp_state, bool first_c
}
/* Make two passes if there's a SCHED_GROUP_P insn; make sure to handle
- such an insn first and note its cost, then schedule all other insns
- for one cycle later. */
+ such an insn first and note its cost. If at least one SCHED_GROUP_P insn
+ gets queued, then all other insns get queued for one cycle later. */
for (pass = sched_group_found ? 0 : 1; pass < 2; )
{
int n = ready.n_ready;
@@ -6333,7 +6333,8 @@ prune_ready_list (state_t temp_state, bool first_c
if (DEBUG_INSN_P (insn))
continue;
- if (sched_group_found && !SCHED_GROUP_P (insn))
+ if (sched_group_found && !SCHED_GROUP_P (insn)
+ && ((pass == 0) || (min_cost_group >= 1)))
{
if (pass == 0)
continue;
