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++; }