fixes

Author: adurang

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

@@ -330,7 +330,7 @@ class MemAllocatorTy {
   /// to support target pointer with offset, and positive "ActiveSize" is
   /// specified in such cases for correct debug logging.
   Expected<void *> allocL0(size_t Size, size_t Align, int32_t Kind,
-                           size_t ActiveSize = 0);
+                           size_t ActiveSize = 0, bool Logging = true);
 
   /// Allocate memory with the specified information from a memory pool
   Expected<void *> alloc(size_t Size, size_t Align, int32_t Kind,

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

@@ -156,7 +156,7 @@ std::pair<uint32_t, uint32_t> L0DeviceTy::findCopyOrdinal(bool LinkCopy) {
 }
 
 void L0DeviceTy::reportDeviceInfo() const {
-  DP("Device %" PRIu32 "\n", DeviceId);
+  DP("Device %" PRIu32 " information\n", DeviceId);
   DP("-- Name                         : %s\n", getNameCStr());
   DP("-- PCI ID                       : 0x%" PRIx32 "\n", getPCIId());
   DP("-- UUID                         : %s\n", getUuid().data());
@@ -216,6 +216,8 @@ Error L0DeviceTy::initImpl(GenericPluginTy &Plugin) {
   if (auto Err = MemAllocator.initDevicePools(*this, Options))
     return Err;
   l0Context.getHostMemAllocator().updateMaxAllocSize(*this);
+  if (getDebugLevel() > 0)
+    reportDeviceInfo();
   return Plugin::success();
 }
 

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

@@ -83,7 +83,9 @@ Error MemAllocatorTy::MemPoolTy::init(int32_t Kind, MemAllocatorTy *AllocatorIn,
 
   // Check page size used for this allocation kind to decide minimum
   // allocation size when allocating from L0.
-  auto MemOrErr = Allocator->allocL0(8, 0, AllocKind);
+  auto MemOrErr =
+      Allocator->allocL0(/* Size=*/8, /*Align=*/0, AllocKind, /*ActiveSize=*/0,
+                         /*Logging=*/false);
   if (!MemOrErr)
     return MemOrErr.takeError();
   void *Mem = *MemOrErr;
@@ -610,7 +612,8 @@ Error MemAllocatorTy::enqueueMemCopy(void *Dst, const void *Src, size_t Size) {
 }
 
 Expected<void *> MemAllocatorTy::allocL0(size_t Size, size_t Align,
-                                         int32_t Kind, size_t ActiveSize) {
+                                         int32_t Kind, size_t ActiveSize,
+                                         bool Logging) {
   void *Mem = nullptr;
   ze_device_mem_alloc_desc_t DeviceDesc{ZE_STRUCTURE_TYPE_DEVICE_MEM_ALLOC_DESC,
                                         nullptr, 0, 0};
@@ -649,8 +652,11 @@ Expected<void *> MemAllocatorTy::allocL0(size_t Size, size_t Align,
     assert(0 && "Invalid target data allocation kind");
   }
 
-  size_t LoggedSize = ActiveSize ? ActiveSize : Size;
-  log(LoggedSize, LoggedSize, Kind);
+  if (Logging) {
+    size_t LoggedSize = ActiveSize ? ActiveSize : Size;
+    log(LoggedSize, LoggedSize, Kind);
+  }
+
   if (makeResident) {
     assert(Device &&
            "Device is not set for memory allocation. Is this a Device Pool?");

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

@@ -144,14 +144,9 @@ GenericDeviceTy *LevelZeroPluginTy::createDevice(GenericPluginTy &Plugin,
                       (SubId < 0 ? "" : "." + std::to_string(SubId)) +
                       (CCSId < 0 ? "" : "." + std::to_string(CCSId));
 
-  auto *NewDevice = new L0DeviceTy(
-      static_cast<LevelZeroPluginTy &>(Plugin), DeviceId, NumDevices, zeDevice,
-      *zeDriver, std::move(IdStr), CCSId < 0 ? 0 : CCSId /* ComputeIndex */);
-  if (NewDevice && getDebugLevel() > 0) {
-    DP("Device %" PRIi32 " information\n", DeviceId);
-    NewDevice->reportDeviceInfo();
-  }
-  return NewDevice;
+  return new L0DeviceTy(static_cast<LevelZeroPluginTy &>(Plugin), DeviceId,
+                        NumDevices, zeDevice, *zeDriver, std::move(IdStr),
+                        CCSId < 0 ? 0 : CCSId /* ComputeIndex */);
 }
 
 GenericGlobalHandlerTy *LevelZeroPluginTy::createGlobalHandler() {