fix different issues

Author: adurang

offload/CMakeLists.txt

@@ -185,8 +185,8 @@ if(NOT (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(AMD64)$" AND
   endif()
 endif()
 if("level_zero" IN_LIST LIBOMPTARGET_PLUGINS_TO_BUILD AND
-		NOT LIBOMPTARGET_DEP_LEVEL_ZERO_FOUND)
-    list(REMOVE_ITEM LIBOMPTARGET_PLUGINS_TO_BUILD "level_zero")
+   NOT LIBOMPTARGET_DEP_LEVEL_ZERO_FOUND)
+  list(REMOVE_ITEM LIBOMPTARGET_PLUGINS_TO_BUILD "level_zero")
 endif()
 message(STATUS "Building the offload library with support for "
                "the \"${LIBOMPTARGET_PLUGINS_TO_BUILD}\" plugins")

offload/cmake/Modules/LibomptargetGetDependencies.cmake

@@ -95,7 +95,7 @@ endif()
 find_path(LIBOMPTARGET_DEP_LEVEL_ZERO_INCLUDE_DIRS NAMES level_zero/ze_api.h)
 
 if(NOT LIBOMPTARGET_DEP_LEVEL_ZERO_INCLUDE_DIRS)
-	set(LIBOMPTARGET_DEP_LEVEL_ZERO_FOUND FALSE)
+  set(LIBOMPTARGET_DEP_LEVEL_ZERO_FOUND FALSE)
 else()
   set(LIBOMPTARGET_DEP_LEVEL_ZERO_FOUND TRUE)
   find_library(LIBOMPTARGET_DEP_LEVEL_ZERO_LIBRARIES NAMES ze_loader)

offload/plugins-nextgen/level_zero/include/L0Device.h

@@ -403,6 +403,7 @@ class L0DeviceTy final : public GenericDeviceTy {
   auto getMaxGroupSize() const { return ComputeProperties.maxTotalGroupSize; }
   auto getGlobalMemorySize() const { return MemoryProperties.totalSize; }
   auto getCacheSize() const { return CacheProperties.cacheSize; }
+  auto getMaxMemAllocSize() const { return DeviceProperties.maxMemAllocSize; }
 
   int32_t getAllocKind() const { return AllocKind; }
   DeviceArchTy getDeviceArch() const { return DeviceArch; }

offload/plugins-nextgen/level_zero/include/L0Options.h

@@ -27,28 +27,26 @@ enum class CommandModeTy { Sync = 0, Async, AsyncOrdered };
 class SpecConstantsTy {
   std::vector<uint32_t> ConstantIds;
   std::vector<const void *> ConstantValues;
+  BumpPtrAllocator &Allocator;
 
 public:
-  SpecConstantsTy() = default;
+  SpecConstantsTy(BumpPtrAllocator &Allocator) : Allocator(Allocator) {}
   SpecConstantsTy(const SpecConstantsTy &) = delete;
   SpecConstantsTy(SpecConstantsTy &&) = delete;
   SpecConstantsTy &operator=(const SpecConstantsTy &) = delete;
   SpecConstantsTy &operator=(const SpecConstantsTy &&) = delete;
   SpecConstantsTy(const SpecConstantsTy &&Other)
       : ConstantIds(std::move(Other.ConstantIds)),
-        ConstantValues(std::move(Other.ConstantValues)) {}
+        ConstantValues(std::move(Other.ConstantValues)),
+        Allocator(Other.Allocator) {}
 
   ~SpecConstantsTy() {
-    for (auto I : ConstantValues) {
-      const char *ValuePtr = reinterpret_cast<const char *>(I);
-      delete[] ValuePtr;
-    }
   }
 
   template <typename T> void addConstant(uint32_t Id, T Val) {
-    const size_t ValSize = sizeof(Val);
-    char *ValuePtr = new char[ValSize];
-    *reinterpret_cast<T *>(ValuePtr) = Val;
+    T *ValuePtr =
+        reinterpret_cast<T *>(Allocator.Allocate(sizeof(T), alignof(T)));
+    *ValuePtr = Val;
 
     ConstantIds.push_back(Id);
     ConstantValues.push_back(reinterpret_cast<void *>(ValuePtr));
@@ -134,7 +132,10 @@ struct L0OptionsTy {
 
   bool Init = false; // have the options already been processed
 
-  L0OptionsTy() {}
+  // Allocator for long-lived allocations (e.g. spec constants)
+  BumpPtrAllocator Allocator;
+
+  L0OptionsTy() : CommonSpecConstants(Allocator) {}
 
   /// Read environment variables
   void processEnvironmentVars();

offload/plugins-nextgen/level_zero/src/L0Device.cpp

@@ -553,10 +553,25 @@ Error L0DeviceTy::initDeviceInfoImpl(__tgt_device_info *Info) {
   return Plugin::success();
 }
 
+static const char *DriverVersionToStrTable[] = {
+    "1.0", "1.1", "1.2", "1.3",  "1.4",  "1.5", "1.6",
+    "1.7", "1.8", "1.9", "1.10", "1.11", "1.12"};
+constexpr size_t DriverVersionToStrTableSize =
+    sizeof(DriverVersionToStrTable) / sizeof(DriverVersionToStrTable[0]);
+
 Expected<InfoTreeNode> L0DeviceTy::obtainInfoImpl() {
   InfoTreeNode Info;
   Info.add("Device Number", getDeviceId());
-  Info.add("Device Name", getNameCStr());
+  Info.add("Device Name", getNameCStr(), "", DeviceInfo::NAME);
+  Info.add("Device Type", "GPU", "", DeviceInfo::TYPE);
+  Info.add("Vendor", "Intel", "", DeviceInfo::VENDOR);
+  Info.add("Vendor ID", getVendorId(), "", DeviceInfo::VENDOR_ID);
+  auto DriverVersion = getDriverAPIVersion();
+  if (DriverVersion < DriverVersionToStrTableSize)
+    Info.add("Driver Version", DriverVersionToStrTable[DriverVersion], "",
+             DeviceInfo::DRIVER_VERSION);
+  else
+    Info.add("Driver Version", "Unknown", "", DeviceInfo::DRIVER_VERSION);
   Info.add("Device PCI ID", getPCIId());
   Info.add("Device UUID", getUuid().data());
   Info.add("Number of total EUs", getNumEUs());
@@ -566,9 +581,10 @@ Expected<InfoTreeNode> L0DeviceTy::obtainInfoImpl() {
   Info.add("Number of subslices per slice", getNumSubslicesPerSlice());
   Info.add("Number of slices", getNumSlices());
   Info.add("Local memory size (bytes)", getMaxSharedLocalMemory());
-  Info.add("Global memory size (bytes)", getGlobalMemorySize());
+  Info.add("Global memory size (bytes)", getGlobalMemorySize(), "", DeviceInfo::GLOBAL_MEM_SIZE);
   Info.add("Cache size (bytes)", getCacheSize());
-  Info.add("Max clock frequency (MHz)", getClockRate());
+  Info.add("Max Memory Allocation Size (bytes)", getMaxMemAllocSize(), "", DeviceInfo::MAX_MEM_ALLOC_SIZE);
+  Info.add("Max clock frequency (MHz)", getClockRate(), "" , DeviceInfo::MAX_CLOCK_FREQUENCY);
   return Info;
 }