*_wait* routines changed parameter from ptr to ivars to match OpenSHMEM

src/reverse_offload/context_ro_host.hpp

@@ -148,42 +148,42 @@ class ROHostContext : public Context {
                        int nreduce);
 
   template <typename T>
-  __host__ void wait_until(T *ptr, roc_shmem_cmps cmp, T val);
+  __host__ void wait_until(T *ivars, roc_shmem_cmps cmp, T val);
 
   template <typename T>
-  __host__ void wait_until_all(T* ptr, size_t nelems,
+  __host__ void wait_until_all(T *ivars, size_t nelems,
                                const int *status,
                                roc_shmem_cmps cmp, T val);
 
   template <typename T>
-  __host__ size_t wait_until_any(T* ptr, size_t nelems,
+  __host__ size_t wait_until_any(T *ivars, size_t nelems,
                                  const int *status,
                                  roc_shmem_cmps cmp, T val);
 
   template <typename T>
-  __host__ size_t wait_until_some(T* ptr, size_t nelems,
+  __host__ size_t wait_until_some(T *ivars, size_t nelems,
                                 size_t* indices,
                                 const int *status,
                                 roc_shmem_cmps cmp, T val);
 
   template <typename T>
-  __host__ void wait_until_all_vector(T* ptr, size_t nelems,
+  __host__ void wait_until_all_vector(T *ivars, size_t nelems,
                                       const int *status,
                                       roc_shmem_cmps cmp, T* vals);
 
   template <typename T>
-  __host__ size_t wait_until_any_vector(T* ptr, size_t nelems,
+  __host__ size_t wait_until_any_vector(T *ivars, size_t nelems,
                                         const int *status,
                                         roc_shmem_cmps cmp, T* vals);
 
   template <typename T>
-  __host__ size_t wait_until_some_vector(T* ptr, size_t nelems,
+  __host__ size_t wait_until_some_vector(T *ivars, size_t nelems,
                                        size_t* indices,
                                        const int *status,
                                        roc_shmem_cmps cmp, T* vals);
 
   template <typename T>
-  __host__ int test(T *ptr, roc_shmem_cmps cmp, T val);
+  __host__ int test(T *ivars, roc_shmem_cmps cmp, T val);
 };
 
 }  // namespace rocshmem

src/reverse_offload/context_ro_tmpl_host.hpp

@@ -141,58 +141,58 @@ __host__ void ROHostContext::to_all(roc_shmem_team_t team, T *dest,
 }
 
 template <typename T>
-__host__ void ROHostContext::wait_until(T *ptr, roc_shmem_cmps cmp, T val) {
-  host_interface->wait_until<T>(ptr, cmp, val, context_window_info);
+__host__ void ROHostContext::wait_until(T *ivars, roc_shmem_cmps cmp, T val) {
+  host_interface->wait_until<T>(ivars, cmp, val, context_window_info);
 }
 
 template <typename T>
-__host__ size_t ROHostContext::wait_until_any(T* ptr, size_t nelems,
+__host__ size_t ROHostContext::wait_until_any(T *ivars, size_t nelems,
       const int *status, roc_shmem_cmps cmp, T val) {
-  return host_interface->wait_until_any<T>(ptr, nelems, status, cmp, val, context_window_info);
+  return host_interface->wait_until_any<T>(ivars, nelems, status, cmp, val, context_window_info);
 }
 
 template <typename T>
 __host__
-void ROHostContext::wait_until_all(T* ptr, size_t nelems,
+void ROHostContext::wait_until_all(T *ivars, size_t nelems,
     const int *status, roc_shmem_cmps cmp, T val) {
-  host_interface->wait_until_all(ptr, nelems, status, cmp, val, context_window_info);
+  host_interface->wait_until_all(ivars, nelems, status, cmp, val, context_window_info);
 }
 
 template <typename T>
 __host__
-size_t ROHostContext::wait_until_some(T* ptr, size_t nelems,
+size_t ROHostContext::wait_until_some(T *ivars, size_t nelems,
                               size_t* indices,
                               const int *status,
                               roc_shmem_cmps cmp, T val) {
-  return host_interface->wait_until_some(ptr, nelems, indices, status, cmp, val, context_window_info);
+  return host_interface->wait_until_some(ivars, nelems, indices, status, cmp, val, context_window_info);
 }
 
 template <typename T>
 __host__
-void ROHostContext::wait_until_all_vector(T* ptr, size_t nelems,
+void ROHostContext::wait_until_all_vector(T *ivars, size_t nelems,
                                     const int *status,
                                     roc_shmem_cmps cmp, T* vals) {
-  host_interface->wait_until_all_vector(ptr, nelems, status, cmp, vals, context_window_info);
+  host_interface->wait_until_all_vector(ivars, nelems, status, cmp, vals, context_window_info);
 }
 
 template <typename T>
-__host__ size_t ROHostContext::wait_until_any_vector(T* ptr, size_t nelems,
+__host__ size_t ROHostContext::wait_until_any_vector(T *ivars, size_t nelems,
                                       const int *status,
                                       roc_shmem_cmps cmp, T* vals) {
-  return host_interface->wait_until_any_vector(ptr, nelems, status, cmp, vals, context_window_info);
+  return host_interface->wait_until_any_vector(ivars, nelems, status, cmp, vals, context_window_info);
 }
 
 template <typename T>
-__host__ size_t ROHostContext::wait_until_some_vector(T* ptr, size_t nelems,
+__host__ size_t ROHostContext::wait_until_some_vector(T *ivars, size_t nelems,
                                      size_t* indices,
                                      const int *status,
                                      roc_shmem_cmps cmp, T* vals) {
-  return host_interface->wait_until_some_vector(ptr, nelems, indices, status, cmp, vals, context_window_info);
+  return host_interface->wait_until_some_vector(ivars, nelems, indices, status, cmp, vals, context_window_info);
 }
 
 template <typename T>
-__host__ int ROHostContext::test(T *ptr, roc_shmem_cmps cmp, T val) {
-  return host_interface->test<T>(ptr, cmp, val, context_window_info);
+__host__ int ROHostContext::test(T *ivars, roc_shmem_cmps cmp, T val) {
+  return host_interface->test<T>(ivars, cmp, val, context_window_info);
 }
 
 }  // namespace rocshmem