From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6296 invoked by alias); 31 Jan 2014 11:13:05 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 6279 invoked by uid 89); 31 Jan 2014 11:13:04 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS autolearn=ham version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: mailout1.w1.samsung.com Received: from mailout1.w1.samsung.com (HELO mailout1.w1.samsung.com) (210.118.77.11) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (DES-CBC3-SHA encrypted) ESMTPS; Fri, 31 Jan 2014 11:13:01 +0000 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N0900ML7J5L6U70@mailout1.w1.samsung.com>; Fri, 31 Jan 2014 11:12:57 +0000 (GMT) Received: from eusync4.samsung.com ( [203.254.199.214]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id 82.DB.18565.9358BE25; Fri, 31 Jan 2014 11:12:57 +0000 (GMT) Received: from [106.109.130.57] by eusync4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N0900BG9J5JBK60@eusync4.samsung.com>; Fri, 31 Jan 2014 11:12:56 +0000 (GMT) Message-id: <52EB8537.4090708@samsung.com> Date: Fri, 31 Jan 2014 11:17:00 -0000 From: Ilmir Usmanov User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.0 MIME-version: 1.0 To: Thomas Schwinge Cc: Evgeny Gavrin , GarbuzovViacheslav , Dmitri Botcharnikov , gcc-patches@gcc.gnu.org, jakub@redhat.com, fortran@gcc.gnu.org Subject: Re: [PATCH 2/6] [GOMP4] OpenACC 1.0+ support in fortran front-end References: <52E158EF.9050009@samsung.com> <877g9pqmt2.fsf@schwinge.name> <52E65B24.9070403@samsung.com> <87iot5pgqb.fsf@schwinge.name> <52EB8437.3060602@samsung.com> <52EB84C3.4010407@samsung.com> In-reply-to: <52EB84C3.4010407@samsung.com> Content-type: multipart/mixed; boundary=------------050902020904060809010508 X-IsSubscribed: yes X-SW-Source: 2014-01/txt/msg02041.txt.bz2 This is a multi-part message in MIME format. --------------050902020904060809010508 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 1313 OpenACC 1.0 fortran FE support -- matching and resolving. * openmp.c (gfc_free_omp_clauses): Remove also OpenACC clauses. (gfc_free_exprlist): New function to clear expression list. (match_oacc_exprlist): New function to match expression list. (match_oacc_clause_gang): New function to match OpenACC 2.0 gang clauses. (OMP_CLAUSE_ASYNC, OMP_CLAUSE_NUM_GANGS, OMP_CLAUSE_NUM_WORKERS, OMP_CLAUSE_VECTOR_LENGTH, OMP_CLAUSE_COPY, OMP_CLAUSE_OACC_COPYIN, OMP_CLAUSE_COPYOUT, OMP_CLAUSE_CREATE, OMP_CLAUSE_PRESENT, OMP_CLAUSE_PRESENT_OR_COPY, OMP_CLAUSE_PRESENT_OR_COPYIN, OMP_CLAUSE_PRESENT_OR_COPYOUT, OMP_CLAUSE_PRESENT_OR_CREATE, OMP_CLAUSE_DEVICEPTR, OMP_CLAUSE_GANG, OMP_CLAUSE_WORKER, OMP_CLAUSE_VECTOR, OMP_CLAUSE_SEQ, OMP_CLAUSE_INDEPENDENT, OMP_CLAUSE_USE_DEVICE, OMP_CLAUSE_HOST, OMP_CLAUSE_DEVICE_RESIDENT, OMP_CLAUSE_DEVICE, OMP_CLAUSE_DEFAULT, OMP_CLAUSE_WAIT, OMP_CLAUSE_DELETE, OMP_CLAUSE_AUTO, OMP_CLAUSE_TILE): New clauses. (OACC_PARALLEL_CLAUSES, OACC_KERNELS_CLAUSES, OACC_DATA_CLAUSES, OACC_LOOP_CLAUSES, OACC_PARALLEL_LOOP_CLAUSES, OACC_KERNELS_LOOP_CLAUSES, OACC_HOST_DATA_CLAUSES, OACC_DECLARE_CLAUSES, OACC_UPDATE_CLAUSES, OACC_ENTER_DATA_CLAUSES, OACC_EXIT_DATA_CLAUSES): New defines. --------------050902020904060809010508 Content-Type: text/x-diff; name="0002-OpenACC-fortran-front-end-part-2.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0002-OpenACC-fortran-front-end-part-2.patch" Content-length: 34537 >From 64b05eeeadf25fca4f92f083cc11aaad1a7a692a Mon Sep 17 00:00:00 2001 From: Ilmir Usmanov Date: Fri, 31 Jan 2014 13:26:13 +0400 Subject: [PATCH 2/6] OpenACC fortran front-end -- part 2 --- gcc/fortran/openmp.c | 942 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 940 insertions(+), 2 deletions(-) diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c index dff3ab1..d4e3ebd 100644 --- a/gcc/fortran/openmp.c +++ b/gcc/fortran/openmp.c @@ -69,11 +69,36 @@ gfc_free_omp_clauses (gfc_omp_clauses *c) gfc_free_expr (c->final_expr); gfc_free_expr (c->num_threads); gfc_free_expr (c->chunk_size); + gfc_free_expr (c->async_expr); + gfc_free_expr (c->gang_expr); + gfc_free_expr (c->worker_expr); + gfc_free_expr (c->vector_expr); + gfc_free_expr (c->num_gangs_expr); + gfc_free_expr (c->num_workers_expr); + gfc_free_expr (c->vector_length_expr); + gfc_free_expr (c->non_clause_wait_expr); + for (i = 0; i < OMP_LIST_NUM; i++) gfc_free_namelist (c->lists[i]); + + gfc_free_exprlist (c->waitlist); + free (c); } +/* Free expression list. */ +void +gfc_free_exprlist (gfc_exprlist *list) +{ + gfc_exprlist *n; + + for (; list; list = n) + { + n = list->next; + free (list); + } +} + /* Match a variable/common block list and construct a namelist from it. */ static match @@ -169,6 +194,87 @@ cleanup: return MATCH_ERROR; } +static match +match_oacc_exprlist (const char *str, gfc_exprlist **list, bool allow_asterisk) +{ + gfc_exprlist *head, *tail, *p; + locus old_loc; + gfc_expr *expr; + match m; + + head = tail = NULL; + + old_loc = gfc_current_locus; + + m = gfc_match (str); + if (m != MATCH_YES) + return m; + + for (;;) + { + m = gfc_match_expr (&expr); + if (m == MATCH_YES || allow_asterisk) + { + p = gfc_get_exprlist (); + if (head == NULL) + head = tail = p; + else + { + tail->next = p; + tail = tail->next; + } + if (m == MATCH_YES) + tail->expr = expr; + else if (gfc_match (" *") != MATCH_YES) + goto syntax; + goto next_item; + } + if (m == MATCH_ERROR) + goto cleanup; + goto syntax; + + next_item: + if (gfc_match_char (')') == MATCH_YES) + break; + if (gfc_match_char (',') != MATCH_YES) + goto syntax; + } + + while (*list) + list = &(*list)->next; + + *list = head; + return MATCH_YES; + +syntax: + gfc_error ("Syntax error in OpenACC expression list at %C"); + +cleanup: + gfc_free_exprlist (head); + gfc_current_locus = old_loc; + return MATCH_ERROR; +} + +static match +match_oacc_clause_gang (gfc_omp_clauses *cp) +{ + if (gfc_match_char ('(') != MATCH_YES) + return MATCH_NO; + if (gfc_match (" num :") == MATCH_YES) + { + cp->gang_static = false; + return gfc_match (" %e )", &cp->gang_expr); + } + if (gfc_match (" static :") == MATCH_YES) + { + cp->gang_static = true; + if (gfc_match (" * )") != MATCH_YES) + return gfc_match (" %e )", &cp->gang_expr); + return MATCH_YES; + } + return gfc_match (" %e )", &cp->gang_expr); +} + #define OMP_CLAUSE_PRIVATE (1 << 0) #define OMP_CLAUSE_FIRSTPRIVATE (1 << 1) #define OMP_CLAUSE_LASTPRIVATE (1 << 2) @@ -186,11 +292,40 @@ cleanup: #define OMP_CLAUSE_FINAL (1 << 14) #define OMP_CLAUSE_MERGEABLE (1 << 15) +/* OpenACC 2.0 clauses. */ +#define OMP_CLAUSE_ASYNC (1 << 16) +#define OMP_CLAUSE_NUM_GANGS (1 << 17) +#define OMP_CLAUSE_NUM_WORKERS (1 << 18) +#define OMP_CLAUSE_VECTOR_LENGTH (1 << 19) +#define OMP_CLAUSE_COPY (1 << 20) +#define OMP_CLAUSE_COPYOUT (1 << 21) +#define OMP_CLAUSE_CREATE (1 << 22) +#define OMP_CLAUSE_PRESENT (1 << 23) +#define OMP_CLAUSE_PRESENT_OR_COPY (1 << 24) +#define OMP_CLAUSE_PRESENT_OR_COPYIN (1 << 25) +#define OMP_CLAUSE_PRESENT_OR_COPYOUT (1 << 26) +#define OMP_CLAUSE_PRESENT_OR_CREATE (1 << 27) +#define OMP_CLAUSE_DEVICEPTR (1 << 28) +#define OMP_CLAUSE_GANG (1 << 29) +#define OMP_CLAUSE_WORKER (1 << 30) +#define OMP_CLAUSE_VECTOR (1 << 31) +#define OMP_CLAUSE_SEQ (1ll << 32) +#define OMP_CLAUSE_INDEPENDENT (1ll << 33) +#define OMP_CLAUSE_USE_DEVICE (1ll << 34) +#define OMP_CLAUSE_DEVICE_RESIDENT (1ll << 35) +#define OMP_CLAUSE_HOST (1ll << 36) +#define OMP_CLAUSE_DEVICE (1ll << 37) +#define OMP_CLAUSE_OACC_COPYIN (1ll << 38) +#define OMP_CLAUSE_WAIT (1ll << 39) +#define OMP_CLAUSE_DELETE (1ll << 40) +#define OMP_CLAUSE_AUTO (1ll << 41) +#define OMP_CLAUSE_TILE (1ll << 42) + /* Match OpenMP directive clauses. MASK is a bitmask of clauses that are allowed for a particular directive. */ static match -gfc_match_omp_clauses (gfc_omp_clauses **cp, int mask) +gfc_match_omp_clauses (gfc_omp_clauses **cp, long long mask) { gfc_omp_clauses *c = gfc_get_omp_clauses (); locus old_loc; @@ -205,6 +340,52 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, int mask) needs_space = false; first = false; gfc_gobble_whitespace (); + if ((mask & OMP_CLAUSE_ASYNC) && !c->async) + if (gfc_match ("async") == MATCH_YES) + { + c->async = true; + if (gfc_match (" ( %e )", &c->async_expr) == MATCH_YES) + needs_space = false; + else + needs_space = true; + continue; + } + if ((mask & OMP_CLAUSE_GANG) && !c->gang) + if (gfc_match ("gang") == MATCH_YES) + { + c->gang = true; + if (match_oacc_clause_gang(c) == MATCH_YES) + needs_space = false; + else + needs_space = true; + continue; + } + if ((mask & OMP_CLAUSE_WORKER) && !c->worker) + if (gfc_match ("worker") == MATCH_YES) + { + c->worker = true; + if (gfc_match (" ( num : %e )", &c->worker_expr) == MATCH_YES + || gfc_match (" ( %e )", &c->worker_expr) == MATCH_YES) + needs_space = false; + else + needs_space = true; + continue; + } + if ((mask & OMP_CLAUSE_VECTOR_LENGTH) && c->vector_length_expr == NULL + && gfc_match ("vector_length ( %e )", &c->vector_length_expr) + == MATCH_YES) + continue; + if ((mask & OMP_CLAUSE_VECTOR) && !c->vector) + if (gfc_match ("vector") == MATCH_YES) + { + c->vector = true; + if (gfc_match (" ( length : %e )", &c->vector_expr) == MATCH_YES + || gfc_match (" ( %e )", &c->vector_expr) == MATCH_YES) + needs_space = false; + else + needs_space = true; + continue; + } if ((mask & OMP_CLAUSE_IF) && c->if_expr == NULL && gfc_match ("if ( %e )", &c->if_expr) == MATCH_YES) continue; @@ -247,6 +428,145 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, int mask) &c->lists[OMP_LIST_COPYIN], true) == MATCH_YES) continue; + if ((mask & OMP_CLAUSE_NUM_GANGS) && c->num_gangs_expr == NULL + && gfc_match ("num_gangs ( %e )", &c->num_gangs_expr) == MATCH_YES) + continue; + if ((mask & OMP_CLAUSE_NUM_WORKERS) && c->num_workers_expr == NULL + && gfc_match ("num_workers ( %e )", &c->num_workers_expr) + == MATCH_YES) + continue; + if ((mask & OMP_CLAUSE_COPY) + && gfc_match_omp_variable_list ("copy (", + &c->lists[OMP_LIST_COPY], true) + == MATCH_YES) + continue; + if ((mask & OMP_CLAUSE_OACC_COPYIN) + && gfc_match_omp_variable_list ("copyin (", + &c->lists[OMP_LIST_OACC_COPYIN], true) + == MATCH_YES) + continue; + if ((mask & OMP_CLAUSE_COPYOUT) + && gfc_match_omp_variable_list ("copyout (", + &c->lists[OMP_LIST_COPYOUT], true) + == MATCH_YES) + continue; + if ((mask & OMP_CLAUSE_CREATE) + && gfc_match_omp_variable_list ("create (", + &c->lists[OMP_LIST_CREATE], true) + == MATCH_YES) + continue; + if ((mask & OMP_CLAUSE_DELETE) + && gfc_match_omp_variable_list ("delete (", + &c->lists[OMP_LIST_DELETE], true) + == MATCH_YES) + continue; + if ((mask & OMP_CLAUSE_PRESENT) + && gfc_match_omp_variable_list ("present (", + &c->lists[OMP_LIST_PRESENT], true) + == MATCH_YES) + continue; + if ((mask & OMP_CLAUSE_PRESENT_OR_COPY) + && gfc_match_omp_variable_list ("present_or_copy (", + &c->lists[OMP_LIST_PRESENT_OR_COPY], true) + == MATCH_YES) + continue; + if ((mask & OMP_CLAUSE_PRESENT_OR_COPY) + && gfc_match_omp_variable_list ("pcopy (", + &c->lists[OMP_LIST_PRESENT_OR_COPY], true) + == MATCH_YES) + continue; + if ((mask & OMP_CLAUSE_PRESENT_OR_COPYIN) + && gfc_match_omp_variable_list ("present_or_copyin (", + &c->lists[OMP_LIST_PRESENT_OR_COPYIN], + true) + == MATCH_YES) + continue; + if ((mask & OMP_CLAUSE_PRESENT_OR_COPYIN) + && gfc_match_omp_variable_list ("pcopyin (", + &c->lists[OMP_LIST_PRESENT_OR_COPYIN], + true) + == MATCH_YES) + continue; + if ((mask & OMP_CLAUSE_PRESENT_OR_COPYOUT) + && gfc_match_omp_variable_list ("present_or_copyout (", + &c->lists[OMP_LIST_PRESENT_OR_COPYOUT], + true) + == MATCH_YES) + continue; + if ((mask & OMP_CLAUSE_PRESENT_OR_COPYOUT) + && gfc_match_omp_variable_list ("pcopyout (", + &c->lists[OMP_LIST_PRESENT_OR_COPYOUT], + true) + == MATCH_YES) + continue; + if ((mask & OMP_CLAUSE_PRESENT_OR_CREATE) + && gfc_match_omp_variable_list ("present_or_create (", + &c->lists[OMP_LIST_PRESENT_OR_CREATE], + true) + == MATCH_YES) + continue; + if ((mask & OMP_CLAUSE_PRESENT_OR_CREATE) + && gfc_match_omp_variable_list ("pcreate (", + &c->lists[OMP_LIST_PRESENT_OR_CREATE], + true) + == MATCH_YES) + continue; + if ((mask & OMP_CLAUSE_DEVICEPTR) + && gfc_match_omp_variable_list ("deviceptr (", + &c->lists[OMP_LIST_DEVICEPTR], true) + == MATCH_YES) + continue; + if ((mask & OMP_CLAUSE_USE_DEVICE) + && gfc_match_omp_variable_list ("use_device (", + &c->lists[OMP_LIST_USE_DEVICE], true) + == MATCH_YES) + continue; + if ((mask & OMP_CLAUSE_DEVICE_RESIDENT) + && gfc_match_omp_variable_list ("device_resident (", + &c->lists[OMP_LIST_DEVICE_RESIDENT], true) + == MATCH_YES) + continue; + if ((mask & OMP_CLAUSE_HOST) + && gfc_match_omp_variable_list ("host (", + &c->lists[OMP_LIST_HOST], true) + == MATCH_YES) + continue; + if ((mask & OMP_CLAUSE_DEVICE) + && gfc_match_omp_variable_list ("device (", + &c->lists[OMP_LIST_DEVICE], true) + == MATCH_YES) + continue; + if ((mask & OMP_CLAUSE_TILE) + && match_oacc_exprlist ("tile (", &c->tilelist, true) == MATCH_YES) + continue; + if ((mask & OMP_CLAUSE_SEQ) && !c->seq + && gfc_match ("seq") == MATCH_YES) + { + c->seq = true; + needs_space = true; + continue; + } + if ((mask & OMP_CLAUSE_INDEPENDENT) && !c->independent + && gfc_match ("independent") == MATCH_YES) + { + c->independent = true; + needs_space = true; + continue; + } + if ((mask & OMP_CLAUSE_AUTO) && !c->par_auto + && gfc_match ("auto") == MATCH_YES) + { + c->par_auto = true; + needs_space = true; + continue; + } + if ((mask & OMP_CLAUSE_WAIT) && !c->wait + && gfc_match ("wait") == MATCH_YES) + { + c->wait = true; + match_oacc_exprlist (" (", &c->waitlist, false); + continue; + } old_loc = gfc_current_locus; if ((mask & OMP_CLAUSE_REDUCTION) && gfc_match ("reduction ( ") == MATCH_YES) @@ -433,6 +753,52 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, int mask) return MATCH_YES; } +#define OACC_PARALLEL_CLAUSES \ + (OMP_CLAUSE_IF | OMP_CLAUSE_ASYNC | OMP_CLAUSE_NUM_GANGS \ + | OMP_CLAUSE_NUM_WORKERS | OMP_CLAUSE_VECTOR_LENGTH | OMP_CLAUSE_REDUCTION \ + | OMP_CLAUSE_COPY | OMP_CLAUSE_OACC_COPYIN | OMP_CLAUSE_COPYOUT \ + | OMP_CLAUSE_CREATE | OMP_CLAUSE_PRESENT | OMP_CLAUSE_PRESENT_OR_COPY \ + | OMP_CLAUSE_PRESENT_OR_COPYIN | OMP_CLAUSE_PRESENT_OR_COPYOUT \ + | OMP_CLAUSE_PRESENT_OR_CREATE | OMP_CLAUSE_DEVICEPTR | OMP_CLAUSE_PRIVATE \ + | OMP_CLAUSE_FIRSTPRIVATE | OMP_CLAUSE_DEFAULT | OMP_CLAUSE_WAIT) +#define OACC_KERNELS_CLAUSES \ + (OMP_CLAUSE_IF | OMP_CLAUSE_ASYNC | OMP_CLAUSE_DEVICEPTR \ + | OMP_CLAUSE_COPY | OMP_CLAUSE_OACC_COPYIN | OMP_CLAUSE_COPYOUT \ + | OMP_CLAUSE_CREATE | OMP_CLAUSE_PRESENT | OMP_CLAUSE_PRESENT_OR_COPY \ + | OMP_CLAUSE_PRESENT_OR_COPYIN | OMP_CLAUSE_PRESENT_OR_COPYOUT \ + | OMP_CLAUSE_PRESENT_OR_CREATE | OMP_CLAUSE_DEFAULT | OMP_CLAUSE_WAIT) +#define OACC_DATA_CLAUSES \ + (OMP_CLAUSE_IF | OMP_CLAUSE_DEVICEPTR | OMP_CLAUSE_COPY \ + | OMP_CLAUSE_OACC_COPYIN | OMP_CLAUSE_COPYOUT | OMP_CLAUSE_CREATE \ + | OMP_CLAUSE_PRESENT | OMP_CLAUSE_PRESENT_OR_COPY \ + | OMP_CLAUSE_PRESENT_OR_COPYIN | OMP_CLAUSE_PRESENT_OR_COPYOUT \ + | OMP_CLAUSE_PRESENT_OR_CREATE) +#define OACC_LOOP_CLAUSES \ + (OMP_CLAUSE_COLLAPSE | OMP_CLAUSE_GANG | OMP_CLAUSE_WORKER \ + | OMP_CLAUSE_VECTOR | OMP_CLAUSE_SEQ | OMP_CLAUSE_INDEPENDENT \ + | OMP_CLAUSE_PRIVATE | OMP_CLAUSE_REDUCTION | OMP_CLAUSE_AUTO \ + | OMP_CLAUSE_TILE) +#define OACC_PARALLEL_LOOP_CLAUSES \ + (OACC_LOOP_CLAUSES | OACC_PARALLEL_CLAUSES) +#define OACC_KERNELS_LOOP_CLAUSES \ + (OACC_LOOP_CLAUSES | OACC_KERNELS_CLAUSES) +#define OACC_HOST_DATA_CLAUSES OMP_CLAUSE_USE_DEVICE +#define OACC_DECLARE_CLAUSES \ + (OMP_CLAUSE_COPY | OMP_CLAUSE_OACC_COPYIN | OMP_CLAUSE_COPYOUT \ + | OMP_CLAUSE_CREATE | OMP_CLAUSE_DEVICEPTR | OMP_CLAUSE_DEVICE_RESIDENT \ + | OMP_CLAUSE_PRESENT | OMP_CLAUSE_PRESENT_OR_COPY \ + | OMP_CLAUSE_PRESENT_OR_COPYIN | OMP_CLAUSE_PRESENT_OR_COPYOUT \ + | OMP_CLAUSE_PRESENT_OR_CREATE) +#define OACC_UPDATE_CLAUSES \ + (OMP_CLAUSE_IF | OMP_CLAUSE_ASYNC | OMP_CLAUSE_HOST | OMP_CLAUSE_DEVICE) +#define OACC_ENTER_DATA_CLAUSES \ + (OMP_CLAUSE_IF | OMP_CLAUSE_ASYNC | OMP_CLAUSE_WAIT | OMP_CLAUSE_OACC_COPYIN \ + | OMP_CLAUSE_CREATE | OMP_CLAUSE_PRESENT_OR_COPYIN \ + | OMP_CLAUSE_PRESENT_OR_CREATE) +#define OACC_EXIT_DATA_CLAUSES \ + (OMP_CLAUSE_IF | OMP_CLAUSE_ASYNC | OMP_CLAUSE_WAIT | OMP_CLAUSE_COPYOUT \ + | OMP_CLAUSE_DELETE) + #define OMP_PARALLEL_CLAUSES \ (OMP_CLAUSE_PRIVATE | OMP_CLAUSE_FIRSTPRIVATE | OMP_CLAUSE_SHARED \ | OMP_CLAUSE_COPYIN | OMP_CLAUSE_REDUCTION | OMP_CLAUSE_IF \ @@ -449,6 +815,185 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, int mask) | OMP_CLAUSE_IF | OMP_CLAUSE_DEFAULT | OMP_CLAUSE_UNTIED \ | OMP_CLAUSE_FINAL | OMP_CLAUSE_MERGEABLE) + +match +gfc_match_oacc_parallel_loop (void) +{ + gfc_omp_clauses *c; + if (gfc_match_omp_clauses (&c, OACC_PARALLEL_LOOP_CLAUSES) != MATCH_YES) + return MATCH_ERROR; + + new_st.op = EXEC_OACC_PARALLEL_LOOP; + new_st.ext.omp_clauses = c; + return MATCH_YES; +} + + +match +gfc_match_oacc_parallel (void) +{ + gfc_omp_clauses *c; + if (gfc_match_omp_clauses (&c, OACC_PARALLEL_CLAUSES) != MATCH_YES) + return MATCH_ERROR; + + new_st.op = EXEC_OACC_PARALLEL; + new_st.ext.omp_clauses = c; + return MATCH_YES; +} + + +match +gfc_match_oacc_kernels_loop (void) +{ + gfc_omp_clauses *c; + if (gfc_match_omp_clauses (&c, OACC_KERNELS_LOOP_CLAUSES) != MATCH_YES) + return MATCH_ERROR; + + new_st.op = EXEC_OACC_KERNELS_LOOP; + new_st.ext.omp_clauses = c; + return MATCH_YES; +} + + +match +gfc_match_oacc_kernels (void) +{ + gfc_omp_clauses *c; + if (gfc_match_omp_clauses (&c, OACC_KERNELS_CLAUSES) != MATCH_YES) + return MATCH_ERROR; + + new_st.op = EXEC_OACC_KERNELS; + new_st.ext.omp_clauses = c; + return MATCH_YES; +} + + +match +gfc_match_oacc_data (void) +{ + gfc_omp_clauses *c; + if (gfc_match_omp_clauses (&c, OACC_DATA_CLAUSES) != MATCH_YES) + return MATCH_ERROR; + + new_st.op = EXEC_OACC_DATA; + new_st.ext.omp_clauses = c; + return MATCH_YES; +} + + +match +gfc_match_oacc_host_data (void) +{ + gfc_omp_clauses *c; + if (gfc_match_omp_clauses (&c, OACC_HOST_DATA_CLAUSES) != MATCH_YES) + return MATCH_ERROR; + + new_st.op = EXEC_OACC_HOST_DATA; + new_st.ext.omp_clauses = c; + return MATCH_YES; +} + + +match +gfc_match_oacc_loop (void) +{ + gfc_omp_clauses *c; + if (gfc_match_omp_clauses (&c, OACC_LOOP_CLAUSES) != MATCH_YES) + return MATCH_ERROR; + + new_st.op = EXEC_OACC_LOOP; + new_st.ext.omp_clauses = c; + return MATCH_YES; +} + + +match +gfc_match_oacc_declare (void) +{ + gfc_omp_clauses *c; + if (gfc_match_omp_clauses (&c, OACC_DECLARE_CLAUSES) != MATCH_YES) + return MATCH_ERROR; + + new_st.ext.omp_clauses = c; + return MATCH_YES; +} + + +match +gfc_match_oacc_update (void) +{ + gfc_omp_clauses *c; + if (gfc_match_omp_clauses (&c, OACC_UPDATE_CLAUSES) != MATCH_YES) + return MATCH_ERROR; + + new_st.op = EXEC_OACC_UPDATE; + new_st.ext.omp_clauses = c; + return MATCH_YES; +} + + +match +gfc_match_oacc_enter_data (void) +{ + gfc_omp_clauses *c; + if (gfc_match_omp_clauses (&c, OACC_ENTER_DATA_CLAUSES) != MATCH_YES) + return MATCH_ERROR; + + new_st.op = EXEC_OACC_ENTER_DATA; + new_st.ext.omp_clauses = c; + return MATCH_YES; +} + + +match +gfc_match_oacc_exit_data (void) +{ + gfc_omp_clauses *c; + if (gfc_match_omp_clauses (&c, OACC_EXIT_DATA_CLAUSES) != MATCH_YES) + return MATCH_ERROR; + + new_st.op = EXEC_OACC_EXIT_DATA; + new_st.ext.omp_clauses = c; + return MATCH_YES; +} + + +match +gfc_match_oacc_wait (void) +{ + gfc_omp_clauses *c = gfc_get_omp_clauses (); + gfc_match (" ( %e )", &c->non_clause_wait_expr); + + new_st.op = EXEC_OACC_WAIT; + new_st.ext.omp_clauses = c; + return MATCH_YES; +} + + +match +gfc_match_oacc_cache (void) +{ + gfc_omp_clauses *c = gfc_get_omp_clauses (); + match m = gfc_match_omp_variable_list (" (",&c->lists[OMP_LIST_CACHE], true); + if (m != MATCH_YES) + { + gfc_free_omp_clauses(c); + return m; + } + + if (gfc_current_state() != COMP_DO) + { + gfc_error ("ACC CACHE directive must be inside of loop %C"); + gfc_free_omp_clauses(c); + return MATCH_ERROR; + } + + new_st.op = EXEC_OACC_CACHE; + new_st.ext.omp_clauses = c; + return MATCH_YES; +} + + match gfc_match_omp_parallel (void) { @@ -793,6 +1338,27 @@ gfc_match_omp_end_single (void) } +static void +resolve_oacc_scalar_int_expr (gfc_expr *expr, const char *clause) +{ + if (!gfc_resolve_expr (expr) + || expr->ts.type != BT_INTEGER || expr->rank != 0) + gfc_error ("%s clause at %L requires a scalar INTEGER expression", + clause, &expr->where); +} + + +static void +resolve_oacc_positive_int_expr (gfc_expr *expr, const char *clause) +{ + resolve_oacc_scalar_int_expr (expr, clause); + if (expr->expr_type == EXPR_CONSTANT && expr->ts.type == BT_INTEGER + && expr->value.integer->_mp_size <= 0) + gfc_warning ("INTEGER expression of %s clause at %L must be positive", + clause, &expr->where); +} + + /* OpenMP directive resolving routines. */ static void @@ -800,10 +1366,14 @@ resolve_omp_clauses (gfc_code *code) { gfc_omp_clauses *omp_clauses = code->ext.omp_clauses; gfc_namelist *n; + gfc_exprlist *el; int list; static const char *clause_names[] = { "PRIVATE", "FIRSTPRIVATE", "LASTPRIVATE", "COPYPRIVATE", "SHARED", - "COPYIN", "REDUCTION" }; + "COPYIN", "COPY", "COPYIN", "COPYOUT", "CREATE", "DELETE", + "PRESENT", "PRESENT_OR_COPY", "PRESENT_OR_COPYIN", "PRESENT_OR_COPYOUT", + "PRESENT_OR_CREATE", "DEVICEPTR", "USE_DEVICE", "DEVICE_RESIDENT", + "HOST", "DEVICE", "CACHE", "REDUCTION"}; if (omp_clauses == NULL) return; @@ -933,8 +1503,43 @@ resolve_omp_clauses (gfc_code *code) else gcc_unreachable (); + if (list >= OMP_LIST_DATA_CLAUSE_FIRST + && list <= OMP_LIST_DATA_CLAUSE_LAST) + { + if (n->sym->ts.type == BT_DERIVED + && n->sym->attr.allocatable) + gfc_error ("ALLOCATABLE object '%s' of DERIVED type in %s clause at %L", + n->sym->name, name, &code->loc); + if (n->sym->ts.type == BT_DERIVED + && n->sym->attr.pointer) + gfc_error ("POINTER object '%s' of DERIVED type in %s clause at %L", + n->sym->name, name, &code->loc); + } + + if (list > OMP_LIST_DATA_CLAUSE_LAST + && list < OMP_LIST_REDUCTION_FIRST) + { + if (n->sym->attr.pointer) + gfc_error ("POINTER object '%s' in %s clause at %L", + n->sym->name, name, &code->loc); + if (n->sym->as && n->sym->as->type == AS_ASSUMED_SIZE) + gfc_error ("Assumed size array '%s' in %s clause at %L", + n->sym->name, name, &code->loc); + } + switch (list) { + case OMP_LIST_DEVICEPTR: + if (n->sym->attr.pointer) + gfc_error ("POINTER object '%s' in %s clause at %L", + n->sym->name, name, &code->loc); + if (n->sym->attr.allocatable) + gfc_error ("ALLOCATABLE object '%s' in %s clause at %L", + n->sym->name, name, &code->loc); + if (n->sym->attr.value) + gfc_error ("VALUE object '%s' in %s clause at %L", + n->sym->name, name, &code->loc); + break; case OMP_LIST_COPYIN: for (; n != NULL; n = n->next) { @@ -1059,6 +1664,25 @@ resolve_omp_clauses (gfc_code *code) break; } } + if (omp_clauses->async) + if (omp_clauses->async_expr) + resolve_oacc_scalar_int_expr (omp_clauses->async_expr, "ASYNC"); + if (omp_clauses->num_gangs_expr) + resolve_oacc_positive_int_expr (omp_clauses->num_gangs_expr, "NUM_GANGS"); + if (omp_clauses->num_workers_expr) + resolve_oacc_positive_int_expr (omp_clauses->num_workers_expr, "NUM_WORKERS"); + if (omp_clauses->vector_length_expr) + resolve_oacc_positive_int_expr (omp_clauses->vector_length_expr, "VECTOR_LENGTH"); + if (omp_clauses->gang_expr) + resolve_oacc_positive_int_expr (omp_clauses->gang_expr, "GANG"); + if (omp_clauses->worker_expr) + resolve_oacc_positive_int_expr (omp_clauses->worker_expr, "WORKER"); + if (omp_clauses->vector_expr) + resolve_oacc_positive_int_expr (omp_clauses->vector_expr, "VECTOR"); + if (omp_clauses->wait) + if (omp_clauses->waitlist) + for (el = omp_clauses->waitlist; el; el = el->next) + resolve_oacc_positive_int_expr (el->expr, "WAIT"); } @@ -1727,6 +2351,320 @@ resolve_omp_do (gfc_code *code) } } +typedef struct omp_context oacc_context; +oacc_context *oacc_current_ctx; + +static bool +oacc_is_parallel (gfc_code *code) +{ + return code->op == EXEC_OACC_PARALLEL || code->op == EXEC_OACC_PARALLEL_LOOP; +} + +static bool +oacc_is_kernels (gfc_code *code) +{ + return code->op == EXEC_OACC_KERNELS || code->op == EXEC_OACC_KERNELS_LOOP; +} + +static bool +oacc_is_loop (gfc_code *code) +{ + return code->op == EXEC_OACC_PARALLEL_LOOP + || code->op == EXEC_OACC_KERNELS_LOOP + || code->op == EXEC_OACC_LOOP; +} + + +static void +resolve_oacc_nested_loops (gfc_code *code, gfc_code* do_code, int collapse, + const char *clause) +{ + gfc_symbol *dovar; + gfc_code *c; + int i; + + for (i = 1; i <= collapse; i++) + { + if (do_code->op == EXEC_DO_WHILE) + { + gfc_error ("!$ACC LOOP cannot be a DO WHILE or DO without loop control " + "at %L", &do_code->loc); + break; + } + gcc_assert (do_code->op == EXEC_DO); + if (do_code->ext.iterator->var->ts.type != BT_INTEGER) + gfc_error ("!$ACC LOOP iteration variable must be of type integer at %L", + &do_code->loc); + dovar = do_code->ext.iterator->var->symtree->n.sym; + if (i > 1) + { + gfc_code *do_code2 = code->block->next; + int j; + + for (j = 1; j < i; j++) + { + gfc_symbol *ivar = do_code2->ext.iterator->var->symtree->n.sym; + if (dovar == ivar + || gfc_find_sym_in_expr (ivar, do_code->ext.iterator->start) + || gfc_find_sym_in_expr (ivar, do_code->ext.iterator->end) + || gfc_find_sym_in_expr (ivar, do_code->ext.iterator->step)) + { + gfc_error ("!$ACC LOOP %s loops don't form rectangular iteration space at %L", + clause, &do_code->loc); + break; + } + if (j < i) + break; + do_code2 = do_code2->block->next; + } + } + if (i == collapse) + break; + for (c = do_code->next; c; c = c->next) + if (c->op != EXEC_NOP && c->op != EXEC_CONTINUE) + { + gfc_error ("%s !$ACC LOOP loops not perfectly nested at %L", + clause, &c->loc); + break; + } + if (c) + break; + do_code = do_code->block; + if (do_code->op != EXEC_DO && do_code->op != EXEC_DO_WHILE) + { + gfc_error ("not enough DO loops for %s !$ACC LOOP at %L", + clause, &code->loc); + break; + } + do_code = do_code->next; + if (do_code == NULL + || (do_code->op != EXEC_DO && do_code->op != EXEC_DO_WHILE)) + { + gfc_error ("not enough DO loops for %s !$ACC LOOP at %L", + clause, &code->loc); + break; + } + } +} + +static void +resolve_oacc_params_in_parallel (gfc_code *code, const char *clause) +{ + oacc_context *c; + + if (oacc_is_parallel (code)) + gfc_error ("LOOP %s in PARALLEL section allows no argument or static at %L", + clause, &code->loc); + for (c = oacc_current_ctx; c; c = c->previous) + { + if (oacc_is_loop (c->code)) + break; + if (oacc_is_parallel (c->code)) + gfc_error ("LOOP %s in PARALLEL section allows no argument or static at %L", + clause, &code->loc); + } +} + + +static void +resolve_oacc_loop_blocks (gfc_code *code) +{ + oacc_context *c; + + if (!oacc_is_loop (code)) + return; + + if (code->op == EXEC_OACC_LOOP) + for (c = oacc_current_ctx; c; c = c->previous) + { + if (oacc_is_loop (c->code)) + { + if (code->ext.omp_clauses->gang) + { + if (c->code->ext.omp_clauses->gang) + gfc_error ("Loop parallelized across gangs is not allowed " + "inside another loop parallelized across gangs at %L", + &code->loc); + if (c->code->ext.omp_clauses->worker) + gfc_error ("Loop parallelized across gangs is not allowed " + "inside loop parallelized across workers at %L", + &code->loc); + if (c->code->ext.omp_clauses->vector) + gfc_error ("Loop parallelized across gangs is not allowed " + "inside loop parallelized across workers at %L", + &code->loc); + } + if (code->ext.omp_clauses->worker) + { + if (c->code->ext.omp_clauses->worker) + gfc_error ("Loop parallelized across workers is not allowed " + "inside another loop parallelized across workers at %L", + &code->loc); + if (c->code->ext.omp_clauses->vector) + gfc_error ("Loop parallelized across workers is not allowed " + "inside another loop parallelized across vectors at %L", + &code->loc); + } + if (code->ext.omp_clauses->vector) + if (c->code->ext.omp_clauses->vector) + gfc_error ("Loop parallelized across vectors is not allowed " + "inside another loop parallelized across vectors at %L", + &code->loc); + } + + if (oacc_is_parallel (c->code) || oacc_is_kernels (c->code)) + break; + } + + if (code->ext.omp_clauses->seq) + { + if (code->ext.omp_clauses->independent) + gfc_error ("Both SEQ and INDEPENDENT are not allowed in %L", &code->loc); + if (code->ext.omp_clauses->gang) + gfc_error ("Both SEQ and GANG are not allowed in %L", &code->loc); + if (code->ext.omp_clauses->worker) + gfc_error ("Both SEQ and WORKER are not allowed in %L", &code->loc); + if (code->ext.omp_clauses->vector) + gfc_error ("Both SEQ and VECTOR are not allowed in %L", &code->loc); + if (code->ext.omp_clauses->par_auto) + gfc_error ("Both SEQ and AUTO are not allowed in %L", &code->loc); + } + if (code->ext.omp_clauses->par_auto) + { + if (code->ext.omp_clauses->gang) + gfc_error ("Both AUTO and GANG are not allowed in %L", &code->loc); + if (code->ext.omp_clauses->worker) + gfc_error ("Both AUTO and WORKER are not allowed in %L", &code->loc); + if (code->ext.omp_clauses->vector) + gfc_error ("Both AUTO and VECTOR are not allowed in %L", &code->loc); + } + if (!code->ext.omp_clauses->tilelist) + { + if (code->ext.omp_clauses->gang) + { + if (code->ext.omp_clauses->worker) + gfc_error ("Both GANG and WORKER are not allowed in %L", &code->loc); + if (code->ext.omp_clauses->vector) + gfc_error ("Both GANG and VECTOR are not allowed in %L", &code->loc); + } + if (code->ext.omp_clauses->worker) + if (code->ext.omp_clauses->vector) + gfc_error ("Both WORKER and VECTOR are not allowed in %L", &code->loc); + } + else if (code->ext.omp_clauses->gang + && code->ext.omp_clauses->worker + && code->ext.omp_clauses->vector) + gfc_error ("All GANG, WORKER and VECTOR are not allowed in %L", &code->loc); + + if (code->ext.omp_clauses->gang + && code->ext.omp_clauses->gang_expr + && !code->ext.omp_clauses->gang_static) + resolve_oacc_params_in_parallel (code, "GANG"); + + if (code->ext.omp_clauses->worker + && code->ext.omp_clauses->worker_expr) + resolve_oacc_params_in_parallel (code, "WORKER"); + + if (code->ext.omp_clauses->tilelist) + { + gfc_exprlist *el; + int num = 0; + for (el = code->ext.omp_clauses->tilelist; el; el = el->next) + { + num++; + if (el->expr == NULL) + continue; + resolve_oacc_positive_int_expr (el->expr, "TILE"); + if (el->expr->expr_type != EXPR_CONSTANT) + gfc_error ("TILE requires constant expression at %L", &code->loc); + } + resolve_oacc_nested_loops (code, code->block->next, num, "tiled"); + } +} + + +void +gfc_resolve_oacc_blocks (gfc_code *code, gfc_namespace *ns) +{ + oacc_context ctx; + + resolve_oacc_loop_blocks (code); + + ctx.code = code; + ctx.previous = oacc_current_ctx; + oacc_current_ctx = &ctx; + + gfc_resolve_blocks (code->block, ns); + + oacc_current_ctx = ctx.previous; +} + + +static void +resolve_oacc_loop(gfc_code *code) +{ + gfc_code *do_code; + int collapse; + + if (code->ext.omp_clauses) + resolve_omp_clauses (code); + + do_code = code->block->next; + collapse = code->ext.omp_clauses->collapse; + + if (collapse <= 0) + collapse = 1; + resolve_oacc_nested_loops (code, do_code, collapse, "collapsed"); +} + + +static void +resolve_oacc_cache (gfc_code *) +{ + //TODO: resolve subarrays +} + + +static void +resolve_oacc_wait (gfc_code *code) +{ + gfc_exprlist* el; + + for (el = code->ext.omp_clauses->waitlist; el; el = el->next) + resolve_oacc_positive_int_expr (el->expr, "WAIT"); +} + + +void +gfc_resolve_oacc_directive (gfc_code *code, gfc_namespace *ns ATTRIBUTE_UNUSED) +{ + switch (code->op) + { + case EXEC_OACC_PARALLEL: + case EXEC_OACC_KERNELS: + case EXEC_OACC_DATA: + case EXEC_OACC_HOST_DATA: + case EXEC_OACC_UPDATE: + case EXEC_OACC_ENTER_DATA: + case EXEC_OACC_EXIT_DATA: + resolve_omp_clauses (code); + break; + case EXEC_OACC_PARALLEL_LOOP: + case EXEC_OACC_KERNELS_LOOP: + case EXEC_OACC_LOOP: + resolve_oacc_loop (code); + break; + case EXEC_OACC_CACHE: + resolve_oacc_cache (code); + break; + case EXEC_OACC_WAIT: + resolve_oacc_wait (code); + break; + default: + break; + } +} + /* Resolve OpenMP directive clauses and check various requirements of each directive. */ -- 1.8.3.2 --------------050902020904060809010508--