02889d23ee
2017-02-09 Nathan Sidwell <nathan@codesourcery.com> Cesar Philippidis <cesar@codesourcery.com> Joseph Myers <joseph@codesourcery.com> Chung-Lin Tang <cltang@codesourcery.com> gcc/ * gimplify.c (gimplify_scan_omp_clauses): No special handling for OMP_CLAUSE_TILE. (gimplify_adjust_omp_clauses): Don't delete TILE. (gimplify_omp_for): Deal with TILE. * internal-fn.c (expand_GOACC_TILE): New function. * internal-fn.def (GOACC_DIM_POS): Comment may be overly conservative. (GOACC_TILE): New. * omp-expand.c (struct oacc_collapse): Add tile and outer fields. (expand_oacc_collapse_init): Add LOC paramter. Initialize tile element fields. (expand_oacc_collapse_vars): Add INNER parm, adjust for tiling, avoid DIV for outermost collapse var. (expand_oacc_for): Insert tile element loop as needed. Adjust. Remove out of date comments, fix whitespace. * omp-general.c (omp_extract_for_data): Deal with tiling. * omp-general.h (enum oacc_loop_flags): Add OLF_TILE flag, adjust OLF_DIM_BASE value. (struct omp_for_data): Add tiling field. * omp-low.c (scan_sharing_clauses): Allow OMP_CLAUSE_TILE. (lower_oacc_head_mark): Add OLF_TILE as appropriate. Ensure 2 levels for auto loops. Remove default auto determining, moved to oacc_loop_fixed_partitions. * omp-offload.c (struct oacc_loop): Change 'ifns' to vector of call stmts, add e_mask field. (oacc_dim_call): New function, abstracted out from oacc_thread_numbers. (oacc_thread_numbers): Use oacc_dim_call. (oacc_xform_tile): New. (new_oacc_loop_raw): Initialize e_mask, adjust for ifns vector. (finish_oacc_loop): Adjust for ifns vector. (oacc_loop_discover_walk): Append loop abstraction sites to list, add case for GOACC_TILE fns. (oacc_loop_xform_loop): Delete. (oacc_loop_process): Iterate over call list directly, and add handling for GOACC_TILE fns. (oacc_loop_fixed_partitions): Determine default auto, deal with TILE, dump partitioning. (oacc_loop_auto_partitions): Add outer_assign parm. Assign all but vector partitioning to outer loops. Assign 2 partitions to loops when available. Add TILE handling. (oacc_loop_partition): Adjust oacc_loop_auto_partitions call. (execite_oacc_device_lower): Process GOACC_TILE fns, ignore unknown specs. * tree-nested.c (convert_nonlocal_omp_clauses): Allow OMP_CLAUSE_TILE. * tree.c (omp_clause_num_ops): Adjust TILE ops. * tree.h (OMP_CLAUSE_TILE_ITERVAR, OMP_CLAUSE_TILE_COUNT): New. gcc/c/ * c-parser.c (c_parser_omp_clause_collapse): Disallow tile. (c_parser_oacc_clause_tile): Disallow collapse. Fix parsing and semantic checking. * c-parser.c (c_parser_omp_for_loop): Accept tiling constructs. gcc/cp/ * parser.c (cp_parser_oacc_clause_tile): Disallow collapse. Fix parsing. Parse constant expression. Remove semantic checking. (cp_parser_omp_clause_collapse): Disallow tile. (cp_parser_omp_for_loop): Deal with tile clause. Don't emit a parse error about missing for after already emitting one. Use more conventional for idiom for unbounded loop. * pt.c (tsubst_omp_clauses): Handle OMP_CLAUSE_TILE. * semantics.c (finish_omp_clauses): Correct TILE semantic check. (finish_omp_for): Deal with tile clause. gcc/fortran/ * openmp.c (resolve_omp_clauses): Error on directives containing both tile and collapse clauses. (resolve_oacc_loop_blocks): Represent '*' tile arguments as zero. * trans-openmp.c (gfc_trans_omp_do): Lower tiled loops like collapsed loops. gcc/testsuite/ * c-c++-common/goacc/combined-directives.c: Remove xfail. * c-c++-common/goacc/loop-auto-1.c: Adjust and add additional case. * c-c++-common/goacc/loop-auto-2.c: New. * c-c++-common/goacc/tile.c: Include stdbool, fix expected errors. * c-c++-common/goacc/tile-2.c: New. * g++.dg/goacc/template.C: Test tile subst. Adjust erroneous uses. * g++.dg/goacc/tile-1.C: New, check tile subst. * gcc.dg/goacc/loop-processing-1.c: Adjust dg-final pattern. * gfortran.dg/goacc/combined-directives.f90: Remove xfail. * gfortran.dg/goacc/tile-1.f90: New test. * gfortran.dg/goacc/tile-2.f90: New test. * gfortran.dg/goacc/tile-lowering.f95: New test. libgomp/ * testsuite/libgomp.oacc-c-c++-common/tile-1.c: New. * testsuite/libgomp.oacc-c-c++-common/loop-auto-1.c: Adjust and add additional case. * testsuite/libgomp.oacc-c-c++-common/vprop.c: XFAIL under "openacc_nvidia_accel_selected". * libgomp.oacc-fortran/nested-function-1.f90 (test2): Add num_workers(8) clause. From-SVN: r245300 |
||
---|---|---|
.. | ||
abort-1.f90 | ||
abort-2.f90 | ||
acc_on_device-1-1.f90 | ||
acc_on_device-1-2.f | ||
acc_on_device-1-3.f | ||
asyncwait-1.f90 | ||
asyncwait-2.f90 | ||
asyncwait-3.f90 | ||
atomic_capture-1.f90 | ||
atomic_rw-1.f90 | ||
atomic_update-1.f90 | ||
cache-1.f95 | ||
clauses-1.f90 | ||
collapse-1.f90 | ||
collapse-2.f90 | ||
collapse-3.f90 | ||
collapse-4.f90 | ||
collapse-5.f90 | ||
collapse-6.f90 | ||
collapse-7.f90 | ||
collapse-8.f90 | ||
combined-directives-1.f90 | ||
combined-reduction.f90 | ||
data-1.f90 | ||
data-2.f90 | ||
data-3.f90 | ||
data-4-2.f90 | ||
data-4.f90 | ||
data-already-1.f | ||
data-already-2.f | ||
data-already-3.f | ||
data-already-4.f | ||
data-already-5.f | ||
data-already-6.f | ||
data-already-7.f | ||
data-already-8.f | ||
declare-1.f90 | ||
declare-2.f90 | ||
declare-3.f90 | ||
declare-4.f90 | ||
declare-5.f90 | ||
default-1.f90 | ||
firstprivate-1.f90 | ||
fortran.exp | ||
gang-static-1.f90 | ||
host_data-1.f90 | ||
if-1.f90 | ||
implicit-firstprivate-ref.f90 | ||
kernels-loop-2.f95 | ||
kernels-loop-data-2.f95 | ||
kernels-loop-data-enter-exit-2.f95 | ||
kernels-loop-data-enter-exit.f95 | ||
kernels-loop-data-update.f95 | ||
kernels-loop-data.f95 | ||
kernels-loop.f95 | ||
lib-1.f90 | ||
lib-2.f | ||
lib-3.f | ||
lib-4.f90 | ||
lib-5.f90 | ||
lib-6.f90 | ||
lib-7.f90 | ||
lib-8.f90 | ||
lib-10.f90 | ||
map-1.f90 | ||
nested-function-1.f90 | ||
nested-function-2.f90 | ||
nested-function-3.f90 | ||
non-scalar-data.f90 | ||
openacc_version-1.f | ||
openacc_version-2.f90 | ||
parallel-reduction.f90 | ||
pointer-align-1.f90 | ||
pr68813.f90 | ||
pr70289.f90 | ||
pr70643.f90 | ||
private-variables.f90 | ||
pset-1.f90 | ||
reduction-1.f90 | ||
reduction-2.f90 | ||
reduction-3.f90 | ||
reduction-4.f90 | ||
reduction-5.f90 | ||
reduction-6.f90 | ||
reduction-7.f90 | ||
reduction-8.f90 | ||
routine-1.f90 | ||
routine-2.f90 | ||
routine-3.f90 | ||
routine-4.f90 | ||
routine-5.f90 | ||
routine-7.f90 | ||
routine-9.f90 | ||
subarrays-1.f90 | ||
subarrays-2.f90 | ||
update-1.f90 |