Add more fixes

Author: kevinsala

offload/include/device.h

@@ -37,6 +37,8 @@
 #include "PluginInterface.h"
 
 using GenericPluginTy = llvm::omp::target::plugin::GenericPluginTy;
+using DeviceInfo = llvm::omp::target::plugin::DeviceInfo;
+using InfoTreeNode = llvm::omp::target::plugin::InfoTreeNode;
 
 // Forward declarations.
 struct __tgt_bin_desc;
@@ -167,8 +169,20 @@ struct DeviceTy {
   /// Indicate that there are pending images for this device or not.
   void setHasPendingImages(bool V) { HasPendingImages = V; }
 
-  /// Get the maximum shared memory per team for any kernel.
-  uint64_t getMaxSharedTeamMemory();
+  /// Get information from the device.
+  template <typename T>
+  T getInfo(DeviceInfo Info) const {
+    InfoTreeNode DevInfo = RTL->obtain_device_info(RTLDeviceID);
+
+    auto EntryOpt = DevInfo.get(Info);
+    if (!EntryOpt)
+      return 0;
+
+    auto Entry = *EntryOpt;
+    if (!std::holds_alternative<T>(Entry->Value))
+      return T{};
+    return std::get<T>(Entry->Value);
+  }
 
 private:
   /// Deinitialize the device (and plugin).

offload/include/omptarget.h

@@ -280,9 +280,8 @@ void ompx_dump_mapping_tables(void);
 int omp_get_num_devices(void);
 int omp_get_device_num(void);
 int omp_get_initial_device(void);
-size_t
-omp_get_groupprivate_limit(int DeviceNum,
-                           omp_access_t AccessGroup = omp_access_cgroup);
+size_t omp_get_groupprivate_limit(int DeviceNum,
+                                  omp_access_t AccessGroup = omp_access_cgroup);
 void *omp_target_alloc(size_t Size, int DeviceNum);
 void omp_target_free(void *DevicePtr, int DeviceNum);
 int omp_target_is_present(const void *Ptr, int DeviceNum);

offload/libomptarget/OpenMP/API.cpp

@@ -90,7 +90,7 @@ EXTERN size_t omp_get_groupprivate_limit(int DeviceNum,
   if (!DeviceOrErr)
     FATAL_MESSAGE(DeviceNum, "%s", toString(DeviceOrErr.takeError()).c_str());
 
-  return DeviceOrErr->getMaxSharedTeamMemory();
+  return DeviceOrErr->getInfo<uint64_t>(DeviceInfo::WORK_GROUP_LOCAL_MEM_SIZE);
 }
 
 EXTERN void *omp_target_alloc(size_t Size, int DeviceNum) {

offload/libomptarget/device.cpp

@@ -371,16 +371,3 @@ bool DeviceTy::useAutoZeroCopy() {
 bool DeviceTy::isAccessiblePtr(const void *Ptr, size_t Size) {
   return RTL->is_accessible_ptr(RTLDeviceID, Ptr, Size);
 }
-
-uint64_t DeviceTy::getMaxSharedTeamMemory() {
-  InfoTreeNode Info = RTL->obtain_device_info(RTLDeviceID);
-
-  auto EntryOpt = Info.get(DeviceInfo::WORK_GROUP_LOCAL_MEM_SIZE);
-  if (!EntryOpt)
-    return 0;
-
-  auto Entry = *EntryOpt;
-  if (!std::holds_alternative<uint64_t>(Entry->Value))
-    return 0;
-  return std::get<uint64_t>(Entry->Value);
-}