WiP: resolved some minor errors that raised from the initial clone of the branch

.gitignore

@@ -13,3 +13,4 @@ gpufort.h
 gpufort_reductions.h
 render*.template.*
 render.py.in
+.vscode/settings.json

python/gpufort/scanner/parser.py

@@ -629,6 +629,7 @@ def is_end_statement_(tokens, kind):
                     current_linemap["statements"]):
                 try:
                     expand_statement_functions_(current_statement)
+                    original_statement = current_statement["body"]
                     original_statement_lower = current_statement["body"].lower()
                     util.logging.log_debug4(opts.log_prefix,"parse_file","parsing statement '{}' associated with lines [{},{}]".format(original_statement_lower.rstrip(),\
                         current_linemap["lineno"],current_linemap["lineno"]+len(current_linemap["lines"])-1))

python/gpufort/util/parsing/parsing.py

@@ -1942,7 +1942,6 @@ def is_declaration(tokens):
 def is_blank_line(statement):
     return not len(statement.strip())
 
-
 def is_fortran_directive(statement,modern_fortran):
     """If the statement is a directive."""
     return len(statement) > 2 and (modern_fortran and statement.lstrip()[0:2] == "!$" 

runtime/gpufortrt/Makefile

@@ -31,8 +31,8 @@ $(CXX_OBJ): %.cpp.o: %.cpp
 $(F_OBJ): %.o: %.f90
 	$(FC) -c $< $(FCFLAGS)
 
-codegen:
-	python3 codegen.py src/gpufortrt_api.template.f90 -d 7
+# codegen:
+# 	python3 codegen.py src/gpufortrt_api.template.f90 -d 7
 
 clean_all:
 	rm -f *.o *.mod *.a

runtime/gpufortrt/include/gpufortrt_api.h

@@ -9,13 +9,18 @@ extern "C" {
 
   void gpufortrt_set_device_num(int dev_num);
   int gpufortrt_get_device_num();
-
+  // Explicit Fortran interfaces that assume device number starts from 1
+  void gpufortrt_set_device_num_f(int dev_num);
+  int gpufortrt_get_device_num_f();
+
   size_t gpufortrt_get_property(int dev_num,
                                 gpufortrt_device_property_t property);
   const 
   char* gpufortrt_get_property_string(int dev_num,
                                       gpufortrt_device_property_t property);
-
+  size_t gpufortrt_get_property_f(int dev_num, gpufortrt_device_property_t property);
+  const char* gpufortrt_get_property_string_f(int dev_num, gpufortrt_device_property_t property);
+
   void gpufortrt_init();
   void gpufortrt_shutdown();
 
@@ -84,6 +89,10 @@ extern "C" {
   void* gpufortrt_present(
           void* hostptr,
           std::size_t num_bytes);
+
+  bool gpufortrt_is_present(
+          void* hostptr,
+          std::size_t num_bytes);
 
   void* gpufortrt_create(
           void* hostptr,
@@ -140,13 +149,24 @@ extern "C" {
                             bool if_arg);
   void gpufortrt_wait_all_async(int* async_arg,int num_async,
                                 bool if_arg);
-
+  void gpufortrt_wait_device(int* wait_arg, int num_wait, 
+                             int dev_num, bool if_arg);
+  void gpufortrt_wait_device_async(int* wait_arg, int num_wait, 
+                                   int* async_arg, int num_async, 
+                                   int dev_num, bool if_arg);
+  void gpufortrt_wait_all_device(int dev_num, bool if_arg);
+  void gpufortrt_wait_all_device_async(int* async_arg, int num_async, 
+                                 int dev_num, bool if_arg);
   int gpufortrt_async_test(int wait_arg);
   int gpufortrt_async_test_device(int wait_arg, int dev_num);
   int gpufortrt_async_test_all(void);
   int gpufortrt_async_test_all_device(int dev_num);
 
   gpufortrt_queue_t gpufortrt_get_stream(int async_arg);
+  void* gpufortrt_malloc(size_t bytes);
+  void gpufortrt_free(void* data_dev);
+  void gpufortrt_map_data(void* data_arg, void* data_dev,
+                        size_t bytes);
 
   /** \return device pointer associated with `hostptr`, or nullptr.
    *  First searches through the structured region stack and then

runtime/gpufortrt/include/gpufortrt_types.h

@@ -12,7 +12,7 @@ extern "C" {
   extern int gpufortrt_async_sync;
   extern int gpufortrt_async_default;
 
-  enum gpufortrt_property_t {
+  enum gpufortrt_device_property_t {
     gpufortrt_property_memory = 0,//>integer,  size of device memory in bytes
     gpufortrt_property_free_memory,//>integer,  free device memory in bytes
     gpufortrt_property_shared_memory_support,//>integer,  nonzero if the specified device supports sharing memory with the local thread

runtime/gpufortrt/include/openacc.h

@@ -2,10 +2,11 @@
 // Copyright (c) 2020-2022 Advanced Micro Devices, Inc. All rights reserved.
 #ifndef OPENACC_LIB_H
 #define OPENACC_LIB_H
+#include "gpufortrt_types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "gpufortrt_types.h"
+
 
 extern int acc_async_noval;
 extern int acc_async_sync;
@@ -16,18 +17,17 @@ extern int acc_async_default;
 
 /** \note Enum values assigned according to `acc_set_device_num` description.*/
 enum acc_device_t {
-  acc_device_default = -1,
-  acc_device_all = 0,     
-  acc_device_none = 1,
+  acc_device_none = 0,
+  acc_device_default,
   acc_device_host,
-  acc_device_current,
   acc_device_not_host,
-  acc_device_hip = acc_device_not_host,
-  acc_device_radeon = acc_device_hip,
-  acc_device_nvidia = acc_device_hip
+  acc_device_current,
+  acc_device_hip,
+  acc_device_radeon,
+  acc_device_nvidia
 };
 
-enum acc_property_t {
+enum acc_device_property_t {
   acc_property_memory = 0,//>integer,  size of device memory in bytes
   acc_property_free_memory,//>integer,  free device memory in bytes
   acc_property_shared_memory_support,//>integer,  nonzero if the specified device supports sharing memory with the local thread
@@ -51,7 +51,9 @@ void acc_set_device_type(acc_device_t dev_type);
 acc_device_t acc_get_device_type(void);
 
 void acc_set_device_num(int dev_num, acc_device_t dev_type);
+void acc_set_device_num_f(int dev_num, acc_device_t dev_type);
 int acc_get_device_num(acc_device_t dev_type);
+int acc_get_device_num_f(acc_device_t dev_type);
 
 size_t acc_get_property(int dev_num,
                         acc_device_t dev_type,
@@ -61,7 +63,14 @@ char* acc_get_property_string(int dev_num,
                               acc_device_t dev_type,
                               acc_device_property_t property);
 
-void acc_init(acc_on_device_t dev_type);
+size_t acc_get_property_f(int dev_num,
+                        acc_device_t dev_type,
+                        acc_device_property_t property);
+const 
+char* acc_get_property_string_f(int dev_num,
+                              acc_device_t dev_type,
+                              acc_device_property_t property);
+void acc_init(acc_device_t dev_type);
 void acc_shutdown(acc_device_t dev_type);
 
 int acc_async_test(int wait_arg);
@@ -72,9 +81,8 @@ int acc_async_test_all_device(int dev_num);
 void acc_wait(int wait_arg);
 void acc_wait_device(int wait_arg, int dev_num);
 void acc_wait_async(int wait_arg, int async_arg);
-void acc_wait_device_async(int wait_arg, int async_arg,
-int dev_num);
-void acc_wait_all(void);
+void acc_wait_device_async(int wait_arg, int async_arg, int dev_num);
+void acc_wait_all();
 void acc_wait_all_device(int dev_num);
 void acc_wait_all_async(int async_arg);
 void acc_wait_all_device_async(int async_arg, int dev_num);
@@ -141,7 +149,7 @@ void acc_memcpy_from_device(h_void* data_host_dest,
                             d_void* data_dev_src, size_t bytes);
 void acc_memcpy_from_device_async(h_void* data_host_dest,
                                   d_void* data_dev_src, size_t bytes,
-                                  int async_arg)
+                                  int async_arg);
 
 void acc_attach(h_void** ptr_addr);
 void acc_attach_async(h_void** ptr_addr, int async_arg);

runtime/gpufortrt/openacc_library_routines.md

@@ -0,0 +1,57 @@
+---
+geometry: margin=2cm
+---
+
+# Implemented API
+
+| API | Lang\* | OpenACC | GPUFORTRT\*\* | Priority\*\*\* | 
+|-----|--------|---------|-------------|----------|
+|acc\_get\_num\_devices|C/C++, Fortran|implemented|implemented|high|
+|acc\_set\_device\_type|C/C++, Fortran|implemented|implemented|high|
+|acc\_get\_device\_type|C/C++, Fortran|implemented|implemented|high|
+|acc\_set\_device\_num|C/C++, Fortran|implemented|implemented||
+|acc\_get\_device\_num|C/C++, Fortran|implemented|implemented||
+|acc\_get\_property|C/C++, Fortran|implemented|implemented||
+|acc\_init|C/C++, Fortran|implemented|implemented||
+|acc\_shutdown|C/C++, Fortran|implemented|implemented||
+|acc\_async\_test|C/C++, Fortran|implemented|implemented||
+|acc\_async\_test\_device|C/C++, Fortran|implemented|implemented||
+|acc\_async\_test\_all|C/C++, Fortran|implemented|implemented||
+|acc\_async\_test\_all\_device|C/C++, Fortran|implemented|implemented||
+|acc\_wait|C/C++, Fortran|implemented|implemented||
+|acc\_wait\_device|C/C++, Fortran|implemented|implemented|high|
+|acc\_wait\_async|C/C++, Fortran|implemented|implemented||
+|acc\_wait\_device\_async|C/C++, Fortran|implemented|implemented|high|
+|acc\_wait\_all|C/C++, Fortran|implemented|implemented||
+|acc\_wait\_all\_device|C/C++, Fortran|implemented|implemented|high|
+|acc\_wait\_all\_async|C/C++, Fortran|implemented|implemented||
+|acc\_wait\_all\_device\_async|C/C++, Fortran|implemented|implemented|high|
+|acc\_get\_default\_async|C/C++, Fortran|implemented|implemented||
+|acc\_set\_default\_async|C/C++, Fortran|implemented|implemented||
+|acc\_on\_device||||low|
+|acc\_malloc||||low|
+|acc\_free||||low|
+|acc\_copyin|C/C++, Fortran|implemented|implemented||
+|acc\_create|C/C++, Fortran|implemented|implemented||
+|acc\_copyout|C/C++, Fortran|implemented|implemented||
+|acc\_delete|C/C++, Fortran|implemented|implemented||
+|acc\_update\_device|C/C++, Fortran|implemented|implemented||
+|acc\_update\_self|C/C++, Fortran|implemented|implemented||
+|acc\_map\_data||||low|
+|acc\_unmap\_data||||low|
+|acc\_deviceptr|C/C++||implemented||
+|acc\_hostptr|C/C++|||low|
+|acc\_is\_present|||implemented||
+|acc\_memcpy\_to\_device||||low|
+|acc\_memcpy\_from\_device||||low|
+|acc\_memcpy\_device||||low|
+|acc\_attach||||low|
+|acc\_detach||||low|
+|acc\_memcpy\_d2d||||low|
+
+Remarks:
+
+* \* While some APIs are exposed only to C according to the OpenACC standard, `GPUFORTRT` may expose some C interfaces also to Fortran. An \* indicates that this feature was exposed by the GPUFORTRT to Fortran despite the OpenACC standard not requiring this.
+* \*\* `GPUFORTRT` signatures are prefixd by `gpufortrt_` instead of `acc_` and the number and meaning of 
+arguments may differ compared to the OpenACC signature.
+* \*\*\* Current priorities for implementing missing APIs. This column will disappear as soon as all are implemented.

runtime/gpufortrt/rules.mk

@@ -2,7 +2,7 @@ HIP_PLATFORM ?= amd
 LIBGPUFORTRT  = libgpufortrt_$(HIP_PLATFORM).a
 
 FC      = gfortran -fmax-errors=5
-FCFLAGS ?= -std=f2008 -ffree-line-length-none -cpp
+FCFLAGS ?= -ffree-line-length-none -cpp
 
 #FCFLAGS += -g -ggdb -O0 -fbacktrace -fmax-errors=5 # -DDEBUG=3