fixes and cleanup

Author: adurang

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

@@ -348,10 +348,10 @@ class L0DeviceTy final : public GenericDeviceTy {
   uint32_t getMaxSharedLocalMemory() const {
     return ComputeProperties.maxSharedLocalMemory;
   }
-  auto getMaxGroupSize() const { return ComputeProperties.maxTotalGroupSize; }
-  auto getGlobalMemorySize() const { return MemoryProperties.totalSize; }
-  auto getCacheSize() const { return CacheProperties.cacheSize; }
-  auto getMaxMemAllocSize() const { return DeviceProperties.maxMemAllocSize; }
+  uint32_t getMaxGroupSize() const { return ComputeProperties.maxTotalGroupSize; }
+  uint64_t getGlobalMemorySize() const { return MemoryProperties.totalSize; }
+  size_t getCacheSize() const { return CacheProperties.cacheSize; }
+  uint64_t getMaxMemAllocSize() const { return DeviceProperties.maxMemAllocSize; }
 
   int32_t getAllocKind() const { return AllocKind; }
   DeviceArchTy getDeviceArch() const { return DeviceArch; }

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

@@ -214,12 +214,12 @@ class MemAllocatorTy {
     void printUsage();
 
     /// Initialize pool with allocation kind, allocator, and user options.
-    Error init(int32_t Kind, MemAllocatorTy *_Allocator,
+    Error init(int32_t Kind, MemAllocatorTy *Allocator,
                const L0OptionsTy &Option);
     // Initialize pool used for reduction pool
-    Error init(MemAllocatorTy *_Allocator, const L0OptionsTy &Option);
+    Error init(MemAllocatorTy *Allocator, const L0OptionsTy &Option);
     // Initialize pool used for small memory pool with fixed parameters
-    Error init(MemAllocatorTy *_Allocator);
+    Error init(MemAllocatorTy *Allocator);
 
     /// Release resources used in the pool.
     Error deinit();

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

@@ -213,7 +213,7 @@ Error L0DeviceTy::initImpl(GenericPluginTy &Plugin) {
 
   IsAsyncEnabled =
       isDiscreteDevice() && Options.CommandMode != CommandModeTy::Sync;
-  if (auto Err = MemAllocator.initDevicePools(*this, getPlugin().getOptions()))
+  if (auto Err = MemAllocator.initDevicePools(*this, Options))
     return Err;
   l0Context.getHostMemAllocator().updateMaxAllocSize(*this);
   return Plugin::success();
@@ -639,6 +639,7 @@ Expected<OmpInteropTy> L0DeviceTy::createInterop(int32_t InteropContext,
     if (useImmForInterop()) {
       auto CmdListOrErr = createImmCmdList(InOrder);
       if (!CmdListOrErr) {
+        delete Ret->async_info;
         delete Ret;
         return CmdListOrErr.takeError();
       }
@@ -647,6 +648,7 @@ Expected<OmpInteropTy> L0DeviceTy::createInterop(int32_t InteropContext,
     } else {
       auto QueueOrErr = createCommandQueue(InOrder);
       if (!QueueOrErr) {
+        delete Ret->async_info;
         delete Ret;
         return QueueOrErr.takeError();
       }

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

@@ -430,6 +430,8 @@ Error MemAllocatorTy::deinit() {
     return Plugin::success();
 
   std::lock_guard<std::mutex> Lock(Mtx);
+  if (!L0Context)
+    return Plugin::success();
   // Release RTL-owned memory
   for (auto *M : MemOwned) {
     auto Err = deallocLocked(M);
@@ -501,7 +503,7 @@ Expected<void *> MemAllocatorTy::alloc(size_t Size, size_t Align, int32_t Kind,
       (AllocOpt == AllocOptionTy::ALLOC_OPT_REDUCTION_COUNTER);
   const bool UseDedicatedPool = UseScratchPool || UseZeroInitPool;
 
-  if ((Pools[Kind] != nullptr && MemAdvice == UINT32_MAX) || UseDedicatedPool) {
+  if ((Pools[Kind] && MemAdvice == UINT32_MAX) || UseDedicatedPool) {
     // Pool is enabled for the allocation kind, and we do not use any memory
     // advice. We should avoid using pool if there is any meaningful memory
     // advice not to affect sibling allocation in the same block.
@@ -511,11 +513,11 @@ Expected<void *> MemAllocatorTy::alloc(size_t Size, size_t Align, int32_t Kind,
     MemPoolTy *Pool = nullptr;
 
     if (UseScratchPool)
-      AllocBase = &ReductionPool;
+      Pool = ReductionPool.get();
     else if (UseZeroInitPool)
-      AllocBase = &CounterPool;
+      Pool = CounterPool.get();
     else
-      AllocBase = Pools[Kind].get();
+      Pool = Pools[Kind].get();
 
     auto PtrOrErr = Pool->alloc(AllocSize, PoolAllocSize);
     if (!PtrOrErr)
@@ -567,7 +569,7 @@ Error MemAllocatorTy::deallocLocked(void *Ptr) {
   }
   if (Info.InPool) {
     size_t DeallocSize = 0;
-    if (Pools[Info.Kind] != nullptr)
+    if (Pools[Info.Kind])
       DeallocSize = Pools[Info.Kind]->dealloc(Info.Base);
     if (DeallocSize == 0) {
       // Try reduction scratch pool

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

@@ -41,8 +41,7 @@ void L0OptionsTy::processEnvironmentVars() {
   if (MemoryPoolVar.isPresent()) {
     if (MemoryPoolVar.get() == "0") {
       Flags.UseMemoryPool = 0;
-      std::for_each(MemPoolConfig.begin(), MemPoolConfig.end(),
-                    [](auto &I) { I = {false, 0, 0, 0}; });
+      MemPoolConfig.fill({false, 0, 0, 0});
     } else {
       std::istringstream Str(MemoryPoolVar.get());
       int32_t MemType = -1;
@@ -51,7 +50,7 @@ void L0OptionsTy::processEnvironmentVars() {
       const std::array<int32_t, 3> DefaultValue{1, 4, 256};
       const int32_t AllMemType = INT32_MAX;
       std::array<int32_t, 3> AllInfo{1, 4, 256};
-      std::array<std::array<int32_t, 3>, 3> PoolInfo;
+      std::array<std::array<int32_t, 3>, 3> PoolInfo = {{{0, 0, 0}}};
       for (std::string Token; std::getline(Str, Token, ',') && Valid > 0;) {
         if (Token == "device") {
           MemType = TARGET_ALLOC_DEVICE;
@@ -95,8 +94,7 @@ void L0OptionsTy::processEnvironmentVars() {
             MemPoolConfig[TARGET_ALLOC_SHARED] = {true, AllInfo[0], AllInfo[1],
                                                   AllInfo[2]};
           } else {
-            std::for_each(MemPoolConfig.begin(), MemPoolConfig.end(),
-                          [](auto &I) { I = {false, 0, 0, 0}; });
+            MemPoolConfig.fill({false, 0, 0, 0});
           }
         } else {
           for (size_t Pool = 0; Pool < PoolInfo.size(); ++Pool) {

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

@@ -96,17 +96,16 @@ Expected<int32_t> LevelZeroPluginTy::findDevices() {
 
   DP("Found %" PRIu32 " devices.\n", NumDevices);
   DP("List of devices (DeviceID[.SubID[.CCSID]])\n");
-  for (auto &DeviceInfo : DetectedDevices) {
+    for (auto &DeviceInfo : DetectedDevices) {
     (void)DeviceInfo; // to avoid unused variable warning in non-debug builds
-    DP("-- Device %" PRIu32 "%s%s (zeDevice=" PRIu64 ") from Driver %p\n",
+    DP("-- Device %" PRIu32 "%s%s\n",
        DeviceInfo.Id.RootId,
        (DeviceInfo.Id.SubId < 0
             ? ""
             : ("." + std::to_string(DeviceInfo.Id.SubId)).c_str()),
        (DeviceInfo.Id.CCSId < 0
             ? ""
-            : ("." + std::to_string(DeviceInfo.Id.CCSId)).c_str()),
-       DPxPTR(DeviceInfo.Id.zeId), DPxPTR(DeviceInfo.Driver));
+            : ("." + std::to_string(DeviceInfo.Id.CCSId)).c_str()));
   }
   return NumDevices;
 }