OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

openmp.c (match_acc): New generic function to parse OpenACC directives. 

gcc/fortran/
	* openmp.c (match_acc): New generic function to parse OpenACC
	directives.
	(gfc_match_oacc_parallel_loop): Use it.
	(gfc_match_oacc_parallel): Likewise.
	(gfc_match_oacc_kernels_loop): Likewise.
	(gfc_match_oacc_kernels): Likewise.
	(gfc_match_oacc_data): Likewise.
	(gfc_match_oacc_host_data): Likewise.
	(gfc_match_oacc_loop): Likewise.
	(gfc_match_oacc_enter_data): Likewise.
	(gfc_match_oacc_exit_data): Likewise.

From-SVN: r237565
This commit is contained in:
Cesar Philippidis 2016-06-17 13:32:03 -07:00 committed by Cesar Philippidis
parent c561b09181
commit 8559b90fc1
2 changed files with 34 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gcc/fortran/ChangeLog
View File

@ -1,3 +1,17 @@
2016-06-17 Cesar Philippidis <cesar@codesourcery.com>
* openmp.c (match_acc): New generic function to parse OpenACC
directives.
(gfc_match_oacc_parallel_loop): Use it.
(gfc_match_oacc_parallel): Likewise.
(gfc_match_oacc_kernels_loop): Likewise.
(gfc_match_oacc_kernels): Likewise.
(gfc_match_oacc_data): Likewise.
(gfc_match_oacc_host_data): Likewise.
(gfc_match_oacc_loop): Likewise.
(gfc_match_oacc_enter_data): Likewise.
(gfc_match_oacc_exit_data): Likewise.
2016-06-16 Martin Liska <mliska@suse.cz>
* trans-stmt.c (gfc_trans_simple_do): Predict the edge.

92
gcc/fortran/openmp.c
View File

@ -1411,101 +1411,63 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, uint64_t mask,
(OMP_CLAUSE_GANG | OMP_CLAUSE_WORKER | OMP_CLAUSE_VECTOR | OMP_CLAUSE_SEQ)
static match
match_acc (gfc_exec_op op, uint64_t mask)
{
gfc_omp_clauses *c;
if (gfc_match_omp_clauses (&c, mask, false, false, true) != MATCH_YES)
return MATCH_ERROR;
new_st.op = op;
new_st.ext.omp_clauses = c;
return MATCH_YES;
}
match
gfc_match_oacc_parallel_loop (void)
{
gfc_omp_clauses *c;
if (gfc_match_omp_clauses (&c, OACC_PARALLEL_LOOP_CLAUSES, false, false,
true) != MATCH_YES)
return MATCH_ERROR;
new_st.op = EXEC_OACC_PARALLEL_LOOP;
new_st.ext.omp_clauses = c;
return MATCH_YES;
return match_acc (EXEC_OACC_PARALLEL_LOOP, OACC_PARALLEL_LOOP_CLAUSES);
}
match
gfc_match_oacc_parallel (void)
{
gfc_omp_clauses *c;
if (gfc_match_omp_clauses (&c, OACC_PARALLEL_CLAUSES, false, false, true)
!= MATCH_YES)
return MATCH_ERROR;
new_st.op = EXEC_OACC_PARALLEL;
new_st.ext.omp_clauses = c;
return MATCH_YES;
return match_acc (EXEC_OACC_PARALLEL, OACC_PARALLEL_CLAUSES);
}
match
gfc_match_oacc_kernels_loop (void)
{
gfc_omp_clauses *c;
if (gfc_match_omp_clauses (&c, OACC_KERNELS_LOOP_CLAUSES, false, false,
true) != MATCH_YES)
return MATCH_ERROR;
new_st.op = EXEC_OACC_KERNELS_LOOP;
new_st.ext.omp_clauses = c;
return MATCH_YES;
return match_acc (EXEC_OACC_KERNELS_LOOP, OACC_KERNELS_LOOP_CLAUSES);
}
match
gfc_match_oacc_kernels (void)
{
gfc_omp_clauses *c;
if (gfc_match_omp_clauses (&c, OACC_KERNELS_CLAUSES, false, false, true)
!= MATCH_YES)
return MATCH_ERROR;
new_st.op = EXEC_OACC_KERNELS;
new_st.ext.omp_clauses = c;
return MATCH_YES;
return match_acc (EXEC_OACC_KERNELS, OACC_KERNELS_CLAUSES);
}
match
gfc_match_oacc_data (void)
{
gfc_omp_clauses *c;
if (gfc_match_omp_clauses (&c, OACC_DATA_CLAUSES, false, false, true)
!= MATCH_YES)
return MATCH_ERROR;
new_st.op = EXEC_OACC_DATA;
new_st.ext.omp_clauses = c;
return MATCH_YES;
return match_acc (EXEC_OACC_DATA, OACC_DATA_CLAUSES);
}
match
gfc_match_oacc_host_data (void)
{
gfc_omp_clauses *c;
if (gfc_match_omp_clauses (&c, OACC_HOST_DATA_CLAUSES, false, false, true)
!= MATCH_YES)
return MATCH_ERROR;
new_st.op = EXEC_OACC_HOST_DATA;
new_st.ext.omp_clauses = c;
return MATCH_YES;
return match_acc (EXEC_OACC_HOST_DATA, OACC_HOST_DATA_CLAUSES);
}
match
gfc_match_oacc_loop (void)
{
gfc_omp_clauses *c;
if (gfc_match_omp_clauses (&c, OACC_LOOP_CLAUSES, false, false, true)
!= MATCH_YES)
return MATCH_ERROR;
new_st.op = EXEC_OACC_LOOP;
new_st.ext.omp_clauses = c;
return MATCH_YES;
return match_acc (EXEC_OACC_LOOP, OACC_LOOP_CLAUSES);
}
@ -1617,28 +1579,14 @@ gfc_match_oacc_update (void)
match
gfc_match_oacc_enter_data (void)
{
gfc_omp_clauses *c;
if (gfc_match_omp_clauses (&c, OACC_ENTER_DATA_CLAUSES, false, false, true)
!= MATCH_YES)
return MATCH_ERROR;
new_st.op = EXEC_OACC_ENTER_DATA;
new_st.ext.omp_clauses = c;
return MATCH_YES;
return match_acc (EXEC_OACC_ENTER_DATA, OACC_ENTER_DATA_CLAUSES);
}
match
gfc_match_oacc_exit_data (void)
{
gfc_omp_clauses *c;
if (gfc_match_omp_clauses (&c, OACC_EXIT_DATA_CLAUSES, false, false, true)
!= MATCH_YES)
return MATCH_ERROR;
new_st.op = EXEC_OACC_EXIT_DATA;
new_st.ext.omp_clauses = c;
return MATCH_YES;
return match_acc (EXEC_OACC_EXIT_DATA, OACC_EXIT_DATA_CLAUSES);
}