(Closes #1664) Add ACCWaitDirective and async keyword on kernels, enter data, parallel

src/psyclone/f2pygen.py

@@ -161,7 +161,10 @@ class ACCDirective(Directive):
                          'loop').
     '''
     def __init__(self, root, line, position, dir_type):
-        self._types = ["parallel", "kernels", "enter data", "loop", "routine"]
+        self._types = [
+            "parallel", "kernels", "enter data", "loop", "routine",
+            "wait"
+        ]
         self._positions = ["begin", "end"]
 
         super(ACCDirective, self).__init__(root, line, position, dir_type)

src/psyclone/psyGen.py

@@ -35,6 +35,8 @@
 # Modified by I. Kavcic and L. Turner, Met Office
 # Modified by C.M. Maynard, Met Office / University of Reading
 # Modified by J. Henrichs, Bureau of Meteorology
+# Modified S. Valat, Inria / Laboratoire Jean Kuntzmann
+# Modified M. Schreiber, Univ. Grenoble Alpes / Inria / Lab. Jean Kuntzmann
 # -----------------------------------------------------------------------------
 
 ''' This module provides generic support for PSyclone's PSy code optimisation
@@ -2582,11 +2584,11 @@ class KernelArgument(Argument):
     arguments as specified by the kernel argument metadata and the
     kernel invocation in the Algorithm layer.
 
-    :param arg: information obtained from the metadata for this kernel \
-                argument.
+    :param arg: information obtained from the metadata for this kernel
+        argument.
     :type arg: :py:class:`psyclone.parse.kernel.Descriptor`
-    :param arg_info: information on how this argument is specified in \
-                     the Algorithm layer.
+    :param arg_info: information on how this argument is specified in
+        the Algorithm layer.
     :type arg_info: :py:class:`psyclone.parse.algorithm.Arg`
     :param call: the PSyIR kernel node to which this argument pertains.
     :type call: :py:class:`psyclone.psyGen.Kern`

src/psyclone/psyir/nodes/__init__.py

@@ -84,7 +84,7 @@
     ACCDirective, ACCLoopDirective, ACCEnterDataDirective,
     ACCParallelDirective, ACCKernelsDirective, ACCDataDirective,
     ACCUpdateDirective, ACCStandaloneDirective, ACCRegionDirective,
-    ACCRoutineDirective, ACCAtomicDirective)
+    ACCRoutineDirective, ACCAtomicDirective, ACCWaitDirective)
 from psyclone.psyir.nodes.omp_directives import (
     OMPDirective, OMPDoDirective, OMPParallelDirective,
     OMPParallelDoDirective, OMPSingleDirective, OMPMasterDirective,