From 22182e12bdc003ba164650bfa8ac82c0041c86b3 Mon Sep 17 00:00:00 2001
From: German Andryeyev <German.Andryeyev@amd.com>
Date: Wed, 27 Oct 2021 10:48:35 -0400
Subject: [PATCH] SWDEV-286150 - Switch PAL to 678 interface

Change-Id: I3c130998902654e1dffc954ddf33530ea998ac34


[ROCm/clr commit: 4aea2ad1722f83b6686b78162200a47f6ab4799d]
---
 projects/clr/rocclr/device/pal/palcdefs        | 2 +-
 projects/clr/rocclr/device/pal/palresource.cpp | 8 ++++----
 projects/clr/rocclr/device/pal/palvirtual.cpp  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/projects/clr/rocclr/device/pal/palcdefs b/projects/clr/rocclr/device/pal/palcdefs
index ab2e762171..3cdaff8689 100644
--- a/projects/clr/rocclr/device/pal/palcdefs
+++ b/projects/clr/rocclr/device/pal/palcdefs
@@ -1,3 +1,3 @@
 # PAL interface versions
-PAL_MAJOR_VERSION = 665
+PAL_MAJOR_VERSION = 678
 GPUOPEN_MAJOR_VERSION = 42
diff --git a/projects/clr/rocclr/device/pal/palresource.cpp b/projects/clr/rocclr/device/pal/palresource.cpp
index a3de8b86e3..4c1142895b 100644
--- a/projects/clr/rocclr/device/pal/palresource.cpp
+++ b/projects/clr/rocclr/device/pal/palresource.cpp
@@ -84,7 +84,7 @@ GpuMemoryReference* GpuMemoryReference::Create(const Device& dev,
   }
   if (!createInfo.flags.sdiExternal) {
     // Update free memory size counters
-    dev.updateAllocedMemory(memRef->gpuMem_->Desc().preferredHeap, memRef->gpuMem_->Desc().size, false);
+    dev.updateAllocedMemory(memRef->gpuMem_->Desc().heaps[0], memRef->gpuMem_->Desc().size, false);
   }
   return memRef;
 }
@@ -111,7 +111,7 @@ GpuMemoryReference* GpuMemoryReference::Create(const Device& dev,
     }
   }
   // Update free memory size counters
-  dev.updateAllocedMemory(memRef->gpuMem_->Desc().preferredHeap, memRef->gpuMem_->Desc().size, false);
+  dev.updateAllocedMemory(memRef->gpuMem_->Desc().heaps[0], memRef->gpuMem_->Desc().size, false);
   return memRef;
 }
 
@@ -136,7 +136,7 @@ GpuMemoryReference* GpuMemoryReference::Create(const Device& dev,
     }
   }
   // Update free memory size counters
-  dev.updateAllocedMemory(memRef->gpuMem_->Desc().preferredHeap, memRef->gpuMem_->Desc().size, false);
+  dev.updateAllocedMemory(memRef->gpuMem_->Desc().heaps[0], memRef->gpuMem_->Desc().size, false);
   return memRef;
 }
 
@@ -251,7 +251,7 @@ GpuMemoryReference::~GpuMemoryReference() {
   if (!(iMem()->Desc().flags.isShared || iMem()->Desc().flags.isExternal ||
         iMem()->Desc().flags.isExternPhys)) {
     // Update free memory size counters
-    device_.updateAllocedMemory(iMem()->Desc().preferredHeap, iMem()->Desc().size, true);
+    device_.updateAllocedMemory(iMem()->Desc().heaps[0], iMem()->Desc().size, true);
   }
   iMem()->Destroy();
   gpuMem_ = nullptr;
diff --git a/projects/clr/rocclr/device/pal/palvirtual.cpp b/projects/clr/rocclr/device/pal/palvirtual.cpp
index 8df146c5bd..5f87f19dfc 100644
--- a/projects/clr/rocclr/device/pal/palvirtual.cpp
+++ b/projects/clr/rocclr/device/pal/palvirtual.cpp
@@ -527,7 +527,7 @@ void VirtualGPU::Queue::DumpMemoryReferences() const {
       dump << (it.first)->iMem()->Desc().gpuVirtAddr << ", "
            << (it.first)->iMem()->Desc().gpuVirtAddr + (it.first)->iMem()->Desc().size;
       dump.setf(std::ios::dec);
-      dump << "] CbId:" << it.second << ", Heap: " << (it.first)->iMem()->Desc().preferredHeap
+      dump << "] CbId:" << it.second << ", Heap: " << (it.first)->iMem()->Desc().heaps[0]
            << "\n";
       idx++;
     }