The `serial' construct (cf. section 2.5.3 of the OpenACC 2.6 standard) is equivalent to a `parallel' construct with clauses `num_gangs(1) num_workers(1) vector_length(1)' implied. These clauses are therefore not supported with the `serial' construct. All the remaining clauses accepted with `parallel' are also accepted with `serial'. The `serial' construct is implemented like `parallel', except for hardcoding dimensions rather than taking them from the relevant clauses, in `expand_omp_target'. Separate codes are used to denote the `serial' construct throughout the middle end, even though the mapping of `serial' to an equivalent `parallel' construct could have been done in the individual language frontends. In particular, this allows to distinguish between compute constructs in warnings, error messages, dumps etc. 2019-11-12 Maciej W. Rozycki <macro@codesourcery.com> Tobias Burnus <tobias@codesourcery.com> Frederik Harwath <frederik@codesourcery.com> Thomas Schwinge <thomas@codesourcery.com> gcc/ * gimple.h (gf_mask): Add GF_OMP_TARGET_KIND_OACC_SERIAL enumeration constant. (is_gimple_omp_oacc): Handle GF_OMP_TARGET_KIND_OACC_SERIAL. (is_gimple_omp_offloaded): Likewise. * gimplify.c (omp_region_type): Add ORT_ACC_SERIAL enumeration constant. Adjust the value of ORT_NONE accordingly. (is_gimple_stmt): Handle OACC_SERIAL. (oacc_default_clause): Handle ORT_ACC_SERIAL. (gomp_needs_data_present): Likewise. (gimplify_adjust_omp_clauses): Likewise. (gimplify_omp_workshare): Handle OACC_SERIAL. (gimplify_expr): Likewise. * omp-expand.c (expand_omp_target): Handle GF_OMP_TARGET_KIND_OACC_SERIAL. (build_omp_regions_1, omp_make_gimple_edges): Likewise. * omp-low.c (is_oacc_parallel): Rename function to... (is_oacc_parallel_or_serial): ... this. Handle GF_OMP_TARGET_KIND_OACC_SERIAL. (scan_sharing_clauses): Adjust accordingly. (scan_omp_for): Likewise. (lower_oacc_head_mark): Likewise. (convert_from_firstprivate_int): Likewise. (lower_omp_target): Likewise. (check_omp_nesting_restrictions): Handle GF_OMP_TARGET_KIND_OACC_SERIAL. (lower_oacc_reductions): Likewise. (lower_omp_target): Likewise. * tree.def (OACC_SERIAL): New tree code. * tree-pretty-print.c (dump_generic_node): Handle OACC_SERIAL. * doc/generic.texi (OpenACC): Document OACC_SERIAL. gcc/c-family/ * c-pragma.h (pragma_kind): Add PRAGMA_OACC_SERIAL enumeration constant. * c-pragma.c (oacc_pragmas): Add "serial" entry. gcc/c/ * c-parser.c (OACC_SERIAL_CLAUSE_MASK): New macro. (c_parser_oacc_kernels_parallel): Rename function to... (c_parser_oacc_compute): ... this. Handle PRAGMA_OACC_SERIAL. (c_parser_omp_construct): Update accordingly. gcc/cp/ * constexpr.c (potential_constant_expression_1): Handle OACC_SERIAL. * parser.c (OACC_SERIAL_CLAUSE_MASK): New macro. (cp_parser_oacc_kernels_parallel): Rename function to... (cp_parser_oacc_compute): ... this. Handle PRAGMA_OACC_SERIAL. (cp_parser_omp_construct): Update accordingly. (cp_parser_pragma): Handle PRAGMA_OACC_SERIAL. Fix alphabetic order. * pt.c (tsubst_expr): Handle OACC_SERIAL. gcc/fortran/ * gfortran.h (gfc_statement): Add ST_OACC_SERIAL_LOOP, ST_OACC_END_SERIAL_LOOP, ST_OACC_SERIAL and ST_OACC_END_SERIAL enumeration constants. (gfc_exec_op): Add EXEC_OACC_SERIAL_LOOP and EXEC_OACC_SERIAL enumeration constants. * match.h (gfc_match_oacc_serial): New prototype. (gfc_match_oacc_serial_loop): Likewise. * dump-parse-tree.c (show_omp_node, show_code_node): Handle EXEC_OACC_SERIAL_LOOP and EXEC_OACC_SERIAL. * match.c (match_exit_cycle): Handle EXEC_OACC_SERIAL_LOOP. * openmp.c (OACC_SERIAL_CLAUSES): New macro. (gfc_match_oacc_serial_loop): New function. (gfc_match_oacc_serial): Likewise. (oacc_is_loop): Handle EXEC_OACC_SERIAL_LOOP. (resolve_omp_clauses): Handle EXEC_OACC_SERIAL. (oacc_code_to_statement): Handle EXEC_OACC_SERIAL and EXEC_OACC_SERIAL_LOOP. (gfc_resolve_oacc_directive): Likewise. * parse.c (decode_oacc_directive) <'s'>: Add case for "serial" and "serial loop". (next_statement): Handle ST_OACC_SERIAL_LOOP and ST_OACC_SERIAL. (gfc_ascii_statement): Likewise. Handle ST_OACC_END_SERIAL_LOOP and ST_OACC_END_SERIAL. (parse_oacc_structured_block): Handle ST_OACC_SERIAL. (parse_oacc_loop): Handle ST_OACC_SERIAL_LOOP and ST_OACC_END_SERIAL_LOOP. (parse_executable): Handle ST_OACC_SERIAL_LOOP and ST_OACC_SERIAL. (is_oacc): Handle EXEC_OACC_SERIAL_LOOP and EXEC_OACC_SERIAL. * resolve.c (gfc_resolve_blocks, gfc_resolve_code): Likewise. * st.c (gfc_free_statement): Likewise. * trans-openmp.c (gfc_trans_oacc_construct): Handle EXEC_OACC_SERIAL. (gfc_trans_oacc_combined_directive): Handle EXEC_OACC_SERIAL_LOOP. (gfc_trans_oacc_directive): Handle EXEC_OACC_SERIAL_LOOP and EXEC_OACC_SERIAL. * trans.c (trans_code): Likewise. gcc/testsuite/ * c-c++-common/goacc/parallel-dims.c: New test. * gfortran.dg/goacc/parallel-dims.f90: New test. libgomp/ * testsuite/libgomp.oacc-c-c++-common/parallel-dims.c: New test. * testsuite/libgomp.oacc-fortran/parallel-dims-aux.c: New test. * testsuite/libgomp.oacc-fortran/parallel-dims.f89: New test. * testsuite/libgomp.oacc-fortran/parallel-dims-2.f90: New test. Reviewed-by: Thomas Schwinge <thomas@codesourcery.com> Co-Authored-By: Frederik Harwath <frederik@codesourcery.com> Co-Authored-By: Thomas Schwinge <thomas@codesourcery.com> Co-Authored-By: Tobias Burnus <tobias@codesourcery.com> From-SVN: r278082
Name |
Last commit
|
Last update |
---|---|---|
.. | ||
Wparentheses-1.c | Loading commit data... | |
acc-icf.c | Loading commit data... | |
asyncwait-1.c | Loading commit data... | |
asyncwait-5.c | Loading commit data... | |
builtin-goacc-parlevel-id-size-2.c | Loading commit data... | |
builtin-goacc-parlevel-id-size.c | Loading commit data... | |
cache-1.c | Loading commit data... | |
cache-2.c | Loading commit data... | |
classify-kernels-unparallelized.c | Loading commit data... | |
classify-kernels.c | Loading commit data... | |
classify-parallel.c | Loading commit data... | |
classify-routine.c | Loading commit data... | |
clauses-fail.c | Loading commit data... | |
collapse-1.c | Loading commit data... | |
combined-directives-2.c | Loading commit data... | |
combined-directives-3.c | Loading commit data... | |
combined-directives.c | Loading commit data... | |
combined-reduction.c | Loading commit data... | |
data-1.c | Loading commit data... | |
data-2.c | Loading commit data... | |
data-clause-duplicate-1.c | Loading commit data... | |
declare-1.c | Loading commit data... | |
declare-2.c | Loading commit data... | |
declare-pr90861.c | Loading commit data... | |
default-1.c | Loading commit data... | |
default-2.c | Loading commit data... | |
default-3.c | Loading commit data... | |
default-4.c | Loading commit data... | |
default-5.c | Loading commit data... | |
deviceptr-1.c | Loading commit data... | |
deviceptr-2.c | Loading commit data... | |
deviceptr-3.c | Loading commit data... | |
deviceptr-4.c | Loading commit data... | |
executeables-1.c | Loading commit data... | |
finalize-1.c | Loading commit data... | |
firstprivate-mappings-1.c | Loading commit data... | |
host_data-1.c | Loading commit data... | |
host_data-2.c | Loading commit data... | |
if-clause-1.c | Loading commit data... | |
if-clause-2.c | Loading commit data... | |
kernels-1.c | Loading commit data... | |
kernels-alias-2.c | Loading commit data... | |
kernels-alias-3.c | Loading commit data... | |
kernels-alias-4.c | Loading commit data... | |
kernels-alias-5.c | Loading commit data... | |
kernels-alias-6.c | Loading commit data... | |
kernels-alias-7.c | Loading commit data... | |
kernels-alias-8.c | Loading commit data... | |
kernels-alias-ipa-pta-2.c | Loading commit data... | |
kernels-alias-ipa-pta-3.c | Loading commit data... | |
kernels-alias-ipa-pta-4.c | Loading commit data... | |
kernels-alias-ipa-pta.c | Loading commit data... | |
kernels-alias.c | Loading commit data... | |
kernels-counter-var-redundant-load.c | Loading commit data... | |
kernels-counter-vars-function-scope.c | Loading commit data... | |
kernels-default-2.c | Loading commit data... | |
kernels-default.c | Loading commit data... | |
kernels-double-reduction-n.c | Loading commit data... | |
kernels-double-reduction.c | Loading commit data... | |
kernels-loop-2.c | Loading commit data... | |
kernels-loop-3.c | Loading commit data... | |
kernels-loop-data-2.c | Loading commit data... | |
kernels-loop-data-enter-exit-2.c | Loading commit data... | |
kernels-loop-data-enter-exit.c | Loading commit data... | |
kernels-loop-data-update.c | Loading commit data... | |
kernels-loop-data.c | Loading commit data... | |
kernels-loop-g.c | Loading commit data... | |
kernels-loop-mod-not-zero.c | Loading commit data... | |
kernels-loop-n.c | Loading commit data... | |
kernels-loop-nest.c | Loading commit data... | |
kernels-loop.c | Loading commit data... | |
kernels-one-counter-var.c | Loading commit data... | |
kernels-parallel-loop-data-enter-exit.c | Loading commit data... | |
kernels-reduction.c | Loading commit data... | |
loop-1.c | Loading commit data... | |
loop-2-kernels.c | Loading commit data... | |
loop-2-parallel.c | Loading commit data... | |
loop-3.c | Loading commit data... | |
loop-auto-1.c | Loading commit data... | |
loop-auto-2.c | Loading commit data... | |
loop-clauses.c | Loading commit data... | |
loop-private-1.c | Loading commit data... | |
loop-shape.c | Loading commit data... | |
nested-reductions-warn.c | Loading commit data... | |
nested-reductions.c | Loading commit data... | |
nesting-1.c | Loading commit data... | |
nesting-data-1.c | Loading commit data... | |
nesting-fail-1.c | Loading commit data... | |
note-parallelism.c | Loading commit data... | |
parallel-1.c | Loading commit data... | |
parallel-dims-1.c | Loading commit data... | |
parallel-dims-2.c | Loading commit data... | |
parallel-reduction.c | Loading commit data... | |
pcopy.c | Loading commit data... | |
pcopyin.c | Loading commit data... | |
pcopyout.c | Loading commit data... | |
pcreate.c | Loading commit data... | |
pr69916.c | Loading commit data... | |
pr70688.c | Loading commit data... | |
pr79428-1.c | Loading commit data... | |
pr84217.c | Loading commit data... | |
pr85782.c | Loading commit data... | |
pragma_context.c | Loading commit data... | |
present-1.c | Loading commit data... | |
private-reduction-1.c | Loading commit data... | |
reduction-1.c | Loading commit data... | |
reduction-2.c | Loading commit data... | |
reduction-3.c | Loading commit data... | |
reduction-4.c | Loading commit data... | |
reduction-5.c | Loading commit data... | |
reduction-6.c | Loading commit data... | |
reduction-promotions.c | Loading commit data... | |
routine-1.c | Loading commit data... | |
routine-2.c | Loading commit data... | |
routine-3-extern.c | Loading commit data... | |
routine-3.c | Loading commit data... | |
routine-4-extern.c | Loading commit data... | |
routine-4.c | Loading commit data... | |
routine-5.c | Loading commit data... | |
routine-level-of-parallelism-1.c | Loading commit data... | |
routine-level-of-parallelism-2.c | Loading commit data... | |
sb-1.c | Loading commit data... | |
sb-2.c | Loading commit data... | |
sb-3.c | Loading commit data... | |
tile-2.c | Loading commit data... | |
tile.c | Loading commit data... | |
uninit-copy-clause.c | Loading commit data... | |
uninit-dim-clause.c | Loading commit data... | |
uninit-firstprivate-clause.c | Loading commit data... | |
uninit-if-clause.c | Loading commit data... | |
uninit-use-device-clause.c | Loading commit data... | |
update-1.c | Loading commit data... | |
update-if_present-1.c | Loading commit data... | |
update-if_present-2.c | Loading commit data... |