diff options
Diffstat (limited to 'gcc/fortran/parse.c')
| -rw-r--r-- | gcc/fortran/parse.c | 40 |
1 files changed, 33 insertions, 7 deletions
diff --git a/gcc/fortran/parse.c b/gcc/fortran/parse.c index 650135b..b98dda1 100644 --- a/gcc/fortran/parse.c +++ b/gcc/fortran/parse.c @@ -637,6 +637,9 @@ decode_oacc_directive (void) switch (c) { + case 'a': + match ("atomic", gfc_match_oacc_atomic, ST_OACC_ATOMIC); + break; case 'c': match ("cache", gfc_match_oacc_cache, ST_OACC_CACHE); break; @@ -645,6 +648,7 @@ decode_oacc_directive (void) match ("declare", gfc_match_oacc_declare, ST_OACC_DECLARE); break; case 'e': + match ("end atomic", gfc_match_omp_eos, ST_OACC_END_ATOMIC); match ("end data", gfc_match_omp_eos, ST_OACC_END_DATA); match ("end host_data", gfc_match_omp_eos, ST_OACC_END_HOST_DATA); match ("end kernels loop", gfc_match_omp_eos, ST_OACC_END_KERNELS_LOOP); @@ -1373,7 +1377,8 @@ next_statement (void) case ST_OMP_DISTRIBUTE_PARALLEL_DO_SIMD: \ case ST_CRITICAL: \ case ST_OACC_PARALLEL_LOOP: case ST_OACC_PARALLEL: case ST_OACC_KERNELS: \ - case ST_OACC_DATA: case ST_OACC_HOST_DATA: case ST_OACC_LOOP: case ST_OACC_KERNELS_LOOP + case ST_OACC_DATA: case ST_OACC_HOST_DATA: case ST_OACC_LOOP: \ + case ST_OACC_KERNELS_LOOP: case ST_OACC_ATOMIC /* Declaration statements */ @@ -1937,6 +1942,12 @@ gfc_ascii_statement (gfc_statement st) case ST_OACC_ROUTINE: p = "!$ACC ROUTINE"; break; + case ST_OACC_ATOMIC: + p = "!ACC ATOMIC"; + break; + case ST_OACC_END_ATOMIC: + p = "!ACC END ATOMIC"; + break; case ST_OMP_ATOMIC: p = "!$OMP ATOMIC"; break; @@ -4316,14 +4327,24 @@ parse_omp_do (gfc_statement omp_st) /* Parse the statements of OpenMP atomic directive. */ static gfc_statement -parse_omp_atomic (void) +parse_omp_oacc_atomic (bool omp_p) { - gfc_statement st; + gfc_statement st, st_atomic, st_end_atomic; gfc_code *cp, *np; gfc_state_data s; int count; - accept_statement (ST_OMP_ATOMIC); + if (omp_p) + { + st_atomic = ST_OMP_ATOMIC; + st_end_atomic = ST_OMP_END_ATOMIC; + } + else + { + st_atomic = ST_OACC_ATOMIC; + st_end_atomic = ST_OACC_END_ATOMIC; + } + accept_statement (st_atomic); cp = gfc_state_stack->tail; push_state (&s, COMP_OMP_STRUCTURED_BLOCK, NULL); @@ -4350,7 +4371,7 @@ parse_omp_atomic (void) pop_state (); st = next_statement (); - if (st == ST_OMP_END_ATOMIC) + if (st == st_end_atomic) { gfc_clear_new_st (); gfc_commit_symbols (); @@ -4646,7 +4667,7 @@ parse_omp_structured_block (gfc_statement omp_st, bool workshare_stmts_only) continue; case ST_OMP_ATOMIC: - st = parse_omp_atomic (); + st = parse_omp_oacc_atomic (true); continue; default: @@ -4865,8 +4886,12 @@ parse_executable (gfc_statement st) return st; continue; + case ST_OACC_ATOMIC: + st = parse_omp_oacc_atomic (false); + continue; + case ST_OMP_ATOMIC: - st = parse_omp_atomic (); + st = parse_omp_oacc_atomic (true); continue; default: @@ -5782,6 +5807,7 @@ is_oacc (gfc_state_data *sd) case EXEC_OACC_CACHE: case EXEC_OACC_ENTER_DATA: case EXEC_OACC_EXIT_DATA: + case EXEC_OACC_ATOMIC: return true; default: |