[OpenACC][NFC] Name OpenMP extensions' parameters consistently

Author: jdenny-ornl

clang/README-OpenACC-design.md

@@ -1868,12 +1868,12 @@ mapping relies on the following OpenMP extensions, which are
 implemented in Clacc's version of LLVM's OpenMP runtime library:
 
 * `size_t omp_get_accessible_buffer(const void *ptr, size_t size, int device_num, void **buffer_host, void **buffer_device);`
-* `void *omp_target_map_to(void *, size_t, int);`
-* `void *omp_target_map_alloc(void *, size_t, int);`
-* `void omp_target_map_from(void *, size_t, int);`
-* `void omp_target_map_from_delete(void *, size_t, int);`
-* `void omp_target_map_release(void *, size_t, int);`
-* `void omp_target_map_delete(void *, size_t, int);`
+* `void *omp_target_map_to(void *ptr, size_t size, int device_num);`
+* `void *omp_target_map_alloc(void *ptr, size_t size, int device_num);`
+* `void omp_target_map_from(void *ptr, size_t size, int device_num);`
+* `void omp_target_map_from_delete(void *ptr, size_t size, int device_num);`
+* `void omp_target_map_release(void *ptr, size_t size, int device_num);`
+* `void omp_target_map_delete(void *ptr, size_t size, int device_num);`
 
 Support for the OpenACC Profiling Interface appears primarily in the
 source file `openmp/libacc2omp/src/prof.cpp`.  It is documented in the

openmp/libomptarget/include/omptarget.h

@@ -156,12 +156,12 @@ int omp_target_disassociate_ptr(void *host_ptr, int device_num);
 void *omp_get_mapped_ptr(const void *ptr, int device_num);
 size_t omp_get_accessible_buffer(const void *ptr, size_t size, int device_num,
                                  void **buffer_host, void **buffer_device);
-void *omp_target_map_to(void *, size_t, int);
-void omp_target_map_from(void *, size_t, int);
-void omp_target_map_from_delete(void *, size_t, int);
-void *omp_target_map_alloc(void *, size_t, int);
-void omp_target_map_release(void *, size_t, int);
-void omp_target_map_delete(void *, size_t, int);
+void *omp_target_map_to(void *ptr, size_t size, int device_num);
+void omp_target_map_from(void *ptr, size_t size, int device_num);
+void omp_target_map_from_delete(void *ptr, size_t size, int device_num);
+void *omp_target_map_alloc(void *ptr, size_t size, int device_num);
+void omp_target_map_release(void *ptr, size_t size, int device_num);
+void omp_target_map_delete(void *ptr, size_t size, int device_num);
 
 /// add the clauses of the requires directives in a given file
 void __tgt_register_requires(int64_t flags);

openmp/libomptarget/src/api.cpp

@@ -567,56 +567,52 @@ EXTERN int omp_target_disassociate_ptr(void *host_ptr, int device_num) {
   return rc;
 }
 
