implement feedback

Author: ro-i

offload/libomptarget/OpenMP/API.cpp

@@ -93,6 +93,10 @@ EXTERN int omp_get_device_num(void) {
   return HostDevice;
 }
 
+static inline bool is_host_device_uid(const char *DeviceUid) {
+  return strcmp(DeviceUid, GenericDeviceTy::getHostDeviceUid()) == 0;
+}
+
 EXTERN int omp_get_device_from_uid(const char *DeviceUid) {
   TIMESCOPE();
   OMPT_IF_BUILT(ReturnAddressSetterRAII RA(__builtin_return_address(0)));
@@ -101,7 +105,7 @@ EXTERN int omp_get_device_from_uid(const char *DeviceUid) {
     DP("Call to omp_get_device_from_uid returning omp_invalid_device\n");
     return omp_invalid_device;
   }
-  if (strcmp(DeviceUid, GenericDeviceTy::getHostDeviceUid()) == 0) {
+  if (is_host_device_uid(DeviceUid)) {
     DP("Call to omp_get_device_from_uid returning host device number %d\n",
        omp_get_initial_device());
     return omp_get_initial_device();

openmp/device/include/DeviceTypes.h

@@ -21,6 +21,7 @@ template <typename T> using Constant = __gpu_constant T;
 template <typename T> using Local = __gpu_local T;
 template <typename T> using Global = __gpu_local T;
 
+// See definition in OpenMP (omp.h.var/omp_lib.(F90|h).var)
 #define omp_invalid_device -2
 
 enum omp_proc_bind_t {

openmp/runtime/src/kmp_ftn_entry.h

@@ -1550,7 +1550,6 @@ int FTN_STDCALL FTN_GET_DEVICE_NUM(void) KMP_WEAK_ATTRIBUTE_EXTERNAL;
 int FTN_STDCALL FTN_GET_DEVICE_NUM(void) {
   return KMP_EXPAND_NAME(FTN_GET_INITIAL_DEVICE)();
 }
-
 const char *FTN_STDCALL FTN_GET_UID_FROM_DEVICE(int device_num)
     KMP_WEAK_ATTRIBUTE_EXTERNAL;
 const char *FTN_STDCALL FTN_GET_UID_FROM_DEVICE(int device_num) {