[Bug tree-optimization/67476] New: Add --param parloops-schedule=<static|dynamic|guided|auto|runtime>

[Bug tree-optimization/67476] New: Add --param parloops-schedule=<static|dynamic|guided|auto|runtime>

[vries at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67476

            Bug ID: 67476
           Summary: Add --param
                    parloops-schedule=<static|dynamic|guided|auto|runtime>
           Product: gcc
           Version: 6.0
            Status: UNCONFIRMED
          Severity: enhancement
          Priority: P3
         Component: tree-optimization
          Assignee: unassigned at gcc dot gnu.org
          Reporter: vries at gcc dot gnu.org
  Target Milestone: ---

[Bug tree-optimization/67476] Add --param parloops-schedule=<static|dynamic|guided|auto|runtime>

[vries at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67476

--- Comment #1 from vries at gcc dot gnu.org ---
Created attachment 36297
  --> https://gcc.gnu.org/bugzilla/attachment.cgi?id=36297&action=edit
Initial patch, adding param

[Bug tree-optimization/67476] Add --param parloops-schedule=<static|dynamic|guided|auto|runtime>

[vries at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67476

--- Comment #2 from vries at gcc dot gnu.org ---
All but the static omp schedules use expand_omp_for_generic. There does seem to
be some ssa support in expand_omp_for_generic.

If we revert "Don't cancel loop tree in parloops" (r226427) to eliminate
disturbance from that patch, what doesn't seem to work is reductions. 

We can see here that there's an inner loop PHI for sum in bb4.
...
f._loopfn.0 (void * .paral_data_param)
{
  int i.9;
  unsigned int sum.7;
  long int .iend0.15;
  long int .istart0.14;
  unsigned int * restrict a.10;
  unsigned int n.8;
  long int _6;
  _Bool _7;
  long int _8;
  unsigned int ivtmp_9;
  long int _10;
  unsigned int _11;
  unsigned int ivtmp_14;
  unsigned int ivtmp_15;
  long unsigned int _19;
  long unsigned int _20;
  unsigned int * _21;
  unsigned int _22;
  _Bool _25;
  unsigned int * _27;

  <bb 2>:
  n.8_4 = MEM[(struct  *).paral_data_param_1(D)].n;
  a.10_5 = MEM[(struct  *).paral_data_param_1(D)].a;
  _6 = (long int) n.8_4;
  _7 = __builtin_GOMP_loop_dynamic_start (0, _6, 1, 1, &.istart0.14,
&.iend0.15);
  if (_7 != 0)
    goto <bb 3>;
  else
    goto <bb 6>;

  <bb 3>:
  _8 = .istart0.14;
  ivtmp_9 = (unsigned int) _8;
  _10 = .iend0.15;
  _11 = (unsigned int) _10;

  <bb 4>:
  # sum.7_12 = PHI <sum.7_13(4), 0(3)>
  # ivtmp_14 = PHI <ivtmp_15(4), ivtmp_9(3)>
  i.9_18 = (int) ivtmp_14;
  _19 = (long unsigned int) i.9_18;
  _20 = _19 * 4;
  _21 = a.10_5 + _20;
  _22 = *_21;
  sum.7_13 = sum.7_12 + _22;
  ivtmp_15 = ivtmp_14 + 1;
  if (_11 > ivtmp_15)
    goto <bb 4>;
  else
    goto <bb 5>;

  <bb 5>:
  _25 = __builtin_GOMP_loop_dynamic_next (&.istart0.14, &.iend0.15);
  if (_25 != 0)
    goto <bb 3>;
  else
    goto <bb 6>;

  <bb 6>:
  # sum.7_26 = PHI <sum.7_13(5), 0(2)>
  __builtin_GOMP_loop_end_nowait ();
  _27 = &MEM[(struct  *).paral_data_param_1(D)].sum.7;
  __atomic_fetch_add_4 (_27, sum.7_26, 0);
  return;

}
...

What is missing, is the outer loop phi for sum in bb3.

[Bug tree-optimization/67476] Add --param parloops-schedule=<static|dynamic|guided|auto|runtime>

[vries at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67476

--- Comment #3 from vries at gcc dot gnu.org ---
Created attachment 36318
  --> https://gcc.gnu.org/bugzilla/attachment.cgi?id=36318&action=edit
Tentative patch

[Bug tree-optimization/67476] Add --param parloops-schedule=<static|dynamic|guided|auto|runtime>

[vries at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67476

vries at gcc dot gnu.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Keywords|                            |patch

--- Comment #4 from vries at gcc dot gnu.org ---
https://gcc.gnu.org/ml/gcc-patches/2015-09/msg00782.html

[Bug tree-optimization/67476] Add --param parloops-schedule=<static|dynamic|guided|auto|runtime>

[vries at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67476

--- Comment #6 from vries at gcc dot gnu.org ---
Updated patch series:
- https://gcc.gnu.org/ml/gcc-patches/2015-09/msg00938.html
- https://gcc.gnu.org/ml/gcc-patches/2015-09/msg00940.html

[Bug tree-optimization/67476] Add --param parloops-schedule=<static|dynamic|guided|auto|runtime>

[vries at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67476

--- Comment #7 from vries at gcc dot gnu.org ---
(In reply to vries from comment #6)
> Updated patch series:
> - https://gcc.gnu.org/ml/gcc-patches/2015-09/msg00938.html
> - https://gcc.gnu.org/ml/gcc-patches/2015-09/msg00940.html

FTR, bootstrap and reg-test of this patch series on x86_64 succeeded.

[Bug tree-optimization/67476] Add --param parloops-schedule=<static|dynamic|guided|auto|runtime>

[vries at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67476

--- Comment #8 from vries at gcc dot gnu.org ---
Pinged: https://gcc.gnu.org/ml/gcc-patches/2015-09/msg01623.html

[Bug tree-optimization/67476] Add --param parloops-schedule=<static|dynamic|guided|auto|runtime>

[vries at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67476

--- Comment #10 from vries at gcc dot gnu.org ---
Author: vries
Date: Mon Oct 12 14:14:22 2015
New Revision: 228718

URL: https://gcc.gnu.org/viewcvs?rev=228718&root=gcc&view=rev
Log:
Add missing phis in expand_omp_for_generic

2015-10-12  Tom de Vries  <tom@codesourcery.com>

        PR tree-optimization/67476
        * omp-low.c (expand_omp_for_generic): Add missing phis.

Modified:
    trunk/gcc/ChangeLog
    trunk/gcc/omp-low.c

[Bug tree-optimization/67476] Add --param parloops-schedule=<static|dynamic|guided|auto|runtime>

[vries at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67476

--- Comment #9 from vries at gcc dot gnu.org ---
Author: vries
Date: Mon Oct 12 14:14:11 2015
New Revision: 228717

URL: https://gcc.gnu.org/viewcvs?rev=228717&root=gcc&view=rev
Log:
Handle simple latch in expand_omp_for_generic

2015-10-12  Tom de Vries  <tom@codesourcery.com>

        PR tree-optimization/67476
        * omp-low.c (expand_omp_for_generic): Handle simple latch.

Modified:
    trunk/gcc/ChangeLog
    trunk/gcc/omp-low.c

[Bug tree-optimization/67476] Add --param parloops-schedule=<static|dynamic|guided|auto|runtime>

[vries at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67476

--- Comment #12 from vries at gcc dot gnu.org ---
Author: vries
Date: Tue Oct 13 10:08:59 2015
New Revision: 228756

URL: https://gcc.gnu.org/viewcvs?rev=228756&root=gcc&view=rev
Log:
Add param parloops-schedule

2015-10-13  Tom de Vries  <tom@codesourcery.com>

        PR tree-optimization/67476
        * doc/invoke.texi (@item parloops-schedule): New item.
        * params.def (PARAM_PARLOOPS_SCHEDULE): New DEFPARAMENUM5.
        * tree-parloops.c: Include params-enum.h.
        (create_parallel_loop): Handle PARAM_PARLOOPS_SCHEDULE.

        * testsuite/libgomp.c/autopar-3.c: New test.
        * testsuite/libgomp.c/autopar-4.c: New test.
        * testsuite/libgomp.c/autopar-5.c: New test.
        * testsuite/libgomp.c/autopar-6.c: New test.
        * testsuite/libgomp.c/autopar-7.c: New test.
        * testsuite/libgomp.c/autopar-8.c: New test.

Added:
    trunk/libgomp/testsuite/libgomp.c/autopar-3.c
    trunk/libgomp/testsuite/libgomp.c/autopar-4.c
    trunk/libgomp/testsuite/libgomp.c/autopar-5.c
    trunk/libgomp/testsuite/libgomp.c/autopar-6.c
    trunk/libgomp/testsuite/libgomp.c/autopar-7.c
    trunk/libgomp/testsuite/libgomp.c/autopar-8.c
Modified:
    trunk/gcc/ChangeLog
    trunk/gcc/doc/invoke.texi
    trunk/gcc/params.def
    trunk/gcc/tree-parloops.c
    trunk/libgomp/ChangeLog

[Bug tree-optimization/67476] Add --param parloops-schedule=<static|dynamic|guided|auto|runtime>

[vries at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67476

vries at gcc dot gnu.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|UNCONFIRMED                 |RESOLVED
         Resolution|---                         |FIXED

--- Comment #13 from vries at gcc dot gnu.org ---
patch series and test-cases committed, marking resolved-fixed.

[Bug tree-optimization/67476] Add --param parloops-schedule=<static|dynamic|guided|auto|runtime>

[vries at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67476

--- Comment #16 from vries at gcc dot gnu.org ---
Author: vries
Date: Wed Oct 14 14:30:19 2015
New Revision: 228815

URL: https://gcc.gnu.org/viewcvs?rev=228815&root=gcc&view=rev
Log:
Handle original loop tree in expand_omp_for_generic

2015-10-14  Tom de Vries  <tom@codesourcery.com>

        backport from trunk:
        2015-10-13  Tom de Vries  <tom@codesourcery.com>

        PR tree-optimization/67476
        * omp-low.c (expand_omp_for_generic): Handle original loop tree.

Modified:
    branches/gomp-4_0-branch/gcc/ChangeLog.gomp
    branches/gomp-4_0-branch/gcc/omp-low.c

[Bug tree-optimization/67476] Add --param parloops-schedule=<static|dynamic|guided|auto|runtime>

[vries at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67476

--- Comment #14 from vries at gcc dot gnu.org ---
Author: vries
Date: Wed Oct 14 14:29:55 2015
New Revision: 228813

URL: https://gcc.gnu.org/viewcvs?rev=228813&root=gcc&view=rev
Log:
Handle simple latch in expand_omp_for_generic

2015-10-14  Tom de Vries  <tom@codesourcery.com>

        backport from trunk:
        2015-10-12  Tom de Vries  <tom@codesourcery.com>

        PR tree-optimization/67476
        * omp-low.c (expand_omp_for_generic): Handle simple latch.

Modified:
    branches/gomp-4_0-branch/gcc/ChangeLog.gomp
    branches/gomp-4_0-branch/gcc/omp-low.c

[Bug tree-optimization/67476] Add --param parloops-schedule=<static|dynamic|guided|auto|runtime>

[vries at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67476

--- Comment #15 from vries at gcc dot gnu.org ---
Author: vries
Date: Wed Oct 14 14:30:05 2015
New Revision: 228814

URL: https://gcc.gnu.org/viewcvs?rev=228814&root=gcc&view=rev
Log:
Add missing phis in expand_omp_for_generic

2015-10-14  Tom de Vries  <tom@codesourcery.com>

        backport from trunk:
        2015-10-12  Tom de Vries  <tom@codesourcery.com>

        PR tree-optimization/67476
        * omp-low.c (expand_omp_for_generic): Add missing phis.

Modified:
    branches/gomp-4_0-branch/gcc/ChangeLog.gomp
    branches/gomp-4_0-branch/gcc/omp-low.c

[Bug tree-optimization/67476] Add --param parloops-schedule=<static|dynamic|guided|auto|runtime>

[vries at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67476

--- Comment #17 from vries at gcc dot gnu.org ---
Author: vries
Date: Wed Oct 14 14:30:41 2015
New Revision: 228817

URL: https://gcc.gnu.org/viewcvs?rev=228817&root=gcc&view=rev
Log:
Add param parloops-schedule

2015-10-14  Tom de Vries  <tom@codesourcery.com>

        backport from trunk:
        2015-10-13  Tom de Vries  <tom@codesourcery.com>

        PR tree-optimization/67476
        * doc/invoke.texi (@item parloops-schedule): New item.
        * params.def (PARAM_PARLOOPS_SCHEDULE): New DEFPARAMENUM5.
        * tree-parloops.c: Include params-enum.h.
        (create_parallel_loop): Handle PARAM_PARLOOPS_SCHEDULE.

        * testsuite/libgomp.c/autopar-3.c: New test.
        * testsuite/libgomp.c/autopar-4.c: New test.
        * testsuite/libgomp.c/autopar-5.c: New test.
        * testsuite/libgomp.c/autopar-6.c: New test.
        * testsuite/libgomp.c/autopar-7.c: New test.
        * testsuite/libgomp.c/autopar-8.c: New test.

Added:
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.c/autopar-3.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.c/autopar-4.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.c/autopar-5.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.c/autopar-6.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.c/autopar-7.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.c/autopar-8.c
Modified:
    branches/gomp-4_0-branch/gcc/ChangeLog.gomp
    branches/gomp-4_0-branch/gcc/doc/invoke.texi
    branches/gomp-4_0-branch/gcc/params.def
    branches/gomp-4_0-branch/gcc/tree-parloops.c
    branches/gomp-4_0-branch/libgomp/ChangeLog.gomp