From 1fdd6f0412922eb7438cbbadbb805fce8cc77485 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 12 Jul 2019 09:49:51 +0200 Subject: [PATCH] tree-core.h (enum omp_clause_code): Add OMP_CLAUSE_ORDER. * tree-core.h (enum omp_clause_code): Add OMP_CLAUSE_ORDER. * tree.c (omp_clause_num_ops, omp_clause_code_name): Add order clause entries. (walk_tree_1): Handle OMP_CLAUSE_ORDER. * tree-pretty-print.c (dump_omp_clause): Likewise. * gimplify.c (gimplify_scan_omp_clauses, gimplify_adjust_omp_clauses): Likewise. * omp-low.c (scan_sharing_clauses): Likewise. * tree-nested.c (convert_nonlocal_omp_clauses, convert_local_omp_clauses): Likewise. c-family/ * c-pragma.h (enum pragma_omp_clause): Add PRAGMA_OMP_CLAUSE_ORDER. * c-omp.c (c_omp_split_clauses): Handle splitting of OMP_CLAUSE_ORDER. c/ * c-parser.c (c_parser_omp_clause_name): Handle order clause. (c_parser_omp_clause_order): New function. (c_parser_omp_all_clauses): Handle PRAGMA_OMP_CLAUSE_ORDER. (OMP_SIMD_CLAUSE_MASK, OMP_FOR_CLAUSE_MASK): Add PRAGMA_OMP_CLAUSE_ORDER. * c-typeck.c (c_finish_omp_clauses): Handle OMP_CLAUSE_ORDER. cp/ * parser.c (cp_parser_omp_clause_name): Handle order clause. (cp_parser_omp_clause_order): New function. (cp_parser_omp_all_clauses): Handle PRAGMA_OMP_CLAUSE_ORDER. (OMP_SIMD_CLAUSE_MASK, OMP_FOR_CLAUSE_MASK): Add PRAGMA_OMP_CLAUSE_ORDER. * semantics.c (finish_omp_clauses): Handle OMP_CLAUSE_ORDER. * pt.c (tsubst_omp_clauses): Likewise. testsuite/ * c-c++-common/gomp/order-1.c: New test. * c-c++-common/gomp/order-2.c: New test. From-SVN: r273431 --- gcc/ChangeLog | 13 +++++ gcc/c-family/ChangeLog | 7 ++- gcc/c-family/c-omp.c | 18 +++++++ gcc/c-family/c-pragma.h | 1 + gcc/c/ChangeLog | 9 ++++ gcc/c/c-parser.c | 50 ++++++++++++++++++- gcc/c/c-typeck.c | 28 +++++++++++ gcc/cp/ChangeLog | 10 ++++ gcc/cp/parser.c | 60 +++++++++++++++++++++-- gcc/cp/pt.c | 1 + gcc/cp/semantics.c | 19 +++++++ gcc/gimplify.c | 2 + gcc/omp-low.c | 2 + gcc/testsuite/ChangeLog | 5 ++ gcc/testsuite/c-c++-common/gomp/order-1.c | 53 ++++++++++++++++++++ gcc/testsuite/c-c++-common/gomp/order-2.c | 57 +++++++++++++++++++++ gcc/tree-core.h | 3 ++ gcc/tree-nested.c | 2 + gcc/tree-pretty-print.c | 4 ++ gcc/tree.c | 5 +- 20 files changed, 342 insertions(+), 7 deletions(-) create mode 100644 gcc/testsuite/c-c++-common/gomp/order-1.c create mode 100644 gcc/testsuite/c-c++-common/gomp/order-2.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d4eaa491a10..34fb0da4846 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,16 @@ +2019-07-12 Jakub Jelinek + + * tree-core.h (enum omp_clause_code): Add OMP_CLAUSE_ORDER. + * tree.c (omp_clause_num_ops, omp_clause_code_name): Add + order clause entries. + (walk_tree_1): Handle OMP_CLAUSE_ORDER. + * tree-pretty-print.c (dump_omp_clause): Likewise. + * gimplify.c (gimplify_scan_omp_clauses, gimplify_adjust_omp_clauses): + Likewise. + * omp-low.c (scan_sharing_clauses): Likewise. + * tree-nested.c (convert_nonlocal_omp_clauses, + convert_local_omp_clauses): Likewise. + 2019-07-12 Kewen Lin * gcc/cfgrtl.c (print_rtl_with_bb): Emit a hint if the diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index bbad47fc497..b84e1f5b9a0 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,7 +1,12 @@ +2019-07-12 Jakub Jelinek + + * c-pragma.h (enum pragma_omp_clause): Add PRAGMA_OMP_CLAUSE_ORDER. + * c-omp.c (c_omp_split_clauses): Handle splitting of OMP_CLAUSE_ORDER. + 2019-07-09 Martin Sebor PR c++/61339 - * c-opts.c (handle_deferred_opts): : Change class-key of PODs to struct + * c-opts.c (handle_deferred_opts): Change class-key of PODs to struct and others to class. * c-pretty-print.h: Same. diff --git a/gcc/c-family/c-omp.c b/gcc/c-family/c-omp.c index 583305e268b..fc08e939651 100644 --- a/gcc/c-family/c-omp.c +++ b/gcc/c-family/c-omp.c @@ -1632,6 +1632,24 @@ c_omp_split_clauses (location_t loc, enum tree_code code, } s = C_OMP_CLAUSE_SPLIT_PARALLEL; break; + /* order clauses are allowed on for and simd. */ + case OMP_CLAUSE_ORDER: + if ((mask & (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_SCHEDULE)) != 0) + { + if (code == OMP_SIMD) + { + c = build_omp_clause (OMP_CLAUSE_LOCATION (clauses), + OMP_CLAUSE_ORDER); + OMP_CLAUSE_CHAIN (c) = cclauses[C_OMP_CLAUSE_SPLIT_FOR]; + cclauses[C_OMP_CLAUSE_SPLIT_FOR] = c; + s = C_OMP_CLAUSE_SPLIT_SIMD; + } + else + s = C_OMP_CLAUSE_SPLIT_FOR; + } + else + s = C_OMP_CLAUSE_SPLIT_SIMD; + break; /* Reduction is allowed on simd, for, parallel, sections, taskloop and teams. Duplicate it on all of them, but omit on for or sections if parallel is present (unless inscan, in that case diff --git a/gcc/c-family/c-pragma.h b/gcc/c-family/c-pragma.h index ed650368620..4239adafce2 100644 --- a/gcc/c-family/c-pragma.h +++ b/gcc/c-family/c-pragma.h @@ -114,6 +114,7 @@ enum pragma_omp_clause { PRAGMA_OMP_CLAUSE_NUM_TASKS, PRAGMA_OMP_CLAUSE_NUM_TEAMS, PRAGMA_OMP_CLAUSE_NUM_THREADS, + PRAGMA_OMP_CLAUSE_ORDER, PRAGMA_OMP_CLAUSE_ORDERED, PRAGMA_OMP_CLAUSE_PARALLEL, PRAGMA_OMP_CLAUSE_PRIORITY, diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index bb0573e5401..c58680c135b 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,12 @@ +2019-07-12 Jakub Jelinek + + * c-parser.c (c_parser_omp_clause_name): Handle order clause. + (c_parser_omp_clause_order): New function. + (c_parser_omp_all_clauses): Handle PRAGMA_OMP_CLAUSE_ORDER. + (OMP_SIMD_CLAUSE_MASK, OMP_FOR_CLAUSE_MASK): Add + PRAGMA_OMP_CLAUSE_ORDER. + * c-typeck.c (c_finish_omp_clauses): Handle OMP_CLAUSE_ORDER. + 2019-07-10 Richard Biener * gimple-parser.c (c_parser_gimple_postfix_expression): Support diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c index 3fa7e682b8f..1f83c247160 100644 --- a/gcc/c/c-parser.c +++ b/gcc/c/c-parser.c @@ -11789,6 +11789,8 @@ c_parser_omp_clause_name (c_parser *parser) case 'o': if (!strcmp ("ordered", p)) result = PRAGMA_OMP_CLAUSE_ORDERED; + else if (!strcmp ("order", p)) + result = PRAGMA_OMP_CLAUSE_ORDER; break; case 'p': if (!strcmp ("parallel", p)) @@ -13467,6 +13469,44 @@ c_parser_oacc_clause_wait (c_parser *parser, tree list) return list; } + +/* OpenMP 5.0: + order ( concurrent ) */ + +static tree +c_parser_omp_clause_order (c_parser *parser, tree list) +{ + location_t loc = c_parser_peek_token (parser)->location; + tree c; + const char *p; + + matching_parens parens; + if (!parens.require_open (parser)) + return list; + if (!c_parser_next_token_is (parser, CPP_NAME)) + { + c_parser_error (parser, "expected %"); + goto out_err; + } + p = IDENTIFIER_POINTER (c_parser_peek_token (parser)->value); + if (strcmp (p, "concurrent") != 0) + { + c_parser_error (parser, "expected %"); + goto out_err; + } + c_parser_consume_token (parser); + parens.skip_until_found_close (parser); + /* check_no_duplicate_clause (list, OMP_CLAUSE_ORDER, "order"); */ + c = build_omp_clause (loc, OMP_CLAUSE_ORDER); + OMP_CLAUSE_CHAIN (c) = list; + return c; + + out_err: + parens.skip_until_found_close (parser); + return list; +} + + /* OpenMP 2.5: ordered @@ -15092,6 +15132,10 @@ c_parser_omp_all_clauses (c_parser *parser, omp_clause_mask mask, clauses = c_parser_omp_clause_num_threads (parser, clauses); c_name = "num_threads"; break; + case PRAGMA_OMP_CLAUSE_ORDER: + clauses = c_parser_omp_clause_order (parser, clauses); + c_name = "order"; + break; case PRAGMA_OMP_CLAUSE_ORDERED: clauses = c_parser_omp_clause_ordered (parser, clauses); c_name = "ordered"; @@ -17221,7 +17265,8 @@ omp_split_clauses (location_t loc, enum tree_code code, | (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_REDUCTION) \ | (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_COLLAPSE) \ | (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_IF) \ - | (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_NONTEMPORAL)) + | (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_NONTEMPORAL) \ + | (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_ORDER)) static tree c_parser_omp_simd (location_t loc, c_parser *parser, @@ -17277,7 +17322,8 @@ c_parser_omp_simd (location_t loc, c_parser *parser, | (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_ORDERED) \ | (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_SCHEDULE) \ | (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_COLLAPSE) \ - | (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_NOWAIT)) + | (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_NOWAIT) \ + | (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_ORDER)) static tree c_parser_omp_for (location_t loc, c_parser *parser, diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c index 6419ca985c4..e4ce03d9ff5 100644 --- a/gcc/c/c-typeck.c +++ b/gcc/c/c-typeck.c @@ -13667,6 +13667,7 @@ c_finish_omp_clauses (tree clauses, enum c_omp_region_type ort) tree last_iterators = NULL_TREE; bool last_iterators_remove = false; tree *nogroup_seen = NULL; + tree *order_clause = NULL; /* 1 if normal/task reduction has been seen, -1 if inscan reduction has been seen, -2 if mixed inscan/normal reduction diagnosed. */ int reduction_seen = 0; @@ -14631,6 +14632,25 @@ c_finish_omp_clauses (tree clauses, enum c_omp_region_type ort) pc = &OMP_CLAUSE_CHAIN (c); continue; + case OMP_CLAUSE_ORDER: + if (ordered_clause) + { + error_at (OMP_CLAUSE_LOCATION (c), + "% clause must not be used together " + "with %"); + remove = true; + break; + } + else if (order_clause) + { + /* Silently remove duplicates. */ + remove = true; + break; + } + order_clause = pc; + pc = &OMP_CLAUSE_CHAIN (c); + continue; + case OMP_CLAUSE_IF: case OMP_CLAUSE_NUM_THREADS: case OMP_CLAUSE_NUM_TEAMS: @@ -14683,6 +14703,14 @@ c_finish_omp_clauses (tree clauses, enum c_omp_region_type ort) case OMP_CLAUSE_ORDERED: ordered_clause = c; + if (order_clause) + { + error_at (OMP_CLAUSE_LOCATION (*order_clause), + "% clause must not be used together " + "with %"); + *order_clause = OMP_CLAUSE_CHAIN (*order_clause); + order_clause = NULL; + } pc = &OMP_CLAUSE_CHAIN (c); continue; diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index bc788c1b446..a18959d6388 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,13 @@ +2019-07-12 Jakub Jelinek + + * parser.c (cp_parser_omp_clause_name): Handle order clause. + (cp_parser_omp_clause_order): New function. + (cp_parser_omp_all_clauses): Handle PRAGMA_OMP_CLAUSE_ORDER. + (OMP_SIMD_CLAUSE_MASK, OMP_FOR_CLAUSE_MASK): Add + PRAGMA_OMP_CLAUSE_ORDER. + * semantics.c (finish_omp_clauses): Handle OMP_CLAUSE_ORDER. + * pt.c (tsubst_omp_clauses): Likewise. + 2019-07-10 Paolo Carlini * decl.c (get_type_quals, diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 12814102465..c46740a2d10 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -32528,6 +32528,8 @@ cp_parser_omp_clause_name (cp_parser *parser) case 'o': if (!strcmp ("ordered", p)) result = PRAGMA_OMP_CLAUSE_ORDERED; + else if (!strcmp ("order", p)) + result = PRAGMA_OMP_CLAUSE_ORDER; break; case 'p': if (!strcmp ("parallel", p)) @@ -33919,6 +33921,50 @@ cp_parser_omp_clause_defaultmap (cp_parser *parser, tree list, return list; } +/* OpenMP 5.0: + order ( concurrent ) */ + +static tree +cp_parser_omp_clause_order (cp_parser *parser, tree list, location_t location) +{ + tree c, id; + const char *p; + + matching_parens parens; + if (!parens.require_open (parser)) + return list; + + if (!cp_lexer_next_token_is (parser->lexer, CPP_NAME)) + { + cp_parser_error (parser, "expected %"); + goto out_err; + } + else + { + id = cp_lexer_peek_token (parser->lexer)->u.value; + p = IDENTIFIER_POINTER (id); + } + if (strcmp (p, "concurrent") != 0) + { + cp_parser_error (parser, "expected %"); + goto out_err; + } + cp_lexer_consume_token (parser->lexer); + if (!parens.require_close (parser)) + goto out_err; + + /* check_no_duplicate_clause (list, OMP_CLAUSE_ORDER, "order", location); */ + c = build_omp_clause (location, OMP_CLAUSE_ORDER); + OMP_CLAUSE_CHAIN (c) = list; + return c; + + out_err: + cp_parser_skip_to_closing_parenthesis (parser, /*recovering=*/true, + /*or_comma=*/false, + /*consume_paren=*/true); + return list; +} + /* OpenMP 2.5: ordered @@ -35510,7 +35556,8 @@ cp_parser_omp_all_clauses (cp_parser *parser, omp_clause_mask mask, c_name = "mergeable"; break; case PRAGMA_OMP_CLAUSE_NOWAIT: - clauses = cp_parser_omp_clause_nowait (parser, clauses, token->location); + clauses = cp_parser_omp_clause_nowait (parser, clauses, + token->location); c_name = "nowait"; break; case PRAGMA_OMP_CLAUSE_NUM_TASKS: @@ -35523,6 +35570,11 @@ cp_parser_omp_all_clauses (cp_parser *parser, omp_clause_mask mask, token->location); c_name = "num_threads"; break; + case PRAGMA_OMP_CLAUSE_ORDER: + clauses = cp_parser_omp_clause_order (parser, clauses, + token->location); + c_name = "order"; + break; case PRAGMA_OMP_CLAUSE_ORDERED: clauses = cp_parser_omp_clause_ordered (parser, clauses, token->location); @@ -37560,7 +37612,8 @@ cp_omp_split_clauses (location_t loc, enum tree_code code, | (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_REDUCTION) \ | (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_COLLAPSE) \ | (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_IF) \ - | (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_NONTEMPORAL)) + | (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_NONTEMPORAL) \ + | (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_ORDER)) static tree cp_parser_omp_simd (cp_parser *parser, cp_token *pragma_tok, @@ -37620,7 +37673,8 @@ cp_parser_omp_simd (cp_parser *parser, cp_token *pragma_tok, | (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_ORDERED) \ | (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_SCHEDULE) \ | (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_NOWAIT) \ - | (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_COLLAPSE)) + | (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_COLLAPSE) \ + | (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_ORDER)) static tree cp_parser_omp_for (cp_parser *parser, cp_token *pragma_tok, diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index c0a04872001..e23c0aaf325 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -16422,6 +16422,7 @@ tsubst_omp_clauses (tree clauses, enum c_omp_region_type ort, case OMP_CLAUSE_THREADS: case OMP_CLAUSE_SIMD: case OMP_CLAUSE_DEFAULTMAP: + case OMP_CLAUSE_ORDER: case OMP_CLAUSE_INDEPENDENT: case OMP_CLAUSE_AUTO: case OMP_CLAUSE_SEQ: diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index aadfaffca2a..1a217051263 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -6127,6 +6127,7 @@ finish_omp_clauses (tree clauses, enum c_omp_region_type ort) bool branch_seen = false; bool copyprivate_seen = false; bool ordered_seen = false; + bool order_seen = false; bool schedule_seen = false; bool oacc_async = false; tree last_iterators = NULL_TREE; @@ -7600,6 +7601,13 @@ finish_omp_clauses (tree clauses, enum c_omp_region_type ort) ordered_seen = true; break; + case OMP_CLAUSE_ORDER: + if (order_seen) + remove = true; + else + order_seen = true; + break; + case OMP_CLAUSE_INBRANCH: case OMP_CLAUSE_NOTINBRANCH: if (branch_seen) @@ -7775,6 +7783,17 @@ finish_omp_clauses (tree clauses, enum c_omp_region_type ort) "% clause", "ordered"); pc = &OMP_CLAUSE_CHAIN (c); continue; + case OMP_CLAUSE_ORDER: + if (ordered_seen) + { + error_at (OMP_CLAUSE_LOCATION (c), + "% clause must not be used together " + "with %"); + *pc = OMP_CLAUSE_CHAIN (c); + continue; + } + pc = &OMP_CLAUSE_CHAIN (c); + continue; case OMP_CLAUSE_NOWAIT: if (copyprivate_seen) { diff --git a/gcc/gimplify.c b/gcc/gimplify.c index 146a86ce588..ca7ad33f867 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -9263,6 +9263,7 @@ gimplify_scan_omp_clauses (tree *list_p, gimple_seq *pre_p, case OMP_CLAUSE_NOGROUP: case OMP_CLAUSE_THREADS: case OMP_CLAUSE_SIMD: + case OMP_CLAUSE_ORDER: case OMP_CLAUSE_IF_PRESENT: case OMP_CLAUSE_FINALIZE: break; @@ -10223,6 +10224,7 @@ gimplify_adjust_omp_clauses (gimple_seq *pre_p, gimple_seq body, tree *list_p, case OMP_CLAUSE_SIMD: case OMP_CLAUSE_HINT: case OMP_CLAUSE_DEFAULTMAP: + case OMP_CLAUSE_ORDER: case OMP_CLAUSE_USE_DEVICE_PTR: case OMP_CLAUSE_IS_DEVICE_PTR: case OMP_CLAUSE_ASYNC: diff --git a/gcc/omp-low.c b/gcc/omp-low.c index a855c5b2f8b..052ffc9c3b9 100644 --- a/gcc/omp-low.c +++ b/gcc/omp-low.c @@ -1402,6 +1402,7 @@ scan_sharing_clauses (tree clauses, omp_context *ctx) case OMP_CLAUSE_SIMD: case OMP_CLAUSE_NOGROUP: case OMP_CLAUSE_DEFAULTMAP: + case OMP_CLAUSE_ORDER: case OMP_CLAUSE_ASYNC: case OMP_CLAUSE_WAIT: case OMP_CLAUSE_GANG: @@ -1595,6 +1596,7 @@ scan_sharing_clauses (tree clauses, omp_context *ctx) case OMP_CLAUSE_SIMD: case OMP_CLAUSE_NOGROUP: case OMP_CLAUSE_DEFAULTMAP: + case OMP_CLAUSE_ORDER: case OMP_CLAUSE_USE_DEVICE_PTR: case OMP_CLAUSE_NONTEMPORAL: case OMP_CLAUSE_ASYNC: diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6c40496db9c..ed3165ee4a5 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-07-12 Jakub Jelinek + + * c-c++-common/gomp/order-1.c: New test. + * c-c++-common/gomp/order-2.c: New test. + 2019-07-11 Sunil K Pandey PR target/90980 diff --git a/gcc/testsuite/c-c++-common/gomp/order-1.c b/gcc/testsuite/c-c++-common/gomp/order-1.c new file mode 100644 index 00000000000..da4b73d5086 --- /dev/null +++ b/gcc/testsuite/c-c++-common/gomp/order-1.c @@ -0,0 +1,53 @@ +void +f1 (int *a) +{ + int i; + #pragma omp for order(concurrent) + for (i = 0; i < 128; i++) + a[i]++; + #pragma omp simd order ( concurrent ) + for (i = 0; i < 128; i++) + a[i]++; + #pragma omp for simd order(concurrent) + for (i = 0; i < 128; i++) + a[i]++; +} + +void +f2 (int *a) +{ + int i; + #pragma omp parallel for order(concurrent) + for (i = 0; i < 128; i++) + a[i]++; + #pragma omp parallel for simd order (concurrent) + for (i = 0; i < 128; i++) + a[i]++; + #pragma omp teams distribute parallel for order(concurrent) + for (i = 0; i < 128; i++) + a[i]++; + #pragma omp teams distribute parallel for simd order(concurrent) + for (i = 0; i < 128; i++) + a[i]++; + #pragma omp teams + { + #pragma omp distribute parallel for order(concurrent) + for (i = 0; i < 128; i++) + a[i]++; + #pragma omp distribute parallel for simd order(concurrent) + for (i = 0; i < 128; i++) + a[i]++; + } + #pragma omp taskloop simd order (concurrent) + for (i = 0; i < 128; i++) + a[i]++; +} + +void +f3 (int *a) +{ + int i; + #pragma omp for order(concurrent) order(concurrent) order(concurrent) + for (i = 0; i < 128; i++) + a[i]++; +} diff --git a/gcc/testsuite/c-c++-common/gomp/order-2.c b/gcc/testsuite/c-c++-common/gomp/order-2.c new file mode 100644 index 00000000000..1a9adb09dcb --- /dev/null +++ b/gcc/testsuite/c-c++-common/gomp/order-2.c @@ -0,0 +1,57 @@ +void +f1 (int *a) +{ + int i; + #pragma omp for order /* { dg-error "expected" } */ + for (i = 0; i < 128; i++) + a[i]++; + #pragma omp for simd order : /* { dg-error "expected" } */ + for (i = 0; i < 128; i++) + a[i]++; + #pragma omp simd order ( foobar ) /* { dg-error "expected" } */ + for (i = 0; i < 128; i++) + a[i]++; + #pragma omp for simd order( concurrent /* { dg-error "expected" } */ + for (i = 0; i < 128; i++) + a[i]++; + #pragma omp for simd order( concurrent : foo )/* { dg-error "expected" } */ + for (i = 0; i < 128; i++) + a[i]++; +} + +void +f2 (int *a) +{ + int i; + #pragma omp teams + #pragma omp distribute order(concurrent) /* { dg-error "'order' is not valid for '#pragma omp distribute'" } */ + for (i = 0; i < 128; i++) + a[i]++; + #pragma omp taskloop order (concurrent) /* { dg-error "'order' is not valid for '#pragma omp taskloop'" } */ + for (i = 0; i < 128; i++) + a[i]++; + #pragma omp for order(concurrent) ordered /* { dg-error "'order' clause must not be used together with 'ordered'" } */ + for (i = 0; i < 128; i++) + { + #pragma omp ordered + a[i]++; + } + #pragma omp for ordered order(concurrent) /* { dg-error "'order' clause must not be used together with 'ordered'" } */ + for (i = 0; i < 128; i++) + { + #pragma omp ordered + a[i]++; + } + #pragma omp for ordered (1) order(concurrent) /* { dg-error "'order' clause must not be used together with 'ordered'" } */ + for (i = 0; i < 128; i++) + { + #pragma omp ordered depend (sink: i - 1) + #pragma omp ordered depend (source) + } + #pragma omp for order(concurrent)ordered (1) /* { dg-error "'order' clause must not be used together with 'ordered'" } */ + for (i = 0; i < 128; i++) + { + #pragma omp ordered depend (sink: i - 1) + #pragma omp ordered depend (source) + } +} diff --git a/gcc/tree-core.h b/gcc/tree-core.h index b5dde47da4f..8ac07e83b12 100644 --- a/gcc/tree-core.h +++ b/gcc/tree-core.h @@ -448,6 +448,9 @@ enum omp_clause_code { /* OpenMP clause: defaultmap (tofrom: scalar). */ OMP_CLAUSE_DEFAULTMAP, + /* OpenMP clause: order (concurrent). */ + OMP_CLAUSE_ORDER, + /* Internally used only clause, holding SIMD uid. */ OMP_CLAUSE__SIMDUID_, diff --git a/gcc/tree-nested.c b/gcc/tree-nested.c index e703cd982a6..1527456e0c5 100644 --- a/gcc/tree-nested.c +++ b/gcc/tree-nested.c @@ -1343,6 +1343,7 @@ convert_nonlocal_omp_clauses (tree *pclauses, struct walk_stmt_info *wi) case OMP_CLAUSE_THREADS: case OMP_CLAUSE_SIMD: case OMP_CLAUSE_DEFAULTMAP: + case OMP_CLAUSE_ORDER: case OMP_CLAUSE_SEQ: case OMP_CLAUSE_INDEPENDENT: case OMP_CLAUSE_AUTO: @@ -2073,6 +2074,7 @@ convert_local_omp_clauses (tree *pclauses, struct walk_stmt_info *wi) case OMP_CLAUSE_THREADS: case OMP_CLAUSE_SIMD: case OMP_CLAUSE_DEFAULTMAP: + case OMP_CLAUSE_ORDER: case OMP_CLAUSE_SEQ: case OMP_CLAUSE_INDEPENDENT: case OMP_CLAUSE_AUTO: diff --git a/gcc/tree-pretty-print.c b/gcc/tree-pretty-print.c index 742c2840cd5..a75f97aa721 100644 --- a/gcc/tree-pretty-print.c +++ b/gcc/tree-pretty-print.c @@ -1040,6 +1040,10 @@ dump_omp_clause (pretty_printer *pp, tree clause, int spc, dump_flags_t flags) pp_right_paren (pp); break; + case OMP_CLAUSE_ORDER: + pp_string (pp, "order(concurrent)"); + break; + case OMP_CLAUSE__SIMDUID_: pp_string (pp, "_simduid_("); dump_generic_node (pp, OMP_CLAUSE__SIMDUID__DECL (clause), diff --git a/gcc/tree.c b/gcc/tree.c index a6099639fb0..751370b903c 100644 --- a/gcc/tree.c +++ b/gcc/tree.c @@ -342,7 +342,8 @@ unsigned const char omp_clause_num_ops[] = 0, /* OMP_CLAUSE_THREADS */ 0, /* OMP_CLAUSE_SIMD */ 1, /* OMP_CLAUSE_HINT */ - 0, /* OMP_CLAUSE_DEFALTMAP */ + 0, /* OMP_CLAUSE_DEFAULTMAP */ + 0, /* OMP_CLAUSE_ORDER */ 1, /* OMP_CLAUSE__SIMDUID_ */ 0, /* OMP_CLAUSE__SIMT_ */ 0, /* OMP_CLAUSE_INDEPENDENT */ @@ -424,6 +425,7 @@ const char * const omp_clause_code_name[] = "simd", "hint", "defaultmap", + "order", "_simduid_", "_simt_", "independent", @@ -12340,6 +12342,7 @@ walk_tree_1 (tree *tp, walk_tree_fn func, void *data, case OMP_CLAUSE_THREADS: case OMP_CLAUSE_SIMD: case OMP_CLAUSE_DEFAULTMAP: + case OMP_CLAUSE_ORDER: case OMP_CLAUSE_AUTO: case OMP_CLAUSE_SEQ: case OMP_CLAUSE_TILE: -- 2.30.2