address review comments

Author: adurang

offload/include/OpenMP/InteropAPI.h

@@ -28,10 +28,9 @@ struct interop_attrs_t {
   bool inorder : 1;
   int reserved : 31;
 
-  /* Check if the supported attributes are compatible with the current
-     attributes. Only if an attribute is supported can the value be true,
-     otherwise it needs to be false
-  */
+  /// Check if the supported attributes are compatible with the current
+  ///   attributes. Only if an attribute is supported can the value be true,
+  ///   otherwise it needs to be false
   bool checkSupportedOnly(interop_attrs_t supported) const {
     return supported.inorder || (!supported.inorder && !inorder);
   }
@@ -167,7 +166,7 @@ struct InteropTableEntry {
     }
   }
 
-  /* vector interface */
+  /// vector interface
   int size() const { return Interops.size(); }
   iterator begin() { return Interops.begin(); }
   iterator end() { return Interops.end(); }
@@ -179,4 +178,6 @@ struct InteropTblTy
   void clear();
 };
 
+void syncImplicitInterops(int gtid, void *event);
+
 #endif // OMPTARGET_OPENMP_INTEROP_API_H

offload/libomptarget/OpenMP/API.cpp

@@ -16,6 +16,7 @@
 #include "rtl.h"
 
 #include "OpenMP/InternalTypes.h"
+#include "OpenMP/InteropAPI.h"
 #include "OpenMP/Mapping.h"
 #include "OpenMP/OMPT/Interface.h"
 #include "OpenMP/omp.h"
@@ -684,7 +685,6 @@ EXTERN void *omp_get_mapped_ptr(const void *Ptr, int DeviceNum) {
   return TPR.TargetPointer;
 }
 
-void syncImplicitInterops(int gtid, void *event);
 // This routine gets called from the Host RTL at sync points (taskwait, barrier,
 // ...) so we can synchronize the necessary objects from the offload side.
 EXTERN void __tgt_target_sync(ident_t *loc_ref, int gtid, void *current_task,

offload/libomptarget/OpenMP/InteropAPI.cpp

@@ -227,10 +227,9 @@ omp_interop_val_t *__tgt_interop_get(ident_t *LocRef, int32_t InteropType,
 
   auto DeviceOrErr = PM->getDevice(DeviceNum);
   if (!DeviceOrErr) {
-    [[maybe_unused]] std::string ErrStr = toString(DeviceOrErr.takeError());
     DP("Couldn't find device %" PRId64
        " while constructing interop object: %s\n",
-       DeviceNum, ErrStr.c_str());
+       DeviceNum, toString(DeviceOrErr.takeError()).c_str());
     return omp_interop_none;
   }
   auto &Device = *DeviceOrErr;
@@ -280,18 +279,18 @@ omp_interop_val_t *__tgt_interop_get(ident_t *LocRef, int32_t InteropType,
 
 int __tgt_interop_use(ident_t *LocRef, omp_interop_val_t *Interop,
                       interop_ctx_t *Ctx, dep_pack_t *Deps) {
-  bool nowait = Ctx->flags.nowait;
+  bool Nowait = Ctx->flags.nowait;
   DP("Call to %s with interop " DPxMOD ", nowait %" PRId32 "\n", __func__,
-     DPxPTR(Interop), nowait);
+     DPxPTR(Interop), Nowait);
   if (OffloadPolicy::get(*PM).Kind == OffloadPolicy::DISABLED || !Interop)
     return OFFLOAD_FAIL;
 
   if (Interop->interop_type == kmp_interop_type_targetsync) {
     if (Deps) {
-      if (nowait) {
+      if (Nowait) {
         DP("Warning: nowait flag on interop use with dependences not supported"
            "yet. Ignored\n");
-        nowait = false;
+        Nowait = false;
       }
 
       __kmpc_omp_wait_deps(LocRef, Ctx->gtid, Deps->ndeps, Deps->deplist,
@@ -300,7 +299,7 @@ int __tgt_interop_use(ident_t *LocRef, omp_interop_val_t *Interop,
   }
 
   if (Interop->async_info && Interop->async_info->Queue) {
-    if (nowait)
+    if (Nowait)
       Interop->asyncBarrier();
     else {
       Interop->flush();
@@ -333,16 +332,16 @@ int __tgt_interop_release(ident_t *LocRef, omp_interop_val_t *Interop,
 }
 
 EXTERN int ompx_interop_add_completion_callback(omp_interop_val_t *Interop,
-                                                ompx_interop_cb_t *cb,
-                                                void *data) {
+                                                ompx_interop_cb_t *CB,
+                                                void *Data) {
   DP("Call to %s with interop " DPxMOD ", property callback " DPxMOD
      "and data " DPxMOD "\n",
-     __func__, DPxPTR(Interop), DPxPTR(cb), DPxPTR(data));
+     __func__, DPxPTR(Interop), DPxPTR(CB), DPxPTR(Data));
 
   if (OffloadPolicy::get(*PM).Kind == OffloadPolicy::DISABLED || !Interop)
     return omp_irc_other;
 
-  Interop->addCompletionCb(cb, data);
+  Interop->addCompletionCb(CB, Data);
 
   return omp_irc_success;
 }
@@ -433,15 +432,15 @@ int32_t omp_interop_val_t::release() {
   return release(Device);
 }
 
-void syncImplicitInterops(int gtid, void *event) {
+void syncImplicitInterops(int Gtid, void *Event) {
   if (PM->InteropTbl.size() == 0)
     return;
 
   DP("target_sync: syncing interops for gtid %" PRId32 ", event " DPxMOD "\n",
-     gtid, DPxPTR(event));
+     Gtid, DPxPTR(Event));
 
   for (auto iop : PM->InteropTbl) {
-    if (iop->async_info && iop->async_info->Queue && iop->isOwnedBy(gtid) &&
+    if (iop->async_info && iop->async_info->Queue && iop->isOwnedBy(Gtid) &&
         !iop->isClean()) {
 
       iop->flush();