-EXTERN void *omp_target_map_to(void *host_ptr, size_t size, int device_num) {
+EXTERN void *omp_target_map_to(void *ptr, size_t size, int device_num) {
   int64_t tgt_map_type = OMP_TGT_MAPTYPE_TO;
   int64_t s = size;
   OMPT_SET_DIRECTIVE_INFO(ompt_directive_omp_target_map_to);
-  __tgt_target_data_begin(device_num, 1, &host_ptr, &host_ptr, &s,
-                          &tgt_map_type);
+  __tgt_target_data_begin(device_num, 1, &ptr, &ptr, &s, &tgt_map_type);
   OMPT_CLEAR_DIRECTIVE_INFO();
-  return omp_get_mapped_ptr(host_ptr, device_num);
+  return omp_get_mapped_ptr(ptr, device_num);
 }
 
-EXTERN void *omp_target_map_alloc(void *host_ptr, size_t size, int device_num) {
+EXTERN void *omp_target_map_alloc(void *ptr, size_t size, int device_num) {
   int64_t tgt_map_type = OMP_TGT_MAPTYPE_NONE;
   int64_t s = size;
   OMPT_SET_DIRECTIVE_INFO(ompt_directive_omp_target_map_alloc);
-  __tgt_target_data_begin(device_num, 1, &host_ptr, &host_ptr, &s,
-                          &tgt_map_type);
+  __tgt_target_data_begin(device_num, 1, &ptr, &ptr, &s, &tgt_map_type);
   OMPT_CLEAR_DIRECTIVE_INFO();
-  return omp_get_mapped_ptr(host_ptr, device_num);
+  return omp_get_mapped_ptr(ptr, device_num);
 }
 
-EXTERN void omp_target_map_from(void *host_ptr, size_t size, int device_num) {
+EXTERN void omp_target_map_from(void *ptr, size_t size, int device_num) {
   int64_t tgt_map_type = OMP_TGT_MAPTYPE_FROM;
   int64_t s = size;
   OMPT_SET_DIRECTIVE_INFO(ompt_directive_omp_target_map_from);
-  __tgt_target_data_end(device_num, 1, &host_ptr, &host_ptr, &s, &tgt_map_type);
+  __tgt_target_data_end(device_num, 1, &ptr, &ptr, &s, &tgt_map_type);
   OMPT_CLEAR_DIRECTIVE_INFO();
 }
 
-EXTERN void omp_target_map_from_delete(void *host_ptr, size_t size,
-                                       int device_num) {
+EXTERN void omp_target_map_from_delete(void *ptr, size_t size, int device_num) {
   int64_t tgt_map_type = OMP_TGT_MAPTYPE_FROM | OMP_TGT_MAPTYPE_DELETE;
   int64_t s = size;
   OMPT_SET_DIRECTIVE_INFO(ompt_directive_omp_target_map_from_delete);
-  __tgt_target_data_end(device_num, 1, &host_ptr, &host_ptr, &s, &tgt_map_type);
+  __tgt_target_data_end(device_num, 1, &ptr, &ptr, &s, &tgt_map_type);
   OMPT_CLEAR_DIRECTIVE_INFO();
 }
 
-EXTERN void omp_target_map_release(void *host_ptr, size_t size,
-                                   int device_num) {
+EXTERN void omp_target_map_release(void *ptr, size_t size, int device_num) {
   int64_t tgt_map_type = OMP_TGT_MAPTYPE_NONE;
   int64_t s = size;
   OMPT_SET_DIRECTIVE_INFO(ompt_directive_omp_target_map_release);
-  __tgt_target_data_end(device_num, 1, &host_ptr, &host_ptr, &s, &tgt_map_type);
+  __tgt_target_data_end(device_num, 1, &ptr, &ptr, &s, &tgt_map_type);
   OMPT_CLEAR_DIRECTIVE_INFO();
 }
 
-EXTERN void omp_target_map_delete(void *host_ptr, size_t size, int device_num) {
+EXTERN void omp_target_map_delete(void *ptr, size_t size, int device_num) {
   int64_t tgt_map_type = OMP_TGT_MAPTYPE_DELETE;
   int64_t s = size;
   OMPT_SET_DIRECTIVE_INFO(ompt_directive_omp_target_map_delete);
-  __tgt_target_data_end(device_num, 1, &host_ptr, &host_ptr, &s, &tgt_map_type);
+  __tgt_target_data_end(device_num, 1, &ptr, &ptr, &s, &tgt_map_type);
   OMPT_CLEAR_DIRECTIVE_INFO();
 }

openmp/runtime/src/include/omp.h.var

@@ -201,8 +201,8 @@
     //   - A "to" or "alloc" map type.
     //   - A locator for the specified host memory range.
     // The result is a pointer to the device allocation.
-    extern void *__KAI_KMPC_CONVENTION omp_target_map_to(void *, size_t, int);
-    extern void *__KAI_KMPC_CONVENTION omp_target_map_alloc(void *, size_t, int);
+    extern void *__KAI_KMPC_CONVENTION omp_target_map_to(void *ptr, size_t size, int device_num);
+    extern void *__KAI_KMPC_CONVENTION omp_target_map_alloc(void *ptr, size_t size, int device_num);
 
     // Same as an OpenMP "target exit data" construct with:
     // - A device clause for the specified device number.
@@ -212,10 +212,10 @@
     // In the case of "omp_target_map_from_delete", the behavior is that of two
     // map clauses, such that both the transfer and deallocation occurs, except
     // that two map clauses for the same variable isn't supported yet.
-    extern void __KAI_KMPC_CONVENTION omp_target_map_from(void *, size_t, int);
-    extern void __KAI_KMPC_CONVENTION omp_target_map_from_delete(void *, size_t, int);
-    extern void __KAI_KMPC_CONVENTION omp_target_map_release(void *, size_t, int);
-    extern void __KAI_KMPC_CONVENTION omp_target_map_delete(void *, size_t, int);
+    extern void __KAI_KMPC_CONVENTION omp_target_map_from(void *ptr, size_t size, int device_num);
+    extern void __KAI_KMPC_CONVENTION omp_target_map_from_delete(void *ptr, size_t size, int device_num);
+    extern void __KAI_KMPC_CONVENTION omp_target_map_release(void *ptr, size_t size, int device_num);
+    extern void __KAI_KMPC_CONVENTION omp_target_map_delete(void *ptr, size_t size, int device_num);
 
     /* kmp API functions */
     extern int    __KAI_KMPC_CONVENTION  kmp_get_stacksize          (void);