2020-08-19 Sandra Loosemore <san...@codesourcery.com> gcc/ * tree.h (OACC_LOOP_COMBINED): New.
gcc/c/ * c-parser.c (c_parser_oacc_loop): Set OACC_LOOP_COMBINED. gcc/cp/ * parser.c (cp_parser_oacc_loop): Set OACC_LOOP_COMBINED. gcc/fortran/ * trans-openmp.c (gfc_trans_omp_do): Add combined parameter, use it to set OACC_LOOP_COMBINED. Update all call sites. --- gcc/ChangeLog.omp | 6 ++++++ gcc/c/ChangeLog.omp | 6 ++++++ gcc/c/c-parser.c | 3 +++ gcc/cp/ChangeLog.omp | 6 ++++++ gcc/cp/parser.c | 3 +++ gcc/fortran/ChangeLog.omp | 7 +++++++ gcc/fortran/trans-openmp.c | 30 +++++++++++++++++++----------- gcc/tree.h | 5 +++++ 8 files changed, 55 insertions(+), 11 deletions(-) diff --git a/gcc/ChangeLog.omp b/gcc/ChangeLog.omp index 063eda3..6bed0b9 100644 --- a/gcc/ChangeLog.omp +++ b/gcc/ChangeLog.omp @@ -1,3 +1,9 @@ +2020-08-19 Sandra Loosemore <san...@codesourcery.com> + + Add a "combined" flag for "acc kernels loop" etc directives. + + * tree.h (OACC_LOOP_COMBINED): New. + 2020-08-18 Kwok Cheung Yeung <k...@codesourcery.com> Backport from mainline diff --git a/gcc/c/ChangeLog.omp b/gcc/c/ChangeLog.omp index 7eff6ab..2803482 100644 --- a/gcc/c/ChangeLog.omp +++ b/gcc/c/ChangeLog.omp @@ -1,3 +1,9 @@ +2020-08-19 Sandra Loosemore <san...@codesourcery.com> + + Add a "combined" flag for "acc kernels loop" etc directives. + + * c-parser.c (c_parser_oacc_loop): Set OACC_LOOP_COMBINED. + 2020-08-18 Kwok Cheung Yeung <k...@codesourcery.com> Backport from mainline diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c index b7ed742..a895bdb 100644 --- a/gcc/c/c-parser.c +++ b/gcc/c/c-parser.c @@ -16798,6 +16798,7 @@ c_parser_oacc_loop (location_t loc, c_parser *parser, char *p_name, omp_clause_mask mask, tree *cclauses, bool *if_p) { bool is_parallel = ((mask >> PRAGMA_OACC_CLAUSE_REDUCTION) & 1) == 1; + bool is_combined = (cclauses != NULL); strcat (p_name, " loop"); mask |= OACC_LOOP_CLAUSE_MASK; @@ -16816,6 +16817,8 @@ c_parser_oacc_loop (location_t loc, c_parser *parser, char *p_name, tree block = c_begin_compound_stmt (true); tree stmt = c_parser_omp_for_loop (loc, parser, OACC_LOOP, clauses, NULL, if_p); + if (stmt && stmt != error_mark_node) + OACC_LOOP_COMBINED (stmt) = is_combined; block = c_end_compound_stmt (loc, block, true); add_stmt (block); diff --git a/gcc/cp/ChangeLog.omp b/gcc/cp/ChangeLog.omp index 023321a..3c97668 100644 --- a/gcc/cp/ChangeLog.omp +++ b/gcc/cp/ChangeLog.omp @@ -1,3 +1,9 @@ +2020-08-19 Sandra Loosemore <san...@codesourcery.com> + + Add a "combined" flag for "acc kernels loop" etc directives. + + * parser.c (cp_parser_oacc_loop): Set OACC_LOOP_COMBINED. + 2020-08-18 Kwok Cheung Yeung <k...@codesourcery.com> Backport from mainline diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 437253e..b657e4f 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -41185,6 +41185,7 @@ cp_parser_oacc_loop (cp_parser *parser, cp_token *pragma_tok, char *p_name, omp_clause_mask mask, tree *cclauses, bool *if_p) { bool is_parallel = ((mask >> PRAGMA_OACC_CLAUSE_REDUCTION) & 1) == 1; + bool is_combined = (cclauses != NULL); strcat (p_name, " loop"); mask |= OACC_LOOP_CLAUSE_MASK; @@ -41203,6 +41204,8 @@ cp_parser_oacc_loop (cp_parser *parser, cp_token *pragma_tok, char *p_name, tree block = begin_omp_structured_block (); int save = cp_parser_begin_omp_structured_block (parser); tree stmt = cp_parser_omp_for_loop (parser, OACC_LOOP, clauses, NULL, if_p); + if (stmt && stmt != error_mark_node) + OACC_LOOP_COMBINED (stmt) = is_combined; cp_parser_end_omp_structured_block (parser, save); add_stmt (finish_omp_structured_block (block)); diff --git a/gcc/fortran/ChangeLog.omp b/gcc/fortran/ChangeLog.omp index e64bf82..1d1ee9e 100644 --- a/gcc/fortran/ChangeLog.omp +++ b/gcc/fortran/ChangeLog.omp @@ -1,3 +1,10 @@ +2020-08-19 Sandra Loosemore <san...@codesourcery.com> + + Add a "combined" flag for "acc kernels loop" etc directives. + + * trans-openmp.c (gfc_trans_omp_do): Add combined parameter, + use it to set OACC_LOOP_COMBINED. Update all call sites. + 2020-08-18 Kwok Cheung Yeung <k...@codesourcery.com> Backport from mainline diff --git a/gcc/fortran/trans-openmp.c b/gcc/fortran/trans-openmp.c index f2e6868..1c8ca81 100644 --- a/gcc/fortran/trans-openmp.c +++ b/gcc/fortran/trans-openmp.c @@ -4273,7 +4273,8 @@ typedef struct dovar_init_d { static tree gfc_trans_omp_do (gfc_code *code, gfc_exec_op op, stmtblock_t *pblock, - gfc_omp_clauses *do_clauses, tree par_clauses) + gfc_omp_clauses *do_clauses, tree par_clauses, + bool combined) { gfc_se se; tree dovar, stmt, from, to, step, type, init, cond, incr, orig_decls; @@ -4601,7 +4602,10 @@ gfc_trans_omp_do (gfc_code *code, gfc_exec_op op, stmtblock_t *pblock, case EXEC_OMP_DO: stmt = make_node (OMP_FOR); break; case EXEC_OMP_DISTRIBUTE: stmt = make_node (OMP_DISTRIBUTE); break; case EXEC_OMP_TASKLOOP: stmt = make_node (OMP_TASKLOOP); break; - case EXEC_OACC_LOOP: stmt = make_node (OACC_LOOP); break; + case EXEC_OACC_LOOP: + stmt = make_node (OACC_LOOP); + OACC_LOOP_COMBINED (stmt) = combined; + break; default: gcc_unreachable (); } @@ -4695,7 +4699,8 @@ gfc_trans_oacc_combined_directive (gfc_code *code) pblock = █ else pushlevel (); - stmt = gfc_trans_omp_do (code, EXEC_OACC_LOOP, pblock, &loop_clauses, NULL); + stmt = gfc_trans_omp_do (code, EXEC_OACC_LOOP, pblock, &loop_clauses, NULL, + true); protected_set_expr_location (stmt, loc); if (TREE_CODE (stmt) != BIND_EXPR) stmt = build3_v (BIND_EXPR, NULL, stmt, poplevel (1, 0)); @@ -5128,7 +5133,7 @@ gfc_trans_omp_do_simd (gfc_code *code, stmtblock_t *pblock, omp_do_clauses = gfc_trans_omp_clauses (&block, &clausesa[GFC_OMP_SPLIT_DO], code->loc); body = gfc_trans_omp_do (code, EXEC_OMP_SIMD, pblock ? pblock : &block, - &clausesa[GFC_OMP_SPLIT_SIMD], omp_clauses); + &clausesa[GFC_OMP_SPLIT_SIMD], omp_clauses, false); if (pblock == NULL) { if (TREE_CODE (body) != BIND_EXPR) @@ -5181,7 +5186,7 @@ gfc_trans_omp_parallel_do (gfc_code *code, stmtblock_t *pblock, pushlevel (); } stmt = gfc_trans_omp_do (code, EXEC_OMP_DO, new_pblock, - &clausesa[GFC_OMP_SPLIT_DO], omp_clauses); + &clausesa[GFC_OMP_SPLIT_DO], omp_clauses, false); if (pblock == NULL) { if (TREE_CODE (stmt) != BIND_EXPR) @@ -5424,7 +5429,8 @@ gfc_trans_omp_distribute (gfc_code *code, gfc_omp_clauses *clausesa) case EXEC_OMP_TARGET_TEAMS_DISTRIBUTE_SIMD: case EXEC_OMP_TEAMS_DISTRIBUTE_SIMD: stmt = gfc_trans_omp_do (code, EXEC_OMP_SIMD, &block, - &clausesa[GFC_OMP_SPLIT_SIMD], NULL_TREE); + &clausesa[GFC_OMP_SPLIT_SIMD], NULL_TREE, + false); if (TREE_CODE (stmt) != BIND_EXPR) stmt = build3_v (BIND_EXPR, NULL, stmt, poplevel (1, 0)); else @@ -5480,7 +5486,7 @@ gfc_trans_omp_teams (gfc_code *code, gfc_omp_clauses *clausesa, case EXEC_OMP_TEAMS_DISTRIBUTE: stmt = gfc_trans_omp_do (code, EXEC_OMP_DISTRIBUTE, NULL, &clausesa[GFC_OMP_SPLIT_DISTRIBUTE], - NULL); + NULL, false); break; default: stmt = gfc_trans_omp_distribute (code, clausesa); @@ -5548,7 +5554,8 @@ gfc_trans_omp_target (gfc_code *code) break; case EXEC_OMP_TARGET_SIMD: stmt = gfc_trans_omp_do (code, EXEC_OMP_SIMD, &block, - &clausesa[GFC_OMP_SPLIT_SIMD], NULL_TREE); + &clausesa[GFC_OMP_SPLIT_SIMD], NULL_TREE, + false); if (TREE_CODE (stmt) != BIND_EXPR) stmt = build3_v (BIND_EXPR, NULL, stmt, poplevel (1, 0)); else @@ -5617,7 +5624,8 @@ gfc_trans_omp_taskloop (gfc_code *code) break; case EXEC_OMP_TASKLOOP_SIMD: stmt = gfc_trans_omp_do (code, EXEC_OMP_SIMD, &block, - &clausesa[GFC_OMP_SPLIT_SIMD], NULL_TREE); + &clausesa[GFC_OMP_SPLIT_SIMD], NULL_TREE, + false); if (TREE_CODE (stmt) != BIND_EXPR) stmt = build3_v (BIND_EXPR, NULL, stmt, poplevel (1, 0)); else @@ -5930,7 +5938,7 @@ gfc_trans_oacc_directive (gfc_code *code) return gfc_trans_oacc_construct (code); case EXEC_OACC_LOOP: return gfc_trans_omp_do (code, code->op, NULL, code->ext.omp_clauses, - NULL); + NULL, false); case EXEC_OACC_UPDATE: case EXEC_OACC_CACHE: case EXEC_OACC_ENTER_DATA: @@ -5967,7 +5975,7 @@ gfc_trans_omp_directive (gfc_code *code) case EXEC_OMP_SIMD: case EXEC_OMP_TASKLOOP: return gfc_trans_omp_do (code, code->op, NULL, code->ext.omp_clauses, - NULL); + NULL, false); case EXEC_OMP_DISTRIBUTE_PARALLEL_DO: case EXEC_OMP_DISTRIBUTE_PARALLEL_DO_SIMD: case EXEC_OMP_DISTRIBUTE_SIMD: diff --git a/gcc/tree.h b/gcc/tree.h index 7cc75fc..2fa7117 100644 --- a/gcc/tree.h +++ b/gcc/tree.h @@ -1485,6 +1485,11 @@ class auto_suppress_location_wrappers #define OMP_TARGET_COMBINED(NODE) \ (OMP_TARGET_CHECK (NODE)->base.private_flag) +/* True on an OACC_LOOP statement if it is part of a combined construct, + for example "#pragma acc kernels loop". */ +#define OACC_LOOP_COMBINED(NODE) \ + (OACC_LOOP_CHECK (NODE)->base.private_flag) + /* Memory order for OMP_ATOMIC*. */ #define OMP_ATOMIC_MEMORY_ORDER(NODE) \ (TREE_RANGE_CHECK (NODE, OMP_ATOMIC, \ -- 2.8.1