debug build fixes

Author: adurang

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

@@ -16,7 +16,7 @@
 
 namespace llvm::omp::target::plugin {
 
-#if LIBOMPTARGET_DEBUG
+#if OMPTARGET_DEBUG
 static const char *AllocKindToStr(int32_t Kind) {
   switch (Kind) {
   case TARGET_ALLOC_DEVICE:
@@ -455,8 +455,9 @@ Error MemAllocatorTy::deinit() {
   }
   // Report memory usage if requested
   if (getDebugLevel() > 0) {
-    for (auto &Stat : Stats) {
-      DP("Memory usage for %s, device " DPxMOD "\n", AllocKindToStr(Stat.first),
+    for (size_t Kind = 0; Kind < MaxMemKind; Kind++) {
+      auto &Stat = Stats[Kind];
+      DP("Memory usage for %s, device " DPxMOD "\n", AllocKindToStr(Kind),
          DPxPTR(Device));
       if (Stat.NumAllocs[0] == 0 && Stat.NumAllocs[1] == 0) {
         DP("-- Not used\n");

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

@@ -98,15 +98,15 @@ Expected<int32_t> LevelZeroPluginTy::findDevices() {
   DP("List of devices (DeviceID[.SubID[.CCSID]])\n");
   for (auto &DeviceInfo : DetectedDevices) {
     (void)DeviceInfo; // to avoid unused variable warning in non-debug builds
-    DP("-- Device %" PRIu32 "%s%s (zeDevice=%p) from Driver %p\n",
+    DP("-- Device %" PRIu32 "%s%s (zeDevice=" PRIu64 ") from Driver %p\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.Id.Driver));
+       DPxPTR(DeviceInfo.Id.zeId), DPxPTR(DeviceInfo.Driver));
   }
   return NumDevices;
 }