From patchwork Wed Jan 9 12:30:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julian Brown X-Patchwork-Id: 1022407 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-493710-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="MK8rdNUE"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43ZT5k3wWYz9sMQ for ; Wed, 9 Jan 2019 23:31:53 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; q=dns; s= default; b=FFBt4eccwF2AwOVT+dFb+sy17cy5eYSFrKwvlyUKusNdjOa8tiGiA cudmxZ62SZ3jriBsbzpJSHvyorew+vy3Xgx8rherMcD63THBA2JNdu3k754fSBvQ xWFpmXjNqDMO1Gzq9Q7KNp+gGhHyGaW9EMsFWq6ntQPvo/7WG+KsBg= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; s= default; bh=PiXiHVHzw+d4aOYFaOQwoTo/0oM=; b=MK8rdNUEg8Cn2h1U3c4X /8AihvDiuDDqnla5Df5LZY+MTnndwqqMC5jCHIa96gviJrrgXz8EzYn3cro/pvf4 dZyL7dlR1Yf62Pij1PqNM4Jn3l6S2cK+6Xhgw8p0pK+OYwbErrj/R5md1GRNEaqS 98q79yGjSvqkcdA0cRgSFOk= Received: (qmail 99007 invoked by alias); 9 Jan 2019 12:31:31 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 98716 invoked by uid 89); 9 Jan 2019 12:30:58 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS, TIME_LIMIT_EXCEEDED autolearn=unavailable version=3.3.2 spammy=Application, indicating, Technical, STOP X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 09 Jan 2019 12:30:45 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-MBX-04.mgc.mentorg.com) by relay1.mentorg.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) id 1ghD0M-0007J9-Sd from Julian_Brown@mentor.com for gcc-patches@gcc.gnu.org; Wed, 09 Jan 2019 04:30:43 -0800 Received: from squid.athome (137.202.0.90) by SVR-IES-MBX-04.mgc.mentorg.com (139.181.222.4) with Microsoft SMTP Server (TLS) id 15.0.1320.4; Wed, 9 Jan 2019 12:30:39 +0000 Date: Wed, 9 Jan 2019 12:30:37 +0000 From: Julian Brown To: GCC Patches , Catherine Moore , Thomas Schwinge Subject: [PATCH, og8] Update _OPENACC macro, etc. for OpenACC 2.6 Message-ID: <20190109123037.4a57fa47@squid.athome> MIME-Version: 1.0 X-IsSubscribed: yes Hi, This patch updates the _OPENACC macro to 201711, indicating OpenACC 2.6 support, on the openacc-gcc-8-branch. Tested with offloading to NVPTX. I will apply shortly. Cheers, Julian commit e2ff11ceee7f1294313773d013a9d68f0d4e3c02 Author: Julian Brown Date: Wed Jan 9 03:41:04 2019 -0800 [og8] Update OpenACC version to 2.6 gcc/c-family/ * c-cppbuiltin.c (c_cpp_builtins): Update _OPENACC define to 201711. gcc/doc/ * invoke.texi: Update mention of OpenACC version to 2.6. gcc/fortran/ * cpp.c (cpp_define_builtins): Update _OPENACC define to 201711. * gfortran.texi: Update mentions of OpenACC version to 2.6. * intrinsic.texi: Likewise. gcc/testsuite/ * c-c++-common/cpp/openacc-define-3.c: Update expected value for _OPENACC define. * gfortran.dg/openacc-define-3.f90: Likewise. libgomp/ * acc_prof.h (_ACC_PROF_INFO_VERSION): Update to 201711. * libgomp.texi: Update mentions of OpenACC version to 2.6. Update section numbers to match version 2.6 of the spec. * openacc.f90 (openacc_version): Update to 201711. * openacc_lib.h (openacc_version): Update to 201711. * testsuite/libgomp.oacc-c-c++-common/acc_prof-version-1.c (cb_any_event): Update expected profiling info version to 201711. * testsuite/libgomp.oacc-fortran/openacc_version-1.f: Update expected openacc_version to 201711. * testsuite/libgomp.oacc-fortran/openacc_version-2.f90: Likewise. diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c index fe83981..949cc9a 100644 --- a/gcc/c-family/c-cppbuiltin.c +++ b/gcc/c-family/c-cppbuiltin.c @@ -1387,7 +1387,7 @@ c_cpp_builtins (cpp_reader *pfile) cpp_define (pfile, "__SSP__=1"); if (flag_openacc) - cpp_define (pfile, "_OPENACC=201510"); + cpp_define (pfile, "_OPENACC=201711"); if (flag_openmp) cpp_define (pfile, "_OPENMP=201511"); diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi index eab399d..085a871 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi @@ -2138,7 +2138,7 @@ freestanding and hosted environments. Enable handling of OpenACC directives @code{#pragma acc} in C/C++ and @code{!$acc} in Fortran. When @option{-fopenacc} is specified, the compiler generates accelerated code according to the OpenACC Application -Programming Interface v2.5 @w{@uref{https://www.openacc.org}}. This option +Programming Interface v2.6 @w{@uref{https://www.openacc.org}}. This option implies @option{-pthread}, and thus is only supported on targets that have support for @option{-pthread}. diff --git a/gcc/fortran/cpp.c b/gcc/fortran/cpp.c index 0d2af2e..11f97ab 100644 --- a/gcc/fortran/cpp.c +++ b/gcc/fortran/cpp.c @@ -165,7 +165,7 @@ cpp_define_builtins (cpp_reader *pfile) cpp_define (pfile, "_LANGUAGE_FORTRAN=1"); if (flag_openacc) - cpp_define (pfile, "_OPENACC=201510"); + cpp_define (pfile, "_OPENACC=201711"); if (flag_openmp) cpp_define (pfile, "_OPENMP=201511"); diff --git a/gcc/fortran/gfortran.texi b/gcc/fortran/gfortran.texi index 6dd6682..8cfe716 100644 --- a/gcc/fortran/gfortran.texi +++ b/gcc/fortran/gfortran.texi @@ -538,7 +538,7 @@ Additionally, the GNU Fortran compilers supports the OpenMP specification (version 4.0 and most of the features of the 4.5 version, @url{http://openmp.org/@/wp/@/openmp-specifications/}). There also is support for the OpenACC specification (targeting -version 2.5, @uref{http://www.openacc.org/}). See +version 2.6, @uref{http://www.openacc.org/}). See @uref{https://gcc.gnu.org/wiki/OpenACC} for more information. @node Varying Length Character Strings @@ -2132,7 +2132,7 @@ influence run-time behavior. GNU Fortran strives to be compatible to the @uref{http://www.openacc.org/, OpenACC Application Programming -Interface v2.5}. +Interface v2.6}. To enable the processing of the OpenACC directive @code{!$acc} in free-form source code; the @code{c$acc}, @code{*$acc} and @code{!$acc} diff --git a/gcc/fortran/intrinsic.texi b/gcc/fortran/intrinsic.texi index 761b575..df94873 100644 --- a/gcc/fortran/intrinsic.texi +++ b/gcc/fortran/intrinsic.texi @@ -14862,7 +14862,7 @@ kind @code{omp_proc_bind_kind}: @section OpenACC Module @code{OPENACC} @table @asis @item @emph{Standard}: -OpenACC Application Programming Interface v2.5 +OpenACC Application Programming Interface v2.6 @end table @@ -14876,9 +14876,9 @@ are listed below. For details refer to the actual @uref{http://www.openacc.org/, -OpenACC Application Programming Interface v2.5}. +OpenACC Application Programming Interface v2.6}. @code{OPENACC} provides the scalar default-integer named constant @code{openacc_version} with a value of the form @var{yyyymm}, where @code{yyyy} is the year and @var{mm} the month -of the OpenACC version; for OpenACC v2.5 the value is @code{201510}. +of the OpenACC version; for OpenACC v2.6 the value is @code{201711}. diff --git a/gcc/testsuite/c-c++-common/cpp/openacc-define-3.c b/gcc/testsuite/c-c++-common/cpp/openacc-define-3.c index 21a735a..f2122f5 100644 --- a/gcc/testsuite/c-c++-common/cpp/openacc-define-3.c +++ b/gcc/testsuite/c-c++-common/cpp/openacc-define-3.c @@ -6,6 +6,6 @@ # error _OPENACC not defined #endif -#if _OPENACC != 201510 +#if _OPENACC != 201711 # error _OPENACC defined to wrong value #endif diff --git a/gcc/testsuite/gfortran.dg/openacc-define-3.f90 b/gcc/testsuite/gfortran.dg/openacc-define-3.f90 index 47cb1b0..dcc52b6 100644 --- a/gcc/testsuite/gfortran.dg/openacc-define-3.f90 +++ b/gcc/testsuite/gfortran.dg/openacc-define-3.f90 @@ -6,6 +6,6 @@ # error _OPENACC not defined #endif -#if _OPENACC != 201510 +#if _OPENACC != 201711 # error _OPENACC defined to wrong value #endif diff --git a/libgomp/acc_prof.h b/libgomp/acc_prof.h index 9247790..fd11d4b 100644 --- a/libgomp/acc_prof.h +++ b/libgomp/acc_prof.h @@ -110,8 +110,8 @@ typedef struct acc_prof_info _ACC_PROF_VALID_BYTES_BASICTYPE (_acc_prof_int_t)) } acc_prof_info; -/* We implement the OpenACC 2.5 Profiling Interface. */ -#define _ACC_PROF_INFO_VERSION 201510 +/* We implement the OpenACC 2.6 Profiling Interface. */ +#define _ACC_PROF_INFO_VERSION 201711 typedef enum acc_construct_t { diff --git a/libgomp/libgomp.texi b/libgomp/libgomp.texi index 48afdb7..5db687c 100644 --- a/libgomp/libgomp.texi +++ b/libgomp/libgomp.texi @@ -1837,7 +1837,7 @@ good practice then to initialize the runtime with an explicit A complete description of all OpenACC directives accepted may be found in the @uref{https://www.openacc.org, OpenACC} Application Programming -Interface manual, version 2.5. +Interface manual, version 2.6. See @uref{https://gcc.gnu.org/wiki/OpenACC} for more information. @@ -1851,14 +1851,14 @@ See @uref{https://gcc.gnu.org/wiki/OpenACC} for more information. @chapter OpenACC Runtime Library Routines The runtime routines described here are defined by section 3 of the OpenACC -specification in version 2.0. +specification in version 2.6. They have C linkage, and do not throw exceptions. Generally, they are available only for the host, with the exception of @code{acc_on_device}, which is available for both the host and the acceleration device. This list has not yet been updated for the OpenACC specification in -version 2.5. +version 2.6. @menu * acc_get_num_devices:: Get number of devices for the given device @@ -1940,7 +1940,7 @@ for the device type specified in @var{devicetype}. @end multitable @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.0}, section +@uref{https://www.openacc.org, OpenACC specification v2.6}, section 3.2.1. @end table @@ -1965,7 +1965,7 @@ in @var{devicetype}, to use when executing a parallel or kernels region. @end multitable @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.0}, section +@uref{https://www.openacc.org, OpenACC specification v2.6}, section 3.2.2. @end table @@ -1990,7 +1990,7 @@ parallel or kernels region. @end multitable @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.0}, section +@uref{https://www.openacc.org, OpenACC specification v2.6}, section 3.2.3. @end table @@ -2017,7 +2017,7 @@ type @var{devicetype}. @end multitable @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.0}, section +@uref{https://www.openacc.org, OpenACC specification v2.6}, section 3.2.4. @end table @@ -2044,7 +2044,7 @@ region. @end multitable @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.0}, section +@uref{https://www.openacc.org, OpenACC specification v2.6}, section 3.2.5. @end table @@ -2111,8 +2111,8 @@ a zero and Fortran returns a @code{false}. @end multitable @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.0}, section -3.2.6. +@uref{https://www.openacc.org, OpenACC specification v2.6}, section +3.2.9. @end table @@ -2139,8 +2139,8 @@ Fortran returns a @code{false}. @end multitable @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.0}, section -3.2.7. +@uref{https://www.openacc.org, OpenACC specification v2.6}, section +3.2.10. @end table @@ -2167,8 +2167,8 @@ specified in @var{arg}. @end multitable @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.0}, section -3.2.8. +@uref{https://www.openacc.org, OpenACC specification v2.6}, section +3.2.11. @end table @@ -2192,8 +2192,8 @@ This function waits for the completion of all asynchronous operations. @end multitable @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.0}, section -3.2.10. +@uref{https://www.openacc.org, OpenACC specification v2.6}, section +3.2.13. @end table @@ -2218,8 +2218,8 @@ any queue. @end multitable @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.0}, section -3.2.11. +@uref{https://www.openacc.org, OpenACC specification v2.6}, section +3.2.14. @end table @@ -2243,8 +2243,8 @@ asynchronous operations enqueued on queue @var{arg}. @end multitable @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.0}, section -3.2.9. +@uref{https://www.openacc.org, OpenACC specification v2.6}, section +3.2.12. @end table @@ -2268,8 +2268,8 @@ This function initializes the runtime for the device type specified in @end multitable @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.0}, section -3.2.12. +@uref{https://www.openacc.org, OpenACC specification v2.6}, section +3.2.7. @end table @@ -2293,8 +2293,8 @@ This function shuts down the runtime for the device type specified in @end multitable @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.0}, section -3.2.13. +@uref{https://www.openacc.org, OpenACC specification v2.6}, section +3.2.8. @end table @@ -2324,8 +2324,8 @@ return @code{false}. @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.0}, section -3.2.14. +@uref{https://www.openacc.org, OpenACC specification v2.6}, section +3.2.17. @end table @@ -2343,8 +2343,8 @@ the device address of the allocated memory. @end multitable @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.0}, section -3.2.15. +@uref{https://www.openacc.org, OpenACC specification v2.6}, section +3.2.18. @end table @@ -2361,8 +2361,8 @@ Free previously allocated device memory at the device address @code{a}. @end multitable @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.0}, section -3.2.16. +@uref{https://www.openacc.org, OpenACC specification v2.6}, section +3.2.19. @end table @@ -2394,8 +2394,8 @@ variable or array element and @var{len} specifies the length in bytes. @end multitable @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.0}, section -3.2.17. +@uref{https://www.openacc.org, OpenACC specification v2.6}, section +3.2.20. @end table @@ -2434,8 +2434,8 @@ array element and @var{len} specifies the length in bytes. @end multitable @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.0}, section -3.2.18. +@uref{https://www.openacc.org, OpenACC specification v2.6}, section +3.2.20. @end table @@ -2467,8 +2467,8 @@ array element and @var{len} specifies the length in bytes. @end multitable @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.0}, section -3.2.19. +@uref{https://www.openacc.org, OpenACC specification v2.6}, section +3.2.21. @end table @@ -2508,8 +2508,8 @@ array element and @var{len} specifies the length in bytes. @end multitable @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.0}, section -3.2.20. +@uref{https://www.openacc.org, OpenACC specification v2.6}, section +3.2.21. @end table @@ -2540,8 +2540,8 @@ array element and @var{len} specifies the length in bytes. @end multitable @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.0}, section -3.2.21. +@uref{https://www.openacc.org, OpenACC specification v2.6}, section +3.2.22. @end table @@ -2572,8 +2572,8 @@ array element and @var{len} specifies the length in bytes. @end multitable @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.0}, section -3.2.22. +@uref{https://www.openacc.org, OpenACC specification v2.6}, section +3.2.23. @end table @@ -2605,8 +2605,8 @@ array element and @var{len} specifies the length in bytes. @end multitable @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.0}, section -3.2.23. +@uref{https://www.openacc.org, OpenACC specification v2.6}, section +3.2.24. @end table @@ -2638,8 +2638,8 @@ array element and @var{len} specifies the length in bytes. @end multitable @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.0}, section -3.2.24. +@uref{https://www.openacc.org, OpenACC specification v2.6}, section +3.2.25. @end table @@ -2658,8 +2658,8 @@ specified with the host address @var{h} and a length of @var{len}. @end multitable @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.0}, section -3.2.25. +@uref{https://www.openacc.org, OpenACC specification v2.6}, section +3.2.26. @end table @@ -2677,8 +2677,8 @@ specified by @var{h}. @end multitable @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.0}, section -3.2.26. +@uref{https://www.openacc.org, OpenACC specification v2.6}, section +3.2.27. @end table @@ -2696,8 +2696,8 @@ host address specified by @var{h}. @end multitable @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.0}, section -3.2.27. +@uref{https://www.openacc.org, OpenACC specification v2.6}, section +3.2.28. @end table @@ -2715,8 +2715,8 @@ device address specified by @var{d}. @end multitable @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.0}, section -3.2.28. +@uref{https://www.openacc.org, OpenACC specification v2.6}, section +3.2.29. @end table @@ -2754,8 +2754,8 @@ a @code{false} is return to indicate the mapped memory is not present. @end multitable @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.0}, section -3.2.29. +@uref{https://www.openacc.org, OpenACC specification v2.6}, section +3.2.30. @end table @@ -2774,8 +2774,8 @@ device memory specified by the device address @var{dest} for a length of @end multitable @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.0}, section -3.2.30. +@uref{https://www.openacc.org, OpenACC specification v2.6}, section +3.2.31. @end table @@ -2794,8 +2794,8 @@ device memory specified by the device address @var{dest} for a length of @end multitable @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.0}, section -3.2.31. +@uref{https://www.openacc.org, OpenACC specification v2.6}, section +3.2.32. @end table @@ -2813,7 +2813,7 @@ as used by the CUDA Runtime or Driver API's. @end multitable @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.0}, section +@uref{https://www.openacc.org, OpenACC specification v2.6}, section A.2.1.1. @end table @@ -2832,7 +2832,7 @@ as used by the CUDA Runtime or Driver API's. @end multitable @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.0}, section +@uref{https://www.openacc.org, OpenACC specification v2.6}, section A.2.1.2. @end table @@ -2851,7 +2851,7 @@ as used by the CUDA Runtime or Driver API's. @end multitable @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.0}, section +@uref{https://www.openacc.org, OpenACC specification v2.6}, section A.2.1.3. @end table @@ -2870,7 +2870,7 @@ the asynchronous value specified by @var{async}. @end multitable @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.0}, section +@uref{https://www.openacc.org, OpenACC specification v2.6}, section A.2.1.4. @end table @@ -2885,7 +2885,7 @@ A.2.1.4. The variables @env{ACC_DEVICE_TYPE}, @env{ACC_DEVICE_NUM}, and @code{ACC_PROFLIB} -are defined by section 4 of the OpenACC specification in version 2.5. +are defined by section 4 of the OpenACC specification in version 2.6. The variable @env{GCC_ACC_NOTIFY} is used for diagnostic purposes. @menu @@ -2901,7 +2901,7 @@ The variable @env{GCC_ACC_NOTIFY} is used for diagnostic purposes. @section @code{ACC_DEVICE_TYPE} @table @asis @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.5}, section +@uref{https://www.openacc.org, OpenACC specification v2.6}, section 4.1. @end table @@ -2911,7 +2911,7 @@ The variable @env{GCC_ACC_NOTIFY} is used for diagnostic purposes. @section @code{ACC_DEVICE_NUM} @table @asis @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.5}, section +@uref{https://www.openacc.org, OpenACC specification v2.6}, section 4.2. @end table @@ -2924,7 +2924,7 @@ The variable @env{GCC_ACC_NOTIFY} is used for diagnostic purposes. @ref{OpenACC Profiling Interface} @item @emph{Reference}: -@uref{https://www.openacc.org, OpenACC specification v2.5}, section +@uref{https://www.openacc.org, OpenACC specification v2.6}, section 4.3. @end table @@ -3141,7 +3141,7 @@ is called prior to a call to an OpenACC function, then you must call @code{acc_set_device_num()}@footnote{More complete information about @env{ACC_DEVICE_TYPE} and @env{ACC_DEVICE_NUM} can be found in sections 4.1 and 4.2 of the @uref{https://www.openacc.org, OpenACC -Application Programming Interface}, version 2.5.} +Application Programming Interface}, version 2.6.} @@ -3155,7 +3155,7 @@ Application Programming Interface}, version 2.5.} @section Implementation Status and Implementation-Defined Behavior We're implementing most of the Profiling Interface as defined by -the OpenACC 2.5 specification. The specification doesn't +the OpenACC 2.6 specification. The specification doesn't clearly define some aspects of its Profiling Interface, so we're clarifying these as @emph{implementation-defined behavior} here. We already have reported to the OpenACC Technical Committee some issues, diff --git a/libgomp/openacc.f90 b/libgomp/openacc.f90 index 3d3f7bb..ecfce3a 100644 --- a/libgomp/openacc.f90 +++ b/libgomp/openacc.f90 @@ -857,7 +857,7 @@ module openacc public :: acc_copyin_async, acc_create_async, acc_copyout_async public :: acc_delete_async, acc_update_device_async, acc_update_self_async - integer, parameter :: openacc_version = 201510 + integer, parameter :: openacc_version = 201711 interface acc_get_num_devices procedure :: acc_get_num_devices_h diff --git a/libgomp/openacc_lib.h b/libgomp/openacc_lib.h index d04dc79..dcb2453 100644 --- a/libgomp/openacc_lib.h +++ b/libgomp/openacc_lib.h @@ -50,7 +50,7 @@ integer (acc_handle_kind), parameter :: acc_async_noval = -1 integer (acc_handle_kind), parameter :: acc_async_sync = -2 - integer, parameter :: openacc_version = 201510 + integer, parameter :: openacc_version = 201711 interface acc_get_num_devices function acc_get_num_devices_h (d) diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/acc_prof-version-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/acc_prof-version-1.c index b0b8934..11e3ad7 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/acc_prof-version-1.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/acc_prof-version-1.c @@ -11,7 +11,7 @@ void cb_any_event (acc_prof_info *prof_info, acc_event_info *event_info, acc_api { DEBUG_printf ("%s %d\n", __FUNCTION__, prof_info->event_type); - assert (prof_info->version == 201510); + assert (prof_info->version == 201711); } void acc_register_library (acc_prof_reg reg_, acc_prof_reg unreg_, acc_prof_lookup_func lookup_) diff --git a/libgomp/testsuite/libgomp.oacc-fortran/openacc_version-1.f b/libgomp/testsuite/libgomp.oacc-fortran/openacc_version-1.f index 59dff67..36e9844 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/openacc_version-1.f +++ b/libgomp/testsuite/libgomp.oacc-fortran/openacc_version-1.f @@ -4,6 +4,6 @@ implicit none include "openacc_lib.h" - if (openacc_version .ne. 201510) STOP 1 + if (openacc_version .ne. 201711) STOP 1 end program main diff --git a/libgomp/testsuite/libgomp.oacc-fortran/openacc_version-2.f90 b/libgomp/testsuite/libgomp.oacc-fortran/openacc_version-2.f90 index 75afed96..e815bc1 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/openacc_version-2.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/openacc_version-2.f90 @@ -4,6 +4,6 @@ program main use openacc implicit none - if (openacc_version .ne. 201510) STOP 1 + if (openacc_version .ne. 201711) STOP 1 end program main