From bd0082644692d56924e176b851648094f7208b0d Mon Sep 17 00:00:00 2001 From: German Date: Mon, 28 Aug 2023 17:09:26 -0400 Subject: [PATCH] SWDEV-3 - Move PAL to version 818 Restore PAL platform destruction. Update CmdAllocatorCreateInfo::AllocInfo for the new interface. Change-Id: Iea418eed7ee26166039a4a9cc1999438856e9097 --- rocclr/cmake/ROCclrPAL.cmake | 2 +- rocclr/device/pal/paldevice.cpp | 2 +- rocclr/device/pal/palvirtual.cpp | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/rocclr/cmake/ROCclrPAL.cmake b/rocclr/cmake/ROCclrPAL.cmake index 2e41bbdb1c..ef4e081424 100644 --- a/rocclr/cmake/ROCclrPAL.cmake +++ b/rocclr/cmake/ROCclrPAL.cmake @@ -20,7 +20,7 @@ set(PAL_CLIENT "OCL") -set(PAL_CLIENT_INTERFACE_MAJOR_VERSION 792) +set(PAL_CLIENT_INTERFACE_MAJOR_VERSION 818) set(GPUOPEN_CLIENT_INTERFACE_MAJOR_VERSION 42) set(GPUOPEN_CLIENT_INTERFACE_MINOR_VERSION 0) set(AMD_DK_ROOT $ENV{DK_ROOT}) diff --git a/rocclr/device/pal/paldevice.cpp b/rocclr/device/pal/paldevice.cpp index d79daf71b8..09f9fe4e28 100644 --- a/rocclr/device/pal/paldevice.cpp +++ b/rocclr/device/pal/paldevice.cpp @@ -1398,7 +1398,7 @@ bool Device::init() { void Device::tearDown() { if (platform_ != nullptr) { - // platform_->Destroy(); + platform_->Destroy(); delete platformObj_; platform_ = nullptr; } diff --git a/rocclr/device/pal/palvirtual.cpp b/rocclr/device/pal/palvirtual.cpp index acd9fba3be..4c82dfdf9c 100644 --- a/rocclr/device/pal/palvirtual.cpp +++ b/rocclr/device/pal/palvirtual.cpp @@ -893,6 +893,10 @@ bool VirtualGPU::create(bool profiling, uint deviceQueueSize, uint rtCUs, createInfo.allocInfo[Pal::EmbeddedDataAlloc].allocSize = 256 * Ki; createInfo.allocInfo[Pal::EmbeddedDataAlloc].suballocSize = 64 * Ki; + createInfo.allocInfo[Pal::LargeEmbeddedDataAlloc].allocHeap = Pal::GpuHeapGartUswc; + createInfo.allocInfo[Pal::LargeEmbeddedDataAlloc].allocSize = 64 * Ki; + createInfo.allocInfo[Pal::LargeEmbeddedDataAlloc].suballocSize = 32 * Ki; + createInfo.allocInfo[Pal::GpuScratchMemAlloc].allocHeap = Pal::GpuHeapInvisible; createInfo.allocInfo[Pal::GpuScratchMemAlloc].allocSize = 64 * Ki; createInfo.allocInfo[Pal::GpuScratchMemAlloc].suballocSize = 4 * Ki;